ruby-fedora 1.0.2 → 1.0.4

data/History.txt

@@ -1,3 +1,10 @@
+== 1.0.4 2009-07-10
+
+!! Not Backwards Compatible with Fedora < 3.2.* !!
+
+* 1 major enhancement:
+  * ruby-fedora is now compatible with Fedora 3.2.1
+  
 == 1.0.0 2009-02-04
 
 * 1 major enhancement:

data/README.txt

@@ -1,3 +1,9 @@
+== Getting Help
+
+* Project Homepage: <http://yourmediashelf.com/activefedora>
+* Further documentation is available at <http://projects.mediashelf.us/show/active-fedora>
+* Community Discussions & Mailing List are located at <http://groups.google.com/group/active-fedora>
+
 == Installation
 
 gem install ruby-fedora
@@ -37,3 +43,32 @@ rake pkg
 == TODO
 
  - remove anything in test/* that are no longer relevant
+
+ == LICENSE:
+
+ Copyright (c) 2009 Matt Zumwalt
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License (LGPL) as 
+ published by the Free Software Foundation, either version 3 of the License, 
+ or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/> or 
+ see <http://www.gnu.org/licenses/lgpl.html>.
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/fedora/datastream.rb

@@ -4,13 +4,19 @@ require 'fedora/repository'
 class Fedora::Datastream < Fedora::BaseObject
   def initialize(attrs = nil)
     super
-    @attributes[:controlGroup] = 'M' if @attributes[:mimeType]
-    # TODO: check for required attributes
+    self.control_group='M' if @attributes[:mimeType]
   end
   
   def pid
     attributes[:pid]
   end
+
+  def control_group
+    @attributes[:controlGroup]
+  end
+  def control_group=(cg)
+    @attributes[:controlGroup]=cg
+  end
   
   def dsid
     if attributes.has_key?(:dsid) 
@@ -20,6 +26,14 @@ class Fedora::Datastream < Fedora::BaseObject
     end
   end
   
+  def label
+    @attributes[:dsLabel]
+  end
+  
+  def label=(new_label)
+    @attributes[:dsLabel] = new_label
+  end
+  
   # See http://www.fedora.info/definitions/identifiers/
   def uri
     "fedora:info/#{pid}/datastreams/#{dsid}"

data/lib/fedora/repository.rb

@@ -21,6 +21,7 @@ module Fedora
       Thread.current[:repo]=nil
     end
     def self.register(url, surrogate=nil)
+      url = url.to_s.chop if url.to_s =~ /\/\Z/
       Thread.current[:repo]= Fedora::Repository.new(url, surrogate)
       begin
         repo = Thread.current[:repo]
@@ -75,7 +76,7 @@ module Fedora
     #                           The field "pid" is always included.
     #
     # == Examples
-    #    find_objects("label=Image1"
+    #    find_objects("label=Image1")
     #    find_objects("pid~demo:*", "label=test")
     #    find_objects("label=Image1", :include => :all)
     #    find_objects("label=Image1", :include => [:label])
@@ -88,7 +89,7 @@ module Fedora
       fields = (fields.nil? || (fields == :all)) ? ALL_FIELDS : ([:pid] + ([fields].flatten! - [:pid]))
       
       query = args.join(' ')
-      params = { :format => 'xml', :query => query }
+      params = { :resultFormat => 'xml', :query => query }
       params[:maxResults] = options[:limit] if options[:limit]
       params[:sessionToken] = options[:sessionToken] if options[:sessionToken]
       includes = fields.inject("") { |s, f| s += "&#{f}=true"; s }
@@ -155,11 +156,12 @@ module Fedora
       case object
       when Fedora::FedoraObject
         response = connection.put("#{url_for(object)}?" + object.attributes.to_fedora_query)
-        response.code == '307'
+        response.code == '200' || '307'
       when Fedora::Datastream
         raise ArgumentError, "Missing dsID attribute" if object.dsid.nil?
         response = connection.put("#{url_for(object)}?" + object.attributes.to_fedora_query, object.blob)
-        response.code == '201'
+        response.code == '200' || '201'
+        return response.code
       else
         raise ArgumentError, "Unknown object type"
       end

data/lib/ruby-fedora.rb

@@ -3,7 +3,7 @@ gem 'xml-simple'
 $LOAD_PATH.unshift File.dirname(__FILE__) unless
 $LOAD_PATH.include?(File.dirname(__FILE__)) || $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
 module Fedora #:nodoc:
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end
 #extended to remove facets dep
 class Hash 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-fedora
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors: 
 - MediaShelf
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-26 00:00:00 -06:00
+date: 2009-07-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -107,7 +107,7 @@ files:
 - lib/ruby-fedora.rb
 - lib/util/class_level_inheritable_attributes.rb
 has_rdoc: true
-homepage: gem install ruby-fedora
+homepage: "Project Homepage: <http://yourmediashelf.com/activefedora>"
 post_install_message: PostInstall.txt
 rdoc_options: 
 - --main
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: ruby-fedora
+rubyforge_project: rubyfedora
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2