rubydora 0.0.2 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.4

data/lib/rubydora/datastream.rb

@@ -42,6 +42,11 @@ module Rubydora
       call_after_initialize
     end
 
+    # Helper method to get digital object pid
+    def pid
+      digital_object.pid
+    end
+
     # Does this datastream already exist?
     # @return [Boolean]
     def new?
@@ -51,10 +56,19 @@ module Rubydora
     # Retrieve the content of the datastream (and cache it)
     # @return [String]
     def content
-      @content ||= repository.datastream_dissemination :pid => digital_object.pid, :dsid => dsid
+      @content ||= repository.datastream_dissemination :pid => pid, :dsid => dsid
     end
     alias_method :read, :content
 
+    # Get the URL for the datastream content
+    # @return [String]
+    def url
+      repository.datastream_url(pid, dsid) + "/content"
+    end
+
+    # Set the content of the datastream
+    # @param [String or IO] 
+    # @return [String or IO]
     def content= content
        @file = content
        @content = content.dup
@@ -66,7 +80,7 @@ module Rubydora
     # @return [Hash] see Fedora #getDatastream documentation for keys
     def profile
       @profile ||= begin
-        profile_xml = repository.datastream(:pid => digital_object.pid, :dsid => dsid)
+        profile_xml = repository.datastream(:pid => pid, :dsid => dsid)
         profile_xml.gsub! '<datastreamProfile', '<datastreamProfile xmlns="http://www.fedora.info/definitions/1/0/access/"' unless profile_xml =~ /xmlns=/
         doc = Nokogiri::XML(profile_xml)
         h = doc.xpath('/access:datastreamProfile/*', {'access' => "http://www.fedora.info/definitions/1/0/access/"} ).inject({}) do |sum, node|
@@ -93,7 +107,7 @@ module Rubydora
     # Add datastream to Fedora
     # @return [Rubydora::Datastream]
     def create
-      repository.add_datastream to_api_params.merge({ :pid => digital_object.pid, :dsid => dsid })
+      repository.add_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
       reset_profile_attributes
       Datastream.new(digital_object, dsid)
     end
@@ -102,7 +116,7 @@ module Rubydora
     # @return [Rubydora::Datastream]
     def save
       return create if new?
-      repository.modify_datastream to_api_params.merge({ :pid => digital_object.pid, :dsid => dsid })
+      repository.modify_datastream to_api_params.merge({ :pid => pid, :dsid => dsid })
       reset_profile_attributes
       Datastream.new(digital_object, dsid)
     end
@@ -110,7 +124,7 @@ module Rubydora
     # Purge the datastream from Fedora
     # @return [Rubydora::Datastream] `self`
     def delete
-      repository.purge_datastream(:pid => digital_object.pid, :dsid => dsid) unless self.new?
+      repository.purge_datastream(:pid => pid, :dsid => dsid) unless self.new?
       digital_object.datastreams.delete(dsid)
       reset_profile_attributes
       self

data/lib/rubydora/digital_object.rb

@@ -125,6 +125,8 @@ module Rubydora
         h = Hash.new { |h,k| h[k] = Datastream.new self, k }                
       end
     end
+    alias_method :datastream, :datastreams
+    alias_method :[], :datastreams
 
     # persist the object to Fedora, either as a new object 
     # by modifing the existing object

data/lib/rubydora/ext/model_loader.rb

@@ -0,0 +1,55 @@
+module Rubydora::Ext
+  # Rubydora extension to load dynamically load modules into an object based on defined models
+  module ModelLoader
+    # @param [Hash] args
+    # @option args [Class] :base_namespace
+    # @option args [Class] :method
+    # @option args [Class] :class
+    #
+    def self.load args = {}
+      args[:class] ||=  Rubydora::DigitalObject
+      args[:method] ||= :models
+
+      args[:class].extension_parameters[:ModelLoaderMixin] ||= {}
+      args[:class].extension_parameters[:ModelLoaderMixin][:namespaces] ||= []
+      args[:class].extension_parameters[:ModelLoaderMixin][:namespaces] << args[:base_namespace]
+      args[:class].extension_parameters[:ModelLoaderMixin][:method] ||= args[:method]
+      args[:class].use_extension(ModelLoaderMixin)
+    end
+
+    module ModelLoaderMixin
+      # @param [Class] base
+      def self.extended(document)
+        self.module_names(document).each do |model|
+          document.class.extension_parameters[:ModelLoaderMixin][:namespaces].each do |ns|
+            begin
+              mod = self.string_to_constant [ns, model].compact.map { |x| x.to_s }.join("/")
+              document.send(:extend, mod)
+            rescue NameError
+            end
+          end
+        end
+      end
+
+      def self.string_to_constant lower_case_and_underscored_word
+        camel_cased_word = lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+
+        names = camel_cased_word.split('::')
+        names.shift if names.empty? || names.first.empty?
+
+        constant = Object
+        names.each do |name|
+          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
+        end
+        constant
+      end
+
+      private
+      def self.module_names(document)
+        arr = document.send(document.class.extension_parameters[:ModelLoaderMixin][:method])
+        arr &&= [arr] unless arr.is_a? Array
+        arr.map { |x| x.gsub('info:fedora/', '').downcase.gsub(/[^a-z0-9_:]+/, '_').gsub(':', '/').gsub(/_{2,}/, '_').gsub(/^_|_$/, '')  }
+      end
+    end
+  end
+end

data/lib/rubydora/ext/solr.rb

@@ -63,7 +63,7 @@ module Rubydora::Ext
           send(method_name, doc)
         end
 
-        doc.reject { |k,v| v.nil? or v.empty? }
+        doc.reject { |k,v| v.nil? or (v.respond_to?(:empty?) and v.empty?) }
       end
 
       # add solr document attributes from the object profile
@@ -79,7 +79,7 @@ module Rubydora::Ext
 
       # add solr document attributes from the object datastreams
       # @param [Hash] doc Solr document object (pass-by-reference)
-      def datstreams_to_solr doc
+      def datastreams_to_solr doc
         datastreams.each do |dsid, ds|
           doc['disseminates_s'] ||= []
           doc['disseminates_s'] << [dsid]
@@ -90,8 +90,8 @@ module Rubydora::Ext
       # add solr document attributes by querying the resource index
       # @param [Hash] doc Solr document object (pass-by-reference)
       def relations_to_solr doc
-        self.repository.sparql("SELECT ? relation ?object FROM <#ri> WHERE {
-   #{uri} ?relation ?object
+        self.repository.sparql("SELECT ?relation ?object FROM <#ri> WHERE {
+   <#{uri}> ?relation ?object
 }").each do |row|
           solr_field = "ri_#{row['relation'].split('#').last}_s"
           doc[solr_field] ||= []

data/lib/rubydora/extension_parameters.rb

@@ -5,6 +5,17 @@ module Rubydora
     def self.included(base)
       base.extend ExtendableClassMethods
 
+      base.class_eval do
+        # Provide a class-level hash for extension parameters
+        # @return [Hash]
+        def self.extension_parameters
+          ## This variable should NOT be @@, since we're in a class method,
+          # it's just @ to be a class variable. Confusing, but it
+          # passes the tests this way.       
+          @extension_parameters ||= {}
+        end      
+      end
+
       base.after_initialize do
         apply_extensions
       end

data/lib/rubydora/rest_api_client.rb

@@ -223,8 +223,6 @@ module Rubydora
       client[dissemination_url(pid,sdef,method,options)].get
     end
     
-    private
-
     # Generate a REST API compatible URI 
     # @param [String] base base URI
     # @param [Hash] options to convert to URL parameters

data/lib/rubydora.rb

@@ -36,6 +36,13 @@ module Rubydora
     @repository ||= self.connect(self.default_config)
   end
 
+  # Set the default Fedora Repository
+  # @param [Rubydora::Repository] repository
+  # @return Rubydora::Repository
+  def self.repository= repository
+    @repository = repository
+  end
+
   # Default repository connection information
   # TODO: read ENV variables?
   # @return Hash

data/rubydora.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubydora}
-  s.version = "0.0.2"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Beer"]
-  s.date = %q{2011-04-18}
+  s.date = %q{2011-04-19}
   s.description = %q{Fedora Commons REST API ruby library : REQUIRES FCREPO 3.4+}
   s.email = %q{chris@cbeer.info}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "lib/rubydora/datastream.rb",
     "lib/rubydora/digital_object.rb",
     "lib/rubydora/ext.rb",
+    "lib/rubydora/ext/model_loader.rb",
     "lib/rubydora/ext/solr.rb",
     "lib/rubydora/extension_parameters.rb",
     "lib/rubydora/models_mixin.rb",
@@ -39,7 +40,9 @@ Gem::Specification.new do |s|
     "rubydora.gemspec",
     "spec/datastream_spec.rb",
     "spec/digital_object_spec.rb",
+    "spec/ext_model_loader_spec.rb",
     "spec/ext_solr_spec.rb",
+    "spec/extension_parameters_spec.rb",
     "spec/integration_test_spec.rb",
     "spec/repository_spec.rb",
     "spec/resource_index_spec.rb",
@@ -54,7 +57,9 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/datastream_spec.rb",
     "spec/digital_object_spec.rb",
+    "spec/ext_model_loader_spec.rb",
     "spec/ext_solr_spec.rb",
+    "spec/extension_parameters_spec.rb",
     "spec/integration_test_spec.rb",
     "spec/repository_spec.rb",
     "spec/resource_index_spec.rb",

data/spec/digital_object_spec.rb

@@ -138,47 +138,6 @@ describe Rubydora::DigitalObject do
     end
   end
 
-  describe "extensions" do
-    module FakeExtension
-    end
-
-    module OtherFakeExtension
-
-    end
-    before(:each) do
-      @mock_repository = mock()
-    end
-
-    after(:each) do
-      Rubydora::DigitalObject.registered_extensions = []
-    end
-
-    it "should be extendable" do
-      Rubydora::DigitalObject.use_extension FakeExtension
-      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
-      @object.is_a?(FakeExtension).should == true
-    end
-
-    it "should be extendable conditionally" do
-      Rubydora::DigitalObject.use_extension(FakeExtension) { |x| true }
-      Rubydora::DigitalObject.use_extension(OtherFakeExtension) { |x| false }
-      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
-      @object.is_a?(FakeExtension).should == true
-      @object.is_a?(OtherFakeExtension).should == false
-    end
-
-    it "should be able to introspect object profiles" do
-      @mock_repository.should_receive(:object).any_number_of_times.with({:pid => 'pid'}).and_return <<-XML
-      <objectProfile>
-        <a>1</a>
-      </objectProfile>
-      XML
-      Rubydora::DigitalObject.use_extension(FakeExtension) { |x| x.profile['a'] == '1' }
-      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
-      @object.is_a?(FakeExtension).should == true
-    end
-
-  end
 
   describe "models" do
     before(:each) do

data/spec/ext_model_loader_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+require 'rubydora/ext/model_loader'
+
+describe Rubydora::Ext::ModelLoader do
+
+end

data/spec/extension_parameters_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe Rubydora::ExtensionParameters do
+  describe "extension parameters" do
+    class MockExtensionParametersClass
+      include Rubydora::Callbacks
+      register_callback :after_initialize
+      include Rubydora::ExtensionParameters
+    end
+
+    it "should have extension parameters at the class level" do
+      MockExtensionParametersClass.extension_parameters[:a] = 1 
+
+      MockExtensionParametersClass.extension_parameters.should == { :a => 1 }
+
+    end
+  end
+
+  describe "DigitalObject" do
+    module FakeExtension
+    end
+
+    module OtherFakeExtension
+
+    end
+    before(:each) do
+      @mock_repository = mock()
+    end
+
+    after(:each) do
+      Rubydora::DigitalObject.registered_extensions = []
+    end
+
+    it "should be extendable" do
+      Rubydora::DigitalObject.use_extension FakeExtension
+      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
+      @object.is_a?(FakeExtension).should == true
+    end
+
+    it "should be extendable conditionally" do
+      Rubydora::DigitalObject.use_extension(FakeExtension) { |x| true }
+      Rubydora::DigitalObject.use_extension(OtherFakeExtension) { |x| false }
+      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
+      @object.is_a?(FakeExtension).should == true
+      @object.is_a?(OtherFakeExtension).should == false
+    end
+
+    it "should be able to introspect object profiles" do
+      @mock_repository.should_receive(:object).any_number_of_times.with({:pid => 'pid'}).and_return <<-XML
+      <objectProfile>
+        <a>1</a>
+      </objectProfile>
+      XML
+      Rubydora::DigitalObject.use_extension(FakeExtension) { |x| x.profile['a'] == '1' }
+      @object = Rubydora::DigitalObject.new 'pid', @mock_repository
+      @object.is_a?(FakeExtension).should == true
+    end
+  end
+end
+

data/spec/repository_spec.rb

@@ -51,6 +51,11 @@ describe Rubydora::Repository do
       @repository.should_receive(:profile).and_return nil
       lambda { @repository.ping }.should raise_error
     end
+
+    it "should return true if a connection is established" do
+      @repository.should_receive(:profile).and_return true
+      @repository.ping.should == true
+    end
   end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubydora
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Chris Beer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -04:00
+date: 2011-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -183,6 +183,7 @@ files:
 - lib/rubydora/datastream.rb
 - lib/rubydora/digital_object.rb
 - lib/rubydora/ext.rb
+- lib/rubydora/ext/model_loader.rb
 - lib/rubydora/ext/solr.rb
 - lib/rubydora/extension_parameters.rb
 - lib/rubydora/models_mixin.rb
@@ -194,7 +195,9 @@ files:
 - rubydora.gemspec
 - spec/datastream_spec.rb
 - spec/digital_object_spec.rb
+- spec/ext_model_loader_spec.rb
 - spec/ext_solr_spec.rb
+- spec/extension_parameters_spec.rb
 - spec/integration_test_spec.rb
 - spec/repository_spec.rb
 - spec/resource_index_spec.rb
@@ -237,7 +240,9 @@ summary: Fedora Commons REST API ruby library
 test_files: 
 - spec/datastream_spec.rb
 - spec/digital_object_spec.rb
+- spec/ext_model_loader_spec.rb
 - spec/ext_solr_spec.rb
+- spec/extension_parameters_spec.rb
 - spec/integration_test_spec.rb
 - spec/repository_spec.rb
 - spec/resource_index_spec.rb