active_cmis 0.3.1 → 0.3.2

data/README.md

@@ -1,4 +1,4 @@
-# ActiveCMIS Release 0.3.1 #
+# ActiveCMIS Release 0.3.2 #
 **Homepage**:  <http://xaop.com/labs/activecmis>  
 **Git**:       <http://github.com/xaop/activecmis>  
 **Documentation**: <http://rdoc.info/github/xaop/activecmis/master/frames>
@@ -12,6 +12,12 @@ ActiveCMIS is Ruby library aimed at easing the interaction with various CMIS pro
 - Write support and the ability to create new objects.
 - Support for paging
 
+## Changes since 0.3.1 ##
+- Does not require ntlm-http unless needed for authentication
+- Fix some issues with authentication (thanks to @beno)
+- Follow redirects for renditions (thanks to @timfel)
+
+
 ## Changes since 0.2.6 ##
 The way authentication works has changed. If you previously used ActiveCMIS.connect then you're fine, otherwise the authentication changes will affect you: the authenticate methods on ActiveCMIS::Server and ActiveCMIS::Repository now return a new object, and don't change the authentication on the object itself. You can also specify optional authentication when connecting to a Server, or when calling the repository method.
 
@@ -20,7 +26,10 @@ If you haven't installed Nokogiri yet it will be installed automatically, you wi
 
     > gem install active_cmis
 
-ActiveCMIS also depends on ntlm-http for ntlm authentication, unfortunately ntlm-http is broken on ruby 1.9.2
+ActiveCMIS also depends on ntlm-http for ntlm authentication, unfortunately ntlm-http is broken on ruby 1.9.x
+This isn't a problem as long as you don't actually try to connect with NTLM authentication.
+If you actually need NTLM authentication you can use https://github.com/xaop/ntlm-http (or any other fixed version of the library), although you may need to use bundler for this to work.
+
 ## Usage ##
     require 'active_cmis'
     repository = ActiveCMIS.load_config('configuration', 'optional_filename_for_config')

data/active_cmis.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{active_cmis}
-  s.version = "0.3.1"
+  s.name = "active_cmis"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joeri Samson"]
-  s.date = %q{2012-02-15}
-  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.date = "2012-11-05"
+  s.description = "A CMIS library implementing both reading and updating capabilities through the AtomPub/REST binding to CMIS."
+  s.email = "joeri@xaop.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md",
@@ -49,14 +49,13 @@ Gem::Specification.new do |s|
     "lib/active_cmis/type.rb",
     "lib/active_cmis/version.rb"
   ]
-  s.homepage = %q{http://xaop.com/labs/activecmis/}
+  s.homepage = "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.summary = %q{A library to interact with CMIS repositories through the AtomPub/REST binding}
+  s.rubygems_version = "1.8.11"
+  s.summary = "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.rb

@@ -1,7 +1,6 @@
 require 'nokogiri'
 require 'net/http'
 require 'net/https'
-require 'net/ntlm_http'
 require 'yaml'
 require 'logger'
 require 'require_relative'

data/lib/active_cmis/atomic_types.rb

@@ -35,7 +35,7 @@ module ActiveCMIS
       end
       def _rb2cmis(xml, value)
         v = value.to_s
-        if max_length && v.length > max_length
+        if max_length && max_length > 0 && v.length > max_length #xCMIS says maxLength=0
           raise Error::InvalidArgument.new("String representation is longer than maximum (max: #{max_length}, string: \n'\n#{v}\n')\n")
         end
         xml["c"].value v

data/lib/active_cmis/document.rb

@@ -224,7 +224,7 @@ module ActiveCMIS
 
 
     def updated_aspects(checkin = nil)
-      if working_copy? && !(checkin || repository.pwc_ubdatable)
+      if working_copy? && !(checkin || repository.pwc_updatable?)
         raise Error::NotSupported.new("Updating a PWC without checking in is not supported by repository")
       end
       unless working_copy? || checkin.nil?

data/lib/active_cmis/internal/connection.rb

@@ -27,6 +27,7 @@ module ActiveCMIS
           @authentication = {:method => :basic_auth, :params => params}
           @user = params.first
         when :ntlm, "ntlm"
+          require 'net/ntlm_http'
           @authentication = {:method => :ntlm_auth, :params => params}
           @user = params.first
         else raise "Authentication method not supported"
@@ -54,8 +55,11 @@ module ActiveCMIS
 
         req = Net::HTTP::Get.new(uri.request_uri)
         http = authenticate_request(uri, req)
-        response = http.request(req)
-        logger.debug "GOT (#{response.code}) #{url}"
+        response = nil
+        http.request(req) do |res|
+          logger.debug "GOT (#{res.code}) #{url}"
+          response = res
+        end
         response
       end
 
@@ -170,54 +174,51 @@ module ActiveCMIS
         end
       end
 
-      def handle_request(uri, req)
-        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
-          }
-
-          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)
+      def handle_request(uri, req, retry_count = 0)
+        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
+        }
+
+        logger.debug "RECEIVED #{status}"
+
+        if 200 <= status && status < 300
+          return body
+        elsif 300 <= status && status < 400
+          # follow the redirected a limited number of times
+          location = headers["location"]
+          logger.debug "REDIRECTING: #{location.inspect}"
+          if retry_count <= 3
+            new_uri = URI.parse(location)
+            if new_uri.relative?
+              new_uri = uri + location
             end
-          elsif 500 <= status
-            raise HTTPError::ServerError.new("The server encountered an internal error #{status} (this could be a client error though):\n" + body)
+            new_req = req.class.new(uri.request_uri)
+            handle_request(new_uri, new_req, retry_count + 1)
+          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 500 <= status
+          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

@@ -392,7 +392,7 @@ module ActiveCMIS
           result << {:message => :save_folders, :parameters => [parent_folders, checkin && !updated_attributes]}
         end
       end
-      if acl && acl.updated # We need to be able to do this for newly created documents and merge the two
+      if acl && acl.updated? # We need to be able to do this for newly created documents and merge the two
         result << {:message => :save_acl, :parameters => [acl]}
       end
 

data/lib/active_cmis/rendition.rb

@@ -63,6 +63,12 @@ module ActiveCMIS
         status = response.code.to_i
         if 200 <= status && status < 300
           data = response.body
+        elsif 300 <= status && status < 400
+          location = response["location"]
+          new_url = URI.parse(location)
+          new_url = @url + location if new_url.relative?
+          @url = new_url
+          get_data
         else
           raise HTTPError.new("Problem downloading rendition: status: #{status}, message: #{response.body}")
         end

data/lib/active_cmis/server.rb

@@ -41,7 +41,9 @@ module ActiveCMIS
       @endpoint = endpoint
       @logger = logger
 
+
       method, *params = authentication_info
+      @authentication_info = authentication_info
       if method
         conn.authenticate(method, *params)
       end
@@ -67,17 +69,21 @@ module ActiveCMIS
     # @param [String] repository_id
     # @param [Array] authentication_info
     # @return [Repository]
-    def repository(repository_id, authentication_info = self.authentcation_info)
-      cached_repositories[[repository_id, authentication_info]] ||= begin
-                                               repository_data = repository_info.
-                                                 xpath("/app:service/app:workspace[cra:repositoryInfo/c:repositoryId[child::text() = '#{repository_id}']]", NS::COMBINED)
-                                               if repository_data.empty?
-                                                 raise Error::ObjectNotFound.new("The repository #{repository_id} doesn't exist")
-                                               else
-                                                 Repository.new(self, conn.dup, logger.dup, repository_data, authentication_info)
-                                               end
-                                             end
+    def repository(repository_id, authentication_info = @authentication_info)
+      key = [repository_id, authentication_info]
+      cached_repositories[key] ||= uncached_repository(*key)
+    end
+
+    def uncached_repository(repository_id, authentication_info)
+      path = "/app:service/app:workspace[cra:repositoryInfo/c:repositoryId[child::text() = '#{repository_id}']]"
+      repository_data = repository_info.xpath(path, NS::COMBINED)
+      if repository_data.empty?
+        raise Error::ObjectNotFound.new("The repository #{repository_id} doesn't exist")
+      else
+        Repository.new(self, conn.dup, logger.dup, repository_data, authentication_info)
+      end
     end
+    private :uncached_repository
 
     # Reset cache of Repository objects
     #

data/lib/active_cmis/version.rb

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

metadata

@@ -1,82 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_cmis
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+version: !ruby/object:Gem::Version
+  version: 0.3.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Joeri Samson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-15 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70335761070080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
+    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 
+  version_requirements: *70335761070080
+- !ruby/object:Gem::Dependency
+  name: ntlm-http
+  requirement: &70335760996720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: require_relative
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70335760996720
+- !ruby/object:Gem::Dependency
+  name: require_relative
+  requirement: &70335760994260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 0
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
-  version_requirements: *id003
-description: A CMIS library implementing both reading and updating capabilities through the AtomPub/REST binding to CMIS.
+  prerelease: false
+  version_requirements: *70335760994260
+description: A CMIS library implementing both reading and updating capabilities through
+  the AtomPub/REST binding to CMIS.
 email: joeri@xaop.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
 - TODO
-files: 
+files:
 - LICENSE
 - README.md
 - Rakefile
@@ -107,41 +84,28 @@ files:
 - 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: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 59
-      segments: 
-      - 1
-      - 8
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A library to interact with CMIS repositories through the AtomPub/REST binding
 test_files: []
-