cmis-ruby 0.5.22 → 0.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47f171c85515c4c795738a660fb29b2527d35d08
-  data.tar.gz: c32a9251c03471ffd630d6decc55442bb8485f18
+  metadata.gz: 856289cf9e1f5487a8468bbdb5ce0840e871eb9f
+  data.tar.gz: 9a110ca5f85e0801ba036f5ee2817e0ee9ee934e
 SHA512:
-  metadata.gz: ab5378d827738725ed2e1f4e1c3fde09e5f36cb34f55e09f5969127da3a42a905e1bf45df9de37e507254d2dcd36e8b32614c8f11bb96e0e5e8f3a08d99ae51c
-  data.tar.gz: 1fa6e27d539787bfd05004d790f397d14d1ef800c6dc30c1af8ef5de62fe4a5e32a6238991a9db479dffbae16115b42ecac390cb65875dbd2c518a0c31d90d45
+  metadata.gz: 34c6c4229ea641c199f36c5582c5ecf11c7fa1f0b5093aa402d4a3a4cc0effedb5d5f6187fe34a319a5af89dbe1315c960c21e2750a324bd164910459213eead
+  data.tar.gz: 7be66e7907459373b7f63289eba6a4a50b80e5a366a5a94f557f066626ed5f021c3ccb73cea06d222a6a776f839b25cac5f0f6565033913de20730d61314972f

data/lib/cmis/connection/request_modifier.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'date'
 
 module CMIS
   class Connection

data/lib/cmis/utils.rb

@@ -15,8 +15,18 @@ module CMIS
       end
 
       def build
+        sec_types = @properties.select { |k, v| v.is_a? Hash }.keys
         statement = "select #{@queried_properties} from #{@type_id}"
-        clause = @properties.map { |k, v| build_predicate(k, v) }.join(' and ')
+        if sec_types.first # TODO Support multiple secondary types
+          statement << " join #{sec_types.first} as X on cmis:objectId = X.cmis:objectId"
+        end
+        clause = @properties.map do |k, v|
+          if v.is_a? Hash
+            v.map { |kk, vv| build_predicate(kk, vv) }
+          else
+            build_predicate(k, v)
+          end
+        end.flatten.join(' and ')
         statement << " where #{clause}" unless clause.empty?
         statement
       end

data/lib/cmis/version.rb

@@ -1,3 +1,3 @@
 module CMIS
-  VERSION = '0.5.22'
+  VERSION = '0.5.23'
 end

data/spec/cmis-ruby/utils_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module CMIS
+  describe Utils do
+    describe '#build_query_statement' do
+      def qs(*args)
+        CMIS::Utils.build_query_statement(*args)
+      end
+
+      it 'builds the correct query statement' do
+        expect(qs('T', {})).to eq 'select * from T'
+        expect(qs('T', foo: 'bar')).to eq "select * from T where foo = 'bar'"
+        expect(qs('T', bar: 'baz', pif: 'poef')).to eq "select * from T where bar = 'baz' and pif = 'poef'"
+        expect(qs('T', foo: { bar: 'baz', pif: 'poef' })).to eq "select * from T join foo as X on cmis:objectId = X.cmis:objectId where bar = 'baz' and pif = 'poef'"
+        expect(qs('T', a: 'b', c: 'd', foo: { bar: 'baz', pif: 'poef' })).to eq "select * from T join foo as X on cmis:objectId = X.cmis:objectId where a = 'b' and c = 'd' and bar = 'baz' and pif = 'poef'"
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.22
+  version: 0.5.23
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -89,6 +89,7 @@ files:
 - spec/cmis-ruby/relationship_spec.rb
 - spec/cmis-ruby/repository_spec.rb
 - spec/cmis-ruby/server_spec.rb
+- spec/cmis-ruby/utils_spec.rb
 - spec/config.yml
 - spec/rspec.opts
 - spec/spec_helper.rb
@@ -124,6 +125,7 @@ test_files:
 - spec/cmis-ruby/relationship_spec.rb
 - spec/cmis-ruby/repository_spec.rb
 - spec/cmis-ruby/server_spec.rb
+- spec/cmis-ruby/utils_spec.rb
 - spec/config.yml
 - spec/rspec.opts
 - spec/spec_helper.rb