ruby-fedora 0.1.1 → 0.1.2

data/History.txt

@@ -2,3 +2,10 @@
 
 * very alpha enhancement:
   * Initial release
+
+== 0.1.1 2008-04-16
+  * Remove the gem dependency on active_resource
+
+== 0.1.2 2008-04-30
+  * Rename FedoraRepository.fetch_conent to FedoraRepository.fetch_content
+  * Support custom mime-type for Datastream with parameter :mimeType

data/README.txt

@@ -10,7 +10,7 @@ test_object = Fedora::FedoraObject.new(:label => 'test', :contentModel => 'Image
 repository.save(test_object)
 
 objects = repository.find_objects('label~Image*')
-object = repository.fetch_conent('demo:1')
+object = repository.fetch_content('demo:1')
 
 
 Check out spec/repository_spec.rb for more examples.

data/lib/fedora/base.rb

@@ -1,6 +1,7 @@
 require 'xmlsimple'
 
 class Hash
+  #   {:q => 'test', :num => 5}.to_query # => 'q=test&num=5'
   def to_query
     self.collect { |key, value| "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}" }.sort * '&'
   end
@@ -25,6 +26,10 @@ class Fedora::BaseObject
     @blob = attributes.delete(:blob)
   end
   
+  def [](key)
+    @attributes[key]
+  end
+  
   def new_object?
     @new_object
   end

data/lib/fedora/connection.rb

@@ -22,23 +22,24 @@ require 'net/https'
 # end
 module Fedora::Multipart
   def set_multipart_data(param_hash={})
+    mime_type = param_hash.delete(:content_type)
     boundary_token = [Array.new(8) {rand(256)}].join
     self.content_type = "multipart/form-data; boundary=#{boundary_token}"
     boundary_marker = "--#{boundary_token}\r\n"
     self.body = param_hash.map { |param_name, param_value|
       boundary_marker + case param_value
-      when File then file_to_multipart(param_name, param_value)
-      when String then text_to_multipart(param_name, param_value)
+      when File then file_to_multipart(param_name, param_value, mime_type)
+      when String then text_to_multipart(param_name, param_value, mime_type)
       else ""      
       end
     }.join('') + "--#{boundary_token}--\r\n"
   end
   
 private
-  def file_to_multipart(key,file)
+  def file_to_multipart(key,file, mime_type = nil)
     filename = File.basename(file.path)
     mime_types = MIME::Types.of(filename)
-    mime_type = mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
+    mime_type ||= mime_types.empty? ? "application/octet-stream" : mime_types.first.content_type
     part = %Q{Content-Disposition: form-data; name="#{key}"; filename="#{filename}"\r\n}
     part += "Content-Transfer-Encoding: binary\r\n"
     part += "Content-Type: #{mime_type}\r\n\r\n#{file.read}"
@@ -147,7 +148,7 @@ module RubyFedora
     # Used to update resources.
     def put(path, body = '', headers = {})
       if body.is_a?(File)
-        multipart_request(Net::HTTP::Put.new(path, build_request_headers(headers)), body)      
+        multipart_request(Net::HTTP::Put.new(path, build_request_headers(headers)), body, headers)      
       else
         request(:put, path, body.to_s, build_request_headers(headers))
       end      
@@ -157,7 +158,7 @@ module RubyFedora
     # Used to create new resources.
     def post(path, body = '', headers = {})
       if body.is_a?(File)
-        multipart_request(Net::HTTP::Post.new(path, build_request_headers(headers)), body)
+        multipart_request(Net::HTTP::Post.new(path, build_request_headers(headers)), body, headers)
       else
         request(:post, path, body.to_s, build_request_headers(headers))
       end
@@ -168,10 +169,10 @@ module RubyFedora
     end
 
     private
-      def multipart_request(req, file)
+      def multipart_request(req, file, headers = {})
         result = nil
         http.start do |conn|
-          req.set_multipart_data(:file => file)
+          req.set_multipart_data(:file => file, :content_type => headers['Content-Type'])
           result = conn.request(req)
         end
         handle_response(result)

data/lib/fedora/datastream.rb

@@ -3,6 +3,7 @@ require 'fedora/base'
 class Fedora::Datastream < Fedora::BaseObject
   def initialize(attrs = nil)
     super
+    @attributes[:controlGroup] = 'M' if @attributes[:mimeType]
     # TODO: check for required attributes
   end
   

data/lib/fedora/repository.rb

@@ -9,12 +9,21 @@ require 'fedora/datastream'
 module Fedora
   NAMESPACE = "fedora:info/"
   ALL_FIELDS = [
-    :pid, :label, :fType, :cModel, :state, :ownerId, :cDate, :dcmDate, 
+    :pid, :label, :fType, :cModel, :state, :ownerId, :cDate, :mDate, :dcmDate, 
     :bMech, :title, :creator, :subject, :description, :contributor,
     :date, :type, :format, :identifier, :source, :language, :relation, :coverage, :rights 
   ]
   
   class Repository
+    class StringResponse < String
+      attr_reader :content_type
+      
+      def initialize(s, content_type)
+        super(s)
+        @content_type = content_type
+      end
+    end
+    
     attr_accessor :fedora_url
 
     def initialize(fedora_url = "http://localhost:8080/fedora") 
@@ -23,8 +32,9 @@ module Fedora
     end
     
     # Fetch the raw content of either a fedora object or datastream
-    def fetch_conent(object_uri)
-      connection.raw_get("#{url_for(object_uri)}?format=xml").body
+    def fetch_content(object_uri)
+      response = connection.raw_get("#{url_for(object_uri)}?format=xml")
+      StringResponse.new(response.body, response.content_type)
     end
     
     # Find fedora objects with http://www.fedora.info/wiki/index.php/API-A-Lite_findObjects
@@ -57,7 +67,7 @@ module Fedora
       params[:sessionToken] = options[:sessionToken] if options[:sessionToken]
       includes = fields.inject("") { |s, f| s += "&#{f}=true"; s }
       
-      convert_xml(connection.get("#{fedora_url.path}/objects?#{to_query(params)}#{includes}"))
+      convert_xml(connection.get("#{fedora_url.path}/objects?#{params.to_query}#{includes}"))
     end
     
     # Create the given object if it's new (not obtained from a find method).  Otherwise update the object.
@@ -83,8 +93,10 @@ module Fedora
           end
         when Fedora::Datastream
           raise ArgumentError, "Missing dsID attribute" if object.dsid.nil?
+          extra_headers = {}
+          extra_headers['Content-Type'] = object.attributes[:mimeType] if object.attributes[:mimeType]
           response = connection.post("#{url_for(object)}?" + object.attributes.to_query, 
-            object.blob)
+            object.blob, extra_headers)
           if response.code == '201'
             object.new_object = false
             true
@@ -147,7 +159,7 @@ module Fedora
       end
       
       extra_params.delete(:format) if method == :export
-      connection.raw_get("#{url_for(object)}#{path}?#{to_query(extra_params)}").body
+      connection.raw_get("#{url_for(object)}#{path}?#{extra_params.to_query}").body
     end
     
   private
@@ -185,11 +197,6 @@ module Fedora
     def extract_pid(response)
       CGI.unescape(response['Location'].split('/').last)
     end
-    
-    #   {:q => 'test', :num => 5}.to_query # => 'q=test&num=5'
-    def to_query(hash)
-      hash.collect { |key, value| "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}" }.sort * '&'
-    end
   end
 end
 

data/lib/ruby-fedora.rb

@@ -6,7 +6,7 @@ module RubyFedora #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-fedora
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Matt Zumwalt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-16 00:00:00 -05:00
+date: 2008-06-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubyfedora
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Ruby API for Fedora