Finish 1.1.3.

Update the reader spec to require @reader_input and @reader_count to allow testing against Enumberable expectations.
Read using @reader_input, and expect it to be valid and yield @reader_count statements.

Author: gkellogg

.gemspec

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gemspec :name => ""
+gemspec
 
 gem "rdf", :git => "git://github.com/ruby-rdf/rdf.git", :branch => "develop"
 

Gemfile

@@ -1,6 +1,6 @@
 # RSpec Extensions for RDF.rb
 
-This is an [RDF.rb][] plugin that provides RDF-specific [RSpec][] matchers
+This is an [RDF.rb][] extension that provides RDF-specific [RSpec][] matchers
 and shared examples for Ruby projects that use RDF.rb and RSpec.
 
 * <http://github.com/ruby-rdf/rdf-spec>

README.md

@@ -1,16 +1,18 @@
 #!/usr/bin/env ruby
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
 require 'rubygems'
-begin
-  require 'rakefile' # @see http://github.com/bendiken/rakefile
-rescue LoadError => e
-end
-
 require 'rdf/spec'
 
-desc "Build the rdf-spec-#{File.read('VERSION').chomp}.gem file"
-task :build do
-  sh "gem build .gemspec"
+namespace :gem do
+  desc "Build the rdf-spec-#{File.read('VERSION').chomp}.gem file"
+  task :build  do
+    sh "gem build rdf-spec.gemspec && mv rdf-spec-#{File.read('VERSION').chomp}.gem pkg/"
+  end
+
+  desc "Release the rdf-spec-#{File.read('VERSION').chomp}.gem file"
+  task :release do
+    sh "gem push pkg/rdf-spec-#{File.read('VERSION').chomp}.gem"
+  end
 end
 
 desc "Build etc files"

Rakefile

@@ -1 +1 @@
-1.1.0
+1.1.3

VERSION

@@ -6,6 +6,8 @@ module RDF_Reader
 
   before(:each) do
     raise '+@reader+ must be defined in a before(:each) block' unless instance_variable_get('@reader')
+    raise '+@reader_input+ must be defined in a before(:each) block' unless instance_variable_get('@reader_input')
+    raise '+@reader_count+ must be defined in a before(:each) block' unless instance_variable_get('@reader_count')
     @reader_class = @reader.class
   end
 
@@ -20,12 +22,11 @@ module RDF_Reader
 
     describe ".open" do
       before(:each) do
-        RDF::Util::File.stub(:open_file).and_yield(StringIO.new("foo"))
+        RDF::Util::File.stub(:open_file).and_yield(StringIO.new(@reader_input))
       end
 
       it "yields reader given file_name" do
         @reader_class.format.each do |f|
-          RDF::Util::File.stub(:open_file).and_yield(StringIO.new("foo"))
           f.file_extensions.each_pair do |sym, content_type|
             reader_mock = double("reader")
             expect(reader_mock).to receive(:got_here)
@@ -40,7 +41,6 @@ module RDF_Reader
 
       it "yields reader given symbol" do
         @reader_class.format.each do |f|
-          RDF::Util::File.stub(:open_file).and_yield(StringIO.new("foo"))
           sym = f.to_sym  # Like RDF::NTriples::Format => :ntriples
           reader_mock = double("reader")
           expect(reader_mock).to receive(:got_here)
@@ -54,7 +54,6 @@ module RDF_Reader
 
       it "yields reader given {:file_name => file_name}" do
         @reader_class.format.each do |f|
-          RDF::Util::File.stub(:open_file).and_yield(StringIO.new("foo"))
           f.file_extensions.each_pair do |sym, content_type|
             reader_mock = double("reader")
             expect(reader_mock).to receive(:got_here)
@@ -69,7 +68,6 @@ module RDF_Reader
 
       it "yields reader given {:content_type => 'a/b'}" do
         @reader_class.format.each do |f|
-          RDF::Util::File.stub(:open_file).and_yield(StringIO.new("foo"))
           f.content_types.each_pair do |content_type, formats|
             reader_mock = double("reader")
             expect(reader_mock).to receive(:got_here)
@@ -94,37 +92,32 @@ module RDF_Reader
       it "sets @input to StringIO given a string" do
         reader_mock = double("reader")
         expect(reader_mock).to receive(:got_here)
-        @reader_class.new("string") do |r|
+        @reader_class.new(@reader_input) do |r|
           reader_mock.got_here
           expect(r.instance_variable_get(:@input)).to be_a(StringIO)
         end
       end
-    
+
       it "sets @input to input given something other than a string" do
         reader_mock = double("reader")
         expect(reader_mock).to receive(:got_here)
-        file = StringIO.new("")
+        file = StringIO.new(@reader_input)
         @reader_class.new(file) do |r|
           reader_mock.got_here
           expect(r.instance_variable_get(:@input)).to eq file
         end
       end
-    
+
       it "sets validate given :validate => true" do
-        # Either set validate, or through error, due to invalid input (null input may be invalid)
-        begin
-          @reader_class.new("string", :validate => true) do |r|
-            expect(r).to be_valid
-          end
-        rescue
-          expect($!).to be_a(RDF::ReaderError)  # An error is acceptable
+        @reader_class.new(@reader_input, :validate => true) do |r|
+          expect(r).to be_valid
         end
       end
 
       it "sets canonicalize given :canonicalize => true" do
         reader_mock = double("reader")
         expect(reader_mock).to receive(:got_here)
-        @reader_class.new("string", :canonicalize => true) do |r|
+        @reader_class.new(@reader_input, :canonicalize => true) do |r|
           reader_mock.got_here
           expect(r).to be_canonicalize
         end
@@ -133,7 +126,7 @@ module RDF_Reader
       it "sets intern given :intern => true" do
         reader_mock = double("reader")
         expect(reader_mock).to receive(:got_here)
-        @reader_class.new("string", :intern => true) do |r|
+        @reader_class.new(@reader_input, :intern => true) do |r|
           reader_mock.got_here
           expect(r).to be_intern
         end
@@ -142,7 +135,7 @@ module RDF_Reader
       it "sets prefixes given :prefixes => {}" do
         reader_mock = double("reader")
         expect(reader_mock).to receive(:got_here)
-        @reader_class.new("string", :prefixes => {:a => "b"}) do |r|
+        @reader_class.new(@reader_input, :prefixes => {:a => "b"}) do |r|
           reader_mock.got_here
           expect(r.prefixes).to eq({:a => "b"})
         end
@@ -168,5 +161,48 @@ module RDF_Reader
         end
       end
     end
+
+    context RDF::Enumerable do
+      it "#count" do
+        @reader_class.new(@reader_input) {|r| expect(r.count).to eq @reader_count}
+      end
+      it "#empty?" do
+        @reader_class.new(@reader_input) {|r| expect(r).not_to be_empty}
+      end
+
+      it "#statements" do
+        @reader_class.new(@reader_input) {|r| expect(r.statements.count).to eq @reader_count}
+      end
+      it "#has_statement?" do
+        @reader_class.new(@reader_input) {|r| expect(r).to respond_to(:has_statement?)}
+      end
+      it "#each_statement" do
+        @reader_class.new(@reader_input) {|r| expect(r.each_statement.count).to eq @reader_count}
+      end
+      it "#enum_statement" do
+        @reader_class.new(@reader_input) {|r| expect(r.enum_statement.count).to eq @reader_count}
+      end
+
+      it "#triples" do
+        @reader_class.new(@reader_input) {|r| expect(r.triples.count).to eq @reader_count}
+      end
+      it "#each_triple" do
+        @reader_class.new(@reader_input) {|r| expect(r.each_triple.count).to eq @reader_count}
+      end
+      it "#enum_triple" do
+        @reader_class.new(@reader_input) {|r| expect(r.enum_triple.count).to eq @reader_count}
+      end
+
+      it "#quads" do
+        @reader_class.new(@reader_input) {|r| expect(r.quads.count).to eq @reader_count}
+      end
+      it "#each_quad" do
+        @reader_class.new(@reader_input) {|r| expect(r.each_quad.count).to eq @reader_count}
+      end
+      it "#enum_quad" do
+        @reader_class.new(@reader_input) {|r| expect(r.enum_quad.count).to eq @reader_count}
+      end
+
+    end
   end
 end

lib/rdf/spec/reader.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby -rubygems
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |gem|
+  gem.version            = File.read('VERSION').chomp
+  gem.date               = File.mtime('VERSION').strftime('%Y-%m-%d')
+
+  gem.name               = 'rdf-spec'
+  gem.homepage           = 'http://ruby-rdf.github.com/rdf-spec/'
+  gem.license            = 'Public Domain' if gem.respond_to?(:license=)
+  gem.summary            = 'RSpec extensions for RDF.rb.'
+  gem.description        = 'RDF.rb extension that provides RSpec matchers and shared examples for RDF objects.'
+  gem.rubyforge_project  = 'rdf'
+
+  gem.authors            = ['Arto Bendiken', 'Ben Lavender', 'Gregg Kellogg']
+  gem.email              = '[email protected]'
+
+  gem.platform           = Gem::Platform::RUBY
+  gem.files              = %w(AUTHORS CREDITS README UNLICENSE VERSION) + Dir.glob('etc/*') + Dir.glob('lib/**/*.rb') + Dir.glob('spec/*.rb')
+  gem.bindir             = %q(bin)
+  gem.executables        = %w()
+  gem.default_executable = gem.executables.first
+  gem.require_paths      = %w(lib)
+  gem.extensions         = %w()
+  gem.test_files         = %w()
+  gem.has_rdoc           = false
+
+  gem.required_ruby_version      = '>= 1.9.2'
+  gem.requirements               = []
+  gem.add_development_dependency 'rdf',   '~> 1.1'
+  gem.add_runtime_dependency     'rspec', '~> 2.14'
+  gem.add_development_dependency 'yard' , '~> 0.8'
+  gem.post_install_message       = nil
+end