active-triples 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4928b254048d00cd2f52d050aea13407ba362425
-  data.tar.gz: 11c44cb9efe80bfc6dd09f6e33a6aee0d288666d
+  metadata.gz: e1f422e5ac96c89ebdaeeb9d97d52ae3d5bfe526
+  data.tar.gz: b5fd9203d247be04fccab63466eee59bcc9af078
 SHA512:
-  metadata.gz: 665fe27ad696dda89568310375194243760cfa22d8761bc10fc40eca9dcd39a81352c840e283e3501c4eb2504bdb1d663efa96138478660f5f9ab3454d3e874f
-  data.tar.gz: ec21704f5faf6aadf57ec45c95bfb64113ef772f3fd48c8e7e26f4ddfa9dd08dfe786cd2039743c7b742d9cf24b600141f5e7dcfd1e1579f2d57fc181e625d8b
+  metadata.gz: 26f27fa5aae3444a211f339c2dcb5dcf26950b31f6f98697b09977f233fe0e23049a245f2ba1b3262b6104caf27b37e254ea5c829fc30f2daea675250ed4988a
+  data.tar.gz: 22400ed6fd5ace6f4772ca8b1c0ddb5a98e99be0d38fdeac42a8bce900d7cf65226e44c399fd38e1174770d1f040a0a98b4bd0589751fa27194443fa17591c3d

data/.travis.yml

@@ -4,14 +4,13 @@ script: "bundle exec rspec spec"
 sudo: false
 cache: bundler
 rvm:
-  - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.2.1
-  - ruby-head
-  - jruby
-  - rbx-2
+ - 2.0
+ - 2.1
+ - 2.2.4
+ - 2.3.0
+ - jruby-9.0.4.0
+ - rbx-2
 matrix:
   allow_failures:
-      - rvm: jruby
-      - rvm: ruby-head
+      - rvm: jruby-9.0.4.0
+      - rvm: rbx-2

data/CHANGES.md

@@ -1,3 +1,72 @@
+0.8.2
+-----
+* Allow PersistenceStrategy set by property config [Tom Johnson]
+* Extend NodeConfig for arbitrary properties [Tom Johnson]
+* Add `Relation#delete?` and `#swap` [Tom Johnson]
+* Make Relation#delete singular; add #subtract [Tom Johnson]
+* Re-add `Relation#delete` with a new implementation [Tom Johnson]
+* Documentation and formatting cleanup on Relation [Tom Johnson]
+* Remove Relation#reset! [Tom Johnson]
+* Remove `Relation#[]=` [Tom Johnson]
+* Remove Relation#delete [Tom Johnson]
+* FIX #200 Use == instead of eql? for resource equality test [E. Lynette Rayle]
+* Add some docs and tests for `PropertyBuilder` [Tom Johnson]
+* Test undefined property on Relation#set [Tom Johnson]
+* add loaded flag to lazy load property sources with parent_strategy [E. Lynette Rayle]
+* Add deprecation warning [MJ Suhonos]
+* Rename #obj to #source for clarity [MJ Suhonos]
+* Update Guardfile [MJ Suhonos]
+* Update comment terminology [MJ Suhonos]
+* Remove reference to concrete persistable from abstract class [MJ Suhonos]
+* Allow fetch to pass args to RDF::Reader.open [Justin Coyne]
+* Delegate join to Relation. [Trey Terrell]
+* Change ParentStrategy usage [Tom Johnson]
+* Delegate #size in Relation. [Trey Terrell]
+* Remove singleton_class call from RepositoryStrategy [Tom Johnson]
+* Convert ancestors enumerator method to Class [Tom Johnson]
+* Avoid circularity in `ParentStrategy` [Tom Johnson]
+* Update .travis.yml Rubies to match RDF.rb [Tom Johnson]
+* Add frozen_string_literals pragma [Justin Coyne]
+* Fixup specs [Tom Johnson]
+* Specs/docs for ValueError scenarios on #set_value [Tom Johnson]
+* Add initial docs/specs for `RDFSource#attributes` [Tom Johnson]
+* Add docs and specs for `Relation#first_or_create` [Tom Johnson]
+* Add tests & docs for `Relation#build` [Tom Johnson]
+* Make `Relation#clear` atomic [Tom Johnson]
+* Test `RDFSource#rdf_label` [Tom Johnson]
+* Fix for circular parent relationships [Tom Johnson]
+* Add documentation and tests for key Relation [Tom Johnson]
+* Refactor Relation#value_arguments [Tom Johnson]
+* Move property methods from RDFSource in Properties [Tom Johnson]
+* Add documentation and some tests for Properties [Tom Johnson]
+* Refactor and rearrange RDFSource & Reflection [Tom Johnson]
+* Finish documentation and testing of Reflection [Tom Johnson]
+* Cleaner handling of undefined properties [Tom Johnson]
+* Add some tests for `#get_values` [Tom Johnson]
+* Make `#set_value` return the Relation it updates [Tom Johnson]
+* Add triple in `#set_value` when argument is self [Tom Johnson]
+* Removes odd logic surrounding property clearance [Tom Johnson]
+* Removing OpenStruct in favor of PORO [Jeremy Friesen]
+* Switching from Array() to Array.wrap [Jeremy Friesen]
+* Fixup RDF.rb and rdf-spec dependencies [Tom Johnson]
+* Track latest `rdf-spec` and `rdf-vocab` [Tom Johnson]
+* Complete update to use RDF::Vocab [Tom Johnson]
+* Use rdf-vocab for vocabularies [Justin Coyne]
+* Add `RDFSource#graph_name` since quads aren't returned [Tom Johnson]
+* Update specs to use a managable invalid statement [Tom Johnson]
+* Test with develop version of rdf-spec [Justin Coyne]
+* Graph#query is faster than using Queryable#query [Justin Coyne]
+* Update error handling specs. [Tom Johnson]
+* Adds a default block to `RDFSource#fetch` [Tom Johnson]
+* Run `ActiveModel` lints on `RDFSource` [Tom Johnson]
+* Fix ActiveModel linter to test `#to_key` [Tom Johnson]
+* Remove unnecessary lines in `parent_strategy_spec` [Tom Johnson]
+* Make `Relation#predicate` a public method [Tom Johnson]
+* Cleanup and unit tests for `RDFSource#get_value` [Tom Johnson]
+* Test ActiveModel validations with RDF's `#valid?` [Tom Johnson]
+* Children should not be persisted? unless their parents are. Fixes #148 [Justin Coyne]
+
+
 0.8.1
 -----
 

data/Gemfile

@@ -3,5 +3,3 @@ source "https://rubygems.org"
 gemspec
 
 gem 'pry-byebug' unless ENV["CI"]
-
-gem 'rdf-spec', :github => 'ruby-rdf/rdf-spec', :branch => 'develop'

data/Guardfile

@@ -1,9 +1,8 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec do
+guard :rspec, cmd: "bundle exec rspec" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
 end
-

data/active-triples.gemspec

@@ -14,15 +14,15 @@ Gem::Specification.new do |s|
   s.license     = "APACHE2"
   s.required_ruby_version     = '>= 1.9.3'
 
-  s.add_dependency('rdf', '~> 1.1.13')
-  s.add_dependency('linkeddata', '~> 1.1')
+  s.add_dependency('rdf', '1.99')
+  s.add_dependency('linkeddata', '~> 1.99')
   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')
+  s.add_development_dependency('rdf-spec', '~> 1.99')
   s.add_development_dependency('coveralls')
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('webmock')

data/lib/active/triples.rb

@@ -1 +1,2 @@
+# frozen_string_literal: true
 require 'active_triples'

data/lib/active_triples.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'rdf'
 require 'active_triples/version'
 require 'active_support'
@@ -53,6 +54,9 @@ module ActiveTriples
              'active_triples/persistence_strategies/parent_strategy'
     autoload :RepositoryStrategy,
              'active_triples/persistence_strategies/repository_strategy'
+
+    # error classes
+    autoload :UndefinedPropertyError
   end
   
   ##

data/lib/active_triples/configurable.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
 require 'deprecation'
+require 'active_support/core_ext/array/wrap'
 
 module ActiveTriples
   ##
@@ -61,7 +63,7 @@ module ActiveTriples
     end
 
     def transform_type(values)
-      Array(values).map do |value|
+      Array.wrap(values).map do |value|
         RDF::URI.new(value).tap do |uri|
           RDFSource.type_registry[uri] = self
         end

data/lib/active_triples/configuration.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
   require_relative 'configuration/item'
   require_relative 'configuration/merge_item'

data/lib/active_triples/configuration/item.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
   class Configuration
     # Basic configuration item which overrides the value for a key on the object.

data/lib/active_triples/configuration/item_factory.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
   class Configuration
     ## Returns a configuration item appropriate for a given configuration property.

data/lib/active_triples/configuration/merge_item.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+require 'active_support/core_ext/array/wrap'
+
 module ActiveTriples
   class Configuration
     # Configuration item which sets a value by turning the original into an array and
@@ -6,8 +9,8 @@ module ActiveTriples
     # This enables multiple types to be set on an object, for example.
     class MergeItem < Item
       def set(value)
-        object.inner_hash[key] = Array(object.inner_hash[key])
-        object.inner_hash[key] |= Array(value)
+        object.inner_hash[key] = Array.wrap(object.inner_hash[key])
+        object.inner_hash[key] |= Array.wrap(value)
       end
     end
   end

data/lib/active_triples/extension_strategy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
   ##
   # Default property applying strategy which just copies all configured properties

data/lib/active_triples/identifiable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support'
 require 'active_support/core_ext/module/delegation'
 

data/lib/active_triples/list.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
   ##
   # An implementation of RDF::List intregrated with ActiveTriples.
@@ -162,6 +163,7 @@ module ActiveTriples
       if subject == RDF.nil
         @subject = RDF::Node.new
         @graph = ListResource.new(subject)
+        @graph.list = self
         @graph.type = RDF.List
       end
 

data/lib/active_triples/nested_attributes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support'
 require 'active_support/concern'
 require 'active_support/core_ext/class'
@@ -121,7 +122,6 @@ module ActiveTriples
               assign_nested_attributes_for_collection_association(:#{association_name}, attributes)
               ## in lieu of autosave_association_callbacks just save all of em.
               send(:#{association_name}).each {|obj| obj.marked_for_destruction? ? obj.destroy : nil}
-              send(:#{association_name}).reset!
             end
           eoruby
       end

data/lib/active_triples/node_config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
   class NodeConfig
     attr_accessor :predicate, :term, :class_name, :type, :behaviors, :cast
@@ -5,14 +6,15 @@ module ActiveTriples
     def initialize(term, predicate, args={})
       self.term = term
       self.predicate = predicate
-      self.class_name = args.fetch(:class_name) { default_class_name }
-      self.cast = args.fetch(:cast) { true }
+      self.class_name = args.delete(:class_name) { default_class_name }
+      self.cast = args.delete(:cast) { true }
+      @opts = args
       yield(self) if block_given?
     end
 
     def [](value)
       value = value.to_sym
-      self.respond_to?(value) ? self.send(value) : nil
+      self.respond_to?(value) ? self.send(value) : @opts[value]
     end
 
     def class_name

data/lib/active_triples/persistable.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
   ##
   # Bundles the core interfaces used by ActiveTriples persistence strategies

data/lib/active_triples/persistence_strategies/parent_strategy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActiveTriples
   ##
   # Persistence strategy for projecting `RDFSource`s onto the graph of an owning
@@ -6,50 +7,76 @@ module ActiveTriples
   class ParentStrategy
     include PersistenceStrategy
 
-    # @!attribute [r] obj
+    # @!attribute [r] source
     #   the source to persist with this strategy
     # @!attribute [r] parent
     #   the target parent source for persistence
-    attr_reader :obj, :parent
+    attr_reader :source, :parent
 
     ##
-    # @param obj [RDFSource, RDF::Enumerable] the `RDFSource` (or other
+    # @param source [RDFSource, RDF::Enumerable] the `RDFSource` (or other
     #   `RDF::Enumerable` to persist with the strategy.
-    def initialize(obj)
-      @obj = obj
+    def initialize(source)
+      @source = source
     end
 
+    ##
+    # Resources using this strategy are persisted only if their parent is also 
+    # persisted.
+    #
+    # @see PersistenceStrategy#persisted?
+    def persisted?
+      super && parent.persisted?
+    end
+
+    ##
+    # Indicates if the resource has been loaded from the repository (used for lazy load)
+    #
+    # @return [Boolean] true if loaded; else false.
+    def loaded?
+      @loaded ||= false
+    end
+
+    ##
+    # Destroys the resource by removing it graph and references from the
+    # parent.
+    #
+    # @see PersistenceStrategy#destroy
     def destroy
-      super { parent.destroy_child(obj) }
+      final_parent.delete(source.statements)
+
+      parent.statements.each do |statement|
+        parent.delete_statement(statement) if
+          statement.subject == source.rdf_subject || 
+          statement.object == source.rdf_subject
+      end
+
+      super { source.clear }
     end
 
-    # Clear out any old assertions in the repository about this node or statement
-    # thus preparing to receive the updated assertions.
+    ##
+    # @abstract Clear out any old assertions in the datastore / repository 
+    # about this node  or statement thus preparing to receive the updated 
+    # assertions.
     def erase_old_resource
-      if obj.rdf_subject.node?
-        final_parent.statements.each do |statement|
-          final_parent.send(:delete_statement, statement) if
-            statement.subject == obj.rdf_subject
-        end
-      else
-        final_parent.delete [obj.rdf_subject, nil, nil]
+      final_parent.statements.each do |statement|
+        final_parent.send(:delete_statement, statement) if
+          statement.subject == source.rdf_subject
       end
     end
 
+    ##
+    # @return [Enumerator<RDFSource>]
+    def ancestors
+      Ancestors.new(source).to_enum
+    end
+
     ##
     # @return [#persist!] the last parent in a chain from `parent` (e.g.
     #   the parent's parent's parent). This is the RDF::Mutable that the
-    #   object will project itself on when persisting.
+    #   resource will project itself on when persisting.
     def final_parent
-      raise NilParentError if parent.nil?
-      @final_parent ||= begin
-        current = self.parent
-        while current && current.respond_to?(:parent) && current.parent
-          break if current.parent == current
-          current = current.parent
-        end
-        current
-      end
+      ancestors.to_a.last
     end
 
     ##
@@ -64,12 +91,12 @@ module ActiveTriples
     end
 
     ##
-    # Persists the object to the final parent.
+    # Persists the resource to the final parent.
     #
     # @return [true] true if the save did not error
     def persist!
       erase_old_resource
-      final_parent << obj
+      final_parent << source
       @persisted = true
     end
 
@@ -78,11 +105,59 @@ module ActiveTriples
     #
     # @return [Boolean]
     def reload
-      obj << final_parent.query(subject: obj.rdf_subject)
-      @persisted = true unless obj.empty?
+      if loaded? || !persisted?
+        source << final_parent.query(subject: source.rdf_subject)
+      else
+        RepositoryStrategy.new(source).reload
+        source.persist!
+        @loaded=true
+      end
+      @persisted = true unless source.empty?
       true
     end
 
+    ##
+    # An enumerable over the ancestors of an resource
+    class Ancestors
+      include Enumerable
+
+      # @!attribute source
+      #   @return [RDFSource]
+      attr_reader :source
+
+      ##
+      # @param source [RDFSource]
+      def initialize(source)
+        @source = source
+      end
+      
+      ##
+      # @yield [RDFSource] gives each ancestor to the block
+      # @return [Enumerator<RDFSource>]
+      #
+      # @raise [NilParentError] if `source` does not persist to a parent
+      def each
+        raise NilParentError if 
+          !source.persistence_strategy.respond_to?(:parent) || 
+          source.persistence_strategy.parent.nil?
+        
+        current = source.persistence_strategy.parent
+        
+        if block_given?
+          loop do
+            yield current
+            
+            break unless (current.persistence_strategy.respond_to?(:parent) && 
+                          current.persistence_strategy.parent)
+            break if current.persistence_strategy.parent == current
+
+            current = current.persistence_strategy.parent
+          end
+        end
+        to_enum
+      end
+    end
+    
     class NilParentError < RuntimeError; end
     class UnmutableParentError < ArgumentError; end
   end