cmis-ruby 0.5.23 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 856289cf9e1f5487a8468bbdb5ce0840e871eb9f
-  data.tar.gz: 9a110ca5f85e0801ba036f5ee2817e0ee9ee934e
+  metadata.gz: 2db6a73373ddd663cb964d85058ec38e53f6ef75
+  data.tar.gz: e8ad9f1d4ccee4a870e0c524f01613512442b708
 SHA512:
-  metadata.gz: 34c6c4229ea641c199f36c5582c5ecf11c7fa1f0b5093aa402d4a3a4cc0effedb5d5f6187fe34a319a5af89dbe1315c960c21e2750a324bd164910459213eead
-  data.tar.gz: 7be66e7907459373b7f63289eba6a4a50b80e5a366a5a94f557f066626ed5f021c3ccb73cea06d222a6a776f839b25cac5f0f6565033913de20730d61314972f
+  metadata.gz: 5af30254eaa230833c5dceda3b51204161dbbd31473e3a9df3bc8f19e1d4e86052e8010bd54695f5668570400501c626a0218e4641ec44449050fbb831000799
+  data.tar.gz: 562dd6b72efad5db6b7e2caabb3428112975de9404257ac094ec5c6a9cce8d27bf6c76ce99d20c7f94dbfe94e1475d3c12b27b1ebec96417da4cb3fb5d530bcf

data/lib/cmis/utils.rb

@@ -15,18 +15,12 @@ module CMIS
       end
 
       def build
-        sec_types = @properties.select { |k, v| v.is_a? Hash }.keys
-        statement = "select #{@queried_properties} from #{@type_id}"
-        if sec_types.first # TODO Support multiple secondary types
-          statement << " join #{sec_types.first} as X on cmis:objectId = X.cmis:objectId"
+        @type_id = Array(@type_id)
+        statement = "select #{@queried_properties} from #{@type_id[0]}"
+        if @type_id[1]
+          statement << " join #{@type_id[1]} 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 ')
+        clause = @properties.map { |k, v| build_predicate(k, v) }.join(' and ')
         statement << " where #{clause}" unless clause.empty?
         statement
       end

data/lib/cmis/version.rb

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

data/spec/cmis-ruby/utils_spec.rb

@@ -11,8 +11,8 @@ module CMIS
         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'"
+        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', 'foo'], a: 'b', c: 'd', 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.23
+  version: 0.5.24
 platform: ruby
 authors:
 - Kenneth Geerts