rdf-mongo 1.1.0 → 1.99.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ce1eb844f8edbdd27d261737d9bb3121555434
-  data.tar.gz: 66a03b0e3b3c79d196aea661215eeeecb8702619
+  metadata.gz: 7e3195ca4d5d5ad17d35bd15054f50cd7c9bff23
+  data.tar.gz: c1974fdf7ed3ed53c454b34dbdb64332037eaaf0
 SHA512:
-  metadata.gz: 0921ee24e6436477ca723a39e20255c9882f80a2fbc8b25f6859f769b19f79b1366ffea09038687794d2ebe8e374eb963a30bccfd7304e74625f33d7b6158851
-  data.tar.gz: aab519c102bb8780ac63d00013533dd1a868a8ddab985fcc655a451784525df6fe7873b9ba24afa3794be152d69a9b3446232e64e18e3c03f5024b2f01fa9fb9
+  metadata.gz: 55b5d27957f3005d8baaf891ba5782da2be7f1a3d7ff313c8e9d76bdf57618ee8bce5d14bfd411317965deb2c0cf0aebbdff0d000135a8df405c3f494d30e82e
+  data.tar.gz: 74fa5f4c341246983df4b01c1dee4698d0b6298ba52fa19f6370d20e688bf9a6fc133399529a24725c1b9db88f45af79f579ce4230cda3a4cc65128b2aa4c4b4

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.99.0

data/lib/rdf/mongo.rb

@@ -14,17 +14,17 @@ module RDF
     end
     
     ##
-    # Create BSON for a statement representation. Note that if the statement has no context,
+    # Create BSON for a statement representation. Note that if the statement has no graph name,
     # a value of `false` will be used to indicate the default context
     #
     # @param [RDF::Statement] statement
     # @return [Hash] Generated BSON representation of statement.
     def self.from_mongo(statement)
       RDF::Statement.new(
-        :subject   => RDF::Mongo::Conversion.from_mongo(statement['s'], statement['st'], statement['sl']),
-        :predicate => RDF::Mongo::Conversion.from_mongo(statement['p'], statement['pt'], statement['pl']),
-        :object    => RDF::Mongo::Conversion.from_mongo(statement['o'], statement['ot'], statement['ol']),
-        :context   => RDF::Mongo::Conversion.from_mongo(statement['c'], statement['ct'], statement['cl']))
+        subject:    RDF::Mongo::Conversion.from_mongo(statement['s'], statement['st'], statement['sl']),
+        predicate:  RDF::Mongo::Conversion.from_mongo(statement['p'], statement['pt'], statement['pl']),
+        object:     RDF::Mongo::Conversion.from_mongo(statement['o'], statement['ot'], statement['ol']),
+        graph_name: RDF::Mongo::Conversion.from_mongo(statement['c'], statement['ct'], statement['cl']))
     end
   end
   
@@ -37,9 +37,9 @@ module RDF
       #
       # @param [RDF::Value, Symbol, false, nil] value
       #   URI, BNode or Literal. May also be a Variable or Symbol to indicate
-      #   a pattern for a named context, or `false` to indicate the default context.
+      #   a pattern for a named graph, or `false` to indicate the default graph.
       #   A value of `nil` indicates a pattern that matches any value.
-      # @param [:subject, :predicate, :object, :context] place_in_statement
+      # @param [:subject, :predicate, :object, :graph_name] place_in_statement
       #   Position within statement.
       # @return [Hash] BSON representation of the statement
       def self.to_mongo(value, place_in_statement)
@@ -76,7 +76,7 @@ module RDF
           t, k1, lt = :pt, :p, :pl
         when :object
           t, k1, lt = :ot, :o, :ol
-        when :context
+        when :graph_name
           t, k1, lt = :ct, :c, :cl
         end
         h = {k1 => v, t => k, lt => ll}
@@ -92,9 +92,9 @@ module RDF
         when :u
           RDF::URI.intern(value)
         when :ll
-          RDF::Literal.new(value, :language => literal_extra.to_sym)
+          RDF::Literal.new(value, language: literal_extra.to_sym)
         when :lt
-          RDF::Literal.new(value, :datatype => RDF::URI.intern(literal_extra))
+          RDF::Literal.new(value, datatype: RDF::URI.intern(literal_extra))
         when :l
           RDF::Literal.new(value)
         when :n
@@ -126,12 +126,15 @@ module RDF
       # @option options [String] :host
       # @option options [Integer] :port
       # @option options [String] :db
+      # @option options [String] :user for authentication
+      # @option options [String] :password for authentication
       # @option options [String] :collection ('quads')
       # @yield  [repository]
       # @yieldparam [Repository] repository
       def initialize(options = {}, &block)
-        options = {:host => 'localhost', :port => 27017, :db => 'quadb', :collection => 'quads'}.merge(options)
+        options = {host: 'localhost', port: 27017, db: 'quadb', collection: 'quads'}.merge(options)
         @db = ::Mongo::Connection.new(options[:host], options[:port]).db(options[:db])
+        @db.authenticate(options[:user], options[:password]) if options[:user] && options[:password]
         @coll = @db[options[:collection]]
         @coll.create_index("s")
         @coll.create_index("p")
@@ -146,21 +149,22 @@ module RDF
       # @see RDF::Mutable#insert_statement
       def supports?(feature)
         case feature.to_sym
-          when :context then true
+          when :graph_name then true
           else false
         end
       end
       
       def insert_statement(statement)
+        raise ArgumentError, "Statement #{statement.inspect} is incomplete" if statement.incomplete?
         st_mongo = statement.to_mongo
-        st_mongo[:ct] ||= :default # Indicate statement is in the default context
+        st_mongo[:ct] ||= :default # Indicate statement is in the default graph
         #puts "insert statement: #{st_mongo.inspect}"
-        @coll.update(st_mongo, st_mongo, :upsert => true)
+        @coll.update(st_mongo, st_mongo, upsert: true)
       end
 
       # @see RDF::Mutable#delete_statement
       def delete_statement(statement)
-        case statement.context
+        case statement.graph_name
         when nil
           @coll.remove(statement.to_mongo.merge('ct'=>:default))
         else
@@ -213,8 +217,8 @@ module RDF
 
       ##
       # @private
-      # @see RDF::Enumerable#has_context?
-      def has_context?(value)
+      # @see RDF::Enumerable#has_graph?
+      def has_graph?(value)
         !!@coll.find_one(RDF::Mongo::Conversion.to_mongo(value, :context))
       end
 
@@ -227,9 +231,9 @@ module RDF
       def query_pattern(pattern, &block)
         @nodes = {} # reset cache. FIXME this should probably be in Node.intern
 
-        # A pattern context of `false` is used to indicate the default context
+        # A pattern graph_name of `false` is used to indicate the default graph
         pm = pattern.to_mongo
-        pm.merge!(:c => nil, :ct => :default) if pattern.context == false
+        pm.merge!(c: nil, ct: :default) if pattern.graph_name == false
         #puts "query using #{pm.inspect}"
         @coll.find(pm) do |cursor|
           cursor.each do |data|

metadata

@@ -1,97 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: rdf-mongo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.99.0
 platform: ruby
 authors:
 - Pius Uzamere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bson_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: rdf-mongo is a storage adapter for integrating MongoDB and rdf.rb, a
@@ -102,10 +116,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- VERSION
 - README.md
-- lib/rdf/mongo/version.rb
+- VERSION
 - lib/rdf/mongo.rb
+- lib/rdf/mongo/version.rb
 homepage: http://ruby-rdf.github.com/rdf-mongo
 licenses:
 - MIT License
@@ -116,17 +130,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A storage adapter for integrating MongoDB and rdf.rb, a Ruby library for