cmis-ruby 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 107af5f3b660dfdeb4a37320f00df2dcd1f90482
-  data.tar.gz: fd8d344df8996b58419b6f2919b0fb0fed6fa58d
+  metadata.gz: 7687556cd432a42906b9d22bb5126864a2504746
+  data.tar.gz: aae0936ee6a12b24c9e5853ff53a84a68e9e5b7d
 SHA512:
-  metadata.gz: b05da4dcef03c6c98e164027e3e3ea019696cf4fce952efbf19d02c75293d8693f6ac248bb4536ca51afac7a154e0a93ba30295acdce48e80ded87064f683ce4
-  data.tar.gz: 1af4ac5bb0fdcb9395f26388e8d8c2fe372a68195dd3c460c05fd75c336e5f220143eea43064b440bd5261d21e75789e03ac03e69c3b6a6c1c3a5e3c2bd31bfc
+  metadata.gz: d4236426c4fb12577adaebf6de386a5caa27c02125deebc227c715c773524439ca009237d521ea4f0fde4359d714adb58419f54b85a911c3523b0e6459a7ac0f
+  data.tar.gz: 370f0c6e50f0fe80d684eef49f1b4b1d96ab9274b5c1fc53983f3eedb0a4cc5b45b481d2040698816a2044df43bfd68e73955a3ee6d23abb19cdd8f81c8d7198

data/cmis-ruby.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'typhoeus', '~> 0.6'
   s.add_dependency 'multipart-post', '~> 1.1'
-  s.add_dependency 'multi_json', '~> 1.5'
   s.add_dependency 'activesupport', '>= 3.2'
 
   s.description = <<-DESC.gsub(/^    /, '')

data/lib/cmis-ruby.rb

@@ -1,20 +1,17 @@
 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/repository'
-
 require 'cmis/object'
-require 'cmis/object_factory'
 require 'cmis/document'
 require 'cmis/folder'
 require 'cmis/item'
 require 'cmis/policy'
 require 'cmis/relationship'
-
-require 'cmis/type'
 require 'cmis/property_definition'
+require 'cmis/type'

data/lib/cmis/children.rb

@@ -1,6 +1,7 @@
+require 'active_support/core_ext/hash/slice'
+
 module CMIS
   class Children
-
     # Options: from, page_size
     def initialize(folder, options = {})
       @folder = folder
@@ -10,8 +11,8 @@ module CMIS
     end
 
     # Options: limit
-    def each_result(options = {}, &block)
-      return enum_for(:each_result, options) unless block_given?
+    def each_child(options = {}, &block)
+      return enum_for(:each_child, options) unless block_given?
 
       init_options
       limit = parse_limit(options)
@@ -66,6 +67,8 @@ module CMIS
       @skip_count = @options['from'] || 0
       @order_by = @options['order_by']
       @has_next = true
+
+      @opts = @options.slice('query', 'headers')
     end
 
     def parse_limit(options)
@@ -82,7 +85,7 @@ module CMIS
                                              objectId: @folder.cmis_object_id,
                                              maxItems: @max_items,
                                              skipCount: @skip_count,
-                                             orderBy: @order_by })
+                                             orderBy: @order_by }, @opts)
 
       results = result['objects'].map do |r|
         ObjectFactory.create(r['object'], @folder.repository)
@@ -90,6 +93,5 @@ module CMIS
 
       QueryResult.new(results, result['numItems'], result['hasMoreItems'])
     end
-
   end
 end

data/lib/cmis/connection.rb

@@ -1,16 +1,11 @@
-require 'active_support/core_ext/hash/indifferent_access'
-require 'date'
+require 'active_support'
 require 'typhoeus'
 require 'net/http/post/multipart'
-require 'multi_json'
 
 module CMIS
-
-  class CMISRequestError < Exception; end
-
   class Connection
 
-    def initialize(service_url, username, password, headers = {})
+    def initialize(service_url, username, password, headers)
       @service_url = service_url
       @username = username
       @password = password
@@ -19,14 +14,17 @@ module CMIS
       @url_cache = {}
     end
 
-    def execute!(params = {}, query = {}, headers = {})
+    def execute!(params = {}, options = {})
+      options.stringify_keys!
+      query = options['query'] || {}
+      headers = @headers.merge(options['headers'] || {})
 
       url = get_url(params.delete(:repositoryId), params[:objectId])
 
       params = transform_hash(params)
 
-      if params.has_key?(:cmisaction)
-        method = params.has_key?(:content) ? 'multipart_post' : 'post'
+      if params[:cmisaction]
+        method = params[:content] ? 'multipart_post' : 'post'
         body = params
       else
         method = 'get'
@@ -34,13 +32,8 @@ module CMIS
         query.merge!(params)
       end
 
-      response = perform_request(method: method,
-                                 url: url,
-                                 query: query,
-                                 body: body,
-                                 headers: headers)
-
-      result = response.body
+      response = perform_request(method: method, url: url,
+                                 body: body, query: query, headers: headers)
 
       content_type = if response.respond_to?(:content_type)
         response.content_type
@@ -48,22 +41,26 @@ module CMIS
         response.headers['Content-Type']
       end
 
-      result = MultiJson.load(result) if content_type =~ /application\/json/
+      result = response.body
+      result = JSON.parse(result) if content_type =~ /application\/json/
       result = result.with_indifferent_access if result.is_a? Hash
 
-      unless (200...300).include?(response.code.to_i)
-        if result.is_a?(Hash) && result.has_key?(:exception)
-          raise CMISRequestError, "#{response.code} -- #{result[:exception]} -- #{result[:message]}"
-        else
-          raise CMISRequestError, "#{response.code} -- #{result}"
-        end
-      end
+      check_for_exception!(response.code.to_i, result)
 
       result
     end
 
     private
 
+    def check_for_exception!(code, result)
+      unless (200...300).include?(code)
+        if result.is_a?(Hash) && result['exception']
+          exception_class = "CMIS::Exceptions::#{result['exception'].camelize}"
+          raise exception_class.constantize, "#{result['message']}"
+        end
+      end
+    end
+
     def get_url(repository_id, cmis_object_id)
       if repository_id.nil?
         @service_url
@@ -79,8 +76,8 @@ module CMIS
 
     def repository_urls(repository_id)
       if @url_cache[repository_id].nil?
-        repository_infos = MultiJson.load(perform_request(url: @service_url).body , symbolize_keys: false)
-        raise "No repository found with ID #{repository_id}." unless repository_infos.has_key?(repository_id)
+        repository_infos = JSON.parse(perform_request(url: @service_url).body)
+        raise Exceptions::ObjectNotFound, "repositoryId: #{repository_id}" unless repository_infos.has_key?(repository_id)
         repository_info = repository_infos[repository_id]
         @url_cache[repository_id] = { repository_url:  repository_info['repositoryUrl'],
                                       root_folder_url: repository_info['rootFolderUrl'] }
@@ -91,28 +88,22 @@ module CMIS
     def transform_hash(hash)
       hash.reject! { |_, v| v.nil? }
 
-      if hash.has_key?(:content)
-        content = hash.delete(:content)
-        hash[:content] = UploadIO.new(content[:stream],
-                                      content[:mime_type],
-                                      content[:filename])
-      end # Move to multipart_post?
-
-      if hash.has_key?(:properties)
-        props = hash.delete(:properties)
-        if props.is_a?(Hash)
-          props.each_with_index do |(id, value), index|
-            value = value.to_time if value.is_a?(Date) or value.is_a?(DateTime)
-            value = (value.to_f * 1000).to_i if value.is_a?(Time)
-            if value.is_a?(Array)
-              hash.merge!("propertyId[#{index}]" => id)
-              value.each_with_index do |v, idx|
-                hash.merge!("propertyValue[#{index}][#{idx}]" => value[idx])
-              end
-            else
-              hash.merge!("propertyId[#{index}]" => id,
-                          "propertyValue[#{index}]" => value)
+      if content_hash = hash[:content]
+        hash[:content] = UploadIO.new(content_hash[:stream], content_hash[:mime_type], content_hash[:filename])
+      end
+
+      if props = hash.delete(:properties)
+        props.each_with_index do |(id, value), index|
+          value = value.to_time if value.is_a?(Date) or value.is_a?(DateTime)
+          value = (value.to_f * 1000).to_i if value.is_a?(Time)
+          if value.is_a?(Array)
+            hash.merge!("propertyId[#{index}]" => id)
+            value.each_with_index do |v, idx|
+              hash.merge!("propertyValue[#{index}][#{idx}]" => value[idx])
             end
+          else
+            hash.merge!("propertyId[#{index}]" => id,
+                        "propertyValue[#{index}]" => value)
           end
         end
       end
@@ -142,6 +133,5 @@ module CMIS
       opts = url.scheme == 'https' ? { use_ssl: true , verify_mode: OpenSSL::SSL::VERIFY_NONE } : {}
       Net::HTTP.start(url.host, url.port, opts) { |http| http.request(req) }
     end
-
   end
 end

data/lib/cmis/document.rb

@@ -1,6 +1,5 @@
 module CMIS
   class Document < Object
-
     def initialize(raw, repository)
       super
       cmis_properties %w( cmis:isImmutable cmis:isLatestVersion
@@ -13,39 +12,45 @@ module CMIS
                           cmis:contentStreamFileName cmis:contentStreamId )
     end
 
-    def create_in_folder(folder)
+    def create_in_folder(folder, opts = {})
       r = connection.execute!({ cmisaction: 'createDocument',
                                 repositoryId: repository.id,
                                 properties: properties,
                                 objectId: folder.cmis_object_id,
                                 folderId: folder.cmis_object_id,
-                                content: @local_content })
+                                content: @local_content }, opts)
 
       ObjectFactory.create(r, repository)
     end
 
-    def copy_in_folder(folder)
+    def copy_in_folder(folder, opts = {})
       id = connection.execute!({ cmisaction: 'createDocument',
                                  repositoryId: repository.id,
                                  sourceId: cmis_object_id,
-                                 objectId: folder.cmis_object_id })
+                                 objectId: folder.cmis_object_id }, opts)
 
       repository.object(id)
     end
 
-    def content
+    def content(opts = {})
       connection.execute!({ cmisselector: 'content',
                             repositoryId: repository.id,
-                            objectId: cmis_object_id })
+                            objectId: cmis_object_id }, opts)
 
-    rescue CMIS::CMISRequestError
+    rescue Exceptions::Constraint
+      # Check for specific constraint?
       nil
     end
 
-    def set_content(stream, mime_type, filename)
-      content = { stream: stream,
-                  mime_type: mime_type,
-                  filename: filename }
+    def set_content(opts = {})
+      opts.stringify_keys!
+      content = { stream: opts.delete('stream'),
+                  mime_type: opts.delete('mime_type'),
+                  filename: opts.delete('filename') }
+
+      if content[:stream].is_a? String
+        content[:stream] = StringIO.new(content[:stream])
+      end
 
       if detached?
         @local_content = content
@@ -54,9 +59,8 @@ module CMIS
                                                   repositoryId: repository.id,
                                                   objectId: cmis_object_id,
                                                   content: content,
-                                                  changeToken: change_token })
+                                                  changeToken: change_token }, opts)
       end
     end
-
   end
 end

data/lib/cmis/exceptions.rb

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

data/lib/cmis/folder.rb

@@ -1,14 +1,13 @@
 module CMIS
   class Folder < Object
-
     def initialize(raw, repository)
       super
       cmis_properties %w( cmis:parentId cmis:path
                           cmis:allowedChildObjectTypeIds )
     end
 
-    def parent
-      repository.object(parent_id) if parent_id
+    def parent(opts = {})
+      repository.object(parent_id, opts) if parent_id
     end
 
     def allowed_child_object_types
@@ -16,34 +15,34 @@ module CMIS
       allowed_child_object_type_ids.map { |type_id| repository.type(type_id) }
     end
 
-    def children(options = {})
-      Children.new(self, options)
+    def children(opts = {})
+      Children.new(self, opts)
     end
 
-    def create(object)
+    def create(object, opts = {})
       case object
       when Relationship
         raise "'cmis:relationship' is not fileable. Use Repository#create_relationship"
 
       when Document
-        return object.create_in_folder(self)
+        return object.create_in_folder(self, opts)
 
       when Folder
         o = connection.execute!({ cmisaction: 'createFolder',
                                   repositoryId: repository.id,
                                   properties: object.properties,
-                                  objectId: cmis_object_id })
+                                  objectId: cmis_object_id }, opts)
 
       when Policy
         o = connection.execute!({ cmisaction: 'createPolicy',
                                   repositoryId: repository.id,
                                   properties: object.properties,
-                                  objectId: cmis_object_id })
+                                  objectId: cmis_object_id }, opts)
       when Item
         o = connection.execute!({ cmisaction: 'createItem',
                                   repositoryId: repository.id,
                                   properties: object.properties,
-                                  objectId: cmis_object_id })
+                                  objectId: cmis_object_id }, opts)
 
       else
         raise "Unexpected base_type_id: #{object.base_type_id}"
@@ -52,25 +51,24 @@ module CMIS
       ObjectFactory.create(o, repository)
     end
 
-    def delete_tree
+    def delete_tree(opts = {})
       connection.execute!({ cmisaction: 'deleteTree',
                             repositoryId: repository.id,
-                            objectId: cmis_object_id })
+                            objectId: cmis_object_id }, opts)
     end
 
-    def add(object)
+    def add(object, opts = {})
       connection.execute!({ cmisaction: 'addObjectToFolder',
                             repositoryId: repository.id,
                             objectId: object.cmis_object_id,
-                            folderId: cmis_object_id })
+                            folderId: cmis_object_id }, opts)
     end
 
-    def remove(object)
+    def remove(object, opts = {})
       connection.execute!({ cmisaction: 'removeObjectFromFolder',
                             repositoryId: repository.id,
                             objectId: object.cmis_object_id,
-                            folderId: cmis_object_id })
+                            folderId: cmis_object_id }, opts)
     end
-
   end
 end

data/lib/cmis/helpers.rb

@@ -2,7 +2,6 @@ require 'active_support/core_ext'
 
 module CMIS
   module Helpers
-
     def initialize_properties(raw)
       @properties = get_properties_map(raw)
     end
@@ -21,7 +20,7 @@ module CMIS
       elsif r['succinctProperties']
         @change_token = r['succinctProperties']['cmis:changeToken']
       else
-        raise "Unexpected hash: #{r}"
+        raise "Unexpected input: #{r}"
       end
     end
 
@@ -53,6 +52,5 @@ module CMIS
 
       result.with_indifferent_access
     end
-
   end
 end

data/lib/cmis/item.rb

@@ -1,11 +1,7 @@
 module CMIS
-
   class Item < Object
-
     def initialize(raw, repository)
       super
     end
-
   end
-
 end

data/lib/cmis/object.rb

@@ -1,6 +1,5 @@
 module CMIS
   class Object
-
     include Helpers
 
     attr_reader :connection
@@ -18,103 +17,102 @@ module CMIS
       @connection = repository.connection
     end
 
-    def object_type
-      repository.type(object_type_id)
+    def object_type(opts = {})
+      repository.type(object_type_id, opts)
     end
 
-    def delete
+    def delete(opts = {})
       connection.execute!({ cmisaction: 'delete',
                             repositoryId: repository.id,
                             objectId: cmis_object_id,
-                            allVersions: true })
+                            allVersions: true }, opts)
     end
 
-    def update_properties(properties)
+    def update_properties(properties, opts = {})
       update_change_token connection.execute!({ cmisaction: 'update',
                                                 repositoryId: repository.id,
                                                 objectId: cmis_object_id,
                                                 properties: properties,
-                                                changeToken: change_token })
+                                                changeToken: change_token }, opts)
     end
 
-    def parents
+    def parents(opts = {})
       result = connection.execute!({ cmisselector: 'parents',
                                      repositoryId: repository.id,
-                                     objectId: cmis_object_id })
+                                     objectId: cmis_object_id }, opts)
 
       result.map { |o| ObjectFactory.create(o['object'], repository) }
     end
 
-    def allowable_actions
+    def allowable_actions(opts = {})
       connection.execute!({ cmisselector: 'allowableActions',
                             repositoryId: repository.id,
-                            objectId: cmis_object_id })
+                            objectId: cmis_object_id }, opts)
     end
 
-    def relationships(direction = :either)
+    def relationships(direction = :either, opts = {})
       result = connection.execute!({ cmisselector: 'relationships',
                                      repositoryId: repository.id,
                                      objectId: cmis_object_id,
-                                     relationshipDirection: direction })
+                                     relationshipDirection: direction }, opts)
 
       result['objects'].map { |r| Relationship.new(r, repository) }
     end
 
-    def policies
+    def policies(opts = {})
       result = connection.execute!({ cmisselector: 'policies',
                                      repositoryId: repository.id,
-                                     objectId: cmis_object_id })
+                                     objectId: cmis_object_id }, opts)
 
       result.map { |r| Policy.new(r, repository) }
     end
 
     # By default removes from all folders
-    def unfile(folder = nil)
-      options = { repositoryId: repository.id,
-                  cmisaction: 'removeObjectFromFolder',
-                  objectId: cmis_object_id }
-      options[:folderId] = folder.cmis_object_id if folder
+    def unfile(folder = nil, opts = {})
+      params = { repositoryId: repository.id,
+                 cmisaction: 'removeObjectFromFolder',
+                 objectId: cmis_object_id }
+      params.update!(folderId: folder.cmis_object_id) if folder
 
-      connection.execute!(options)
+      connection.execute!(params, opts)
     end
 
-    def move(target_folder)
+    def move(target_folder, opts = {})
       object_parents = parents
 
       unless object_parents.size == 1
-        raise 'Cannot move object because it is not in excatly one folder'
+        raise 'Cannot move object because it is not in exactly one folder'
       end
 
       connection.execute!({ cmisaction: 'move',
                             repositoryId: repository.id,
                             objectId: cmis_object_id,
                             targetFolderId: target_folder.cmis_object_id,
-                            sourceFolderId: object_parents.first.cmis_object_id })
+                            sourceFolderId: object_parents.first.cmis_object_id }, opts)
     end
 
-    def acls
+    def acls(opts = {})
       connection.execute!({ cmisselector: 'acl',
                             repositoryId: repository.id,
-                            objectId: cmis_object_id })
+                            objectId: cmis_object_id }, opts)
     end
 
-    def add_aces(aces)
+    def add_aces(aces, opts = {})
       connection.execute!({ cmisaction: 'applyACL',
                             repositoryId: repository.id,
                             objectId: cmis_object_id,
-                            addACEs: aces })
+                            addACEs: aces }, opts)
     end
 
-    def remove_aces(aces)
+    def remove_aces(aces, opts = {})
       connection.execute!({ cmisaction: 'applyACL',
                             repositoryId: repository.id,
                             objectId: cmis_object_id,
-                            removeACEs: aces })
+                            removeACEs: aces }, opts)
     end
 
     def detached?
       cmis_object_id.nil?
     end
-
   end
 end

data/lib/cmis/object_factory.rb

@@ -1,26 +1,26 @@
 module CMIS
   class ObjectFactory
-
     def self.create(raw, repository)
       case base_type_id(raw)
+      when 'cmis:object' then Object.new(raw, repository)
       when 'cmis:folder' then Folder.new(raw, repository)
       when 'cmis:document' then Document.new(raw, repository)
       when 'cmis:relationship' then Relationship.new(raw, repository)
       when 'cmis:policy' then Policy.new(raw, repository)
       when 'cmis:item' then Item.new(raw, repository)
-      else raise "Unexpected baseTypeId: #{base_type_id}."
+      else raise "Unexpected baseTypeId: #{base_type_id}"
       end
     end
 
     private
 
     def self.base_type_id(raw)
-      if raw['properties']
+      if raw['properties'] && raw['properties']['cmis:baseTypeId']
         raw['properties']['cmis:baseTypeId']['value']
-      elsif raw['succinctProperties']
+      elsif raw['succinctProperties'] && raw['succinctProperties']['cmis:baseTypeId']
         raw['succinctProperties']['cmis:baseTypeId']
       else
-        raise "Unexpected json: #{raw}"
+        'cmis:object' # no base type id, construct a poco
       end
     end
   end

data/lib/cmis/policy.rb

@@ -1,6 +1,5 @@
 module CMIS
   class Policy < Object
-
     attr_reader :policy_text
 
     def initialize(raw, repository)
@@ -8,19 +7,18 @@ module CMIS
       cmis_properties %w( cmis:policyText )
     end
 
-    def apply_to(object)
+    def apply_to(object, opts = {})
       connection.execute!({ cmisaction: 'applyPolicy',
                             repositoryId: repository_id,
                             policyId: cmis_object_id,
-                            objectId: object.cmis_object_id })
+                            objectId: object.cmis_object_id }, opts)
     end
 
-    def remove_from(object)
+    def remove_from(object, opts = {})
       connection.execute!({ cmisaction: 'removePolicy',
                             repositoryId: repository_id,
                             policyId: cmis_object_id,
-                            objectId: object.cmis_object_id })
+                            objectId: object.cmis_object_id }, opts)
     end
-
   end
 end

data/lib/cmis/property_definition.rb

@@ -1,8 +1,7 @@
-require 'active_support/core_ext'
+require 'active_support/core_ext/string/inflections'
 
 module CMIS
   class PropertyDefinition
-
     def initialize(hash = {})
       @hash = hash.with_indifferent_access
 
@@ -27,6 +26,5 @@ module CMIS
     def to_hash
       @hash
     end
-
   end
 end

data/lib/cmis/query.rb

@@ -1,6 +1,7 @@
+require 'active_support/core_ext/hash/slice'
+
 module CMIS
   class Query
-
     # Options: from, page_size
     def initialize(repository, statement, options = {})
       @repository = repository
@@ -67,6 +68,8 @@ module CMIS
       @max_items = @options['page_size'] || 10
       @skip_count = @options['from'] || 0
       @has_next = true
+
+      @opts = @options.slice('query', 'headers')
     end
 
     def parse_limit(options)
@@ -87,7 +90,7 @@ module CMIS
         params.merge!(cmisaction: 'query', statement: @statement)
       end
 
-      result = @repository.connection.execute!(params)
+      result = @repository.connection.execute!(params, @opts)
 
       results = result['results'].map do |r|
         ObjectFactory.create(r, @repository)
@@ -95,6 +98,5 @@ module CMIS
 
       QueryResult.new(results, result['numItems'], result['hasMoreItems'])
     end
-
   end
 end

data/lib/cmis/query_result.rb

@@ -1,6 +1,5 @@
 module CMIS
   class QueryResult
-
     attr_reader :results
     attr_reader :num_items
     attr_reader :has_more_items
@@ -10,6 +9,5 @@ module CMIS
       @num_items = num_items
       @has_more_items = has_more_items
     end
-
   end
 end

data/lib/cmis/relationship.rb

@@ -1,18 +1,16 @@
 module CMIS
   class Relationship < Object
-
     def initialize(raw, repository)
       super
       cmis_properties %w( cmis:sourceId cmis:targetId )
     end
 
-    def source
-      repository.object(source_id)
+    def source(opts = {})
+      repository.object(source_id, opts)
     end
 
-    def target
-      repository.object(target_id)
+    def target(opts = {})
+      repository.object(target_id, opts)
     end
-
   end
 end

data/lib/cmis/repository.rb

@@ -1,6 +1,7 @@
+require 'active_support/core_ext/date_time'
+
 module CMIS
   class Repository
-
     attr_reader :connection
 
     def initialize(raw, connection)
@@ -33,72 +34,107 @@ module CMIS
       Policy.new({}, self)
     end
 
-    def root
+    def new_type
+      Type.new({}, self)
+    end
+
+    def root(opts = {})
       result = connection.execute!({ cmisselector: 'object',
                                      repositoryId: id,
-                                     objectId: root_folder_id })
+                                     objectId: root_folder_id }, opts)
 
       ObjectFactory.create(result, self)
     end
 
-    def object(cmis_object_id)
+    def object(cmis_object_id, opts = {})
       result = connection.execute!({ cmisselector: 'object',
                                      repositoryId: id,
-                                     objectId: cmis_object_id })
+                                     objectId: cmis_object_id }, opts)
 
       ObjectFactory.create(result, self)
     end
 
-    def types
+    def types(opts = {})
       result = connection.execute!({ cmisselector: 'typeDescendants',
                                      repositoryId: id,
-                                     includePropertyDefinitions: true })
+                                     includePropertyDefinitions: true }, opts)
 
       construct_types(result)
     end
 
-    def type(type_id)
+    def type(type_id, opts = {})
       result = connection.execute!({ cmisselector: 'typeDefinition',
                                      repositoryId: id,
-                                     typeId: type_id })
+                                     typeId: type_id }, opts)
 
       Type.new(result, self)
     end
 
     def has_type?(type_id)
-      types.map(&:id).include?(type_id)
+      type(type_id)
+      true
+    rescue Exceptions::ObjectNotFound
+      false
     end
 
-    def create_type(type)
+    def create_type(type, opts = {})
       result = connection.execute!({ cmisaction: 'createType',
                                      repositoryId: id,
-                                     type: MultiJson.dump(type.to_hash) })
+                                     type: JSON.generate(type.to_hash) }, opts)
 
       Type.new(result, self)
     end
 
-    def create_relationship(object)
+    def create_relationship(object, opts = {})
       raise 'Object is not a Relationship' unless object.is_a?(Relationship)
 
       result = connection.execute!({ cmisaction: 'createRelationship',
                                      repositoryId: id,
-                                     properties: object.properties })
+                                     properties: object.properties }, opts)
 
       ObjectFactory.create(result, self)
     end
 
-    def content_changes(change_log_token)
+    def content_changes(change_log_token, opts = {})
       connection.execute!({ cmisselector: 'contentChanges',
                             repositoryId: id,
-                            changeLogToken: change_log_token })
+                            changeLogToken: change_log_token }, opts)
+    end
+
+    def query(statement, opts = {})
+      Query.new(self, statement, opts)
     end
 
-    def query(statement, options = {})
-      Query.new(self, statement, options)
+    def find_object(type_id, properties, opts = {})
+      clause = properties.map { |k, v| "#{k}=#{normalize(v)}" }.join(' and ')
+      statement = "select * from #{type_id} where #{clause}"
+      opts.merge!(page_size: 1)
+      query(statement, opts).results.first
     end
 
     private
 
+    BACKSLASH = "\\"
+    QUOTE = "\'"
+
+    def normalize(value)
+      case value
+      when DateTime
+        value = value.strftime('%Y-%m-%dT%H:%M:%S.%L')
+        "TIMESTAMP '#{value}'"
+      when Time
+        value = value.strftime('%Y-%m-%dT%H:%M:%S.%L')
+        "TIMESTAMP '#{value}'"
+      when Date
+        value = value.strftime('%Y-%m-%dT%H:%M:%S.%L')
+        "TIMESTAMP '#{value}'"
+      else
+        # TODO Correct escaping for find_object
+        # value = value.gsub(BACKSLASH, BACKSLASH * 4).gsub(QUOTE, "#{BACKSLASH * 2}#{QUOTE}")
+        "'#{value}'"
+      end
+    end
+
     def construct_types(a)
       types = []
       a.each do |t|
@@ -107,6 +143,5 @@ module CMIS
       end
       types.flatten
     end
-
   end
 end

data/lib/cmis/server.rb

@@ -2,7 +2,6 @@ require 'active_support/core_ext/hash/indifferent_access'
 
 module CMIS
   class Server
-
     attr_reader :connection
 
     def initialize(options = {})
@@ -11,33 +10,33 @@ module CMIS
       service_url = options['service_url'] || ENV['CMIS_BROWSER_URL']
       username    = options['username']    || ENV['CMIS_USER']
       password    = options['password']    || ENV['CMIS_PASSWORD']
-      headers     = options['headers']
+      headers     = options['headers']     || {}
 
-      raise "'service_url' must be set" unless service_url
+      raise "`service_url` must be set" unless service_url
 
       @connection = Connection.new(service_url, username, password, headers)
     end
 
-    def repositories
-      result = connection.execute!
+    def repositories(opts = {})
+      result = connection.execute!({}, opts)
 
       result.values.map do |r|
         Repository.new(r, connection)
       end
     end
 
-    def repository(repository_id)
+    def repository(repository_id, opts = {})
       result = connection.execute!({ cmisselector: 'repositoryInfo',
-                                     repositoryId: repository_id })
+                                     repositoryId: repository_id }, opts)
 
       Repository.new(result[repository_id], connection)
     end
 
     def has_repository?(repository_id)
-      result = connection.execute!
-
-      result.keys.include?(repository_id)
+      repository(repository_id)
+      true
+    rescue Exceptions::ObjectNotFound
+      false
     end
-
   end
 end

data/lib/cmis/type.rb

@@ -1,12 +1,11 @@
-require 'active_support/core_ext'
+require 'active_support/core_ext/string/inflections'
 
 module CMIS
   class Type
-
     attr_accessor :connection
     attr_accessor :repository
 
-    def initialize(hash = {}, repository = nil)
+    def initialize(hash, repository)
       @repository = repository
       @connection = repository.connection if repository
 
@@ -37,7 +36,7 @@ module CMIS
       repository.create_type(self)
     end
 
-    def update(changed_property_defs)
+    def update(changed_property_defs, opts = {})
       new_defs = changed_property_defs.map(&:to_hash).reduce({}) do |result, element|
         result[element[:id]] = element
         result
@@ -46,17 +45,17 @@ module CMIS
       hash = to_hash
       hash['propertyDefinitions'] = new_defs
 
-      result = connection.execute! ({ cmisaction: 'updateType',
-                                      repositoryId: repository.id,
-                                      type: MultiJson.dump(hash) })
+      result = connection.execute!({ cmisaction: 'updateType',
+                                     repositoryId: repository.id,
+                                     type: JSON.generate(hash) }, opts)
 
       Type.new(result, repository)
     end
 
-    def delete
+    def delete(opts = {})
       connection.execute!({ cmisaction: 'deleteType',
                             repositoryId: repository.id,
-                            typeId: id })
+                            typeId: id }, opts)
     end
 
     def document_type?
@@ -101,6 +100,5 @@ module CMIS
     def to_hash
       @hash
     end
-
   end
 end

data/lib/cmis/version.rb

@@ -1,3 +1,3 @@
 module CMIS
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/readme.md

@@ -10,12 +10,8 @@ Running the tests requires a running CMIS server.
 
 ## TODO
 
-* query properties, not *
-* string / symbol consistency
-* better exceptions and handling
-* headers / params in low level (options)
+* cleanup Connection class
 * facilitate copy between servers (make a flow)
-* improve exists for repo / type
 * caching
 
 ## Contributing

data/spec/document_spec.rb

@@ -14,7 +14,9 @@ describe CMIS::Document do
     new_object = @repo.new_document
     new_object.name = 'doc1'
     new_object.object_type_id = 'cmis:document'
-    new_object.set_content(StringIO.new('content1'), 'text/plain', 'doc1.txt') # set content on detached doc
+    new_object.set_content(stream: StringIO.new('content1'),
+                           mime_type: 'text/plain',
+                           filename: 'doc1.txt')
     doc = new_object.create_in_folder(@repo.root)
     doc.name.should eq 'doc1'
     doc.content_stream_mime_type.should eq 'text/plain'

data/spec/folder_spec.rb

@@ -27,7 +27,9 @@ describe CMIS::Folder do
     new_object = @repo.new_document
     new_object.name = 'doc1'
     new_object.object_type_id = 'cmis:document'
-    new_object.set_content(StringIO.new('apple is a fruit'), 'text/plain', 'apple.txt')
+    new_object.set_content(stream: StringIO.new('apple is a fruit'),
+                           mime_type: 'text/plain',
+                           filename: 'apple.txt')
     object = @repo.root.create(new_object)
     object.should be_a_kind_of CMIS::Document
     object.name.should eq 'doc1'

data/spec/helper.rb

@@ -23,5 +23,5 @@ end
 
 def delete_repository(id)
   META.object(id).delete
-rescue CMIS::CMISRequestError => ex
+rescue CMIS::Exceptions::ObjectNotFound => ex
 end

data/spec/repository_spec.rb

@@ -105,7 +105,7 @@ describe CMIS::Repository do
     it 'create, get, delete type - document' do
       type_id = 'apple'
 
-      type = CMIS::Type.new
+      type = @repo.new_type
       type.id = type_id
       type.local_name = 'apple'
       type.query_name = 'apple'
@@ -136,7 +136,7 @@ describe CMIS::Repository do
                                    queryable: true,
                                    orderable: true)
 
-      @repo.create_type(type)
+      type.create
 
       @repo.type(type_id).tap do |t|
         t.should be_a_kind_of CMIS::Type

data/spec/type_spec.rb

@@ -11,7 +11,7 @@ describe CMIS::Type do
   end
 
   it 'shoud update types' do
-    type = CMIS::Type.new
+    type = @repo.new_type
     type.id = 'apple'
     type.local_name = 'apple'
     type.query_name = 'apple'
@@ -44,7 +44,7 @@ describe CMIS::Type do
       orderable: true
     )
 
-    full_type = @repo.create_type(type)
+    full_type = type.create
 
     new_prop = CMIS::PropertyDefinition.new(
       id: 'taste',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmis-ruby
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -39,20 +39,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +70,7 @@ files:
 - lib/cmis/children.rb
 - lib/cmis/connection.rb
 - lib/cmis/document.rb
+- lib/cmis/exceptions.rb
 - lib/cmis/folder.rb
 - lib/cmis/helpers.rb
 - lib/cmis/item.rb
@@ -139,3 +126,4 @@ test_files:
 - spec/repository_spec.rb
 - spec/server_spec.rb
 - spec/type_spec.rb
+has_rdoc: