rubydora 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e7244b839f54ecfee40b9d2c689c54b92aefeae
-  data.tar.gz: 67ecac240d565b673d7c342a1aa0a1a47b1fb3c1
+  metadata.gz: 3a5b245a875f22288d000657c72694c89601fd52
+  data.tar.gz: bccc0e54f0a6c6a208cbff50ce97ccec33ce36aa
 SHA512:
-  metadata.gz: 129b77a40cb1c0c0da8e6ae445b65647d33e510a90907bd0ef36639f63de880a297e3c52eebaaf37380586adf24b6b6183c8828836426722ff9835e9810c79b6
-  data.tar.gz: 1e2f11112a46df3239cb08ea27f2b7d35acc1807fd7bd2c31504edf142d2f7979f59d69294b3a8a26893ff49fbf327d33cba8552f003abaa0a31d4ea26b4b542
+  metadata.gz: a25f822e7db26590892d49f6b36aa51e4f6241db5ffc9b1d6add176af57619b3740c3b26ecaafcbe9119861f31d433c27e108ff785858fb27051ff8f137f7242
+  data.tar.gz: aec54491026595a746447295f391ceb17f1ae012ab92334f57f07170f819f99f93387b399338d50c7d0512a7ee6f7febccf18c0d72084f58419afbf355515ce8

data/History.textile

@@ -1,3 +1,8 @@
+h3. 1.6.2 (29 April 2013)
+* Handle 401 (no access) from Fedora in a graceful manner
+* Expose methods relating to control group (e.g. external?, redirect?, managed?, inline?)
+* validate that a pid is passed as one of the arguments to RestApiClient#export
+
 h3. 1.6.1
 * Removed break which caused Enumerator to never terminate
 

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/lib/rubydora/datastream.rb

@@ -359,6 +359,28 @@ module Rubydora
       attribute_will_change! :profile
     end
 
+    # @return [boolean] is this an external datastream?
+    def external?
+      controlGroup == 'E'
+    end
+
+    # @return [boolean] is this a redirect datastream?
+    def redirect?
+      controlGroup == 'R'
+    end
+
+    # @return [boolean] is this a managed datastream?
+    def managed?
+      controlGroup == 'M'
+    end
+
+    # @return [boolean] is this an inline datastream?
+    def inline?
+      controlGroup == 'X'
+    end
+
+    
+
     protected
     # datastream parameters 
     # @return [Hash]
@@ -409,27 +431,6 @@ module Rubydora
       URI.parse(val) unless val.nil?
     end
 
-    # @return [boolean] is this an external datastream?
-    def external?
-      controlGroup == 'E'
-    end
-
-    # @return [boolean] is this a redirect datastream?
-    def redirect?
-      controlGroup == 'R'
-    end
-
-    # @return [boolean] is this a managed datastream?
-    def managed?
-      controlGroup == 'M'
-    end
-
-    # @return [boolean] is this an inline datastream?
-    def inline?
-      controlGroup == 'X'
-    end
-
-    
     private
 
     # Rack::Test::UploadedFile is often set via content=, however it's not an IO, though it wraps an io object.

data/lib/rubydora/repository.rb

@@ -28,7 +28,7 @@ module Rubydora
     #
     # @params [String] query
     # @params [Hash] options
-    # @yield [DigitalObject] Yield a DigitalObject for each search result
+    # @yield [DigitalObject] Yield a DigitalObject for each search result, skipping forbidden objects
     def search query, options = {}, &block
       return to_enum(:search, query, options).to_a unless block_given?
       
@@ -42,7 +42,14 @@ module Rubydora
         response = self.find_objects(options.merge(:query => query, :resultFormat => 'xml', :pid => true).merge(sessionOptions))
 
         doc = Nokogiri::XML(response)
-        doc.xpath('//xmlns:objectFields/xmlns:pid', doc.namespaces).each { |pid| obj = self.find(pid.text); block.call(obj) }
+        doc.xpath('//xmlns:objectFields/xmlns:pid', doc.namespaces).each do |pid|
+          begin
+            obj = self.find(pid.text);
+          rescue RestClient::Unauthorized
+            next
+          end
+          block.call(obj)
+        end
 
         sessionToken = doc.xpath('//xmlns:listSession/xmlns:token', doc.namespaces).text
       end until sessionToken.nil? or sessionToken.empty? or doc.xpath('//xmlns:resultList/xmlns:objectFields', doc.namespaces).empty?

data/lib/rubydora/rest_api_client.rb

@@ -122,6 +122,7 @@ module Rubydora
     def export options = {}
       query_options = options.dup
       pid = query_options.delete(:pid)
+      raise ArgumentError, "Must have a pid" unless pid
       client[export_object_url(pid, query_options)].get
     rescue Exception => exception
         rescue_with_handler(exception) || raise

data/rubydora.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email = ["chris@cbeer.info"]
   s.summary = %q{Fedora Commons REST API ruby library }
   s.description = %q{Fedora Commons REST API ruby library}
-  s.homepage = "http://github.com/cbeer/rubydora"
+  s.homepage = "http://github.com/projecthydra/rubydora"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -32,4 +32,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rspec")
   s.add_development_dependency("yard")
   s.add_development_dependency("jettywrapper")
+  s.add_development_dependency("webmock")
 end

data/spec/lib/integration_test_spec.rb

@@ -413,6 +413,18 @@ describe "Integration testing against a live Fedora repository", :integration =>
       pids.should include('test:1', 'test:2')
     end
 
+    it "should skip forbidden objects" do
+      # lets say the object test:2 is forbidden
+      stub = stub_http_request(:get, /.*test:2.*/).to_return(:status => 401)
+      objects = []
+      lambda { objects = @repository.search('pid~test:*') }.should_not raise_error
+      pids = objects.map {|obj| obj.pid }
+      pids.should include('test:1')
+      pids.should_not include('test:2')
+      stub.should have_been_requested
+      WebMock.reset!
+    end
+
   end
 
   it "should not destroy content when datastream properties are changed" do

data/spec/lib/rest_api_client_spec.rb

@@ -109,9 +109,14 @@ describe Rubydora::RestApiClient do
     @mock_repository.ingest :pid => 'mypid'
   end
 
-  it "export" do
-     RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/export"))
-    @mock_repository.export :pid => 'mypid'
+  describe "export" do
+    it "should work on the happy path" do
+       RestClient::Request.should_receive(:execute).with(hash_including(:url => "http://example.org/objects/mypid/export"))
+      @mock_repository.export :pid => 'mypid'
+    end
+    it "should require a pid" do
+      lambda { @mock_repository.export }.should raise_error ArgumentError, "Must have a pid"
+    end
   end
 
   it "modify_object" do

data/spec/spec_helper.rb

@@ -13,6 +13,9 @@ end
 require 'rspec/autorun'
 require 'loggable'
 require 'rubydora'
+require 'webmock/rspec'
+
+WebMock.allow_net_connect!
 
 RSpec.configure do |config|
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubydora
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastercsv
@@ -220,6 +220,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fedora Commons REST API ruby library
 email:
 - chris@cbeer.info
@@ -260,7 +274,7 @@ files:
 - spec/lib/rest_api_client_spec.rb
 - spec/lib/transactions_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/cbeer/rubydora
+homepage: http://github.com/projecthydra/rubydora
 licenses: []
 metadata: {}
 post_install_message: 
@@ -279,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Fedora Commons REST API ruby library