active_cmis 0.2.3 → 0.2.4

data/Rakefile

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'rake/gempackagetask'
 
 begin
   require 'yard'

data/active_cmis.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_cmis}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joeri Samson"]
-  s.date = %q{2011-07-18}
+  s.date = %q{2011-09-30}
   s.description = %q{A CMIS library implementing both reading and updating capabilities through the AtomPub/REST binding to CMIS.}
   s.email = %q{joeri@xaop.com}
   s.extra_rdoc_files = [
@@ -52,11 +52,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://xaop.com/labs/activecmis/}
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A library to interact with CMIS repositories through the AtomPub/REST binding}
 
   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

data/lib/active_cmis/internal/connection.rb

@@ -171,26 +171,52 @@ module ActiveCMIS
       end
 
       def handle_request(uri, req)
-        logger.debug "#{req.method} #{uri}"
-        http = authenticate_request(uri, req)
-        response = http.request(req)
-        status = response.code.to_i
-        logger.debug "RECEIVED #{response.code}"
-        if 200 <= status && status < 300
-          return response.body
-        else
-          # Problem: some codes 400, 405, 403, 409, 500 have multiple meanings
-          logger.error "Error occurred when handling request:\n#{response.body}"
-          case status
-          when 400; raise Error::InvalidArgument.new(response.body)
-            # FIXME: can also be filterNotValid
-          when 401; raise HTTPError::AuthenticationError.new(response.body)
-          when 404; raise Error::ObjectNotFound.new(response.body)
-          when 403; raise Error::PermissionDenied.new(response.body)
-            # FIXME: can also be streamNotSupported (?? shouldn't that be 405??)
-          when 405; raise Error::NotSupported.new(response.body)
-          else
-            raise HTTPError.new("A HTTP #{status} error occured, for more precision update the code:\n" + response.body)
+        catch(:retry) do
+          logger.debug "#{req.method} #{uri}"
+          http = authenticate_request(uri, req)
+
+          status, body, headers = nil
+          http.request(req) { |resp|
+            status = resp.code.to_i
+            body = resp.body
+            headers = resp.header
+          }
+
+          logger.debug "RECEIVED #{status}"
+
+          if 200 <= status && status < 300
+            return body
+          elsif 300 <= status && status < 400
+            # follow the redirected a limited number of times
+            retry_count = (retry_count || 0) + 1
+            location = headers["location"]
+            logger.debug "REDIRECTING: #{location.inspect}"
+            if retry_count <= 3
+              new_uri = URI.parse(location)
+              if new_uri.relative?
+                uri = uri + location
+              end
+              req = req.class.new(uri.request_uri)
+              throw(:retry)
+            else
+              raise HTTPError.new("Too many redirects")
+            end
+          elsif 400 <= status && status < 500
+            # Problem: some codes 400, 405, 403, 409, 500 have multiple meanings
+            logger.error "Error occurred when handling request:\n#{body}"
+            case status
+            when 400; raise Error::InvalidArgument.new(body)
+              # FIXME: can also be filterNotValid
+            when 401; raise HTTPError::AuthenticationError.new(body)
+            when 404; raise Error::ObjectNotFound.new(body)
+            when 403; raise Error::PermissionDenied.new(body)
+              # FIXME: can also be streamNotSupported (?? shouldn't that be 405??)
+            when 405; raise Error::NotSupported.new(body)
+            else
+              raise HTTPError::ClientError.new("A HTTP #{status} error occured, for more precision update the code:\n" + body)
+            end
+          elsif 400 <= status && status < 500
+            raise HTTPError::ServerError.new("The server encountered an internal error #{status} (this could be a client error though):\n" + body)
           end
         end
       end

data/lib/active_cmis/object.rb

@@ -226,7 +226,7 @@ module ActiveCMIS
       unless parent_feed.empty?
         Collection.new(repository, parent_feed.first)
       else
-        parent_entry = Internal::Utils.extract_links(data, 'up', 'application/atom+xml','type' => 'entries')
+        parent_entry = Internal::Utils.extract_links(data, 'up', 'application/atom+xml','type' => 'entry')
         unless parent_entry.empty?
           e = conn.get_atom_entry(parent_entry.first)
           [ActiveCMIS::Object.from_atom_entry(repository, e)]

data/lib/active_cmis/repository.rb

@@ -40,6 +40,53 @@ module ActiveCMIS
       @cmis_version ||= data.xpath("cra:repositoryInfo/c:cmisVersionSupported", NS::COMBINED).text
     end
 
+    # The name of the repository, meant for display purposes
+    # @return [String]
+    def name
+      @name ||= data.xpath("cra:repositoryInfo/c:repositoryName", NS::COMBINED).text
+    end
+
+    # A description of the repository
+    # @return [String]
+    def description
+      @name ||= data.xpath("cra:repositoryInfo/c:repositoryDescription", NS::COMBINED).text
+    end
+
+    # The name of the vendor of this Repository
+    # @return [String]
+    def vendor
+      @vendor ||= data.xpath("cra:repositoryInfo/c:vendorName", NS::COMBINED).text
+    end
+
+    # The name of the product behind this Repository
+    # @return [String]
+    def product_name
+      @product_name ||= data.xpath("cra:repositoryInfo/c:productName", NS::COMBINED).text
+    end
+
+    # The version of the product behind this Repository
+    # @return [String]
+    def product_version
+      @product_version ||= data.xpath("cra:repositoryInfo/c:productVersion", NS::COMBINED).text
+    end
+
+    # Changelog token representing the most recent change to this repository (will
+    # represent the most recent change at the time that this ActiveCMIS::Repository
+    # was created
+    # @return [String]
+    def latest_changelog_token
+      @changelog_token ||= data.xpath("cra:repositoryInfo/c:latestChangeLogToken", NS::COMBINED).text
+    end
+
+    # A URI that points to a web service for this repository. May not be present
+    # @return [URI, nil]
+    def thin_client_uri
+      @thin_client_uri ||= begin
+                             string = data.xpath("cra:repositoryInfo/c:thinClientURI", NS::COMBINED).text
+                             URI.parse(string) if string && string != ""
+                           end
+    end
+
     # Finds the object with a given ID in the repository
     #
     # @param [String] id

data/lib/active_cmis/version.rb

@@ -2,7 +2,7 @@ module ActiveCMIS
   module Version
     MAJOR = 0
     MINOR = 2
-    PATCH = 3
+    PATCH = 4
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

metadata

@@ -1,55 +1,40 @@
 --- !ruby/object:Gem::Specification 
 name: active_cmis
 version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+  prerelease: 
+  version: 0.2.4
 platform: ruby
 authors: 
-- Joeri Samson
+  - Joeri Samson
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-18 00:00:00 +02:00
+date: 2011-09-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
-        version: 1.4.1
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ntlm-http
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
-  type: :runtime
-  version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: nokogiri
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.4.1
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: ntlm-http
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.1.1
+    type: :runtime
+    version_requirements: *id002
 description: A CMIS library implementing both reading and updating capabilities through the AtomPub/REST binding to CMIS.
 email: joeri@xaop.com
 executables: []
@@ -57,40 +42,40 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.md
-- TODO
+  - LICENSE
+  - README.md
+  - TODO
 files: 
-- LICENSE
-- README.md
-- Rakefile
-- TODO
-- active_cmis.gemspec
-- lib/active_cmis.rb
-- lib/active_cmis/acl.rb
-- lib/active_cmis/acl_entry.rb
-- lib/active_cmis/active_cmis.rb
-- lib/active_cmis/atomic_types.rb
-- lib/active_cmis/attribute_prefix.rb
-- lib/active_cmis/collection.rb
-- lib/active_cmis/document.rb
-- lib/active_cmis/exceptions.rb
-- lib/active_cmis/folder.rb
-- lib/active_cmis/internal/caching.rb
-- lib/active_cmis/internal/connection.rb
-- lib/active_cmis/internal/utils.rb
-- lib/active_cmis/ns.rb
-- lib/active_cmis/object.rb
-- lib/active_cmis/policy.rb
-- lib/active_cmis/property_definition.rb
-- lib/active_cmis/query_result.rb
-- lib/active_cmis/rel.rb
-- lib/active_cmis/relationship.rb
-- lib/active_cmis/rendition.rb
-- lib/active_cmis/repository.rb
-- lib/active_cmis/server.rb
-- lib/active_cmis/type.rb
-- lib/active_cmis/version.rb
+  - LICENSE
+  - README.md
+  - Rakefile
+  - TODO
+  - active_cmis.gemspec
+  - lib/active_cmis.rb
+  - lib/active_cmis/acl.rb
+  - lib/active_cmis/acl_entry.rb
+  - lib/active_cmis/active_cmis.rb
+  - lib/active_cmis/atomic_types.rb
+  - lib/active_cmis/attribute_prefix.rb
+  - lib/active_cmis/collection.rb
+  - lib/active_cmis/document.rb
+  - lib/active_cmis/exceptions.rb
+  - lib/active_cmis/folder.rb
+  - lib/active_cmis/internal/caching.rb
+  - lib/active_cmis/internal/connection.rb
+  - lib/active_cmis/internal/utils.rb
+  - lib/active_cmis/ns.rb
+  - lib/active_cmis/object.rb
+  - lib/active_cmis/policy.rb
+  - lib/active_cmis/property_definition.rb
+  - lib/active_cmis/query_result.rb
+  - lib/active_cmis/rel.rb
+  - lib/active_cmis/relationship.rb
+  - lib/active_cmis/rendition.rb
+  - lib/active_cmis/repository.rb
+  - lib/active_cmis/server.rb
+  - lib/active_cmis/type.rb
+  - lib/active_cmis/version.rb
 has_rdoc: true
 homepage: http://xaop.com/labs/activecmis/
 licenses: []
@@ -99,31 +84,23 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
-      version: 1.8.6
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A library to interact with CMIS repositories through the AtomPub/REST binding