cmis-ruby 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb2a6ae007e4f3159fd4f301e20f41566a88e0c7
-  data.tar.gz: 847b9a6c163696833c89fdedcb63248658fa7557
+  metadata.gz: 54d939c76212d26bf61e62941fc9c8befd44bd32
+  data.tar.gz: a46f072f12e9309b00334e1c184c9250fd887539
 SHA512:
-  metadata.gz: f8dbd5f1d1dfd272697240739e7fd8dd9af6f111be7f4afe4946e286920186580b07dcd4f3d71097fad75310c908e1d90d0faf3b82c1f21eb34a995975933d84
-  data.tar.gz: a16cdbc5e5acfb6a5fff6d0b0de835729e644d596e574381cfc718a6fe1eb97316ccd953dddf1d6fb640791373e91023dbda49c3ef1dba91fb3acd857769129f
+  metadata.gz: c369361121888cbd294e8c897b153b677377dc115fb31924d46e25cd3c4eb9e24ffdba3081c13a95be8ebf4d490504264b3942febaaade37d43eb10e07f4cb21
+  data.tar.gz: 5c8d73ce97ec3a0b873825e8cb9c1247c9b3ef3529469d03182da7d96a83627a7424003f901d3dd560d7b92a51171eed936227ad0c26072897888857acfd393e

data/lib/cmis-ruby.rb

@@ -1,20 +1,11 @@
-require 'bigdecimal'
-require 'json'
-
-require 'faraday'
-
 require 'active_support/core_ext'
 require 'core_ext'
 
-require 'cmis/connection'
 require 'cmis/exceptions'
-require 'cmis/server'
 require 'cmis/helpers'
 require 'cmis/object_factory'
-require 'cmis/query_result'
-require 'cmis/query'
-require 'cmis/children'
-require 'cmis/relationships'
+require 'cmis/connection'
+require 'cmis/server'
 require 'cmis/repository'
 require 'cmis/object'
 require 'cmis/document'
@@ -22,6 +13,5 @@ require 'cmis/folder'
 require 'cmis/item'
 require 'cmis/policy'
 require 'cmis/relationship'
-require 'cmis/property_definition'
 require 'cmis/type'
-require 'cmis/version'
+require 'cmis/property_definition'

data/lib/cmis/children.rb

@@ -1,3 +1,6 @@
+require 'bigdecimal'
+require 'cmis/query_result'
+
 module CMIS
   class Children
     # Options: from, page_size

data/lib/cmis/connection.rb

@@ -1,10 +1,16 @@
+require 'faraday'
+require 'cmis/version'
+require 'cmis/connection/url_resolver'
+require 'cmis/connection/request_modifier'
+require 'cmis/connection/response_parser'
+
 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
+      service_url = options[:service_url] or raise message
 
       adapter = (options[:adapter] || :net_http).to_sym
 
@@ -27,7 +33,7 @@ module CMIS
         builder.use ResponseParser
       end
 
-      @url_cache = {}
+      @url_resolver = URLResolver.new(@http, service_url)
     end
 
     def execute!(params = {}, options = {})
@@ -35,7 +41,7 @@ module CMIS
 
       query = options[:query] || {}
       headers = options[:headers] || {}
-      url = url(params.delete(:repositoryId), params[:objectId])
+      url = @url_resolver.url(params.delete(:repositoryId), params[:objectId])
 
       response = if params[:cmisaction]
         @http.post(url, params, headers)
@@ -45,111 +51,5 @@ module CMIS
 
       response.body
     end
-
-    private
-
-    def url(repository_id, object_id)
-      if repository_id.nil?
-        @service_url
-      else
-        urls = repository_urls(repository_id)
-        urls[object_id ? :root_folder_url : :repository_url]
-      end
-    end
-
-    def repository_urls(repository_id)
-      if @url_cache[repository_id].nil?
-        repository_infos = @http.get(@service_url).body
-
-        unless repository_infos.has_key?(repository_id)
-          raise Exceptions::ObjectNotFound, "repositoryId: #{repository_id}"
-        end
-
-        repository_info = repository_infos[repository_id]
-        @url_cache[repository_id] = {
-          repository_url:  repository_info[:repositoryUrl],
-          root_folder_url: repository_info[:rootFolderUrl]
-        }
-      end
-      @url_cache[repository_id]
-    end
-  end
-
-  class RequestModifier < Faraday::Middleware
-    def call(env)
-      if env[:body]
-        env[:body].compact!
-        wrap_content(env)
-        massage_properties(env)
-      end
-      @app.call(env)
-    end
-
-    private
-
-    def wrap_content(env)
-      if content_hash = env[:body][:content]
-        env[:body][:content] = Faraday::UploadIO.new(content_hash[:stream],
-                                                     content_hash[:mime_type],
-                                                     content_hash[:filename])
-      end
-    end
-
-    def massage_properties(env)
-      if props = env[:body].delete(:properties)
-        props.each_with_index do |(id, value), index|
-          if value.is_a?(Array)
-            env[:body][id_key(index)] = id
-            value.each_with_index do |sub_value, sub_index|
-              env[:body][val_key(index, sub_index)] = normalize(sub_value)
-            end
-          else
-            env[:body][id_key(index)] = id
-            env[:body][val_key(index)] = normalize(value)
-          end
-        end
-      end
-    end
-
-    def normalize(value)
-      value = value.to_time if value.is_a?(Date)
-      value = (value.to_f * 1000).to_i if value.is_a?(Time)
-      value
-    end
-
-    def id_key(index)
-      "propertyId[#{index}]"
-    end
-
-    def val_key(i1, i2 = nil)
-      result = "propertyValue[#{i1}]"
-      result = "#{result}[#{i2}]" if i2
-      result
-    end
-  end
-
-  class ResponseParser < Faraday::Middleware
-    JSON_CONTENT_TYPE = /\/(x-)?json(;.+?)?$/
-
-    def call(env)
-      @app.call(env).on_complete do |env|
-        if env[:response_headers][:content_type] =~ JSON_CONTENT_TYPE
-          env[:body] = JSON.parse(env[:body]).with_indifferent_access
-          check_for_exception!(env[:body])
-        end
-      end
-    end
-
-    private
-
-    def check_for_exception!(body)
-      return unless body.is_a?(Hash)
-
-      if ex = body[:exception]
-        ruby_exception = "CMIS::Exceptions::#{ex.camelize}".constantize
-        message = "#{ex.underscore.humanize}: #{body[:message]}"
-        raise ruby_exception, message
-      end
-    end
   end
 end

data/lib/cmis/connection/request_modifier.rb

@@ -0,0 +1,58 @@
+require 'faraday'
+
+module CMIS
+  class Connection
+    class RequestModifier < Faraday::Middleware
+      def call(env)
+        if env[:body]
+          env[:body].compact!
+          wrap_content(env)
+          massage_properties(env)
+        end
+        @app.call(env)
+      end
+
+      private
+
+      def wrap_content(env)
+        if content_hash = env[:body][:content]
+          env[:body][:content] = Faraday::UploadIO.new(content_hash[:stream],
+                                                       content_hash[:mime_type],
+                                                       content_hash[:filename])
+        end
+      end
+
+      def massage_properties(env)
+        if props = env[:body].delete(:properties)
+          props.each_with_index do |(id, value), index|
+            if value.is_a?(Array)
+              env[:body][id_key(index)] = id
+              value.each_with_index do |sub_value, sub_index|
+                env[:body][val_key(index, sub_index)] = normalize(sub_value)
+              end
+            else
+              env[:body][id_key(index)] = id
+              env[:body][val_key(index)] = normalize(value)
+            end
+          end
+        end
+      end
+
+      def normalize(value)
+        value = value.to_time if value.is_a?(Date)
+        value = (value.to_f * 1000).to_i if value.is_a?(Time)
+        value
+      end
+
+      def id_key(index)
+        "propertyId[#{index}]"
+      end
+
+      def val_key(i1, i2 = nil)
+        result = "propertyValue[#{i1}]"
+        result = "#{result}[#{i2}]" if i2
+        result
+      end
+    end
+  end
+end

data/lib/cmis/connection/response_parser.rb

@@ -0,0 +1,31 @@
+require 'faraday'
+require 'json'
+
+module CMIS
+  class Connection
+    class ResponseParser < Faraday::Middleware
+      JSON_CONTENT_TYPE = /\/(x-)?json(;.+?)?$/
+
+      def call(env)
+        @app.call(env).on_complete do |env|
+          if env[:response_headers][:content_type] =~ JSON_CONTENT_TYPE
+            env[:body] = JSON.parse(env[:body]).with_indifferent_access
+            check_for_exception!(env[:body])
+          end
+        end
+      end
+
+      private
+
+      def check_for_exception!(body)
+        return unless body.is_a?(Hash)
+
+        if ex = body[:exception]
+          ruby_exception = "CMIS::Exceptions::#{ex.camelize}".constantize
+          message = "#{ex.underscore.humanize}: #{body[:message]}"
+          raise ruby_exception, message
+        end
+      end
+    end
+  end
+end

data/lib/cmis/connection/url_resolver.rb

@@ -0,0 +1,38 @@
+module CMIS
+  class Connection
+    class URLResolver
+      def initialize(http, service_url)
+        @http = http
+        @service_url = service_url
+        @cache = {}
+      end
+
+      def url(repository_id, object_id)
+        return @service_url if repository_id.nil?
+
+        urls = repository_urls(repository_id)
+        urls[object_id ? :root_folder_url : :repository_url]
+      end
+
+      private
+
+      def repository_urls(repository_id)
+        if @cache[repository_id].nil?
+          repository_infos = @http.get(@service_url).body
+
+          unless repository_infos.has_key?(repository_id)
+            raise Exceptions::ObjectNotFound, "repositoryId: #{repository_id}"
+          end
+
+          repository_info = repository_infos[repository_id]
+          @cache[repository_id] = {
+            repository_url:  repository_info[:repositoryUrl],
+            root_folder_url: repository_info[:rootFolderUrl]
+          }
+        end
+
+        @cache[repository_id]
+      end
+    end
+  end
+end

data/lib/cmis/folder.rb

@@ -1,3 +1,5 @@
+require 'cmis/children'
+
 module CMIS
   class Folder < Object
     def initialize(raw, repository)

data/lib/cmis/object.rb

@@ -1,3 +1,5 @@
+require 'cmis/relationships'
+
 module CMIS
   class Object
     include Helpers

data/lib/cmis/query.rb

@@ -1,3 +1,6 @@
+require 'bigdecimal'
+require 'cmis/query_result'
+
 module CMIS
   class Query
     # Options: from, page_size

data/lib/cmis/relationships.rb

@@ -1,3 +1,6 @@
+require 'bigdecimal'
+require 'cmis/query_result'
+
 module CMIS
   class Relationships
     # Options: from, page_size

data/lib/cmis/repository.rb

@@ -1,3 +1,6 @@
+require 'json'
+require 'cmis/query'
+
 module CMIS
   class Repository
     attr_reader :server

data/lib/cmis/type.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module CMIS
   class Type
     attr_accessor :repository

data/lib/cmis/version.rb

@@ -1,3 +1,3 @@
 module CMIS
-  VERSION = '0.3.9'
+  VERSION = '0.4.0'
 end

data/readme.md

@@ -13,7 +13,11 @@ Running the tests requires a separate CMIS server. The default rake task runs th
 
 ## TODO
 
-* facilitate copy between servers (make a flow)
+* remove ActiveSupport dependency:
+    * stringify_keys! -> to_options!
+    * symbolize_keys! -> to_options!
+    * compact!
+    * with_indifferent_access -> ?
 * caching
 
 ## Contributing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -62,6 +62,9 @@ files:
 - lib/cmis-ruby.rb
 - lib/cmis/children.rb
 - 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