cmis-ruby 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dd0672854ad32c484263b5d7a50c0333d276446
-  data.tar.gz: 15a1718aa57ace3f420f8ed6e51beb189cf63a71
+  metadata.gz: 1d7de0653ac57178aae304281dcd8ec41c7b5688
+  data.tar.gz: 6b408d6290cd17fdbe81e4327d37fd6aa7eea251
 SHA512:
-  metadata.gz: 5daf70de48829f6f6f9f8868742033d563870f2d161004918b5eb029ff6e906205008859de2017342d6c78219d64e34d721ca2ac578265018aa23f04fb65075c
-  data.tar.gz: 1a41003e677dd7b69177323a09549a5204f2f649b85fa2d5ebd3742e18a4063f0a0c5d9c5c4eec381c2169bfee257ad6f5de95ad59098f2cb6090d9d461c1d2d
+  metadata.gz: 823583dc1ffb9b66fa1909a47a4224d322b1c2b0d2638279ac9b8bf7208b1104bc00261c64e5ff76a9c1d6b1d4a8ea74c9276df8801896161335d6652d5a14af
+  data.tar.gz: 4146bfe8c67f079767d962573a3eb4176aaaf30ee1fc48209b620f51ca5cd2ac71359035e17421a34b39dd89ba41f2c38d4499b95539e7d533f0bbf1367a9993

data/lib/cmis/connection.rb

@@ -1,18 +1,13 @@
 require 'cmis/connection/request_modifier'
 require 'cmis/connection/response_parser'
-require 'cmis/connection/url_resolver'
 require 'cmis/version'
 require 'faraday'
 
 module CMIS
   class Connection
     def initialize(options)
-      options.symbolize_keys!
-
       message = "option `service_url` must be set"
-      service_url = options[:service_url] or raise message
-
-      options[:adapter] ||= :net_http
+      @service_url = options[:service_url] or raise message
 
       @http = Faraday.new(connection_options(options)) do |builder|
         builder.use RequestModifier
@@ -23,35 +18,30 @@ module CMIS
           builder.basic_auth(options[:username], options[:password])
         end
 
-        builder.adapter options[:adapter].to_sym
+        builder.adapter (options[:adapter] || :net_http).to_sym
         builder.response :logger if options[:log_requests]
         builder.use ResponseParser
       end
 
-      @url_resolver = URLResolver.new(@http, service_url)
+      @repository_infos = {}
     end
 
-    def execute!(params = {}, options = {})
-      params.symbolize_keys!
-      options.symbolize_keys!
-
-      query = options.fetch(:query, {})
-      headers = options.fetch(:headers, {})
-      url = @url_resolver.url(params.delete(:repositoryId), params[:objectId])
+    def do_request(params, query, headers)
+      repository_id = params.delete(:repositoryId)
+      url = infer_url(repository_id, params[:objectId])
 
-      response = if params[:cmisaction]
+      if params[:cmisaction]
         @http.post(url, params, headers)
       else
         @http.get(url, params.merge(query), headers)
       end
-
-      response.body
     end
 
     private
 
     def connection_options(options)
-      headers = { user_agent: "cmis-ruby/#{VERSION} [#{options[:adapter]}]" }
+      adapter = (options[:adapter] || :net_http).to_sym
+      headers = { user_agent: "cmis-ruby/#{VERSION} [#{adapter}]" }
       headers.merge!(options[:headers]) if options[:headers]
 
       conn_opts = { headers: headers }
@@ -59,5 +49,20 @@ module CMIS
 
       conn_opts
     end
+
+    def infer_url(repository_id, object_id)
+      return @service_url unless repository_id
+
+      unless @repository_infos.key?(repository_id)
+        @repository_infos = @http.get(@service_url).body
+      end
+
+      if @repository_infos.key?(repository_id)
+        key = object_id ? 'rootFolderUrl' : 'repositoryUrl'
+        @repository_infos[repository_id][key]
+      else
+        raise Exceptions::ObjectNotFound, "repositoryId: #{repository_id}"
+      end
+    end
   end
 end

data/lib/cmis/server.rb

@@ -1,7 +1,18 @@
 module CMIS
   class Server < Connection
     def initialize(options = {})
-      super
+      @options = options.symbolize_keys
+    end
+
+    def execute!(params = {}, options = {})
+      params.symbolize_keys!
+
+      options.symbolize_keys!
+      query = options.fetch(:query, {})
+      headers = options.fetch(:headers, {})
+
+      response = connection.do_request(params, query, headers)
+      response.body
     end
 
     def repositories(opts = {})
@@ -25,5 +36,19 @@ module CMIS
     rescue Exceptions::ObjectNotFound
       false
     end
+
+    private
+
+    def connection
+      @connection ||= Connection.new(@options)
+    end
+
+    def marshal_dump
+      @options
+    end
+
+    def marshal_load(options)
+      @options = options
+    end
   end
 end

data/lib/cmis/version.rb

@@ -1,3 +1,3 @@
 module CMIS
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -50,7 +50,6 @@ files:
 - lib/cmis/connection.rb
 - lib/cmis/connection/request_modifier.rb
 - lib/cmis/connection/response_parser.rb
-- lib/cmis/connection/url_resolver.rb
 - lib/cmis/document.rb
 - lib/cmis/exceptions.rb
 - lib/cmis/folder.rb

data/lib/cmis/connection/url_resolver.rb

@@ -1,26 +0,0 @@
-module CMIS
-  class Connection
-    class URLResolver
-      def initialize(http, service_url)
-        @http = http
-        @service_url = service_url
-        @repository_infos = {}
-      end
-
-      def url(repository_id, object_id)
-        return @service_url unless repository_id
-
-        unless @repository_infos.key?(repository_id)
-          @repository_infos = @http.get(@service_url).body
-        end
-
-        if @repository_infos.key?(repository_id)
-          key = object_id ? 'rootFolderUrl' : 'repositoryUrl'
-          @repository_infos[repository_id][key]
-        else
-          raise Exceptions::ObjectNotFound, "repositoryId: #{repository_id}"
-        end
-      end
-    end
-  end
-end