active-fedora 6.6.0 → 6.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef5496bb9123668b10de796159b394a50a1ec1da
-  data.tar.gz: 70b9bf4b2d64f1f0a6ffd3b5eb81dca852f47cd6
+  metadata.gz: 95bf10c81395906f26c70a425466ec9e544f2e15
+  data.tar.gz: b18abff4428238811124584add40c90b6b58a1dd
 SHA512:
-  metadata.gz: c87b4be4a4d26c6424cdfa4d7ca73981760fa36d9f91b3e62ecf8396153ee581914f594cdb9a4edaaca1c73f52332ffba2b78af3f0dd57bee176add2e0381d1c
-  data.tar.gz: 15f245fddca1d9fb480cca04e41708e4e2fc1ec8cecd23409346101295bedecd286517e55b19d1420ba4511d076842f141d1171f9d16198b5ff6b3d9d3a11bc6
+  metadata.gz: 5a2087217930bad433c30938c82bcc7416c66cc7552796466bf24c29e6e67cd099419b7e76914a09e66ae147b7c2b8bafa5178c1927e8f74311d283c21031a7d
+  data.tar.gz: 50d38ecf44e8959f978dab853f39d784a2f9d2168d0f6015e7a17e63b8c34a3f17a482064fdc1314a9af8b8b1eb4b0aa084555a3b4ba23a9ed053c9007a1daee

data/History.txt

@@ -1,3 +1,6 @@
+v6.6.1
+Don't try to track changes on delegates that are not attributes
+
 v6.6.0
 Add _destroy method for building nested forms [Justin Coyne]
 Removed the pid placeholder `__DO_NOT_USE__` [Justin Coyne]

data/lib/active_fedora/delegating.rb

@@ -41,6 +41,21 @@ module ActiveFedora
       instance_exec(args, &self.class.delegates[field][:setter])
     end
 
+    # @return [Boolean] true if there is an reader method and it returns a
+    # value different from the new_value.
+    def value_has_changed?(field, new_value)
+      begin
+        new_value != array_reader(field)
+      rescue NoMethodError
+        false
+      end
+    end
+
+    def mark_as_changed(field)
+      self.send("#{field}_will_change!")
+    end
+
+
     module ClassMethods
       def delegates
         @local_delegates ||= {}.with_indifferent_access
@@ -181,7 +196,7 @@ module ActiveFedora
         self.delegates[field] ||= {}
         self.delegates[field][:setter] = lambda do |v|
           ds = self.send(args[:to])
-          self.send("#{field}_will_change!") unless v == array_reader(field)
+          mark_as_changed(field) if value_has_changed?(field, v)
           if ds.kind_of?(ActiveFedora::RDFDatastream)
             ds.send("#{field}=", v)
           else

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.6.0"
+  VERSION = "6.6.1"
 end

data/spec/integration/delegating_spec.rb

@@ -1,32 +1,59 @@
 require 'spec_helper'
 
-describe "delegating objects" do
-  before :all do
-    class TitledObject < ActiveFedora::Base
-      has_metadata :type=>ActiveFedora::SimpleDatastream, :name=>"foo" do |m|
-        m.field "title", :string
+describe "delegating properties" do
+  describe "that have a reader and writer" do
+    before :all do
+      class TitledObject < ActiveFedora::Base
+        has_metadata 'foo', type: ActiveFedora::SimpleDatastream do |m|
+          m.field "title", :string
+        end
+        delegate :title, to: 'foo', multiple: false
+      end
+    end
+    after :all do
+      Object.send(:remove_const, :TitledObject)
+    end
+
+    describe "save" do
+      subject do
+        obj = TitledObject.create 
+        obj.title = "Hydra for Dummies"
+        obj.save
+        obj
+      end
+      it "should keep a list of changes after a successful save" do
+        subject.previous_changes.should_not be_empty
+        subject.previous_changes.keys.should include("title")
+      end
+      it "should clean out changes" do
+        subject.title_changed?.should be_false
+        subject.changes.should be_empty
       end
-      delegate :title, :to=>'foo', :unique=>true
     end
-  end
-  after :all do
-    Object.send(:remove_const, :TitledObject)
   end
 
-  describe "save" do
-    subject do
-      obj = TitledObject.create 
-      obj.title = "Hydra for Dummies"
-      obj.save
-      obj
+  describe "that only have a writer" do
+    before :all do
+      class TestDatastream < ActiveFedora::NtriplesRDFDatastream
+        # accepts_nested_attributes_for :title, would generate a method like this:
+        def title_attributes=(attributes)
+        end
+      end
+      class TitledObject < ActiveFedora::Base
+        has_metadata 'foo', type: TestDatastream
+        delegate :title_attributes, to: 'foo', multiple: false
+      end
     end
-    it "should keep a list of changes after a successful save" do
-      subject.previous_changes.should_not be_empty
-      subject.previous_changes.keys.should include("title")
+    after :all do
+      Object.send(:remove_const, :TitledObject)
+      Object.send(:remove_const, :TestDatastream)
     end
-    it "should clean out changes" do
-      subject.title_changed?.should be_false
-      subject.changes.should be_empty
+
+    subject { TitledObject.new }
+
+    it "Should delegate the method" do
+      subject.title_attributes = {'0' => {'title' => 'Hello'}}
     end
+
   end
 end

data/spec/integration/om_datastream_spec.rb

@@ -161,7 +161,7 @@ describe ActiveFedora::OmDatastream do
         @obj.reload
       end
       it "should solrize terms with :type=>'date' to *_dt solr terms" do
-        @obj.to_solr[ActiveFedora::SolrService.solr_name('mods_journal_issue_publication_date', type: :date)].should == ['2012-11-02T00:00:00Z']
+        @obj.to_solr[ActiveFedora::SolrService.solr_name('journal_issue_publication_date', type: :date)].should == ['2012-11-02T00:00:00Z']
       end
     end
   end

data/spec/unit/query_spec.rb

@@ -20,7 +20,7 @@ describe ActiveFedora::Base do
       it 'should notify of deprecation if no cast parameter is passed' do
         Deprecation.should_receive(:warn).at_least(1).times
         expect {
-          ActiveFedora::Base.find_one('_PID_')
+          ActiveFedora::Base.find_one('mypid:99999')
         }.to raise_error(ActiveFedora::ObjectNotFoundError)
       end
     end
@@ -28,7 +28,7 @@ describe ActiveFedora::Base do
       it 'should not have a deprecation warning when no cast parameter is passed' do
         Deprecation.should_not_receive(:warn)
         expect {
-          SpecModel::Basic.find_one('_PID_')
+          SpecModel::Basic.find_one('mypid:99999')
         }.to raise_error(ActiveFedora::ObjectNotFoundError)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.6.0
+  version: 6.6.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -555,7 +555,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.