active-triples 0.7.6 → 0.8.0

data/spec/active_triples/repositories_spec.rb

@@ -13,9 +13,9 @@ describe ActiveTriples::Repositories do
       subject.add_repository :name, RDF::Repository.new
       expect(subject.repositories).to include :name
     end
+
     it 'should throw an error if passed something that is not a repository' do
-      expect{subject.add_repository :name, :not_a_repo}
-        .to raise_error ArgumentError
+      expect{subject.add_repository :name, :not_a_repo}.to raise_error
     end
   end
 
@@ -74,19 +74,25 @@ describe ActiveTriples::Repositories do
     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
+          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
+          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
+          expect(ActiveTriples::Repositories
+                  .has_subject?("#{resource2.rdf_subject}_NOEXIST",:repo1))
+            .to be_falsey
         end
       end
     end
@@ -94,13 +100,17 @@ describe ActiveTriples::Repositories do
     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
+          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
+          expect(ActiveTriples::Repositories
+                  .has_subject?("#{resource2.rdf_subject}_NOEXIST"))
+            .to be_falsey
         end
       end
     end

data/spec/active_triples/resource_spec.rb

@@ -22,9 +22,7 @@ describe ActiveTriples::Resource do
 
   describe '#property' do
     it 'raises error when set directly on Resource' do
-      expect { ActiveTriples::Resource.property :blah, predicate: RDF::DC.title }
-        .to raise_error 'Properties not definable directly on ' \
-                        'ActiveTriples::Resource, use a subclass'
+      expect { ActiveTriples::Resource.property :blah, :predicate => RDF::DC.title }.to raise_error
     end
   end
 
@@ -69,8 +67,7 @@ describe ActiveTriples::Resource do
       end
 
       it 'should not be settable' do
-        expect{ subject.set_subject! RDF::URI('http://example.org/moomin2') }
-          .to raise_error "Refusing update URI when one is already assigned!" 
+        expect{ subject.set_subject! RDF::URI('http://example.org/moomin2') }.to raise_error
       end
     end
 
@@ -90,46 +87,6 @@ describe ActiveTriples::Resource do
     end
   end
 
-  describe "#reload" do
-    context 'with a repository' do
-      let(:resource) { DummyResourceWithRepo.new }
-      let(:repository) { RDF::Repository.new }
-      before do
-        class DummyResourceWithRepo < ActiveTriples::Resource
-          configure repository: :default
-          property :title, predicate: RDF::DC.title
-        end
-        ActiveTriples::Repositories.add_repository :default, repository
-
-        resource.title = "bla"
-      end
-      after do
-        Object.send(:remove_const, :DummyResourceWithRepo)
-        ActiveTriples::Repositories.clear_repositories!
-      end
-
-      context "and a persisted resource" do
-        before do
-          resource.persist!
-          resource.title = 'Foo'
-          resource.reload
-        end
-        subject { resource.title }
-        it { is_expected.to eq ['Foo'] }
-      end
-
-      context "and a b-node" do
-        before do
-          expect(repository).not_to receive(:query).with(subject: resource.rdf_subject)
-          resource.reload
-          resource.title = 'Foo'
-        end
-        subject { resource.title }
-        it { is_expected.to eq ['Foo'] }
-      end
-    end
-  end
-
   describe "#persisted?" do
     context 'with a repository' do
       before do
@@ -162,7 +119,6 @@ describe ActiveTriples::Resource do
             expect(subject).to be_persisted
           end
         end
-
         context "and then reloaded" do
           before do
             subject.reload
@@ -190,7 +146,7 @@ describe ActiveTriples::Resource do
         before do
           @repo = RDF::Repository.new
           allow(subject.class).to receive(:repository).and_return(nil)
-          allow(subject).to receive(:repository).and_return(@repo)
+          allow(subject.persistence_strategy).to receive(:repository).and_return(@repo)
           subject.title = "bla"
           result
         end
@@ -518,8 +474,7 @@ describe ActiveTriples::Resource do
       end
 
       it 'raises error when trying to set nil value' do
-        expect { subject.aggregates[1] = nil }
-          .to raise_error ActiveTriples::Relation::ValueError
+        expect { subject.aggregates[1] = nil }.to raise_error /value must be an RDF URI, Node, Literal, or a valid datatype/
       end
 
       it "should be changeable for multiple values" do
@@ -605,8 +560,7 @@ describe ActiveTriples::Resource do
     end
 
     it "raise an error if the value is not a URI, Node, Literal, RdfResource, or string" do
-      expect{subject.set_value(RDF::DC.title, Object.new)}
-        .to raise_error ActiveTriples::Relation::ValueError
+      expect{subject.set_value(RDF::DC.title, Object.new)}.to raise_error
     end
 
     it "should be able to accept a subject" do
@@ -629,8 +583,7 @@ describe ActiveTriples::Resource do
     end
 
     it "raise an error if the value is not a URI, Node, Literal, RdfResource, or string" do
-      expect { subject[RDF::DC.title] = Object.new }
-        .to raise_error ActiveTriples::Relation::ValueError
+      expect { subject[RDF::DC.title] = Object.new }.to raise_error
     end
   end
 

data/spec/active_triples_spec.rb

@@ -1,7 +1,56 @@
 require 'spec_helper'
 
 describe ActiveTriples do
-  describe '.ActiveTriples' do
+  describe '.class_from_string' do
+    before do
+      module TestModule
+        class TestClass; end
+      end
+
+      class TestBase; end
+    end
+    
+    after do
+      Object.send(:remove_const, :TestModule)
+      Object.send(:remove_const, :TestBase)
+    end
+
+    it 'converts classes in kernal' do
+      expect(subject.class_from_string('TestBase')).to eq TestBase
+    end
+
+    it 'raises an error when class is undefined' do
+      expect { subject.class_from_string('NotDefined') }
+        .to raise_error NameError
+    end
+
+    it 'converts classes in a module' do
+      expect(subject.class_from_string('TestClass', TestModule))
+        .to eq TestModule::TestClass
+    end
+
+    it 'finds class above selected module' do
+      expect(subject.class_from_string('Object', TestModule)).to eq Object
+    end
+
+    it 'raises an error when class is undefined in module' do
+      expect { subject.class_from_string('NotDefined', TestModule) }
+        .to raise_error NameError
+    end
+
+    it 'finds class above multiple selected modules' do
+      expect(subject.class_from_string('Object', 'TestModule::TestClass'))
+        .to eq Object
+    end
+
+    # is this the correct behavior!?
+    it 'climbs up nested module contexts' do
+      expect(subject.class_from_string('', 'TestModule::TestClass'))
+        .to eq TestModule::TestClass
+    end
+  end
+  
+  describe '.ActiveTripels' do
     it 'outputs a string' do
       expect { described_class.ActiveTripels }.to output.to_stdout
     end

data/spec/spec_helper.rb

@@ -4,7 +4,9 @@ Coveralls.wear!
 require 'bundler/setup'
 Bundler.setup
 
+require 'rdf/spec'
 require 'active_triples'
+
 require 'pry' unless ENV["CI"]
 
 Dir['./spec/support/**/*.rb'].each { |f| require f }
@@ -12,7 +14,9 @@ Dir['./spec/support/**/*.rb'].each { |f| require f }
 RSpec.configure do |config|
   config.color = true
   config.tty = true
-  
+
+  config.include(RDF::Spec::Matchers)
+
   # Uncomment the following line to get errors and backtrace for deprecation warnings
   # config.raise_errors_for_deprecations!
 

data/spec/support/active_model_lint.rb

@@ -6,7 +6,10 @@ shared_examples_for "an ActiveModel" do
       expect(subject).to respond_to :to_key
     end
 
-    it 'should return nil when #persisted? is false ' do
+    ##
+    # @todo FIXME: this is wrong according to
+    #   http://api.rubyonrails.org/classes/ActiveModel/Conversion.html#method-i-to_key
+    xit 'should return nil when #persisted? is false ' do
       def subject.persisted?() false end
       expect(subject.to_key).to eq nil
     end
@@ -73,8 +76,8 @@ shared_examples_for "an ActiveModel" do
     end
   end
 
-  private 
-  
+  private
+
     def match_boolean(result)
       result == true || result == false
     end

data/spec/support/dummies/basic_persistable.rb

@@ -0,0 +1,13 @@
+class BasicPersistable
+  include ActiveTriples::Persistable
+
+  attr_reader :graph
+
+  def initialize
+    @graph = RDF::Graph.new
+  end
+
+  def rdf_subject
+    RDF::Node.new
+  end
+end

data/spec/support/shared_examples/persistence_strategy.rb

@@ -0,0 +1,36 @@
+shared_examples 'a persistence strategy' do
+  shared_context 'with changes' do
+    before do
+      subject.obj << RDF::Statement.new(RDF::Node.new, RDF::DC.title, 'moomin')
+    end
+  end
+
+  describe '#persist!' do
+    it 'evaluates true on success' do
+      expect(subject.persist!).to be_truthy
+    end
+
+    context 'with changes' do
+      include_context 'with changes'
+
+      it 'evaluates true on success' do
+        expect(subject.persist!).to be_truthy
+      end
+    end
+  end
+
+  describe '#persisted?' do
+    context 'before persist!' do
+      it 'returns false' do
+        expect(subject).not_to be_persisted
+      end
+    end
+
+    context 'after persist!' do
+      it 'returns true' do
+        subject.persist!
+        expect(subject).to be_persisted
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Tom Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.13
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,20 @@ 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: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -180,7 +194,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.2
 description: ActiveTriples provides tools for modeling RDF as discrete resources.
-email: thomas.johnson@oregonstate.edu
+email: tom@dp.la
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -210,6 +224,10 @@ files:
 - lib/active_triples/list.rb
 - lib/active_triples/nested_attributes.rb
 - lib/active_triples/node_config.rb
+- lib/active_triples/persistable.rb
+- lib/active_triples/persistence_strategies/parent_strategy.rb
+- lib/active_triples/persistence_strategies/persistence_strategy.rb
+- lib/active_triples/persistence_strategies/repository_strategy.rb
 - lib/active_triples/properties.rb
 - lib/active_triples/property.rb
 - lib/active_triples/property_builder.rb
@@ -226,6 +244,10 @@ files:
 - spec/active_triples/identifiable_spec.rb
 - spec/active_triples/list_spec.rb
 - spec/active_triples/nested_attributes_spec.rb
+- spec/active_triples/persistable_spec.rb
+- spec/active_triples/persistence_strategies/parent_strategy_spec.rb
+- spec/active_triples/persistence_strategies/persistence_strategy_spec.rb
+- spec/active_triples/persistence_strategies/repository_strategy_spec.rb
 - spec/active_triples/properties_spec.rb
 - spec/active_triples/property_spec.rb
 - spec/active_triples/rdf_source_spec.rb
@@ -233,11 +255,12 @@ files:
 - spec/active_triples/repositories_spec.rb
 - spec/active_triples/resource_spec.rb
 - spec/active_triples/schema_spec.rb
-- spec/active_triples/validations_spec.rb
 - spec/active_triples_spec.rb
 - spec/pragmatic_context_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
+- spec/support/dummies/basic_persistable.rb
+- spec/support/shared_examples/persistence_strategy.rb
 homepage: https://github.com/no-reply/ActiveTriples
 licenses:
 - APACHE2
@@ -258,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: RDF graphs in ActiveModel wrappers.