active-fedora 9.2.1 → 9.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 912cef8852fb193d0e8c55b2996b060608b04426
-  data.tar.gz: a9b6e0994fbd8edefb197a93ca5031a3bd439f9f
+  metadata.gz: 1a9499d1539f4cfe6d15bd6240a7636945f49251
+  data.tar.gz: 62c6f9a13eb35a9eaaf269680de4e6624b25fd5f
 SHA512:
-  metadata.gz: 0a8e668c4d8ce320ada6b10a9104a61ced5901802f24f9aeca5fbd5381ddb30573ef270dbbc0e42c9c0b0f51bd70df8d108deb285e34e15ce229abe644d48edd
-  data.tar.gz: 5a9bb242cf7d205c5f853457f4d458afdbfdf0862f041610ffc2705c9e2e32c04ca7c0fb32cf0730be078f3e4da22a3de37efe55137b0ba2673898822fe513b6
+  metadata.gz: 180ae74d2fd67d14b7d205b186cee646915b376257687fe7d9c85731ba5acd6bce8fe4a9990fb065200b2d954c9a10f3006960cec37ca27fbd41b12dc1761ee3
+  data.tar.gz: 99a9bfb6277533275cab73575d3a6c474bed490d6ec51973fcc99ef6e124e23445f85bae8d78f62ca6f316dbe2849026ef6d96d5723e707755ea7c1c4ac23313

data/History.txt

@@ -1,3 +1,12 @@
+v9.3.0
+  2015-08-06: Records should be able to be marshaled and loaded [Justin Coyne]
+
+  2015-07-31: RDF association ids setter should handle nil [Justin Coyne]
+
+  2015-07-31: Add collection#select using block syntax [Trey Terrell]
+
+  2015-07-24: Add type validator objects to associations. [Trey Terrell]
+
 v9.2.1
   2015-07-20: Don't delete objects not part of the association. [Trey Terrell]
 

data/lib/active_fedora/associations.rb

@@ -30,10 +30,11 @@ module ActiveFedora
     autoload :DirectlyContainsOneAssociation, 'active_fedora/associations/directly_contains_one_association'
     autoload :IndirectlyContainsAssociation,  'active_fedora/associations/indirectly_contains_association'
     autoload :ContainsAssociation,            'active_fedora/associations/contains_association'
-    autoload :DeleteProxy,            'active_fedora/associations/delete_proxy'
-    autoload :ContainedFinder,      'active_fedora/associations/contained_finder'
-    autoload :RecordComposite,         'active_fedora/associations/record_composite'
-    autoload :IDComposite,         'active_fedora/associations/id_composite'
+    autoload :DeleteProxy,                    'active_fedora/associations/delete_proxy'
+    autoload :ContainedFinder,                'active_fedora/associations/contained_finder'
+    autoload :RecordComposite,                'active_fedora/associations/record_composite'
+    autoload :IDComposite,                    'active_fedora/associations/id_composite'
+    autoload :NullValidator,                  'active_fedora/associations/null_validator'
 
     module Builder
       autoload :Association,             'active_fedora/associations/builder/association'

data/lib/active_fedora/associations/association.rb

@@ -149,6 +149,11 @@ module ActiveFedora
             message = "#{@reflection.class_name}(##{@reflection.klass.object_id}) expected, got #{record.class}(##{record.class.object_id})"
             raise ActiveFedora::AssociationTypeMismatch, message
           end
+          type_validator.validate!(self, record)
+        end
+
+        def type_validator
+          options[:type_validator] || NullValidator
         end
 
         # Can be redefined by subclasses, notably polymorphic belongs_to

data/lib/active_fedora/associations/builder/association.rb

@@ -1,7 +1,7 @@
 module ActiveFedora::Associations::Builder
   class Association #:nodoc:
     class_attribute :valid_options
-    self.valid_options = [:class_name, :predicate]
+    self.valid_options = [:class_name, :predicate, :type_validator]
 
     # Set by subclasses
     class_attribute :macro

data/lib/active_fedora/associations/builder/property.rb

@@ -2,7 +2,7 @@ module ActiveFedora::Associations::Builder
   class Property < Association
 
     self.macro = :rdf
-    self.valid_options = [:class_name, :predicate]
+    self.valid_options = [:class_name, :predicate, :type_validator]
 
     def initialize(model, name, options)
       super

data/lib/active_fedora/associations/collection_association.rb

@@ -284,6 +284,10 @@ module ActiveFedora
         owner.new_record? && !foreign_key_present?
       end
 
+      def select(select=nil, &block)
+        to_a.select(&block)
+      end
+
       protected
 
         def construct_query

data/lib/active_fedora/associations/null_validator.rb

@@ -0,0 +1,8 @@
+module ActiveFedora::Associations
+  ##
+  # An association type validator which does no validation.
+  class NullValidator
+    def self.validate!(reflection, object)
+    end
+  end
+end

data/lib/active_fedora/associations/rdf.rb

@@ -3,11 +3,12 @@ module ActiveFedora
     class RDF < SingularAssociation #:nodoc:
 
       def replace(values)
+        ids = Array(values).reject(&:blank?)
         raise "can't modify frozen #{owner.class}" if owner.frozen?
         destroy
-        values.each do |value|
-          uri = ActiveFedora::Base.id_to_uri(value)
-          owner.resource.insert [owner.rdf_subject, reflection.predicate, ::RDF::URI.new(uri)]
+        ids.each do |id|
+          uri = ::RDF::URI(ActiveFedora::Base.id_to_uri(id))
+          owner.resource.insert [owner.rdf_subject, reflection.predicate, uri]
         end
         owner.send(:attribute_will_change!, reflection.name)
       end

data/lib/active_fedora/ldp_resource.rb

@@ -22,5 +22,15 @@ module ActiveFedora
       # forces a cast to FedoraRdfResource
       graph_without_inlined_resources(original_graph, inlined_resources)
     end
+
+    # Don't dump @client, it has a proc and thus can't be serialized.
+    def marshal_dump
+      ivars = (instance_variables - [:@client]).map { |name| [name, instance_variable_get(name)] }
+    end
+
+    def marshal_load(data)
+      ivars = data
+      ivars.each { |name, val| instance_variable_set(name, val) }
+    end
   end
 end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.2.1"
+  VERSION = "9.3.0"
 end

data/spec/integration/associations/rdf_spec.rb

@@ -20,6 +20,19 @@ describe "rdf associations" do
       expect(library.association(:foo_ids)).not_to receive(:filter_by_class)
       library.foos.to_a
     end
+
+    describe "the id setter" do
+      it "can handle nil" do
+        library.foo_ids = nil
+        expect(library.foo_ids).to eq []
+      end
+
+      it "can handle array with nils" do
+        library.foo_ids = [nil, nil]
+        expect(library.foo_ids).to eq []
+      end
+    end
+
   end
 
   context "when two relationships have the same predicate" do

data/spec/integration/associations_spec.rb

@@ -56,6 +56,52 @@ describe ActiveFedora::Base do
     end
   end
 
+  describe "type validator" do
+    before do
+      class EnsureBanana
+        def self.validate!(reflection, object)
+          unless object.try(:banana?)
+            raise ActiveFedora::AssociationTypeMismatch.new "#{object} must be a banana"
+          end
+        end
+      end
+      class FooThing < ActiveFedora::Base
+        attr_accessor :banana
+        has_many :bars, class_name: 'BarThing', predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, as: :foothing, type_validator: EnsureBanana
+        def banana?
+          !!banana
+        end
+      end
+
+      class BarThing < ActiveFedora::Base
+        attr_accessor :banana
+        belongs_to :foothing, class_name: 'FooThing', predicate: ActiveFedora::RDF::Fcrepo::RelsExt.isPartOf, type_validator: EnsureBanana
+        def banana?
+          !!banana
+        end
+      end
+    end
+    
+    after do
+      Object.send(:remove_const, :FooThing)
+      Object.send(:remove_const, :BarThing)
+    end
+
+    let(:foo) { FooThing.create }
+    let(:bar) { BarThing.create }
+
+    it "should validate on singular associations" do
+      expect{bar.foothing = foo}.to raise_error ActiveFedora::AssociationTypeMismatch, "#{foo} must be a banana"
+      foo.banana = true
+      expect{bar.foothing = foo}.not_to raise_error
+    end
+    it "should validate on collection associations" do
+      expect{foo.bars << bar}.to raise_error ActiveFedora::AssociationTypeMismatch, "#{bar} must be a banana"
+      bar.banana = true
+      expect{foo.bars << bar}.not_to raise_error
+    end
+  end
+
   describe "complex example" do
     before do
       class Library < ActiveFedora::Base

data/spec/integration/collection_association_spec.rb

@@ -79,12 +79,14 @@ describe ActiveFedora::Base do
     end
   end
 
-  # TODO: Bug described in issue #609
   describe "#select" do
-    it "should choose a subset of objects in the relationship" do
-      pending "method has private visibility"
+    # TODO: Bug described in issue #609
+    xit "should choose a subset of objects in the relationship" do
       expect(library.books.select([:id])).to include(book1.id)
     end
+    it "should work as a block" do
+      expect(library.books.select{|x| x.id == book1.id}).to eq [book1]
+    end
   end
 
   describe "finding the inverse" do

data/spec/integration/marshal_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+
+describe "Marshalling and loading" do
+  before do
+    class Post < ActiveFedora::Base
+      has_many :comments
+      property :text, predicate: ::RDF::URI('http://example.com/text')
+    end
+
+    class Comment < ActiveFedora::Base
+      belongs_to :post, predicate: ::RDF::URI('http://example.com/post')
+    end
+  end
+
+  after do
+    Object.send(:remove_const, :Post)
+    Object.send(:remove_const, :Comment)
+  end
+
+  context "persisted records" do
+    let(:post) { Post.create(text: ['serialize me']) }
+    it "marshals them" do
+      marshalled = Marshal.dump(post)
+      loaded     = Marshal.load(marshalled)
+
+      expect(loaded.attributes).to eq post.attributes
+    end
+  end
+
+  context "with associations" do
+    let(:post) { Post.create(comments: [Comment.new]) }
+    it "marshals associations" do
+      marshalled = Marshal.dump(post)
+      loaded     = Marshal.load(marshalled)
+
+      expect(loaded.comments.size).to eq 1
+    end
+  end
+end

data/spec/unit/builder/has_and_belongs_to_many_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ActiveFedora::Associations::Builder::HasAndBelongsToMany do
   describe "valid_options" do
     subject { ActiveFedora::Associations::Builder::HasAndBelongsToMany.valid_options }
-    it { should eq [:class_name, :predicate, :before_add, :after_add, :before_remove,
+    it { should eq [:class_name, :predicate, :type_validator, :before_add, :after_add, :before_remove,
                     :after_remove, :inverse_of, :solr_page_size, :autosave] }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.2.1
+  version: 9.3.0
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -314,6 +314,7 @@ files:
 - lib/active_fedora/associations/has_many_association.rb
 - lib/active_fedora/associations/id_composite.rb
 - lib/active_fedora/associations/indirectly_contains_association.rb
+- lib/active_fedora/associations/null_validator.rb
 - lib/active_fedora/associations/rdf.rb
 - lib/active_fedora/associations/record_composite.rb
 - lib/active_fedora/associations/singular_association.rb
@@ -496,6 +497,7 @@ files:
 - spec/integration/indexing_spec.rb
 - spec/integration/indirect_container_spec.rb
 - spec/integration/json_serialization_spec.rb
+- spec/integration/marshal_spec.rb
 - spec/integration/model_spec.rb
 - spec/integration/nested_attribute_spec.rb
 - spec/integration/ntriples_datastream_spec.rb