rubydora 0.0.6 → 0.0.7

data/Gemfile

@@ -4,6 +4,8 @@ gem "fastercsv"
 gem "rest-client"
 gem "nokogiri"
 gem "mime-types"
+gem "activesupport", ">= 3.0"
+gem "activemodel", ">= 3.0"
 
 group :soap do
   gem "soap4r"

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/rubydora/datastream.rb

@@ -3,23 +3,31 @@ module Rubydora
   # and provides helper methods for creating and manipulating
   # them. 
   class Datastream
-    include Rubydora::Callbacks
-    register_callback :after_initialize
+    extend ActiveModel::Callbacks
+    define_model_callbacks :initialize, :only => :after
+
+    include ActiveModel::Dirty
+
     include Rubydora::ExtensionParameters
 
     attr_reader :digital_object, :dsid
 
     # mapping datastream attributes (and api parameters) to datastream profile names
     DS_ATTRIBUTES = {:controlGroup => :dsControlGroup, :dsLocation => :dsLocation, :altIDs => nil, :dsLabel => :dsLabel, :versionable => :dsVersionable, :dsState => :dsState, :formatURI => :dsFormatURI, :checksumType => :dsChecksumType, :checksum => :dsChecksum, :mimeType => :dsMIME, :logMessage => nil, :ignoreContent => nil, :lastModifiedDate => nil, :file => nil}
+
+    define_attribute_methods DS_ATTRIBUTES.keys
     
     # accessors for datastream attributes 
     DS_ATTRIBUTES.each do |attribute, profile_name|
       class_eval %Q{
-        def #{attribute.to_s}
-          @#{attribute.to_s} || profile['#{profile_name.to_s}']
-        end
+      def #{attribute.to_s}
+        (@#{attribute} || profile['#{profile_name.to_s}']).to_s
+      end
 
-        attr_writer :#{attribute.to_s}
+      def #{attribute.to_s}= val
+        #{attribute.to_s}_will_change! unless val == @#{attribute.to_s}
+        @#{attribute.to_s} = val
+      end
       }
     end
 
@@ -31,15 +39,15 @@ module Rubydora
     # 
     # @param [Rubydora::DigitalObject]
     # @param [String] Datastream ID
-    # @param [Hash] default attribute values (used esp. for creating new datastreams
+    # @param [Hash] default attribute values (used esp. for creating new datastreams)
     def initialize digital_object, dsid, options = {}
+      _run_initialize_callbacks do
       @digital_object = digital_object
       @dsid = dsid
       options.each do |key, value|
         self.send(:"#{key}=", value)
       end
-
-      call_after_initialize
+      end
     end
 
     # Helper method to get digital object pid
@@ -98,12 +106,6 @@ module Rubydora
       end
     end
 
-    # Has this datastream been modified, but not yet saved?
-    # @return [Boolean]
-    def dirty?
-      DS_ATTRIBUTES.any? { |attribute, profile_name| instance_variable_defined?("@#{attribute.to_s}") } || new?
-    end
-
     # Add datastream to Fedora
     # @return [Rubydora::Datastream]
     def create
@@ -152,9 +154,7 @@ module Rubydora
     # @return [Hash]
     def reset_profile_attributes
       @profile = nil
-      DS_ATTRIBUTES.each do |attribute, profile_name|
-        instance_variable_set("@#{attribute.to_s}", nil) if instance_variable_defined?("@#{attribute.to_s}")
-      end
+      @changed_attributes = {}
     end
 
     # repository reference from the digital object

data/lib/rubydora/digital_object.rb

@@ -8,8 +8,9 @@ module Rubydora
   # provide additional functionality to this base 
   # implementation.
   class DigitalObject
-    include Rubydora::Callbacks
-    register_callback :after_initialize
+    extend ActiveModel::Callbacks
+    define_model_callbacks :initialize, :only => :after
+    include ActiveModel::Dirty
     include Rubydora::ExtensionParameters
     include Rubydora::ModelsMixin
     include Rubydora::RelationshipsMixin
@@ -19,15 +20,19 @@ module Rubydora
     
     # mapping object parameters to profile elements
     OBJ_ATTRIBUTES = {:state => :objState, :ownerId => :objOwnerId, :label => :objLabel, :logMessage => nil, :lastModifiedDate => :objLastModDate }
+
+    define_attribute_methods OBJ_ATTRIBUTES.keys
       
     OBJ_ATTRIBUTES.each do |attribute, profile_name|
       class_eval <<-RUBY
       def #{attribute.to_s}
         @#{attribute.to_s} || profile['#{profile_name.to_s}']
       end
-                     
-      attr_writer :#{attribute.to_s}
 
+      def #{attribute.to_s}= val
+        #{attribute.to_s}_will_change! unless val == @#{attribute.to_s}
+        @#{attribute.to_s} = val
+      end
       RUBY
     end
 
@@ -59,14 +64,14 @@ module Rubydora
     # @param [Rubydora::Repository] repository context
     # @param [Hash] options default attribute values (used esp. for creating new datastreams
     def initialize pid, repository = nil, options = {}
-      self.pid = pid
-      @repository = repository
+      _run_initialize_callbacks do
+        self.pid = pid
+        @repository = repository
 
-      options.each do |key, value|
-        self.send(:"#{key}=", value)
+        options.each do |key, value|
+          self.send(:"#{key}=", value)
+        end
       end
-
-      call_after_initialize
     end
 
     ##
@@ -148,7 +153,7 @@ module Rubydora
         repository.modify_object p.merge(:pid => pid) unless p.empty?
       end
 
-      self.datastreams.select { |dsid, ds| ds.dirty? }.reject {|dsid, ds| ds.new? }.each { |dsid, ds| ds.save }
+      self.datastreams.select { |dsid, ds| ds.changed? }.reject {|dsid, ds| ds.new? }.each { |dsid, ds| ds.save }
       reset
       self
     end
@@ -196,9 +201,7 @@ module Rubydora
     # @return [Hash]
     def reset_profile_attributes
       @profile = nil
-      OBJ_ATTRIBUTES.each do |attribute, profile_name|
-        instance_variable_set("@#{attribute.to_s}", nil) if instance_variable_defined?("@#{attribute.to_s}")
-      end
+      @changed_attributes = {}
     end
 
     # reset the datastreams cache

data/lib/rubydora/ext/model_loader.rb

@@ -25,7 +25,7 @@ module Rubydora::Ext
             begin
               mod = self.string_to_constant [ns, model].compact.map { |x| x.to_s }.join("/")
               document.send(:extend, mod)
-            rescue NameError
+            rescue NameError, LoadError
             end
           end
         end

data/lib/rubydora/relationships_mixin.rb

@@ -9,23 +9,23 @@ module Rubydora
     # Map Rubydora accessors to Fedora RELS-EXT predicates
     RELS_EXT = {"annotations"=>"info:fedora/fedora-system:def/relations-external#hasAnnotation",
                 "has_metadata"=>"info:fedora/fedora-system:def/relations-external#hasMetadata",
-                "description_of"=>"info:fedora/fedora-system:def/relations-external#isDescription_of",
-                "part_of"=>"info:fedora/fedora-system:def/relations-external#isPart_of",
+                "description_of"=>"info:fedora/fedora-system:def/relations-external#isDescriptionOf",
+                "part_of"=>"info:fedora/fedora-system:def/relations-external#isPartOf",
                 "descriptions"=>"info:fedora/fedora-system:def/relations-external#hasDescription",
-                "dependent_of"=>"info:fedora/fedora-system:def/relations-external#isDependent_of",
+                "dependent_of"=>"info:fedora/fedora-system:def/relations-external#isDependentOf",
                 "constituents"=>"info:fedora/fedora-system:def/relations-external#hasConstituent",
                 "parts"=>"info:fedora/fedora-system:def/relations-external#hasPart",
                 "memberOfCollection"=>"info:fedora/fedora-system:def/relations-external#isMemberOfCollection",
-                "member_of"=>"info:fedora/fedora-system:def/relations-external#isMember_of",
+                "member_of"=>"info:fedora/fedora-system:def/relations-external#isMemberOf",
                 "equivalents"=>"info:fedora/fedora-system:def/relations-external#hasEquivalent",
                 "derivations"=>"info:fedora/fedora-system:def/relations-external#hasDerivation",
-                "derivation_of"=>"info:fedora/fedora-system:def/relations-external#isDerivation_of",
+                "derivation_of"=>"info:fedora/fedora-system:def/relations-external#isDerivationOf",
                 "subsets"=>"info:fedora/fedora-system:def/relations-external#hasSubset",
-                "annotation_of"=>"info:fedora/fedora-system:def/relations-external#isAnnotation_of",
+                "annotation_of"=>"info:fedora/fedora-system:def/relations-external#isAnnotationOf",
                 "metadata_for"=>"info:fedora/fedora-system:def/relations-external#isMetadataFor",
                 "dependents"=>"info:fedora/fedora-system:def/relations-external#hasDependent",
-                "subset_of"=>"info:fedora/fedora-system:def/relations-external#isSubset_of",
-                "constituent_of"=>"info:fedora/fedora-system:def/relations-external#isConstituent_of",
+                "subset_of"=>"info:fedora/fedora-system:def/relations-external#isSubsetOf",
+                "constituent_of"=>"info:fedora/fedora-system:def/relations-external#isConstituentOf",
                 "collection_members"=>"info:fedora/fedora-system:def/relations-external#hasCollectionMember",
                 "members"=>"info:fedora/fedora-system:def/relations-external#hasMember"}
 

data/lib/rubydora.rb

@@ -1,4 +1,6 @@
 # Fedora Commons REST API module
+require 'active_model'
+
 module Rubydora
   autoload :Datastream, "rubydora/datastream"
   autoload :Repository, "rubydora/repository"

data/rubydora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubydora}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Beer"]
-  s.date = %q{2011-04-22}
+  s.date = %q{2011-05-12}
   s.description = %q{Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+}
   s.email = %q{chris@cbeer.info}
   s.extra_rdoc_files = [
@@ -54,7 +54,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/cbeer/rubydora}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Fedora Commons REST API ruby library}
   s.test_files = [
     "spec/datastream_spec.rb",
@@ -71,6 +71,7 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -78,6 +79,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
       s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
       s.add_runtime_dependency(%q<mime-types>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
@@ -89,6 +92,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rest-client>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<mime-types>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 3.0"])
+      s.add_dependency(%q<activemodel>, [">= 3.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
@@ -101,6 +106,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rest-client>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<mime-types>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 3.0"])
+    s.add_dependency(%q<activemodel>, [">= 3.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.1"])

data/spec/datastream_spec.rb

@@ -16,8 +16,7 @@ describe Rubydora::Datastream do
     end
 
     it "should be dirty" do
-      @mock_repository.should_receive(:datastream).and_raise("")
-      @datastream.dirty?.should == true
+      @datastream.changed?.should == false
     end
 
     it "should call the appropriate api on save" do
@@ -51,7 +50,7 @@ describe Rubydora::Datastream do
 
     it "should not be new" do
       @datastream.new?.should == false
-      @datastream.dirty?.should == false
+      @datastream.changed?.should == false
     end
 
     it "should provide attribute defaults from dsProfile" do

data/spec/digital_object_spec.rb

@@ -117,16 +117,16 @@ describe Rubydora::DigitalObject do
       @object = Rubydora::DigitalObject.new 'pid', @mock_repository
     end
 
-    it "should save all dirty datastreams" do
+    it "should save all changed datastreams" do
       @ds1 = mock()
-      @ds1.should_receive(:dirty?).and_return(false)
+      @ds1.should_receive(:changed?).and_return(false)
       @ds1.should_not_receive(:save)
       @ds2 = mock()
-      @ds2.should_receive(:dirty?).and_return(true)
+      @ds2.should_receive(:changed?).and_return(true)
       @ds2.should_receive(:new?).and_return(true)
       @ds2.should_not_receive(:save)
       @ds3 = mock()
-      @ds3.should_receive(:dirty?).and_return(true)
+      @ds3.should_receive(:changed?).and_return(true)
       @ds3.should_receive(:new?).and_return(false)
       @ds3.should_receive(:save)
 
@@ -135,7 +135,7 @@ describe Rubydora::DigitalObject do
       @object.save
     end
 
-    it "should save all dirty attributes" do
+    it "should save all changed attributes" do
       @object.label = "asdf"
       @object.should_receive(:datastreams).and_return({})
       @mock_repository.should_receive(:modify_object).with(hash_including(:pid => 'pid'))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubydora
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 17
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Chris Beer
@@ -15,12 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 -04:00
+date: 2011-05-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: fastercsv
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: fastercsv
-  version_requirements: *id001
-  prerelease: false
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rest-client
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +45,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rest-client
-  version_requirements: *id002
-  prerelease: false
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: nokogiri
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +59,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: nokogiri
-  version_requirements: *id003
-  prerelease: false
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: mime-types
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -71,12 +73,42 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mime-types
-  version_requirements: *id004
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
+  name: activesupport
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
+  name: activemodel
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: shoulda
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,12 +117,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: shoulda
-  version_requirements: *id005
-  prerelease: false
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: bundler
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -101,12 +133,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
-  version_requirements: *id006
-  prerelease: false
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: jeweler
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -117,12 +149,12 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  name: jeweler
-  version_requirements: *id007
-  prerelease: false
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rcov
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -131,12 +163,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
-  version_requirements: *id008
-  prerelease: false
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: rspec
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -145,12 +177,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rspec
-  version_requirements: *id009
-  prerelease: false
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  name: yard
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -159,9 +191,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: yard
-  version_requirements: *id010
-  prerelease: false
+  requirement: *id012
 description: "Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+"
 email: chris@cbeer.info
 executables: []
@@ -235,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Fedora Commons REST API ruby library