rdf-n3 1.0.2 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a224d79fbe8999d5b048420a8ea9864dc51c80e1
+  data.tar.gz: 61f619bf9ce4ec962ed50ff675b4ed67f7d708c1
+SHA512:
+  metadata.gz: 48f48f603bf05ab6596131ca6cadcde3607b534c7bcbb27b8ff833d9c9a88e0e04c20582fd747aa70f4d9ef8839a48775d8a166f2225af573a33c55db840e3eb
+  data.tar.gz: 0b52bb139ef75ff4664c468459d9dfe41ea9c2a5f899a6d7682e718f2d8a71a3757657844499b4f9555b21a3a78e4c0c06a39c10371b0b6b16c27239901f996b

data/README.md

@@ -84,7 +84,7 @@ http://www.w3.org/2000/10/swap/grammar/n3.n3 (along with bnf-rules.n3) using cwm
 * Create equivalent to `--think` to iterate on solutions.
 
 ## Dependencies
-* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.0)
+* [RDF.rb](http://rubygems.org/gems/rdf) (>= 1.1)
 
 ## Documentation
 Full documentation available on [RubyDoc.info](http://rubydoc.info/github/ruby-rdf/rdf-n3/frames)
@@ -123,6 +123,7 @@ Full documentation available on [RubyDoc.info](http://rubydoc.info/github/ruby-r
 * [Nicholas Humfrey](http://github.com/njh) - <http://njh.me/>
 
 ## Contributing
+This repository uses [Git Flow](https://github.com/nvie/gitflow) to mange development and release activity. All submissions _must_ be on a feature branch based on the _develop_ branch to ease staging and integration.
 
 * Do your best to adhere to the existing coding conventions and idioms.
 * Don't use hard tabs, and don't leave trailing whitespace on any line.

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/lib/rdf/n3/format.rb

@@ -22,31 +22,6 @@ module RDF::N3
 
     reader { RDF::N3::Reader }
     writer { RDF::N3::Writer }
-
-    ##
-    # Sample detection to see if it matches N3 (or N-Triples or Turtle)
-    #
-    # Use a text sample to detect the format of an input file. Sub-classes implement
-    # a matcher sufficient to detect probably format matches, including disambiguating
-    # between other similar formats.
-    #
-    # @param [String] sample Beginning several bytes (~ 1K) of input.
-    # @return [Boolean]
-    def self.detect(sample)
-      !!sample.match(%r(
-        (?:@(base|prefix|keywords)) |                                   # N3 keywords
-        "{3} |                                                          # Multi-line quotes
-        "[^"]*"^^ | "[^"]*"@ |                                          # Typed/Language literals
-        (?:
-          (?:\s*(?:(?:<[^>]*>) | (?:\w*:\w+) | (?:"[^"]*"))\s*[,;]) ||
-          (?:\s*(?:(?:<[^>]*>) | (?:\w*:\w+) | (?:"[^"]*"))){3}
-        )
-      )mx) && !(
-        sample.match(%r(<(?:\/|html|rdf))i) ||                          # HTML, RDF/XML
-        sample.match(%r(^(?:\s*<[^>]*>){4}.*\.\s*$)) ||                 # N-Quads
-        sample.match(%r("@(context|subject|iri)"))                      # JSON-LD
-      )
-    end
   end
   
   # Alias for N3 format

data/lib/rdf/n3/reader.rb

@@ -215,7 +215,7 @@ module RDF::N3
     # when the formula is completed against all in-scope variables
     def existentialFinish
       pd = @prod_data.pop
-      forSome = [pd[:symbol]].flatten.compact
+      forSome = Array(pd[:symbol])
       forSome.each do |term|
         @variables[term.to_s] = {:formula => @formulae.last, :var => RDF::Node.new(term.to_s.split(/[\/#]/).last)}
       end
@@ -392,13 +392,13 @@ module RDF::N3
       statement = @prod_data.pop
       
       subject = statement[:subject]
-      properties = [statement[:propertylist]].flatten.compact
+      properties = Array(statement[:propertylist])
       properties.each do |p|
         predicate = p[:verb]
         next unless predicate
         add_debug("simpleStatementFinish(pred)") {predicate.to_s}
         error(%(Illegal statment: "#{predicate}" missing object)) unless p.has_key?(:object)
-        objects =[ p[:object]].flatten.compact
+        objects = Array(p[:object])
         objects.each do |object|
           if p[:invert]
             add_triple("simpleStatementFinish", object, predicate, subject)
@@ -448,7 +448,7 @@ module RDF::N3
     # when the formula is completed against all in-scope variables
     def universalFinish
       pd = @prod_data.pop
-      forAll = [pd[:symbol]].flatten.compact
+      forAll = Array(pd[:symbol])
       forAll.each do |term|
         @variables[term.to_s] = { :formula => @formulae.last, :var => univar(term) }
       end
@@ -507,12 +507,12 @@ module RDF::N3
         properties.each do |p|
           predicate = p[:verb]
           add_debug("process_anonnode(verb)") {predicate.inspect}
-          objects = [p[:object]].flatten.compact
+          objects = Array(p[:object])
           objects.each { |object| add_triple("anonnode", bnode, predicate, object) }
         end
         bnode
       elsif anonnode[:pathlist]
-        objects = [anonnode[:pathlist]].flatten.compact
+        objects = Array(anonnode[:pathlist])
         list = RDF::List[*objects]
         list.each_statement do |statement|
           next if statement.predicate == RDF.type && statement.object == RDF.List
@@ -593,9 +593,9 @@ module RDF::N3
       when nil
         @prod_data.last[sym] = value
       when Array
-        @prod_data.last[sym] << value
+        @prod_data.last[sym] += Array(value)
       else
-        @prod_data.last[sym] = [@prod_data.last[sym], value]
+        @prod_data.last[sym] = Array(@prod_data.last[sym]) +  Array(value)
       end
     end
 

data/lib/rdf/n3/reader/parser.rb

@@ -165,7 +165,7 @@ module RDF::N3
     def readline
       @line = @input.readline
       @lineno += 1
-      @line.force_encoding(Encoding::UTF_8) if @line.respond_to?(:force_encoding) # for Ruby 1.9+
+      @line.encode!(Encoding::UTF_8) if @line.respond_to?(:encode!) # for Ruby 1.9+
       puts "readline[#{@lineno}]: #{@line.dump}" if $verbose
       @pos = 0
       @line

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdf-n3
 version: !ruby/object:Gem::Version
-  version: 1.0.2
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Gregg
@@ -10,136 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: json-ld
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-rdfxml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdf-isomorphic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.6
 description: RDF::N3 is an Notation-3 reader/writer for the RDF.rb library suite.
 email: public-rdf-ruby@w3.org
 executables: []
@@ -164,27 +147,26 @@ files:
 homepage: http://ruby-rdf.github.com/rdf-n3
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.1
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rdf-n3
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Notation3 reader/writer for RDF.rb.
 test_files: []
 has_rdoc: false