active-fedora 9.1.0 → 9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db07402e3e8ca081253507888ffda0d81084c947
-  data.tar.gz: 3b1ae9595815772239fb91fa04713afdb736a61e
+  metadata.gz: 1d27733036fa2ceffef04a07c51f6287e1a29345
+  data.tar.gz: 45c6e01a1d0508a3a316771973183cc48a7f08eb
 SHA512:
-  metadata.gz: b8db754769fb5d0a4a93ee0b58304f92080a5d6ecec2a9e3730fdbbe623aa505af85b8c8a88d22ab9be86c93d118395c6134fe85b219b65b0bac091410a57675
-  data.tar.gz: 01b0a5c53e12d3426ae309fdc80af82197ede177ee617ec7da0be468e99841da6e8f0a1db14b0d231b524c3658db3a704bc6ad8dc30f8b9c01726d44ef3bc99a
+  metadata.gz: 921a3c46c4485ec83789512be1fe9caf1d16445f18121d68944a3a3f742b64a1010a7db5bbcf05b77e1d8c094d36ef2e7ea8f506ee8a0f5c046fe16a0788c5f0
+  data.tar.gz: c491773b0438275c4d75e998e54eae06940a4a6137b92630fee5530eafa16e77dc1e56ca003114ccabe9604bf686f443492b40e4ff0581bb856dfc5c39d8aef3

data/lib/active_fedora/attributes.rb

@@ -175,7 +175,7 @@ module ActiveFedora
         if properties.key?(:predicate)
           define_active_triple_accessor(name, properties, &block)
         elsif properties.key?(:delegate_to)
-          define_delegated_accessor([name], properties.delete(:delegate_to), properties.merge(multiple: true), &block)
+          define_delegated_accessor([name], properties.delete(:delegate_to), properties.reverse_merge(multiple: true), &block)
         else
           raise "You must provide `:datastream' or `:predicate' options to property"
         end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.1.0"
+  VERSION = "9.1.1"
 end

data/spec/unit/attributes_spec.rb

@@ -34,7 +34,7 @@ describe ActiveFedora::Base do
     end
 
     describe "#property" do
-      context "with an xml property" do
+      context "with an xml property (default cardinality)" do
         before do
           class BarHistory4 < ActiveFedora::Base
             has_metadata type: BarStream2, name: "xmlish"
@@ -57,6 +57,26 @@ describe ActiveFedora::Base do
           subject { obj.xmlish.cow }
           it { is_expected.to eq ['one', 'two'] }
         end
+      end
+
+      context "with multiple set to false" do
+        before do
+          class BarHistory4 < ActiveFedora::Base
+            has_metadata type: BarStream2, name: "xmlish"
+            property :cow, delegate_to: 'xmlish', multiple: false
+          end
+        end
+        after do
+          Object.send(:remove_const, :BarHistory4)
+        end
+
+        let(:obj) { BarHistory4.new }
+
+        before { obj.cow = 'one' }
+        describe "the object accessor" do
+          subject { obj.cow }
+          it { is_expected.to eq 'one' }
+        end
 
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.1.1
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr