cmis-ruby 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc9f3393f79186ade5f153deb2384a2dc90cb7c0
-  data.tar.gz: 0684f81f515ba8fe393cc463672ac73f79881416
+  metadata.gz: 5b3229e8479edca2b61d24a6851296d30cea4f1a
+  data.tar.gz: fad024a8f321c55d7039c05a0e523eba13bd8739
 SHA512:
-  metadata.gz: 1968cc53fa44ad8007975d6b2bba0c50d4980bd6c31c874b48e215a73e54d237b645a424698c69e376a646c8e6838fc4919ba997fe2a32ea2acc41f4000e15a4
-  data.tar.gz: 1a13f30564ad323bbaea4dfb22850d07e56eaa1f28ad1cfe354dddc78aa7101e3d8d9b384b90d5a8c3835c4710a145c818e271d2a3f0ae08dc1a7e5b189e1c40
+  metadata.gz: 5204a6e9810c562ea5ce9bcb7edf305289a4426f3c977b884d5f7057fe8ce6b9a0c177e3259356a749e48b67ec3bd94dd8dd14a3dc19fc692a080eaa91a328ed
+  data.tar.gz: 1e75079eb77373630c136a2b8d216fb935c365e1b2aa209ff6ca8da2b67ad28e5d2a4ef57625a2172ed3298416aba1b778ba8f0afc432e9564aaa39a80111cb8

data/lib/cmis/connection.rb

@@ -1,3 +1,4 @@
+require 'cmis/connection/follow_redirects'
 require 'cmis/connection/request_modifier'
 require 'cmis/connection/response_parser'
 require 'cmis/version'
@@ -19,6 +20,7 @@ module CMIS
         end
 
         builder.adapter (options[:adapter] || :net_http).to_sym
+        builder.use FollowRedirects
         builder.response :logger if options[:log_requests]
         builder.use ResponseParser
       end
@@ -31,7 +33,7 @@ module CMIS
       url = infer_url(repository_id, params[:objectId])
 
       if params[:cmisaction]
-        @http.post(url, params, headers)
+        @http.post(url, params, headers) { |req| req.params = query }
       else
         @http.get(url, params.merge(query), headers)
       end

data/lib/cmis/connection/follow_redirects.rb

@@ -0,0 +1,137 @@
+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

data/lib/cmis/type.rb

@@ -30,8 +30,8 @@ module CMIS
       property_definitions[property['id']] = property
     end
 
-    def create
-      repository.create_type(self)
+    def create(opts = {})
+      repository.create_type(self, opts)
     end
 
     def update(changed_property_defs, opts = {})

data/lib/cmis/version.rb

@@ -1,3 +1,3 @@
 module CMIS
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -48,6 +48,7 @@ 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
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby client for CMIS
@@ -115,4 +116,3 @@ test_files:
 - spec/config.yml
 - spec/rspec.opts
 - spec/spec_helper.rb
-has_rdoc: false