active-triples 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c39dcd5366189f7c48a5d0cb61ab3d8f21f358a
-  data.tar.gz: 843c3a9739c899ef296822ddbdc37b152e5818d9
+  metadata.gz: 300932925b232989a4b093e73168d529344c5f11
+  data.tar.gz: 64fb356ca3c31691e28d27fd8e88a6a61bdef816
 SHA512:
-  metadata.gz: 7bef92c1abd72a0d8accde6d2346c61c711d8a66be9c26b479537756ce88acf433d2e396af8a28cfce7f8240c4c5d325cc495484a3a3335c7f30a96f67af51bd
-  data.tar.gz: 5bae48e5d3db44d1cd0318a2fab282b94de957421edabdab35082375d4db97319998369ccdb75b884c1c331ce02e5faab92a64e8509ddc53aa42690baf9a72df
+  metadata.gz: d62f7ca7d2757f818d2a8b6be44d079312322b40a75d64ac020a14456145d21b6051372539bf5f18ed71f457f398fdc29722257139f5b4f28e35a3782c1716ab
+  data.tar.gz: 2054a0e5dbc1b4c9dd4eaa77757ddded8129648a6699f511514c2aa14b8ae12d97755a2db88263b3255ed4c297bca50ebd53a7e957eebdceacceb1f72b0ae3a2

data/.travis.yml

@@ -4,7 +4,6 @@ script: "bundle exec rspec spec"
 sudo: false
 cache: bundler
 rvm:
- - 2.0
  - 2.1
  - 2.2.4
  - 2.3.1

data/CHANGES.md

@@ -1,3 +1,10 @@
+0.10.0
+----
+  - Fix Identifiable for ActiveFedora [Trey Pendragon]
+  - Upgrade to RDF.rb 2.0.2 [Tom Johnson]
+  - Avoid touching each_statement on initialization [Tom Johnson]
+  - Drop support for Ruby 2.0
+
 0.9.0
 -----
  - Upgrade to RDF.rb 2.0

data/Gemfile

@@ -2,4 +2,5 @@ source "https://rubygems.org"
 
 gemspec
 
+gem 'activesupport', '< 5.0.0' if RUBY_VERSION =~ /2\.1\..*/
 gem 'pry-byebug' unless ENV["CI"]

data/active-triples.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |s|
   s.summary     = %q{RDF graphs in ActiveModel wrappers.}
   s.description = %q{ActiveTriples provides tools for modeling RDF as discrete resources.}
   s.license     = "APACHE2"
-  s.required_ruby_version     = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.1.0'
 
-  s.add_dependency 'rdf',           '~> 2.0'
+  s.add_dependency 'rdf',           '~> 2.0', '>= 2.0.2'
   s.add_dependency 'linkeddata',    '~> 2.0'
   s.add_dependency 'activemodel',   '>= 3.0.0'
-  s.add_dependency 'deprecation',   '~> 0.1'
+  s.add_dependency 'deprecation',   '~> 1.0'
   s.add_dependency 'activesupport', '>= 3.0.0'
 
   s.add_development_dependency 'rdoc'

data/lib/active_triples/persistence_strategies/parent_strategy.rb

@@ -95,6 +95,7 @@ module ActiveTriples
     #
     # @return [true] true if the save did not error
     def persist!
+      return false if final_parent.frozen?
       erase_old_resource
       final_parent << source
       @persisted = true
@@ -105,6 +106,7 @@ module ActiveTriples
     #
     # @return [Boolean]
     def reload
+      return false if source.frozen?
       if loaded? || !persisted?
         source << final_parent.query(subject: source.rdf_subject)
       else

data/lib/active_triples/rdf_source.rb

@@ -91,6 +91,7 @@ module ActiveTriples
     # @todo move this logic out to a Builder?
     def initialize(*args, &block)
       resource_uri = args.shift unless args.first.is_a?(Hash)
+      @rdf_subject = get_uri(resource_uri) if resource_uri
       unless args.first.is_a?(Hash) || args.empty?
         set_persistence_strategy(ParentStrategy)
         persistence_strategy.parent = args.shift
@@ -98,7 +99,6 @@ module ActiveTriples
         set_persistence_strategy(RepositoryStrategy)
       end
       @graph = RDF::Graph.new(*args, &block)
-      set_subject!(resource_uri) if resource_uri
 
       reload
 

data/lib/active_triples/relation.rb

@@ -34,7 +34,7 @@ module ActiveTriples
     attr_reader :reflections
 
     delegate :<=>, :==, :===, :[], :each, :empty?, :equal, :inspect, :last,
-       :to_a, :to_ary, :size, :join, :length, :to => :result
+       :to_a, :to_ary, :size, :join, :length, :+, :to => :result
 
     ##
     # @param [ActiveTriples::RDFSource] parent_source
@@ -354,15 +354,15 @@ module ActiveTriples
       end
 
       def set_value(val)
-        val = value_to_node(val.respond_to?(:resource) ? val.resource : val)
-        if val.kind_of? RDFSource
-          node_cache[val.rdf_subject] = nil
-          add_child_node(val)
+        resource = value_to_node(val.respond_to?(:resource) ? val.resource : val)
+        if resource.kind_of? RDFSource
+          node_cache[resource.rdf_subject] = nil
+          add_child_node(val, resource)
           return
         end
-        val = val.to_uri if val.respond_to? :to_uri
-        raise ValueError, val unless val.kind_of? RDF::Term
-        parent.insert [rdf_subject, predicate, val]
+        resource = resource.to_uri if resource.respond_to? :to_uri
+        raise ValueError, resource unless resource.kind_of? RDF::Term
+        parent.insert [rdf_subject, predicate, resource]
       end
 
       def type_property
@@ -373,19 +373,21 @@ module ActiveTriples
         valid_datatype?(val) ? RDF::Literal(val) : val
       end
 
-      def add_child_node(resource)
+      def add_child_node(object, resource)
         parent.insert [rdf_subject, predicate, resource.rdf_subject]
+        resource = resource.respond_to?(:resource) ? resource.resource : resource
 
-        resource = resource.dup
-        unless resource == parent ||
+        new_resource = resource.dup unless object.respond_to?(:resource) && object.resource == resource
+        new_resource ||= resource
+        unless new_resource == parent ||
                (parent.persistence_strategy.is_a?(ParentStrategy) &&
-                parent.persistence_strategy.ancestors.find { |a| a == resource })
-          resource.set_persistence_strategy(ParentStrategy)
-          resource.parent = parent
+                parent.persistence_strategy.ancestors.find { |a| a == new_resource })
+          new_resource.set_persistence_strategy(ParentStrategy)
+          new_resource.parent = parent
         end
 
-        self.node_cache[resource.rdf_subject] = resource
-        resource.persist! if resource.persistence_strategy.is_a? ParentStrategy
+        self.node_cache[resource.rdf_subject] = (resource == object ? new_resource : object)
+        new_resource.persist! if new_resource.persistence_strategy.is_a? ParentStrategy
       end
 
       def valid_datatype?(val)

data/lib/active_triples/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ActiveTriples
-  VERSION = '0.9.0'.freeze
+  VERSION = '0.10.0'.freeze
 end

data/spec/active_triples/identifiable_spec.rb

@@ -155,5 +155,15 @@ describe ActiveTriples::Identifiable do
         expect(subject.rdf_subject).to eq 'http://example.org/ns/123'
       end
     end
+
+    describe "adding it as a property for an AT Resource" do
+      include_context 'with data'
+      it "returns the same in-memory object added" do
+        resource = MyResource.new
+        resource.relation = subject
+
+        expect(resource.relation).to eq [subject]
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-triples
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Tom Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -18,6 +18,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -267,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="