active-triples 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afe7dc3e6a03d9813db24e04c17dcad6217ed566
-  data.tar.gz: bf3ee7f705aaf8f9e8e6172c1036b5dde382648d
+  metadata.gz: 42a735382f3d5ad34bb75398f7dbe41bc4092ed0
+  data.tar.gz: 64e572f52e992165f32a84202a73b6266032ce81
 SHA512:
-  metadata.gz: 5ea193783cfafcff37b3726544cbc11b17bf956f6e9f272bfd755bd332384f75a50a9b95826ee90ab977e6bd4ceadebf40f1d1f5ef18eaad928c9cdf8fbcfe62
-  data.tar.gz: 35d643a57725687c70b5c74a715828972b445f90a4d79cce02a4c2b875945f5b84e6859a3dd39c1dc432138be1e2805fe89e2f918bd98d6748bc3581b5bfb7c0
+  metadata.gz: 8e1c1c02dc97fddfb50dd818fd97087a9d8032d8e0552dc5d712da15c5f7363ed0a90eada66d2dfa28692049a6fb1ab6427ffe6167115565ca2cb66537a41d7f
+  data.tar.gz: 4fc879ad051dd585c8eb4b1570f4b1530002e7e2b91a15ee2511b1771d38c3edf4074ee550123598e74d591173483c79141b8d174cb255ae6a385c682fcb67cd

data/.gitignore

@@ -4,4 +4,3 @@ pkg/
 Gemfile.lock
 tmp/*
 .sass-cache
-coverage/

data/.travis.yml

@@ -1,19 +1,12 @@
 anguage: ruby
 bundler_args: --without debug
 script: "bundle exec rspec spec"
-env:
-  - CI=true
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
+  - 2.1.0
+  - 2.1.1
   - jruby-19mode
-cache: bundler
-sudo: false
 matrix:
   allow_failures:
-      - rvm: jruby-19mode
-dist: trusty
+      - rvm: jruby-19mode

data/Gemfile

@@ -1,25 +1,3 @@
 source "https://rubygems.org"
 
 gemspec
-
-version = Gem::Version.new(RUBY_VERSION)
-
-if (version <= Gem::Version.new('2.2.4')) &&
-   (version >= Gem::Version.new('2.0.0'))
-  gem 'ruby_dep', '< 1.4.0'
-end
-
-gem 'listen',        '< 3.1'   if version <= Gem::Version.new('2.2.3')
-gem 'activesupport', '< 5'     if version <= Gem::Version.new('2.2.2')
-
-if version <= Gem::Version.new('2.1.0')
-  gem 'deprecation',   '< 0.3.0'
-  gem 'nokogiri',      '< 1.7'
-end
-
-if version <= Gem::Version.new('2.0.0')
-  gem 'public_suffix', '< 1.5'
-  gem 'json-ld',       '< 1.8'
-  gem 'linkeddata',    '<= 1.1.11'
-  gem 'webmock',       '< 2.3'
-end

data/active-triples.gemspec

@@ -15,18 +15,13 @@ Gem::Specification.new do |s|
   s.required_ruby_version     = '>= 1.9.3'
   
   s.add_dependency('rdf', '~> 1.1')
-  s.add_dependency('rdf-vocab', '~> 0.8')
+  s.add_dependency('linkeddata', '~> 1.1')
   s.add_dependency('activemodel', '>= 3.0.0')
   s.add_dependency('deprecation', '~> 0.1')
   s.add_dependency('activesupport', '>= 3.0.0')
 
   s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec')
-  s.add_development_dependency('rdf-spec',   '~> 1.99')
-  s.add_development_dependency('rdf-rdfxml', '>= 1.1.5', '~> 1.1')
-  s.add_development_dependency('rdf-turtle', '~> 1.99')
-  s.add_development_dependency('rdf-isomorphic', '~> 1.99')
-  s.add_development_dependency('json-ld',    '~> 1.99')
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('webmock')
   s.add_development_dependency('nokogiri')

data/lib/active_triples/identifiable.rb

@@ -33,16 +33,6 @@ module ActiveTriples::Identifiable
       self.class.resource_class
     end
 
-    def update_resource(&block)
-      resource_class.properties.each do |name, property|
-        if block_given?
-          yield name, property
-        else
-          resource.set_value(property.predicate, self.send(property.term))
-        end
-      end
-    end
-
   public
 
     module ClassMethods
@@ -50,7 +40,7 @@ module ActiveTriples::Identifiable
       delegate :configure, :property, :properties, to: :resource_class
 
       def resource_class
-        @resource_class ||= Class.new(ActiveTriples::Resource)
+        @resource_class ||= self.const_set(:GeneratedResourceSchema, Class.new(ActiveTriples::Resource))
       end
 
       def from_uri(uri, *args)

data/lib/active_triples/node_config.rb

@@ -1,14 +1,12 @@
 module ActiveTriples
   class NodeConfig
-    attr_accessor :predicate, :term, :class_name, :type, :behaviors, :multivalue, :cast
+    attr_accessor :predicate, :term, :class_name, :type, :behaviors, :cast
 
     def initialize(term, predicate, args={})
       self.term = term
       self.predicate = predicate
-      self.class_name = args.delete(:class_name)
-      self.multivalue = args.delete(:multivalue) { true }
-      self.cast = args.delete(:cast) { true }
-      raise ArgumentError, "Invalid arguments for Rdf Node configuration: #{args} on #{predicate}" unless args.empty?
+      self.class_name = args.fetch(:class_name) { default_class_name }
+      self.cast = args.fetch(:cast) { true }
       yield(self) if block_given?
     end
 
@@ -38,6 +36,12 @@ module ActiveTriples
       self.behaviors = iobj.behaviors
     end
 
+    private
+
+    def default_class_name
+      nil
+    end
+
     # this enables a cleaner API for solr integration
     class IndexObject
       attr_accessor :data_type, :behaviors

data/lib/active_triples/properties.rb

@@ -17,18 +17,6 @@ module ActiveTriples
       initialize_generated_modules
     end
 
-    ##
-    # Registers properties for Resource-like classes
-    # @param [Symbol]  name of the property (and its accessor methods)
-    # @param [Hash]  opts for this property, must include a :predicate
-    # @yield [index] index sets solr behaviors for the property
-    def property(name, opts={}, &block)
-      self.config[name] = NodeConfig.new(name, opts[:predicate], opts.except(:predicate)).tap do |config|
-        config.with_index(&block) if block_given?
-      end
-      register_property(name)
-    end
-
     module ClassMethods
       def inherited(child_class) #:nodoc:
         child_class.initialize_generated_modules
@@ -57,7 +45,7 @@ module ActiveTriples
         reflection = PropertyBuilder.build(self, name, opts, &block)
         Reflection.add_reflection self, name, reflection
       end
-      
+
       def protected_property_name?(name)
         reject = self.instance_methods.map! { |s| s.to_s.gsub(/=$/, '').to_sym }
         reject -= properties.keys.map { |k| k.to_sym }

data/lib/active_triples/repositories.rb

@@ -32,5 +32,22 @@ module ActiveTriples
     end
     module_function :repositories
 
+    ##
+    # Check for the specified rdf_subject in the specified repository
+    # defaulting to search all registered repositories.
+    # @param [String] rdf_subject
+    # @param [Symbol] repository name
+    def has_subject?(rdf_subject,repo_name=nil)
+      search_repositories = [repositories[repo_name]] if repo_name
+      search_repositories ||= repositories.values
+      found = false
+      search_repositories.each do |repo|
+        found = repo.has_subject? rdf_subject
+        break if found
+      end
+      found
+    end
+    module_function :has_subject?
+
   end
 end

data/lib/active_triples/resource.rb

@@ -316,8 +316,8 @@ module ActiveTriples
     def get_term(args)
       @term_cache ||= {}
       term = Term.new(self, args)
-      @term_cache["#{term.send(:rdf_subject)}/#{term.property}"] ||= term
-      @term_cache["#{term.send(:rdf_subject)}/#{term.property}"]
+      @term_cache["#{term.send(:rdf_subject)}/#{term.property}/#{term.term_args}"] ||= term
+      @term_cache["#{term.send(:rdf_subject)}/#{term.property}/#{term.term_args}"]
     end
 
     ##
@@ -407,7 +407,39 @@ module ActiveTriples
         else
           repository.delete [rdf_subject, nil, nil]
         end
-     end
+      end
+
+      ##
+      # Test if the rdf_subject that would be generated using a
+      # specific ID is already in use in the triplestore.
+      #
+      # @param [Integer, #read] ID to test
+      #
+      # @return [TrueClass, FalseClass] true, if the ID is in
+      #    use in the triplestore; otherwise, false.
+      #    NOTE: If the ID is in use in an object not yet
+      #          persisted, false will be returned presenting
+      #          a window of opportunity for an ID clash.
+      def self.id_persisted?(test_id)
+        rdf_subject = self.new(test_id).rdf_subject
+        ActiveTriples::Repositories.has_subject?(rdf_subject)
+      end
+
+      ##
+      # Test if the rdf_subject that would be generated using a
+      # specific URI is already in use in the triplestore.
+      #
+      # @param [String, RDF::URI, #read] URI to test
+      #
+      # @return [TrueClass, FalseClass] true, if the URI is in
+      #    use in the triplestore; otherwise, false.
+      #    NOTE: If the URI is in use in an object not yet
+      #          persisted, false will be returned presenting
+      #          a window of opportunity for an ID clash.
+      def self.uri_persisted?(test_uri)
+        rdf_subject = test_uri.kind_of?(RDF::URI) ? test_uri : RDF::URI(test_uri)
+        ActiveTriples::Repositories.has_subject?(rdf_subject)
+      end
 
     private
 

data/lib/active_triples/term.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/module/delegation'
 module ActiveTriples
   class Term
 
-    attr_accessor :parent, :value_arguments, :node_cache
+    attr_accessor :parent, :value_arguments, :node_cache, :term_args
     attr_reader :reflections
 
     delegate *(Array.public_instance_methods - [:send, :__send__, :__id__, :class, :object_id] + [:as_json]), :to => :result
@@ -14,18 +14,23 @@ module ActiveTriples
       self.value_arguments = value_arguments
     end
 
+    def value_arguments=(value_args)
+      if value_args.kind_of?(Array) && value_args.last.kind_of?(Hash)
+        self.term_args = value_args.pop
+      end
+      @value_arguments = value_args
+    end
+
     def clear
       set(nil)
     end
 
     def result
-      result = parent.query(:subject => rdf_subject, :predicate => predicate)
-      .each_with_object([]) do |x, collector|
-        converted_object = convert_object(x.object)
-        collector << converted_object unless converted_object.nil?
-      end
-      return result if !property_config || property_config[:multivalue]
-      result.first
+      parent.query(:subject => rdf_subject, :predicate => predicate)
+        .each_with_object([]) do |x, collector|
+          converted_object = convert_object(x.object)
+          collector << converted_object unless converted_object.nil?
+        end
     end
 
     def set(values)
@@ -90,7 +95,7 @@ module ActiveTriples
     end
 
     def type_property
-      { :multivalue => true, :predicate => RDF.type, :cast => false }
+      { :predicate => RDF.type, :cast => false }
     end
 
     def reset!
@@ -147,7 +152,7 @@ module ActiveTriples
       def convert_object(value)
         case value
         when RDF::Literal
-          value.object
+          return_literals? ? value : value.object
         when RDF::Resource
           make_node(value)
         else
@@ -176,6 +181,10 @@ module ActiveTriples
         !!property_config[:cast]
       end
 
+      def return_literals?
+        term_args && term_args[:literal]
+      end
+
       def final_parent
         @final_parent ||= begin
           parent = self.parent

data/lib/active_triples/version.rb

@@ -1,3 +1,3 @@
 module ActiveTriples
-  VERSION = '0.4.1'.freeze
+  VERSION = "0.5.0"
 end

data/spec/active_triples/list_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 require 'nokogiri'
-require 'rdf/rdfxml'
+require 'linkeddata'
 
 describe ActiveTriples::List do
 

data/spec/active_triples/repositories_spec.rb

@@ -25,4 +25,80 @@ describe ActiveTriples::Repositories do
     end
   end
 
+  describe '#has_subject?' do
+
+    let(:resource2) do
+      DummyResource2.new(2)
+    end
+
+    before do
+      class DummyResource1 < ActiveTriples::Resource
+        configure :base_uri => "http://example.org/r1/",
+                  :type => RDF::URI("http://example.org/SomeClass"),
+                  :repository => :repo1
+      end
+      class DummyResource2 < ActiveTriples::Resource
+        configure :base_uri => "http://example.org/r2/",
+                  :type => RDF::URI("http://example.org/SomeClass"),
+                  :repository => :repo2
+      end
+      class DummyResource3 < ActiveTriples::Resource
+        configure :base_uri => "http://example.org/r3/",
+                  :type => RDF::URI("http://example.org/SomeClass"),
+                  :repository => :repo3
+      end
+      ActiveTriples::Repositories.add_repository :repo1, RDF::Repository.new
+      ActiveTriples::Repositories.add_repository :repo2, RDF::Repository.new
+      ActiveTriples::Repositories.add_repository :repo3, RDF::Repository.new
+
+      DummyResource1.new('1').persist!
+      DummyResource2.new('2').persist!
+      DummyResource3.new('3').persist!
+
+    end
+    after do
+      DummyResource1.new('1').destroy!
+      DummyResource2.new('2').destroy!
+      DummyResource3.new('3').destroy!
+
+      Object.send(:remove_const, "DummyResource1") if Object
+      Object.send(:remove_const, "DummyResource2") if Object
+      Object.send(:remove_const, "DummyResource3") if Object
+      ActiveTriples::Repositories.clear_repositories!
+    end
+
+    context 'when checking only one named repository' do
+      context 'and rdf_subject exists in the repository' do
+        it 'should return true' do
+          expect(ActiveTriples::Repositories.has_subject?(resource2.rdf_subject,:repo2)).to be_truthy
+        end
+      end
+
+      context 'and rdf_subject exists in another repository' do
+        it 'should return false' do
+          expect(ActiveTriples::Repositories.has_subject?(resource2.rdf_subject,:repo1)).to be_falsey
+        end
+      end
+
+      context 'and rdf_subject does not exists in any repository' do
+        it 'should return false' do
+          expect(ActiveTriples::Repositories.has_subject?("#{resource2.rdf_subject}_NOEXIST",:repo1)).to be_falsey
+        end
+      end
+    end
+
+    context 'when checking all repositories' do
+      context 'and rdf_subject exists in one repository' do
+        it 'should return true' do
+          expect(ActiveTriples::Repositories.has_subject?(resource2.rdf_subject)).to be_truthy
+        end
+      end
+
+      context 'and rdf_subject does not exists in any repository' do
+        it 'should return false' do
+          expect(ActiveTriples::Repositories.has_subject?("#{resource2.rdf_subject}_NOEXIST")).to be_falsey
+        end
+      end
+    end
+  end
 end

data/spec/active_triples/resource_spec.rb

@@ -162,6 +162,98 @@ describe ActiveTriples::Resource do
     end
   end
 
+  describe "#id_persisted?" do
+
+    subject {DummyResourceWithBaseURI.new('1')}
+
+    before do
+      class DummyResourceWithBaseURI < ActiveTriples::Resource
+        configure :base_uri => "http://example.org",
+                  :type => RDF::URI("http://example.org/SomeClass"),
+                  :repository => :default
+      end
+      ActiveTriples::Repositories.add_repository :default, RDF::Repository.new
+      subject.persist!
+    end
+    after do
+      Object.send(:remove_const, "DummyResourceWithBaseURI") if Object
+      ActiveTriples::Repositories.clear_repositories!
+    end
+
+    context "when ID is a string" do
+      it "should be false if ID does not exist" do
+        expect(DummyResourceWithBaseURI.id_persisted?('2')).to be_falsey
+      end
+
+      it "should be true if ID exists" do
+        expect(DummyResourceWithBaseURI.id_persisted?('1')).to be_truthy
+      end
+    end
+
+    context "when ID is numeric" do
+      it "should be false if ID does not exist" do
+        expect(DummyResourceWithBaseURI.id_persisted?(2)).to be_falsey
+      end
+
+      it "should be true if ID exists" do
+        expect(DummyResourceWithBaseURI.id_persisted?(1)).to be_truthy
+      end
+    end
+
+    context "when object with ID in use is not persisted" do
+      it "should be false" do
+        DummyResourceWithBaseURI.new('3')
+        expect(DummyResourceWithBaseURI.id_persisted?(3)).to be_falsey
+      end
+    end
+  end
+
+  describe "#uri_persisted?" do
+
+    subject {DummyResourceWithBaseURI.new('11')}
+
+    before do
+      class DummyResourceWithBaseURI < ActiveTriples::Resource
+        configure :base_uri => "http://example.org",
+                  :type => RDF::URI("http://example.org/SomeClass"),
+                  :repository => :default
+      end
+      ActiveTriples::Repositories.add_repository :default, RDF::Repository.new
+      subject.persist!
+    end
+    after do
+      Object.send(:remove_const, "DummyResourceWithBaseURI") if Object
+      ActiveTriples::Repositories.clear_repositories!
+    end
+
+    context "when URI is a http string" do
+      it "should be false if URI does not exist" do
+        expect(DummyResourceWithBaseURI.uri_persisted?("http://example.org/22")).to be_falsey
+      end
+
+      it "should be true if URI does exist" do
+        expect(DummyResourceWithBaseURI.uri_persisted?("http://example.org/11")).to be_truthy
+      end
+    end
+
+    context "when URI is a RDF::URI" do
+      it "should be false if URI does not exist" do
+        expect(DummyResourceWithBaseURI.uri_persisted?(RDF::URI("http://example.org/22"))).to be_falsey
+      end
+
+      it "should be true if URI does exist" do
+        expect(DummyResourceWithBaseURI.uri_persisted?(RDF::URI("http://example.org/11"))).to be_truthy
+      end
+    end
+
+    context "when object with URI is not persisted" do
+      it "should be false" do
+        DummyResourceWithBaseURI.new('13')
+        expect(DummyResourceWithBaseURI.uri_persisted?("http://example.org/13")).to be_falsey
+      end
+    end
+  end
+
   describe '#destroy!' do
     before do
       subject.title = 'Creative Commons'
@@ -463,6 +555,26 @@ describe ActiveTriples::Resource do
       subject.set_value(RDF::URI("http://opaquenamespace.org/jokes"), RDF::DC.title, 'Comet in Moominland')
       expect(subject.get_values(RDF::URI("http://opaquenamespace.org/jokes"),:title)).to eq ["Comet in Moominland"]
     end
+
+    context "literals are set" do
+      let(:literal1) { RDF::Literal.new("test", :language => :en) }
+      let(:literal2) { RDF::Literal.new("test", :language => :fr) }
+      before do
+        subject.set_value(RDF::DC.title, [literal1, literal2]) 
+      end
+      context "and literals are not requested" do
+        it "should return a string" do
+          # Should this de-duplicate?
+          expect(subject.get_values(RDF::DC.title)).to eq ["test", "test"]
+        end
+      end
+      context "and literals are requested" do
+        it "should return literals" do
+          expect(subject.get_values(RDF::DC.title, :literal => true)).to eq [literal1, literal2]
+        end
+      end
+    end
+
   end
 
   describe '#[]' do

data/spec/pragmatic_context_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'pragmatic_context'
-require 'json/ld'
 
 describe 'PragmaticContext integration' do
   before do
@@ -42,8 +41,7 @@ describe 'PragmaticContext integration' do
   end
 
   it 'should have contexts' do
-    expect(subject.as_jsonld['@context'].keys)
-      .to contain_exactly("license", "title")
+    expect(subject.as_jsonld['@context'].keys).to eq ["license", "title"]
   end
   
   it 'should use context with dump' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Tom Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -26,19 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rdf-vocab
+  name: linkeddata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -109,82 +109,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdf-spec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.99'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.99'
-- !ruby/object:Gem::Dependency
-  name: rdf-rdfxml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.5
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.5
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rdf-turtle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.99'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.99'
-- !ruby/object:Gem::Dependency
-  name: rdf-isomorphic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.99'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.99'
-- !ruby/object:Gem::Dependency
-  name: json-ld
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.99'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.99'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -303,8 +227,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: RDF graphs in ActiveModel wrappers.
 test_files: []
+has_rdoc: