active-fedora 9.0.3 → 9.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 505a6045300f42aa08d9d68632b7847cddc7b9a7
-  data.tar.gz: 05360af6100e21a5513b612292da24cf01cf9b16
+  metadata.gz: 8399fafb48e7230ac7b01d1902b7f5c08cbbd32c
+  data.tar.gz: a7bba75db0807336e62720997ccc30465b492356
 SHA512:
-  metadata.gz: 399d4f0a75a882db61ccaece0343dcdfa509670cc0e8aa8e11aa830a87797825ac3f923e9c577ef83f70ec02bd1bc7b7f770f7d242807fb443641677c504e70b
-  data.tar.gz: 7a9b1ae26cbed3732b28bd337304765790393f4af1b3b8b4ebf1c98ae8036b1a2d7a8a2ce0779dbe98b8bdd49c5373f4e4900eed005d46806fda0f37740c5e6f
+  metadata.gz: 25eaf5eacaacbe1c4889f3c2cc2381a06a38a7aced2c5dd06b9ea6d5497b512b24f923fca57b8b3b1a49ace425841463a71c8d2e036dd3db6e2d46006bb09810
+  data.tar.gz: 8e5a5556ad3acd780f352feb6043053a41b1ae9be13446d269676748d46ce0830a4beae2550621b14af1ee897145eb7a6151d3a98d0a81ee60e49337ecd60527

data/History.txt

@@ -1,3 +1,8 @@
+v9.0.4
+  2015-03-10: Refactor the AF::Base initializer [Justin Coyne]
+
+  2015-03-10: Added missing id setter [Justin Coyne]
+
 v9.0.3
   2015-03-04: Encapsulate solr_escape and make it private [Justin Coyne]
 

data/lib/active_fedora/core.rb

@@ -33,13 +33,14 @@ module ActiveFedora
     # Also, if +attrs+ does not contain +:id+ but does contain +:namespace+ it will pass the
     # +:namespace+ value to Fedora::Repository.nextid to generate the next id available within
     # the given namespace.
-    def initialize(attributes_or_resource_or_url = nil, &block)
+    def initialize(attributes_or_id = nil, &block)
       init_internals
-      attributes = initialize_resource_and_attributes(attributes_or_resource_or_url)
+      attributes = initialize_attributes(attributes_or_id)
+      @ldp_source = build_ldp_resource(attributes.delete(:id))
       raise IllegalOperation, "Attempting to recreate existing ldp_source: `#{ldp_source.subject}'" unless ldp_source.new?
       assert_content_model
       load_attached_files
-      self.attributes = attributes if attributes
+      self.attributes = attributes
 
       yield self if block_given?
       run_callbacks :initialize
@@ -138,7 +139,7 @@ module ActiveFedora
         else
           id = "/#{id}" unless id.start_with? SLASH
           unless ActiveFedora.fedora.base_path == SLASH || id.start_with?("#{ActiveFedora.fedora.base_path}/")
-            id = ActiveFedora.fedora.base_path + id 
+            id = ActiveFedora.fedora.base_path + id
           end
           ActiveFedora.fedora.host + id
         end
@@ -193,33 +194,22 @@ module ActiveFedora
         end
       end
 
-      def initialize_resource_and_attributes attributes_or_resource_or_url
-        case attributes_or_resource_or_url
+      def initialize_attributes attributes_or_id
+        case attributes_or_id
           when String
-            @ldp_source = build_ldp_resource(attributes_or_resource_or_url)
-            @attributes = {}.with_indifferent_access
+            attributes = {id: attributes_or_id}.with_indifferent_access
           when Hash
-            attributes = attributes_or_resource_or_url
-
-            id = attributes.delete(:id)
-
+            attributes = attributes_or_id.with_indifferent_access
             # TODO: Remove when we decide using 'pid' is no longer supported.
-            if !id && attributes.has_key?(:pid)
+            if !attributes.key?(:id) && attributes.key?(:pid)
               Deprecation.warn Core, 'Initializing with :pid is deprecated and will be removed in active-fedora 10.0. Use :id instead'
-              id = attributes.delete(:pid)
+              attributes[:id] = attributes.delete(:pid)
             end
 
-            attributes = attributes.with_indifferent_access if attributes
-            @ldp_source = if id
-              build_ldp_resource(id)
-            else
-              build_ldp_resource
-            end
           when NilClass
-            @ldp_source = build_ldp_resource
             attributes = {}.with_indifferent_access
           else
-            raise ArgumentError, "#{attributes_or_resource_or_url.class} is not acceptable"
+            raise ArgumentError, "#{attributes_or_id.class} is not acceptable"
         end
         return attributes
       end

data/lib/active_fedora/fedora_attributes.rb

@@ -34,6 +34,12 @@ module ActiveFedora
       end
     end
 
+    def id=(id)
+      raise "ID has already been set to #{self.id}" if self.id
+      @ldp_source = build_ldp_resource(id.to_s)
+    end
+
+
     # TODO: Remove after we no longer support #pid.
     def pid
       Deprecation.warn FedoraAttributes, "#{self.class}#pid is deprecated and will be removed in active-fedora 10.0. Use #{self.class}#id instead."

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.0.3"
+  VERSION = "9.0.4"
 end

data/spec/unit/base_spec.rb

@@ -4,6 +4,30 @@ require 'spec_helper'
 describe ActiveFedora::Base do
   it_behaves_like "An ActiveModel"
 
+  describe "id=" do
+    before do
+      class FooHistory < ActiveFedora::Base
+        property :title, predicate: ::RDF::DC.title
+      end
+    end
+    after do
+      Object.send(:remove_const, :FooHistory)
+    end
+
+    subject { FooHistory.new(title: ["A good title"]) }
+    before { subject.id = 9 }
+
+    it "is settable" do
+      expect(subject.id).to eq '9'
+      expect(subject.title).to eq ["A good title"]
+    end
+
+    it "is only settable once" do
+      expect { subject.id = 10 }.to raise_error "ID has already been set to 9"
+      expect(subject.id).to eq '9'
+    end
+  end
+
   describe 'descendants' do
     it "should record the decendants" do
       expect(ActiveFedora::Base.descendants).to include(ModsArticle, SpecialThing)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.3
+  version: 9.0.4
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -565,3 +565,4 @@ signing_key:
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.
 test_files: []
+has_rdoc: