rubydora 0.5.12 → 0.5.13

data/VERSION

@@ -1 +1 @@
-0.5.12
+0.5.13

data/lib/rubydora/datastream.rb

@@ -21,7 +21,7 @@ module Rubydora
     DS_DEFAULT_ATTRIBUTES = { :controlGroup => 'M', :dsState => 'A', :versionable => true }
 
     define_attribute_methods DS_ATTRIBUTES.keys
- 
+
     # accessors for datastream attributes 
     DS_ATTRIBUTES.each do |attribute, profile_name|
       define_method attribute.to_s do
@@ -29,9 +29,9 @@ module Rubydora
         if instance_variable_defined?(var)
           instance_variable_get var
         elsif profile.has_key? profile_name.to_s
-            profile[profile_name.to_s]
+           profile[profile_name.to_s]
         else
-            DS_DEFAULT_ATTRIBUTES[attribute.to_sym]
+          default_attributes[attribute.to_sym]
         end
       end
 
@@ -47,7 +47,7 @@ module Rubydora
     DS_READONLY_ATTRIBUTES.each do |attribute|
       class_eval %Q{
       def #{attribute.to_s}
-        @#{attribute} || profile['#{attribute.to_s}'] || DS_DEFAULT_ATTRIBUTES[:#{attribute}]
+        @#{attribute} || profile['#{attribute.to_s}'] || default_attributes[:#{attribute}]
       end
       }
 
@@ -78,6 +78,18 @@ module Rubydora
       return self.class.new(@digital_object, @dsid, @options.merge(:asOfDateTime => asOfDateTime))
     end
 
+    def self.default_attributes
+      DS_DEFAULT_ATTRIBUTES
+    end
+
+    def default_attributes
+      @default_attributes ||= self.class.default_attributes
+    end
+
+    def default_attributes= attributes
+      @default_attributes = default_attributes.merge attributes
+    end
+
     ##
     # Initialize a Rubydora::Datastream object, which may or
     # may not already exist in the datastore.
@@ -87,11 +99,12 @@ module Rubydora
     # @param [Rubydora::DigitalObject]
     # @param [String] Datastream ID
     # @param [Hash] default attribute values (used esp. for creating new datastreams)
-    def initialize digital_object, dsid, options = {}
+    def initialize digital_object, dsid, options = {}, default_instance_attributes = {}
       _run_initialize_callbacks do
         @digital_object = digital_object
         @dsid = dsid
         @options = options
+        @default_attributes = default_attributes.merge(default_instance_attributes)
         options.each do |key, value|
           self.send(:"#{key}=", value)
         end
@@ -239,6 +252,10 @@ module Rubydora
       end
     end
 
+    def datastream_will_change!
+      attribute_will_change! :profile
+    end
+
     protected
     # datastream parameters 
     # @return [Hash]
@@ -256,7 +273,7 @@ module Rubydora
     # default datastream parameters
     # @return [Hash]
     def default_api_params
-      return DS_DEFAULT_ATTRIBUTES.dup if new?
+      return default_attributes.dup if new?
       {}
     end
 

data/spec/lib/datastream_spec.rb

@@ -18,10 +18,15 @@ describe Rubydora::Datastream do
       @datastream.new?.should == true
     end
 
-    it "should be dirty" do
+    it "should not be dirty" do
       @datastream.changed?.should == false
     end
 
+    it "should be dirty if datastream_will_change! is called" do
+      @datastream.datastream_will_change!
+      @datastream.changed?.should == true
+    end
+
     it "should have default values" do
       @datastream.controlGroup == "M"
       @datastream.dsState.should == "A"
@@ -29,6 +34,13 @@ describe Rubydora::Datastream do
       @datastream.changed.should be_empty
     end
 
+    it "should allow default values to by specified later" do
+      @datastream.dsState = 'A'
+      @datastream.default_attributes = { :controlGroup => 'E', :dsState => 'I' }
+      @datastream.controlGroup.should == 'E'
+      @datastream.dsState.should == 'A'
+    end
+
     it "should allow versionable to be set to false" do
       @datastream.versionable = false
       @datastream.versionable.should be_false
@@ -340,7 +352,8 @@ describe Rubydora::Datastream do
         end
 
         it "should fall-back to the set of default attributes" do
-          Rubydora::Datastream::DS_DEFAULT_ATTRIBUTES.should_receive(:[]).with(method.to_sym) { 'zxcv'} 
+          mock_attr = { method.to_sym => 'zxcv' }
+          subject.should_receive(:default_attributes).and_return(mock_attr)
           subject.send(method).should == 'zxcv'
         end
       end
@@ -382,7 +395,8 @@ describe Rubydora::Datastream do
         end
 
         it "should fall-back to the set of default attributes" do
-          Rubydora::Datastream::DS_DEFAULT_ATTRIBUTES.should_receive(:[]).with(method.to_sym) { 'zxcv'} 
+          mock_attr = { method.to_sym => 'zxcv' }
+          subject.should_receive(:default_attributes).and_return(mock_attr)
           subject.send(method).should == 'zxcv'
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -312,7 +312,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1776488300066485637
+      hash: -2331369473702813867
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1776488300066485637
+      hash: -2331369473702813867
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24