active-fedora 9.0.5 → 9.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 436ba8923ff37c5dd40860044ff513a17c7ad780
-  data.tar.gz: e9b48072342526acefc2ab0210a9da725057b118
+  metadata.gz: cbfeceebf66b94fa9e04ccb8527c9795167a4e73
+  data.tar.gz: 7438bf293a82b052a103ccea3febb14929e9e3c2
 SHA512:
-  metadata.gz: b58f0179c05783ff6897723088979c1605d5d4a1901b082e2893c6f1ef7b7023c701bd6a91fa345c9ce19833a0ce37a7040b250282ca07a2e8cd6e8f79fcdf8b
-  data.tar.gz: 47851b957993caf1586409266240480f8763b65643bcf41cc9269aaf717ffe010df2cd3ede6bf940aac648179bf20aa992a9920daf8266338e39a2578fb08d66
+  metadata.gz: aa70a485f881672113c3004de9da43d15bb6008e8a95bf85ce22d097260b51169240490b2f2d369eeeb93fa429df116a5f0790b5707bb8ba5cc18684c098e0ef
+  data.tar.gz: cd423d69239dc6c2dfce41c5ad4c69570a71099d82a543122247efc421d59f1637dba4b5ff43319ccd8702f9f97b30ede3891c9c78db2acae083b693da798dfd

data/History.txt

@@ -1,3 +1,19 @@
+v9.0.6
+  2015-03-26: Setting type should not wipe out properties. Fixes #737 [Justin Coyne]
+
+v9.0.5
+  2015-03-25: Properties named *_id should not break the change set [Chris Colvard]
+
+  2015-03-24: Add rdf:type assertions to ActiveFedora::Base [Justin Coyne]
+
+  2015-03-24: Add documentation that differentiates attach_file from add_file [Justin Coyne]
+
+  2015-03-24: Remove #default_attributes. Fixes #732 [Chris Colvard]
+
+  2015-03-18: Make sure datastreams get configured on load as well as new/create [Michael B. Klein]
+
+  2015-03-17: Allow a has_many association to specify an explicit foreign key via the :as option [Michael B. Klein]
+
 v9.0.4
   2015-03-10: Refactor the AF::Base initializer [Justin Coyne]
 

data/lib/active_fedora/fedora_attributes.rb

@@ -65,9 +65,12 @@ module ActiveFedora
     module ClassMethods
       # We make a unique class, because properties belong to a class.
       # This keeps properties from different objects separate.
+      # Since the copy of properties can only happen once, we don't want to invoke it
+      # until all properties have been defined.
       def resource_class
         @generated_resource_class ||= begin
             klass = self.const_set(:GeneratedResourceSchema, Class.new(ActiveTriples::Resource))
+            klass.configure type: @type if @type
             klass.properties.merge(self.properties).each do |property, config|
               klass.property(config.term,
                              predicate: config.predicate,
@@ -77,8 +80,9 @@ module ActiveFedora
         end
       end
 
+      # Set the rdf type for this class
       def type(uri)
-        resource_class.configure type: uri
+        @type = uri
       end
     end
   end

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "9.0.5"
+  VERSION = "9.0.6"
 end

data/spec/unit/base_spec.rb

@@ -32,15 +32,23 @@ describe ActiveFedora::Base do
     before do
       class FooHistory < ActiveFedora::Base
         type ::RDF::URI.new('http://example.com/foo')
+        property :title, predicate: ::RDF::DC.title
       end
     end
     after do
       Object.send(:remove_const, :FooHistory)
     end
 
-    subject { FooHistory.new().type }
+    subject { FooHistory.new.type }
 
     it { is_expected.to eq [RDF::URI('http://example.com/foo')] }
+
+    context "when type is called before propertes" do
+      subject { FooHistory.resource_class.reflect_on_property(:title) }
+      it "should not wipe out the properties" do
+        expect(subject).to be_kind_of ActiveTriples::NodeConfig
+      end
+    end
   end
 
   describe 'descendants' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 9.0.5
+  version: 9.0.6
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr