active-fedora 6.7.7 → 6.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46a78de49a9573826cf094f2f8921d992235d00d
-  data.tar.gz: 4bb2d7fe7f8000df1ee8b5019e55af47149d8b3a
+  metadata.gz: 88d92cb7b19334c1a8e7a4c98dc9acd6fc21ee45
+  data.tar.gz: 0f6107681d23b63de729610f23885e3b4da08ff1
 SHA512:
-  metadata.gz: 79d51675b0bc6ab617eda83f7ea72036b5a106c8b921284db324138647416b2f06e532f39be7be4f567377568feb5becf3058702ea8b5088dc794b4a6a18cadc
-  data.tar.gz: a3a0dde5bfe9cbda4ecf18379defd12e9e361273cdc54f31e34c886ab93cc983a77c590b9720d18d79b85ebffa33230c619f3aa4cb4ed50107e3060e10bcba9c
+  metadata.gz: 66f83b99b48425d77d36ebbc22c086860e4863ae01bce538fd0e520255a4a68376e20ff802506530c92508f68d1c2841d3a872b30c890b7ecc19a3366afdb744
+  data.tar.gz: bb0f4a9379ea95d7788d2fec2eb3803468853d6bc8289d3dcd67193aeea1edf478f60810af1522a616967f0e9be7bd9a666fdfe6feac23f4f3800e586d65f4ff

data/History.txt

@@ -1,3 +1,6 @@
+v6.7.8
+Backported changes from master for proper deserialization of ActiveFedora::DatastreamHash (Fixed #439) [Michael B. Klein]
+
 v6.7.7
 Backported changes from master for rubydora 1.7.1+ compatibility (Fixes #354). Upgraded rubydora to ~> 1.7.4. [David Chandek-Stark]
 

data/active-fedora.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("RedCloth") # for RDoc formatting
   s.add_development_dependency("rake")
   s.add_development_dependency("jettywrapper", ">=1.4.0")
-  s.add_development_dependency("rspec", ">= 2.9.0")
+  s.add_development_dependency("rspec", "~> 2.9")
   s.add_development_dependency("equivalent-xml")
   s.add_development_dependency("rest-client")
   s.add_development_dependency("webmock")

data/lib/active_fedora/base.rb

@@ -93,7 +93,7 @@ module ActiveFedora
     def reload
       raise ActiveFedora::ObjectNotFoundError, "Can't reload an object that hasn't been saved" unless persisted?
       clear_association_cache
-      init_with(self.class.find(self.pid, cast: false).inner_object)
+      init_with_object(self.class.find(self.pid, cast: false).inner_object)
     end
 
     # Initialize an empty model object and set the +inner_obj+
@@ -104,9 +104,9 @@ module ActiveFedora
     #   end
     #
     #   post = Post.allocate
-    #   post.init_with(DigitalObject.find(pid))
+    #   post.init_with_object(DigitalObject.find(pid))
     #   post.properties.title # => 'hello world'
-    def init_with(inner_obj)
+    def init_with_object(inner_obj)
       @association_cache = {}
       @inner_object = inner_obj
       unless @inner_object.is_a? SolrDigitalObject
@@ -279,7 +279,7 @@ module ActiveFedora
       unless klass.ancestors.include? ActiveFedora::Base
         raise "Cannot adapt #{self.class.name} to #{klass.name}: Not a ActiveFedora::Base subclass"
       end
-      klass.allocate.init_with(inner_object)
+      klass.allocate.init_with_object(inner_object)
     end
 
     # Examines the :has_model assertions in the RELS-EXT.
@@ -328,7 +328,7 @@ module ActiveFedora
       if self.inner_object.is_a? DigitalObject
         raise "#{self.inspect} is already a full digital object"
       end
-      self.init_with DigitalObject.find(self.class,self.pid)
+      self.init_with_object DigitalObject.find(self.class,self.pid)
     end
     
     def self.pids_from_uris(uris) 

data/lib/active_fedora/datastream_hash.rb

@@ -1,9 +1,14 @@
+require 'forwardable'
+
 module ActiveFedora
-  class DatastreamHash < Hash
-    
-    def initialize (obj)
+  class DatastreamHash
+    extend Forwardable
+
+    def_delegators :@hash, *(Hash.instance_methods(false))
+
+    def initialize (obj, &block)
       @obj = obj
-      super()
+      @hash = Hash.new &block
     end
 
     def [] (key)
@@ -11,12 +16,12 @@ module ActiveFedora
         ds = Datastream.new(@obj.inner_object, key, :controlGroup=>'X')
         self[key] = ds
       end
-      super
+      @hash[key]
     end 
 
     def []= (key, val)
-      @obj.inner_object.datastreams[key]=val# unless @obj.inner_object.new?
-      super
-    end 
+      @obj.inner_object.datastreams[key]=val
+      @hash[key]=val
+    end
   end
 end

data/lib/active_fedora/querying.rb

@@ -121,7 +121,7 @@ module ActiveFedora
         Deprecation.warn(Querying, "find_one's cast parameter will default to true in ActiveFedora 7.0.0. If you want to maintain your existing behavior set `false' as the second parameter.", caller)
       end
       inner = DigitalObject.find(self, pid)
-      af_base = self.allocate.init_with(inner)
+      af_base = self.allocate.init_with_object(inner)
       cast ? af_base.adapt_to_cmodel : af_base
     end
     

data/lib/active_fedora/rdf_datastream.rb

@@ -73,8 +73,11 @@ module ActiveFedora
     def deserialize(data = nil)
       repository = RDF::Repository.new
       return repository if new? and data.nil?
-
       data ||= datastream_content
+
+      # Because datastream_content can return nil, we should check that here.
+      return repository if data.nil?
+
       data.force_encoding('utf-8')
       RDF::Reader.for(serialization_format).new(data) do |reader|
         reader.each_statement do |statement|

data/lib/active_fedora/solr_instance_loader.rb

@@ -28,7 +28,7 @@ module ActiveFedora
     private
 
     def allocate_object
-      active_fedora_class.allocate.init_with(solr_digital_object)
+      active_fedora_class.allocate.init_with_object(solr_digital_object)
     end
 
     def solr_digital_object

data/lib/active_fedora/version.rb

@@ -1,3 +1,3 @@
 module ActiveFedora
-  VERSION = "6.7.7"
+  VERSION = "6.7.8"
 end

data/spec/integration/base_spec.rb

@@ -252,7 +252,7 @@ describe ActiveFedora::Base do
   describe ".datastreams" do
     it "should return a Hash of datastreams from fedora" do
       datastreams = @test_object.datastreams
-      datastreams.should be_a_kind_of(Hash) 
+      datastreams.should be_a_kind_of(ActiveFedora::DatastreamHash) 
       datastreams.each_value do |ds| 
         ds.should be_a_kind_of(ActiveFedora::Datastream)
       end

data/spec/support/an_active_model.rb

@@ -25,4 +25,10 @@ shared_examples_for "An ActiveModel" do
     subject
   end
 
+  # Because minitest assumes a method #assertions that is an integer.
+  attr_accessor :assertions
+  def assertions
+    @assertions ||= 0
+  end
+
 end

data/spec/unit/datastreams_spec.rb

@@ -86,6 +86,10 @@ describe ActiveFedora::Datastreams do
       subject.stub(:load_datastreams)
       subject.datastreams.should be_a_kind_of(ActiveFedora::DatastreamHash)
     end
+
+    it "should round-trip to/from YAML" do
+      YAML.load(subject.datastreams.to_yaml).inspect.should == subject.datastreams.inspect
+    end
   end
 
   describe "#configure_datastream" do

data/spec/unit/query_spec.rb

@@ -59,13 +59,13 @@ describe ActiveFedora::Base do
         end
       end
       describe "and a pid is specified" do
-        it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
-          SpecModel::Basic.any_instance.should_receive(:init_with).and_return(SpecModel::Basic.new)
+        it "should use SpecModel::Basic.allocate.init_with_object to instantiate an object" do
+          allow_any_instance_of(SpecModel::Basic).to receive(:init_with_object).and_return(SpecModel::Basic.new)
           ActiveFedora::DigitalObject.should_receive(:find).and_return(double("inner obj", :'new?'=>false))
           SpecModel::Basic.find("_PID_").should be_a SpecModel::Basic
         end
         it "should raise an exception if it is not found" do
-          Rubydora::Fc3Service.any_instance.should_receive(:object).and_raise(RestClient::ResourceNotFound)
+          allow_any_instance_of(Rubydora::Fc3Service).to receive(:object).and_raise(RestClient::ResourceNotFound)
           
           SpecModel::Basic.should_receive(:connection_for_pid).with("_PID_")
           lambda {SpecModel::Basic.find("_PID_")}.should raise_error ActiveFedora::ObjectNotFoundError
@@ -73,8 +73,8 @@ describe ActiveFedora::Base do
       end
     end
     describe "with :cast" do
-      it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
-        SpecModel::Basic.any_instance.should_receive(:init_with).and_return(double("Model", :adapt_to_cmodel=>SpecModel::Basic.new ))
+      it "should use SpecModel::Basic.allocate.init_with_object to instantiate an object" do
+        allow_any_instance_of(SpecModel::Basic).to receive(:init_with_object).and_return(double("Model", :adapt_to_cmodel=>SpecModel::Basic.new ))
         ActiveFedora::DigitalObject.should_receive(:find).and_return(double("inner obj", :'new?'=>false))
         SpecModel::Basic.find("_PID_", :cast=>true)
       end

data/spec/unit/solr_config_options_spec.rb

@@ -8,7 +8,7 @@ describe ActiveFedora do
   before(:all) do
     module SolrSpecModel
       class Basic < ActiveFedora::Base
-        def init_with(inner_obj)
+        def init_with_object(inner_obj)
         end
       end
     end

data/spec/unit/solr_service_spec.rb

@@ -38,7 +38,7 @@ describe ActiveFedora::SolrService do
     before(:all) do
       class AudioRecord
         attr_accessor :pid
-        def init_with(inner_obj)
+        def init_with_object(inner_obj)
           self.pid = inner_obj.pid
           self
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-fedora
 version: !ruby/object:Gem::Version
-  version: 6.7.7
+  version: 6.7.8
 platform: ruby
 authors:
 - Matt Zumwalt
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr
@@ -212,16 +212,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -550,7 +550,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A convenience libary for manipulating documents in the Fedora Repository.