Use http: version of test suite URI. Disable suite for jruby.

ruby-rdf · Sep 4, 2012 · 9dbf4b6 · 9dbf4b6
1 parent 7060471
commit 9dbf4b6
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/.gemspec b/.gemspec
@@ -35,8 +35,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency     'rdf-xsd',         '>= 0.3.4'
   gem.add_runtime_dependency     'htmlentities',    '>= 4.3.0'
 
-  gem.add_development_dependency 'nokogiri' ,       '>= 1.5.0'  if  RUBY_ENGINE == "ruby"
-  gem.add_development_dependency 'equivalent-xml' , '>= 0.2.8'  if  RUBY_ENGINE == "ruby"
+  gem.add_development_dependency 'nokogiri' ,       '>= 1.5.0'  #unless  RUBY_ENGINE == "java"
+  gem.add_development_dependency 'equivalent-xml' , '>= 0.2.8'  #unless  RUBY_ENGINE == "java"
   gem.add_development_dependency 'yard' ,           '>= 0.6.0'
   gem.add_development_dependency 'spira',           '>= 0.0.12'
   gem.add_development_dependency 'rspec',           '>= 2.8.0'

diff --git a/History.md b/History.md
@@ -29,7 +29,7 @@
 
 ### 0.2.2
 * Remove non @item* processing
-* Sync to HTML Data TF version of spec: https://dvcs.w3.org/hg/htmldata/raw-file/24af1cde0da1/microdata-rdf/index.html
+* Sync to HTML Data TF version of spec: http://dvcs.w3.org/hg/htmldata/raw-file/24af1cde0da1/microdata-rdf/index.html
 ### 0.2.2
 * RDF.rb 0.3.4 compatibility.
 * Added format detection.

diff --git a/README.md b/README.md
@@ -95,5 +95,5 @@ see <http://unlicense.org/> or the accompanying {file:UNLICENSE} file.
 [YARD-GS]:          http://rubydoc.info/docs/yard/file/docs/GettingStarted.md
 [PDD]:              http://lists.w3.org/Archives/Public/public-rdf-ruby/2010May/0013.html
 [Microdata]:        http://dev.w3.org/html5/md/Overview.html                                      "HTML Microdata"
-[Microdata RDF]:    https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/index.html     "Microdata to RDF"
+[Microdata RDF]:    http://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/index.html     "Microdata to RDF"
 [Microdata doc]:    http://rubydoc.info/github/ruby-rdf/rdf-microdata/frames
diff --git a/lib/rdf/microdata/reader.rb b/lib/rdf/microdata/reader.rb
@@ -13,7 +13,7 @@ module RDF::Microdata
   #
   # Based on processing rules, amended with the following:
   #
-  # @see https://dvcs.w3.org/hg/htmldata/raw-file/0d6b89f5befb/microdata-rdf/index.html
+  # @see http://dvcs.w3.org/hg/htmldata/raw-file/0d6b89f5befb/microdata-rdf/index.html
   # @author [Gregg Kellogg](http://greggkellogg.net/)
   class Reader < RDF::Reader
     format Format

diff --git a/lib/rdf/microdata/reader/rexml.rb b/lib/rdf/microdata/reader/rexml.rb
@@ -179,7 +179,7 @@ def shift
 
         ##
         # Add NodeSetProxys
-        # @param [NodeSetProxy, Nokogiri::XML::Node] other
+        # @param [NodeSetProxy, REXML::Element] other
         # @return [NodeSetProxy]
         def +(other)
           new_ns = node_set.clone
@@ -189,7 +189,7 @@ def +(other)
 
         ##
         # Add a NodeProxy
-        # @param [NodeProxy, Nokogiri::XML::Node] elem
+        # @param [NodeProxy, REXML::Element] elem
         # @return [NodeSetProxy]
         def <<(elem)
           node_set << (elem.is_a?(NodeProxy) ? elem.node : elem)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -14,8 +14,8 @@
   c.filter_run :focus => true
   c.run_all_when_everything_filtered = true
   c.exclusion_filter = {
-    :ruby => lambda { |version| !(RUBY_VERSION.to_s =~ /^#{version.to_s}/) },
-    :ci => lambda {|ci| !ci.nil? }
+    :no_jruby => lambda { |version| !(RUBY_PLATFORM.to_s != 'java') },
+    :no_ci => lambda {|ci| !ci.nil? }
   }
   c.include(RDF::Spec::Matchers)
 end

diff --git a/spec/suite_helper.rb b/spec/suite_helper.rb
@@ -8,7 +8,7 @@
 module RDF::Util
   module File
     TEST_PATH = "http://www.w3.org/TR/microdata-rdf/tests/"
-    REMOTE_PATH = "https://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/tests/"
+    REMOTE_PATH = "http://dvcs.w3.org/hg/htmldata/raw-file/default/microdata-rdf/tests/"
     LOCAL_PATH = ::File.expand_path("../htmldata/microdata-rdf/tests/", __FILE__) + '/'
 
     ##

diff --git a/spec/suite_spec.rb b/spec/suite_spec.rb
@@ -3,7 +3,7 @@
 
 describe RDF::Microdata::Reader do
   # W3C Microdata Test suite from FIXME
-  describe "w3c microdata tests", :ci => ENV['CI'] do
+  describe "w3c microdata tests", :no_ci => ENV['CI'], :no_jruby => true do
     require 'suite_helper'
     MANIFEST = "http://www.w3.org/TR/microdata-rdf/tests/manifest.jsonld"