cmis-ruby 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83faf5a97be0875c1afefae8b00d311f86f6a5b6
-  data.tar.gz: 7501d5a56022f92bb477a042eedf7e7a95a465c5
+  metadata.gz: f22bda5733d214e848507a528d82316c27c56081
+  data.tar.gz: d04542e5800a97e83eab03892d61c51a00e1f0b8
 SHA512:
-  metadata.gz: 1fbb205a9cfec288d5b07ed14d3ea8716deb5c68df6dcc9ae8e3bcc7e16aee6fc5716c5cf4e11a1d589c047f4d7077c0c39b5ff4cd1d6f2249707b2d8154a8bf
-  data.tar.gz: 50235d699f0deeb729797ed638c404274baf4ab733657583a4d6029c6d0dd874f20ed0e3e474a3aafef09873ce238f62099d1819a4544497f4b08bfae3ae6671
+  metadata.gz: 665936fb9b4a4f642783e9c9d80420516177c60f5eed2051a2ac6754d3d21d251e90803f317d482262eae1ad11fb4b09b10bc5bd0f8d42718cfc511c3e9d41d5
+  data.tar.gz: 13d49731f9411132253f1f2b117bed2e498f7f0662547766c5ae779807153f6a320fc99c2c76c8a95ecbe3d7370f44b8248b739a46be11c85a811310b2aa03eb

data/lib/cmis/repository.rb

@@ -1,4 +1,5 @@
 require 'cmis/query'
+require 'cmis/utils'
 require 'json'
 
 module CMIS
@@ -108,13 +109,13 @@ module CMIS
 
     def find_object(type_id, properties = {}, opts = {})
       opts.merge!(page_size: 1)
-      statement = construct_statement(type_id, properties)
+      statement = Utils.build_query_statement(type_id, properties)
       query(statement, opts).results.first
     end
 
     def count_objects(type_id, properties = {}, opts = {})
       opts.merge!(page_size: 0)
-      statement = construct_statement(type_id, properties)
+      statement = Utils.build_query_statement(type_id, properties)
       query(statement, opts).total
     end
 
@@ -124,25 +125,6 @@ module CMIS
 
     private
 
-    def construct_statement(type_id, properties)
-      statement = "select * from #{type_id}"
-      clause = properties.map { |k, v| "#{k}=#{normalize(v)}" }.join(' and ')
-      statement << " where #{clause}" unless clause.empty?
-      statement
-    end
-
-    def normalize(value)
-      if value.respond_to?(:strftime)
-        value = value.strftime('%Y-%m-%dT%H:%M:%S.%L')
-        "TIMESTAMP '#{value}'"
-      else
-        value = value.to_s
-        value.gsub!(/\\/, Regexp.escape('\\\\'))
-        value.gsub!(/'/, Regexp.escape('\\\''))
-        "'#{value}'"
-      end
-    end
-
     def construct_types(a)
       types = []
       a.each do |t|

data/lib/cmis/utils.rb

@@ -0,0 +1,37 @@
+module CMIS
+  module Utils
+    module_function
+
+    def build_query_statement(type_id, properties)
+      QueryStatementBuilder.new(type_id, properties).build
+    end
+
+    class QueryStatementBuilder
+      def initialize(type_id, properties)
+        @type_id = type_id
+        @properties = properties
+      end
+
+      def build
+        statement = "select * from #{@type_id}"
+        clause = @properties.map { |k, v| "#{k}=#{normalize(v)}" }.join(' and ')
+        statement << " where #{clause}" unless clause.empty?
+        statement
+      end
+
+      private
+
+      def normalize(value)
+        if value.respond_to?(:strftime)
+          value = value.strftime('%Y-%m-%dT%H:%M:%S.%L')
+          "TIMESTAMP '#{value}'"
+        else
+          value = value.to_s
+          value.gsub!(/\\/, Regexp.escape('\\\\'))
+          value.gsub!(/'/, Regexp.escape('\\\''))
+          "'#{value}'"
+        end
+      end
+    end
+  end
+end

data/lib/cmis/version.rb

@@ -1,3 +1,3 @@
 module CMIS
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/spec/cmis-ruby/repository_spec.rb

@@ -16,7 +16,7 @@ module CMIS
       expect(repository.id).to eq(repository_id)
     end
 
-    it 'has non null fields' do
+    it 'has non nil fields' do
       expect(repository.id)              .to_not be_nil
       expect(repository.name)            .to_not be_nil
       expect(repository.product_version) .to_not be_nil
@@ -46,6 +46,17 @@ module CMIS
       end
     end
 
+    describe '#find_object' do
+      it 'returns the object when it is present' do
+        object = repository.find_object('cmis:folder', 'cmis:name' => 'root')
+        expect(object).to be_a(CMIS::Folder)
+      end
+      it 'returns nil when it is not present' do
+        object = repository.find_object('cmis:folder', 'cmis:name' => 'rat')
+        expect(object).to be_nil
+      end
+    end
+
     describe '#count_objects' do
       it 'returns 1 folder (which is the root folder)' do
         count = repository.count_objects('cmis:folder')

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'coveralls'
 Coveralls.wear!
 
-require 'cmis-ruby'
+require 'cmis'
 require 'erb'
 require 'yaml'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -75,6 +75,7 @@ files:
 - lib/cmis/repository.rb
 - lib/cmis/server.rb
 - lib/cmis/type.rb
+- lib/cmis/utils.rb
 - lib/cmis/version.rb
 - lib/ext/all.rb
 - lib/ext/hash/keys.rb