rdf-mongo 1.1.0 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ce1eb844f8edbdd27d261737d9bb3121555434
-  data.tar.gz: 66a03b0e3b3c79d196aea661215eeeecb8702619
+  metadata.gz: bf15f8c6d12d55bd85991a3e6bf8ab4ee318568b
+  data.tar.gz: 78e563de1eccb9af04635ebf61cd3b8feb181858
 SHA512:
-  metadata.gz: 0921ee24e6436477ca723a39e20255c9882f80a2fbc8b25f6859f769b19f79b1366ffea09038687794d2ebe8e374eb963a30bccfd7304e74625f33d7b6158851
-  data.tar.gz: aab519c102bb8780ac63d00013533dd1a868a8ddab985fcc655a451784525df6fe7873b9ba24afa3794be152d69a9b3446232e64e18e3c03f5024b2f01fa9fb9
+  metadata.gz: bf281484d6946e53cd6edaf7c83715fe98021f4114cfaf2efad1c1525eb6b39f2ae90de862cdbaa38e6df54513855bd6dfe547356e433ae38657c16e67d34ccf
+  data.tar.gz: 87489d3773aaed971a6060d37139a22440d493ca1ad321fa2e141e1f0e35672212dde03a8a37ea350edd60d8af1b1398b71f85bdab7b640e33c154b181ecf075

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0.beta1

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,11 +76,11 @@ 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}
-        h.delete_if {|k,v| h[k].nil?}
+        h.delete_if {|kk,_| h[kk].nil?}
       end
 
       ##
@@ -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
@@ -108,63 +108,90 @@ module RDF
 
     class Repository < ::RDF::Repository
       # The Mongo database instance
-      # @!attribute [r] db
       # @return [Mongo::DB]
-      attr_reader :db
+      attr_reader :client
 
       # The collection used for storing quads
-      # @!attribute [r] coll
       # @return [Mongo::Collection]
-      attr_reader :coll
+      attr_reader :collection
       
       ##
       # Initializes this repository instance.
       #
-      # @param  [Hash{Symbol => Object}] options
-      # @option options [URI, #to_s]    :uri (nil)
-      # @option options [String, #to_s] :title (nil)
-      # @option options [String] :host
-      # @option options [Integer] :port
-      # @option options [String] :db
-      # @option options [String] :collection ('quads')
+      # @overload initialize(options = {}, &block)
+      #   @param  [Hash{Symbol => Object}] options
+      #   @option options [String, #to_s] :title (nil)
+      #   @option options [URI, #to_s]    :uri (nil)
+      #     URI in the form `mongodb://host:port/db`. The URI should also identify the collection use, but appending a `collection` path component such as `mongodb://host:port/db/collection`, this ensures that the collection will be maintained if cloned. See [Mongo::Client options](https://docs.mongodb.org/ecosystem/tutorial/ruby-driver-tutorial-2-0/#uri-options-conversions) for more information on Mongo URIs.
+      #
+      # @overload initialize(options = {}, &block)
+      #   @param  [Hash{Symbol => Object}] options
+      #     See [Mongo::Client options](https://docs.mongodb.org/ecosystem/tutorial/ruby-driver-tutorial-2-0/#uri-options-conversions) for more information on Mongo Client options.
+      #   @option options [String, #to_s] :title (nil)
+      #   @option options [String] :host
+      #     a single address or an array of addresses, which may contain a port designation
+      #   @option options [Integer] :port (27017) applied to host address(es)
+      #   @option options [String] :database ('quadb')
+      #   @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)
-        @db = ::Mongo::Connection.new(options[:host], options[:port]).db(options[:db])
-        @coll = @db[options[:collection]]
-        @coll.create_index("s")
-        @coll.create_index("p")
-        @coll.create_index("o")
-        @coll.create_index("c")
-        @coll.create_index([["s", ::Mongo::ASCENDING], ["p", ::Mongo::ASCENDING]])
-        @coll.create_index([["s", ::Mongo::ASCENDING], ["o", ::Mongo::ASCENDING]])
-        @coll.create_index([["p", ::Mongo::ASCENDING], ["o", ::Mongo::ASCENDING]])
+        collection = nil
+        if options[:uri]
+          options = options.dup
+          uri = RDF::URI(options.delete(:uri))
+          _, db, coll = uri.path.split('/')
+          collection = coll || options.delete(:collection)
+          db ||= "quadb"
+          uri.path = "/#{db}" if coll
+          @client = ::Mongo::Client.new(uri.to_s, options)
+        else
+          warn "[DEPRECATION] RDF::Mongo::Repository#initialize expects a uri argument. Called from #{Gem.location_of_caller.join(':')}" unless options.empty?
+          options[:database] ||= options.delete(:db) # 1.x compat
+          options[:database] ||= 'quadb'
+          hosts = Array(options[:host] || 'localhost')
+          hosts.map! {|h| "#{h}:#{options[:port]}"} if options[:port]
+          @client = ::Mongo::Client.new(hosts, options)
+        end
+
+        @collection = @client[options.delete(:collection) || 'quads']
+        @collection.indexes.create_many([
+          {key: {s: 1}},
+          {key: {p: 1}},
+          {key: {o: "hashed"}},
+          {key: {c: 1}},
+          {key: {s: 1, p: 1}},
+          #{key: {s: 1, o: "hashed"}}, # Muti-key hashed indexes not allowed
+          #{key: {p: 1, o: "hashed"}}, # Muti-key hashed indexes not allowed
+        ])
         super(options, &block)
       end
 
       # @see RDF::Mutable#insert_statement
       def supports?(feature)
         case feature.to_sym
-          when :context then true
+          when :graph_name then true
+          when :validity     then @options.fetch(:with_validity, 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)
+        @collection.update_one(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))
+          @collection.delete_one(statement.to_mongo.merge('ct'=>:default))
         else
-          @coll.remove(statement.to_mongo)
+          @collection.delete_one(statement.to_mongo)
         end
       end
 
@@ -176,24 +203,24 @@ module RDF
       ##
       # @private
       # @see RDF::Countable#empty?
-      def empty?; @coll.count == 0; end
+      def empty?; @collection.count == 0; end
 
       ##
       # @private
       # @see RDF::Countable#count
       def count
-        @coll.count
+        @collection.count
       end
 
       def clear_statements
-        @coll.remove
+        @collection.delete_many
       end
 
       ##
       # @private
       # @see RDF::Enumerable#has_statement?
       def has_statement?(statement)
-        !!@coll.find_one(statement.to_mongo)
+        @collection.find(statement.to_mongo).count > 0
       end
       ##
       # @private
@@ -201,10 +228,8 @@ module RDF
       def each_statement(&block)
         @nodes = {} # reset cache. FIXME this should probably be in Node.intern
         if block_given?
-          @coll.find() do |cursor|
-            cursor.each do |data|
-              block.call(RDF::Statement.from_mongo(data))
-            end
+          @collection.find().each do |document|
+            block.call(RDF::Statement.from_mongo(document))
           end
         end
         enum_statement
@@ -213,9 +238,9 @@ module RDF
 
       ##
       # @private
-      # @see RDF::Enumerable#has_context?
-      def has_context?(value)
-        !!@coll.find_one(RDF::Mongo::Conversion.to_mongo(value, :context))
+      # @see RDF::Enumerable#has_graph?
+      def has_graph?(value)
+        @collection.find(RDF::Mongo::Conversion.to_mongo(value, :graph_name)).count > 0
       end
 
       protected
@@ -224,17 +249,16 @@ module RDF
       # @private
       # @see RDF::Queryable#query_pattern
       # @see RDF::Query::Pattern
-      def query_pattern(pattern, &block)
+      def query_pattern(pattern, options = {}, &block)
+        return enum_for(:query_pattern, pattern, options) unless block_given?
         @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|
-            block.call(RDF::Statement.from_mongo(data))
-          end
+        @collection.find(pm).each do |document|
+          block.call(RDF::Statement.from_mongo(document))
         end
       end
     

data/lib/rdf/mongo/version.rb

@@ -15,6 +15,6 @@ module RDF::Mongo
 
     ##
     # @return [Array(Integer, Integer, Integer)]
-    def self.to_a() [MAJOR, MINOR, TINY] end
+    def self.to_a() STRING.split(".") end
   end
 end

metadata

@@ -1,114 +1,143 @@
 --- !ruby/object:Gem::Specification
 name: rdf-mongo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Pius Uzamere
+- Gregg Kellogg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2016-02-22 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: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rdf-spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 2.0.0.beta
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !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'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
 description: rdf-mongo is a storage adapter for integrating MongoDB and rdf.rb, a
   Ruby library for working with Resource Description Framework (RDF) data.
-email: pius@alum.mit.edu
+email:
+- pius@alum.mit.edu
+- gregg@greggkellogg.net
 executables: []
 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
+- MIT
 metadata: {}
 post_install_message: Have fun! :)
 rdoc_options: []
@@ -116,17 +145,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A storage adapter for integrating MongoDB and rdf.rb, a Ruby library for