rdf-do 1.99.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573de1e4146e20046b5dd31c6673ea8f8b912573
-  data.tar.gz: ab36389f634218b16294fd8447c5b5500f90b8a4
+  metadata.gz: 8dadfca05d2490a554932159932c6f4e490fec32
+  data.tar.gz: ebd1901324d2a11d96b786ae815c368a16b92e3e
 SHA512:
-  metadata.gz: b8b57dfd0e5279e0cbc6d407671ed0fdbd5ddee38505dad9c7fc7a1c0ab84bc4ec707d8de4ea50637649734d33d31dccc78558ab18f7d4a41e3d720cb0894fe8
-  data.tar.gz: 0d75242e8b460229bfc6c779849391fa8e37dec584a6bc202703f62d08c55d6776c89bb2a57b83e7a5e47d4ce7ed8b30b7fd619f3a13a62738c2dba640651fe3
+  metadata.gz: 6b862f4178cc8dba2e4bf702ebfde6a00fcef90c754b01e2149db3c16868e8246ba5591de3026cd1f55d1b6866df8806bbc9e8ebb5aea6fb6d328b18d26b86e9
+  data.tar.gz: 958c80738b91d3bf0dbe722a27e6da468744b7af511c9fedf69fe6abdb37d431e1985a5f35ebe5a0cd369849cfb45910a20b2552a9a83c180e2643c7df3aba9c

data/README

@@ -16,7 +16,7 @@ and it passes all its tests on Heroku as well.
 
 Example:
 
-    repository = RDF::DataObjects::Repository.new "sqlite3:test.db"
+    repository = RDF::DataObjects::Repository.new uri: "sqlite3:test.db"
     repository.insert(statement)
     repository.count              #=> 1
     repository.delete(statement)
@@ -33,15 +33,15 @@ The greatly preferred installation method is via RubyGems:
 
     $ sudo gem install rdf-do
 
-Requires Ruby >= 1.9.2
+Requires Ruby >= 2.0
 
 ## Connecting
     require 'rdf'
     require 'rdf/do'
     require 'do_postgres' # gem install do_postgres
     require 'do_sqlite3'  # gem install do_sqlite3
-    repo = RDF::DataObjects::Repository.new "postgres://localhost/database"
-    repo = RDF::DataObjects::Repository.new "sqlite3:test.db"
+    repo = RDF::DataObjects::Repository.new uri: "postgres://localhost/database"
+    repo = RDF::DataObjects::Repository.new uri: "sqlite3:test.db"
 
 
 ## Using
@@ -59,9 +59,9 @@ Example:
     require 'do_sqlite3'
     require 'rdf/do'
 
-    repo = RDF::DataObjects::Repository.new('sqlite3:test.db')
-    # repo = RDF::DataObjects::Repository.new 'postgres://postgres@server/database'
-    # heroku_repo = RDF::DataObjects::Repository.new(ENV['DATABASE_URL'])
+    repo = RDF::DataObjects::Repository.new uri: 'sqlite3:test.db'
+    # repo = RDF::DataObjects::Repository.new uri: 'postgres://postgres@server/database'
+    # heroku_repo = RDF::DataObjects::Repository.new uri: ENV['DATABASE_URL']
     repo.load('http://datagraph.org/jhacker/foaf.nt')
 
     # How many statements did we have?

data/VERSION

@@ -1 +1 @@
-1.99.0.1
+2.0.0

data/lib/rdf/do.rb

@@ -23,37 +23,36 @@ module RDF
     #
     class Repository < RDF::Repository
 
-      ## Create a new RDF::DataObjects::Repository
+      ##
+      # Initializes this repository instance.
       # 
-      # The `options` parameter can be anything that
-      # DataObjects::Connection.new accepts.  The correct
-      # RDF::Repository::DataObjects adapter will be loaded based on the URI
-      # scheme of the created connection.
-      #
       # @example
       #     RDF::DataObjects::Repository.new  # => new Repository based on sqlite3://:memory:
-      #     RDF::DataObjects::Repository.new 'postgres://localhost/database'
+      #     RDF::DataObjects::Repository.new uri: 'postgres://localhost/database'
       #       => New repository based on postgres adapter
-      # @param [Any] options
+      #
+      # @param  [Hash{Symbol => Object}] options
+      # @option options [URI, #to_s]    :uri (nil)
+      # @option options [String, #to_s] :title (nil)
+      # @option options [String, #to_s] :adaptor (nil)
+      #   The default adapter will be loaded based on the URI
+      #   scheme of the created connection.
+      # @option options [String] :db Synonym for :uri
       # @return [RDF::DataObjects::Repository]
-      def initialize(options = {})
-        begin
-          case options
-            when String
-              @db     = ::DataObjects::Connection.new(options)
-            when Hash
-              @db     = ::DataObjects::Connection.new(options[:db])
-              adapter = options[:adapter]
-            when nil
-              @db    = ::DataObjects::Connection.new('sqlite3://:memory:')
-          end
-          adapter = @db.instance_variable_get("@uri").scheme
-          require 'rdf/do/adapters/' + adapter.to_s
-        rescue Exception => e
-          raise LoadError, "Could not load a DataObjects adapter for #{options}.  You may need to add a 'require do_adapter', or you may be trying to use an unsupported adapter (Currently supporting postgres, sqlite3).  The error message was: #{e.message}"
-        end
+      def initialize(options = {}, &block)
+        warn "[DEPRECATION] RDF::DataObjects::Repository#initialize expects a uri argument. Called from #{Gem.location_of_caller.join(':')}" unless options.is_a?(Hash)
+        options = {uri: options.to_s} unless options.is_a?(Hash)
+        db = options[:uri] || options[:db] || 'sqlite3://:memory:'
+        @db = ::DataObjects::Connection.new(db)
+
+        adapter = options[:adapter] || @db.instance_variable_get("@uri").scheme
+        require 'rdf/do/adapters/' + adapter.to_s
+
         @adapter = RDF::DataObjects::Adapters::const_get(adapter.to_s.capitalize)
         @adapter.migrate? self
+        super(options, &block)
+      rescue Exception => e
+        raise LoadError, "Could not load a DataObjects adapter for #{options}.  You may need to add a 'require do_adapter', or you may be trying to use an unsupported adapter (Currently supporting postgres, sqlite3).  The error message was: #{e.message}"
       end
 
       # @see RDF::Mutable#insert_statement
@@ -109,7 +108,8 @@ module RDF
       # @param [RDF::Statement] statement
       # @return [void]
       def delete_statement(statement)
-        delete_statements [statement]
+        query = @adapter.delete_sql
+        exec(query, serialize(statement.subject), serialize(statement.predicate), serialize(statement.object), serialize(statement.graph_name)) 
       end
 
       ##
@@ -132,25 +132,13 @@ module RDF
           exec(query,*(args.flatten))
         else
           query = @adapter.insert_sql
-          statements.each do |s|
+          each = statements.respond_to?(:each_statement) ? :each_statement : :each
+          statements.__send__(each) do |s|
             exec(query, serialize(s.subject),serialize(s.predicate), serialize(s.object), serialize(s.graph_name)) 
           end
         end
       end
 
-      ##
-      # Remove multiple statements from this repository
-      #
-      # @see RDF::Mutable#delete_statements
-      # @param  [Array<RDF::Statement>] statements
-      # @return [void]
-      def delete_statements(statements)
-        query = @adapter.delete_sql
-        statements.each do |s|
-          exec(query, serialize(s.subject), serialize(s.predicate), serialize(s.object), serialize(s.graph_name)) 
-        end
-      end
-
       ## 
       # Serialize an RDF::Value into N-triples format.
       # Nil values will be encoded as 'nil' to avoid problems with SQL
@@ -286,12 +274,10 @@ module RDF
       def each_graph(&block)
         return enum_for(:each_graph) unless block_given?
 
-        # Default graph
-        yield RDF::Graph.new(nil, data: self)
-        reader = result(@adapter.each_context_sql)
+        reader = result(@adapter.each_graph_sql)
         while reader.next!
           graph_name = unserialize(reader.values[0])
-          yield RDF::Graph.new(graph_name, data: self)
+          yield RDF::Graph.new(graph_name: graph_name, data: self)
         end
       end
 
@@ -320,7 +306,8 @@ module RDF
       # @param [RDF::Query::Pattern] pattern
       # @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
         reader = @adapter.query(self,pattern.to_hash)
         while reader.next!

data/lib/rdf/do/adapters/defaults.rb

@@ -35,7 +35,7 @@ module RDF::DataObjects
         'select distinct object from quads'
       end
 
-      def each_context_sql
+      def each_graph_sql
         'select distinct context from quads'
       end
 

data/lib/rdf/do/version.rb

@@ -1,16 +1,13 @@
 module RDF::DataObjects
   module VERSION
-    MAJOR = 0
-    MINOR = 3
-    TINY  = 3
-    EXTRA = nil
+    VERSION_FILE = File.join(File.expand_path(File.dirname(__FILE__)), "..", "..", "..", "VERSION")
+    MAJOR, MINOR, TINY, EXTRA = File.read(VERSION_FILE).chop.split(".")
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
-    STRING << ".#{EXTRA}" if EXTRA
+    STRING = [MAJOR, MINOR, TINY, EXTRA].compact.join('.')
 
     ##
     # @return [String]
-    def self.to_s() STRING end
+    def self.to_s()   STRING end
 
     ##
     # @return [String]
@@ -18,6 +15,6 @@ module RDF::DataObjects
 
     ##
     # @return [Array(Integer, Integer, Integer)]
-    def self.to_a() [MAJOR, MINOR, TINY] end
+    def self.to_a() STRING.split(".") end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdf-do
 version: !ruby/object:Gem::Version
-  version: 1.99.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben Lavender
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-30 00:00:00.000000000 Z
+date: 2016-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: data_objects
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.99'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ 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:
   - - ">="
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rdf
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RDF.rb extension providing a DataObjects storage adapter.