Finish 1.99.0

Author: gkellogg

Gemfile

@@ -13,6 +13,7 @@ group :development do
   gem 'rdf-isomorphic', :git => "git://github.com/ruby-rdf/rdf-isomorphic.git", :branch => "develop"
   gem "rdf-spec",       :git => "git://github.com/ruby-rdf/rdf-spec.git", :branch => "develop"
   gem "rdf-turtle",     :git => "git://github.com/ruby-rdf/rdf-turtle.git", :branch => "develop"
+  gem "rdf-vocab",      :git => "git://github.com/ruby-rdf/rdf-vocab.git", :branch => "develop"
 end
 
 group :debug do

Gemfile-pure

@@ -12,6 +12,7 @@ group :development do
   gem 'rdf-isomorphic', :git => "git://github.com/ruby-rdf/rdf-isomorphic.git", :branch => "develop"
   gem "rdf-spec",       :git => "git://github.com/ruby-rdf/rdf-spec.git", :branch => "develop"
   gem "rdf-turtle",     :git => "git://github.com/ruby-rdf/rdf-turtle.git", :branch => "develop"
+  gem "rdf-vocab",      :git => "git://github.com/ruby-rdf/rdf-vocab.git", :branch => "develop"
 end
 
 group :debug do

VERSION

@@ -1 +1 @@
-1.1.5
+1.99.0

lib/rdf/rdfxml/format.rb

@@ -43,22 +43,9 @@ def self.detect(sample)
     def self.name
       "RDF/XML"
     end
-  end
 
-  # Aliases for RDF::Format
-  #
-  # This allows the following:
-  #
-  # @example Obtaining an HTML format class
-  #   RDF::Format.for(:rdf)         # RDF::RDFXML::Lite
-  #   RDF::Format.for(:rdf).reader  # RDF::RDFXML::Reader
-  #   RDF::Format.for(:rdf).writer  # RDF::RDFXML::Writer
-  class RDFFormat < RDF::Format
-    content_type     'application/rdf+xml'
-    content_encoding 'utf-8'
-    reader { RDF::RDFXML::Reader }
-    writer { RDF::RDFXML::Writer }
-    
-    def self.to_sym; :rdf; end
+    def self.symbols
+      [:rdfxml, :rdf]
+    end
   end
 end

rdf-rdfxml.gemspec

@@ -23,21 +23,22 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.3'
   gem.requirements          = []
 
-  gem.add_runtime_dependency     'rdf',             '~> 1.1', '>= 1.1.6'
-  gem.add_runtime_dependency     'rdf-rdfa',        '~> 1.1', '>= 1.1.4.1'
-  gem.add_runtime_dependency     'rdf-xsd',         '~> 1.1'
+  gem.add_runtime_dependency     'rdf',             '~> 1.99'
+  gem.add_runtime_dependency     'rdf-rdfa',        '~> 1.99'
+  gem.add_runtime_dependency     'rdf-xsd',         '~> 1.99'
   gem.add_runtime_dependency     'htmlentities',    '~> 4.3'
 
   #gem.add_development_dependency 'nokogiri' ,       '>= 1.6.1' # conditionally done in Gemfile
   #gem.add_development_dependency 'equivalent-xml' , '~> 0.2' # conditionally done in Gemfile
   gem.add_development_dependency 'open-uri-cached', '~> 0.0', '>= 0.0.5'
   gem.add_development_dependency 'spira',           '= 0.0.12'
-  gem.add_development_dependency 'json-ld',         '~> 1.1'
+  gem.add_development_dependency 'json-ld',         '~> 1.99'
   gem.add_development_dependency 'rspec',           '~> 3.2'
   gem.add_development_dependency 'rspec-its',       '~> 1.0'
-  gem.add_development_dependency 'rdf-isomorphic',  '~> 1.1'
-  gem.add_development_dependency 'rdf-turtle',      '~> 1.1'
-  gem.add_development_dependency 'rdf-spec',        '~> 1.1'
+  gem.add_development_dependency 'rdf-isomorphic',  '~> 1.99'
+  gem.add_development_dependency 'rdf-turtle',      '~> 1.99'
+  gem.add_development_dependency 'rdf-spec',        '~> 1.99'
+  gem.add_development_dependency 'rdf-vocab',       '~> 0.8'
   gem.add_development_dependency 'yard' ,           '~> 0.8'
 
   # Rubinius has it's own dependencies

spec/format_spec.rb

@@ -10,6 +10,7 @@
   describe ".for" do
     formats = [
       :rdfxml,
+      :rdf,
       'etc/doap.rdf',
       {:file_name      => 'etc/doap.rdf'},
       {:file_extension => 'rdf'},
@@ -60,16 +61,5 @@
         expect(described_class.detect(str)).to be_falsey
       end
     end
-
-    describe RDF::RDFXML::RDFFormat do
-      it "discovers with :rdf" do
-        expect(RDF::Format.for(:rdf)).to eq RDF::RDFXML::RDFFormat
-      end
-
-      it "should discover :rdf" do
-        expect(RDF::Format.for(:rdf).reader).to eq RDF::RDFXML::Reader
-        expect(RDF::Format.for(:rdf).writer).to eq RDF::RDFXML::Writer
-      end
-    end
   end
 end

spec/writer_spec.rb

@@ -1,6 +1,7 @@
 $:.unshift "."
 require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'rdf/spec/writer'
+require 'rdf/vocab'
 autoload :CGI, 'cgi'
 
 class FOO < RDF::Vocabulary("http://foo/"); end