rubydora 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/lib/rubydora/datastream.rb

@@ -22,11 +22,18 @@ module Rubydora
  
     # accessors for datastream attributes 
     DS_ATTRIBUTES.each do |attribute, profile_name|
-      class_eval %Q{
-      def #{attribute.to_s}
-        @#{attribute} || profile['#{profile_name.to_s}'] || DS_DEFAULT_ATTRIBUTES[:#{attribute}]
+      define_method attribute.to_s do
+        var = "@#{attribute.to_s}".to_sym
+        if instance_variable_defined?(var)
+          instance_variable_get var
+        elsif profile.has_key? profile_name.to_s
+            profile[profile_name.to_s]
+        else
+            DS_DEFAULT_ATTRIBUTES[attribute.to_sym]
+        end
       end
 
+      class_eval %Q{
       def #{attribute.to_s}= val
         #{attribute.to_s}_will_change! unless val == #{attribute.to_s}
         @#{attribute.to_s} = val
@@ -177,8 +184,7 @@ module Rubydora
       h['dsSize'] &&= h['dsSize'].to_i rescue h['dsSize']
       h['dsCreateDate'] &&= Time.parse(h['dsCreateDate']) rescue h['dsCreateDate']
       h['dsChecksumValid'] &&= h['dsChecksumValid'] == 'true' 
-
-
+      h['dsVersionable'] &&= h['dsVersionable'] == 'true' 
       h
     end
 

data/spec/lib/datastream_spec.rb

@@ -25,10 +25,20 @@ describe Rubydora::Datastream do
     it "should have default values" do
       @datastream.controlGroup == "M"
       @datastream.dsState.should == "A"
-      @datastream.versionable.should == true
+      @datastream.versionable.should be_true
       @datastream.changed.should be_empty
     end
 
+    it "should allow versionable to be set to false" do
+      @datastream.versionable = false
+      @datastream.versionable.should be_false
+    end
+
+    # it "should cast versionable to boolean" do
+    #   @datastream.profile['versionable'] = 'true'
+    #   @datastream.versionable.should be_true
+    # end
+
 
     it "should call the appropriate api on save" do
       @mock_repository.should_receive(:add_datastream).with(hash_including(:pid => 'pid', :dsid => 'dsid', :controlGroup => 'M', :dsState => 'A'))
@@ -42,6 +52,37 @@ describe Rubydora::Datastream do
     end
   end
 
+  describe 'versionable' do
+    before(:each) do
+      @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
+    end
+    it "should be nil when it hasn't been set" do
+      @mock_repository.should_receive(:datastream).and_return <<-XML
+        <datastreamProfile>
+        </datastreamProfile>
+      XML
+      @datastream.versionable.should be_true
+    end
+
+    it "should be true when it's returned as true" do
+      @mock_repository.should_receive(:datastream).and_return <<-XML
+        <datastreamProfile>
+          <dsVersionable>true</dsVersionable>
+        </datastreamProfile>
+      XML
+      @datastream.versionable.should be_true
+    end
+
+    it "should be false when it's returned as false" do
+      @mock_repository.should_receive(:datastream).and_return <<-XML
+        <datastreamProfile>
+          <dsVersionable>false</dsVersionable>
+        </datastreamProfile>
+      XML
+      @datastream.versionable.should be_false
+    end
+  end
+
   describe 'dsChecksumValid' do
     before(:each) do
       @datastream = Rubydora::Datastream.new @mock_object, 'dsid'
@@ -251,7 +292,7 @@ describe Rubydora::Datastream do
         end
 
         it "should look in the object profile" do
-          subject.should_receive(:profile) { { Rubydora::Datastream::DS_ATTRIBUTES[method.to_sym].to_s => 'qwerty' } }
+          subject.should_receive(:profile) { { Rubydora::Datastream::DS_ATTRIBUTES[method.to_sym].to_s => 'qwerty' } }.twice
           subject.send(method).should == 'qwerty'
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-06 00:00:00.000000000 Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70365343748360 !ruby/object:Gem::Requirement
+  requirement: &70207867601020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365343748360
+  version_requirements: *70207867601020
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70365343747580 !ruby/object:Gem::Requirement
+  requirement: &70207867611180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365343747580
+  version_requirements: *70207867611180
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70365343746620 !ruby/object:Gem::Requirement
+  requirement: &70207867610600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365343746620
+  version_requirements: *70207867610600
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &70365343776580 !ruby/object:Gem::Requirement
+  requirement: &70207867609920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365343776580
+  version_requirements: *70207867609920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70365343776040 !ruby/object:Gem::Requirement
+  requirement: &70207867609280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365343776040
+  version_requirements: *70207867609280
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70365343775300 !ruby/object:Gem::Requirement
+  requirement: &70207867607060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365343775300
+  version_requirements: *70207867607060
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70365343774660 !ruby/object:Gem::Requirement
+  requirement: &70207867604800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365343774660
+  version_requirements: *70207867604800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70365343774200 !ruby/object:Gem::Requirement
+  requirement: &70207867631520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365343774200
+  version_requirements: *70207867631520
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70365343773680 !ruby/object:Gem::Requirement
+  requirement: &70207867628840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365343773680
+  version_requirements: *70207867628840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70365343773080 !ruby/object:Gem::Requirement
+  requirement: &70207867644580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.0.14
   type: :development
   prerelease: false
-  version_requirements: *70365343773080
+  version_requirements: *70207867644580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70365343772660 !ruby/object:Gem::Requirement
+  requirement: &70207867643500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365343772660
+  version_requirements: *70207867643500
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70365343772120 !ruby/object:Gem::Requirement
+  requirement: &70207867642360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365343772120
+  version_requirements: *70207867642360
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  requirement: &70365343771420 !ruby/object:Gem::Requirement
+  requirement: &70207867637120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70365343771420
+  version_requirements: *70207867637120
 description: ! 'Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+'
 email:
 - chris@cbeer.info
@@ -213,7 +213,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1071574168413423455
+      hash: 4404235495484812155
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -222,10 +222,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1071574168413423455
+      hash: 4404235495484812155
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Fedora Commons REST API ruby library