cmis-ruby 0.5 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02dde86712abce2614a30d613e2d555758370a12
-  data.tar.gz: eae9b485ebb9ab22bccdf90dd12bfa2160e1f9cb
+  metadata.gz: 18071f7ae45271f5534f5407231a3164a5c2e7a9
+  data.tar.gz: 36039b23cda23f53c81246d3574a797a115b8fcb
 SHA512:
-  metadata.gz: e388fa58601821918c3729047795559e8866070d76d570aec71bf5f0dae4758b71a21542941e6b0a845fe17941769eaa7b16ee61fd9a8ce97ee8b822c5d49eab
-  data.tar.gz: 189cadb79c4b5fdf45b50eebd65782234d4d7f2ca3fe46d0c376c2deeca50174ec02842d1267e86aaefa5b01500dbf5157ba6a083eaffb42b7b53f9d1a551ce8
+  metadata.gz: d1db5aeace1879fffc2f3645753c3c246994813b7cdba12c649eae7ddd44790cc42136cabf5eefed1c6cb3813af331f1d75c918e2e35662ae107ead686527e4a
+  data.tar.gz: 8cc86fe428199a44801f2e7f5fa6da7f1767fe92ec1d0f60aaa9e32b3e264393eac4366678e9d0b9454415b63b4288ffeb4cf8901a120d26841ef01e7548d83f

data/cmis-ruby.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency        'faraday', '~> 0.9'
+  s.add_dependency        'faraday',            '~> 0.9'
+  s.add_dependency        'faraday_middleware', '~> 0.9'
 
   s.description = <<-DESCRIPTION
 CMIS browser binding client library in ruby.

data/lib/cmis/connection.rb

@@ -1,8 +1,8 @@
-require 'cmis/connection/follow_redirects'
 require 'cmis/connection/request_modifier'
 require 'cmis/connection/response_parser'
 require 'cmis/version'
 require 'faraday'
+require 'faraday_middleware'
 
 module CMIS
   class Connection
@@ -21,7 +21,7 @@ module CMIS
         end
 
         builder.adapter (options[:adapter] || :net_http).to_sym
-        builder.use FollowRedirects
+        builder.response :follow_redirects, standards_compliant: true
         builder.response :logger if options[:log_requests]
         builder.use ResponseParser
       end

data/lib/cmis/connection/response_parser.rb

@@ -31,8 +31,9 @@ module CMIS
       def check_for_cmis_exception!(body)
         return unless body.is_a?(Hash)
 
-        if exception = body['exception']
-          raise exception_class(exception), "#{exception}: #{body['message']}"
+        if body.key?('exception')
+          e, m, s = body.values_at('exception', 'message', 'stacktrace')
+          raise exception_class(e), "[#{e}] #{m}\n#{s}"
         end
       end
 

data/lib/cmis/exceptions.rb

@@ -1,20 +1,20 @@
 module CMIS
   module Exceptions
-    class InvalidArgument         < Exception; end
-    class NotSupported            < Exception; end
-    class ObjectNotFound          < Exception; end
-    class PermissionDenied        < Exception; end
-    class Runtime                 < Exception; end
-    class Constraint              < Exception; end
-    class ContentAlreadyExists    < Exception; end
-    class FilterNotValid          < Exception; end
-    class NameConstraintViolation < Exception; end
-    class Storage                 < Exception; end
-    class StreamNotSupported      < Exception; end
-    class UpdateConflict          < Exception; end
-    class Versioning              < Exception; end
+    InvalidArgument         = Class.new(Exception)
+    NotSupported            = Class.new(Exception)
+    ObjectNotFound          = Class.new(Exception)
+    PermissionDenied        = Class.new(Exception)
+    Runtime                 = Class.new(Exception)
+    Constraint              = Class.new(Exception)
+    ContentAlreadyExists    = Class.new(Exception)
+    FilterNotValid          = Class.new(Exception)
+    NameConstraintViolation = Class.new(Exception)
+    Storage                 = Class.new(Exception)
+    StreamNotSupported      = Class.new(Exception)
+    UpdateConflict          = Class.new(Exception)
+    Versioning              = Class.new(Exception)
 
     # Non-CMIS
-    class Unauthorized            < Exception; end
+    Unauthorized            = Class.new(Exception)
   end
 end

data/lib/cmis/object.rb

@@ -112,6 +112,10 @@ module CMIS
       cmis_object_id.nil?
     end
 
+    def refresh(opts = {})
+      detached? ? self : repository.object(cmis_object_id, opts)
+    end
+
     private
 
     def server

data/lib/cmis/version.rb

@@ -1,3 +1,3 @@
 module CMIS
-  VERSION = '0.5'
+  VERSION = '0.5.1'
 end

data/readme.md

@@ -24,7 +24,7 @@ document = repository.find_object('cmis:document',
                                   'cmis:name' => 'some_unique_name')
 
 # set document content
-document.content = { stream: StringIO.new('Apple is a fruit'),
+document.content = { stream: 'Apple is a fruit',
                      mime_type: 'text/plain',
                      filename: 'apple.txt' }
 

data/spec/cmis-ruby/document_spec.rb

@@ -46,9 +46,9 @@ module CMIS
                              mime_type: 'text/apple',
                              filename: 'apple.txt' }
 
-        # Why doesn't this work?
-        # expect(document.content_stream_mime_type).to eq('text/apple')
-        # expect(document.content_stream_file_name).to eq('apple.txt')
+        document = document.refresh
+        expect(document.content_stream_mime_type).to eq('text/apple')
+        expect(document.content_stream_file_name).to eq('apple.txt')
         expect(document.content).to eq('apple is a fruit')
 
         document.delete

data/spec/cmis-ruby/folder_spec.rb

@@ -38,6 +38,18 @@ module CMIS
       end
     end
 
+    context 'when creating an item in a folder' do
+      it 'has the item available' do
+        item = repository.new_item
+        item.name = 'test_item'
+        item.object_type_id = 'cmis:item'
+        item = repository.root.create(item)
+        expect(item).to be_a CMIS::Item
+        expect(item.name).to eq('test_item')
+        item.delete
+      end
+    end
+
     describe '#create' do
       context 'when creating a relationship in a folder' do
         it 'raises an exception' do
@@ -50,18 +62,6 @@ module CMIS
         end
       end
 
-      context 'when creating an item in a folder' do
-        it 'raises an exception' do
-          item = repository.new_item
-          item.name = 'test_item'
-          item.object_type_id = 'cmis:item'
-          item = repository.root.create(item)
-          expect(item).to be_a CMIS::Item
-          expect(item.name).to eq('test_item')
-          item.delete
-        end
-      end
-
       context 'when creating a plain object in a folder' do
         it 'raises an exception' do
           new_object = CMIS::Object.new({}, repository)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmis-ruby
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 description: |
   CMIS browser binding client library in ruby.
 email:
@@ -42,7 +56,6 @@ files:
 - lib/cmis-ruby.rb
 - lib/cmis/children.rb
 - lib/cmis/connection.rb
-- lib/cmis/connection/follow_redirects.rb
 - lib/cmis/connection/request_modifier.rb
 - lib/cmis/connection/response_parser.rb
 - lib/cmis/document.rb
@@ -110,3 +123,4 @@ test_files:
 - spec/config.yml
 - spec/rspec.opts
 - spec/spec_helper.rb
+has_rdoc: false

data/lib/cmis/connection/follow_redirects.rb

@@ -1,137 +0,0 @@
-require 'faraday'
-require 'set'
-
-module CMIS
-  class Connection
-    # Based on https://github.com/lostisland/faraday_middleware/blob/master/lib/faraday_middleware/response/follow_redirects.rb
-    # Modified ALLOWED_METHODS to only include :get
-
-    # Public: Exception thrown when the maximum amount of requests is exceeded.
-    class RedirectLimitReached < Faraday::Error::ClientError
-      attr_reader :response
-
-      def initialize(response)
-        super "too many redirects; last one to: #{response['location']}"
-        @response = response
-      end
-    end
-
-    # Public: Follow HTTP 301, 302, 303, and 307 redirects.
-    #
-    # For HTTP 301, 302, and 303, the original GET, POST, PUT, DELETE, or PATCH
-    # request gets converted into a GET. With `:standards_compliant => true`,
-    # however, the HTTP method after 301/302 remains unchanged. This allows you
-    # to opt into HTTP/1.1 compliance and act unlike the major web browsers.
-    #
-    # This middleware currently only works with synchronous requests; i.e. it
-    # doesn't support parallelism.
-    class FollowRedirects < Faraday::Middleware
-      # HTTP methods for which 30x redirects can be followed
-      ALLOWED_METHODS = Set.new [:get]
-
-      # HTTP redirect status codes that this middleware implements
-      REDIRECT_CODES  = Set.new [301, 302, 303, 307]
-
-      # Keys in env hash which will get cleared between requests
-      ENV_TO_CLEAR    = Set.new [:status, :response, :response_headers]
-
-      # Default value for max redirects followed
-      FOLLOW_LIMIT = 3
-
-      # Public: Initialize the middleware.
-      #
-      # options - An options Hash (default: {}):
-      #           :limit               - A Numeric redirect limit (default: 3)
-      #           :standards_compliant - A Boolean indicating whether to respect
-      #                                  the HTTP spec when following 301/302
-      #                                  (default: false)
-      #           :cookies             - An Array of Strings (e.g.
-      #                                  ['cookie1', 'cookie2']) to choose
-      #                                  cookies to be kept, or :all to keep
-      #                                  all cookies (default: []).
-      def initialize(app, options = {})
-        super(app)
-        @options = options
-
-        @convert_to_get = Set.new [303]
-        @convert_to_get << 301 << 302 unless standards_compliant?
-      end
-
-      def call(env)
-        perform_with_redirection(env, follow_limit)
-      end
-
-      private
-
-      def convert_to_get?(response)
-        ![:head, :options].include?(response.env[:method]) &&
-          @convert_to_get.include?(response.status)
-      end
-
-      def perform_with_redirection(env, follows)
-        request_body = env[:body]
-        response = @app.call(env)
-
-        response.on_complete do |env|
-          if follow_redirect?(env, response)
-            raise RedirectLimitReached, response if follows.zero?
-            env = update_env(env, request_body, response)
-            response = perform_with_redirection(env, follows - 1)
-          end
-        end
-        response
-      end
-
-      def update_env(env, request_body, response)
-        env[:url] += response['location']
-        if @options[:cookies]
-          cookies = keep_cookies(env)
-          env[:request_headers][:cookies] = cookies unless cookies.nil?
-        end
-
-        if convert_to_get?(response)
-          env[:method] = :get
-          env[:body] = nil
-        else
-          env[:body] = request_body
-        end
-
-        ENV_TO_CLEAR.each {|key| env.delete key }
-
-        env
-      end
-
-      def follow_redirect?(env, response)
-        ALLOWED_METHODS.include? env[:method] and
-        REDIRECT_CODES.include? response.status
-      end
-
-      def follow_limit
-        @options.fetch(:limit, FOLLOW_LIMIT)
-      end
-
-      def keep_cookies(env)
-        cookies = @options.fetch(:cookies, [])
-        response_cookies = env[:response_headers][:cookies]
-        cookies == :all ? response_cookies : selected_request_cookies(response_cookies)
-      end
-
-      def selected_request_cookies(cookies)
-        selected_cookies(cookies)[0...-1]
-      end
-
-      def selected_cookies(cookies)
-        "".tap do |cookie_string|
-          @options[:cookies].each do |cookie|
-            string = /#{cookie}=?[^;]*/.match(cookies)[0] + ';'
-            cookie_string << string
-          end
-        end
-      end
-
-      def standards_compliant?
-        @options.fetch(:standards_compliant, false)
-      end
-    end
-  end
-end