odata-model 0.5.15 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daf0d3e0301711dd16f05d1c7b9fcb29661ad8d0
-  data.tar.gz: dc1dd7e060dd3e0a266087a93ebd3af7f0762ab3
+  metadata.gz: 01e34e0a18e5eadb5b2b85752b06cb819ce8df8f
+  data.tar.gz: b20729b4a93638e07e055e5d78f7f9f8e44f8632
 SHA512:
-  metadata.gz: e3b0fad1dadabc01cd4ee52ce597cb8189e582f00c054a385888a1acc13c7cfb0be1b94454d809f6c34f54e36195d62abd6142fafdaf0f54a98d2b0926a88e42
-  data.tar.gz: 582349ba8daee47b23e8d12c87cecda58237dcdaf5ff3e0130af8fbf49a6775cfa8248c7dcc99958b5ff595a9c5a16746ba3909b520aa607b79cd2b2dcfc1819
+  metadata.gz: 327e539a3ae432ddcac979044933aa22e94bdc978130967ee51327ab7652214ffbaf4ac524c57ba302e1936457120b22d54bd6d6020d25b1245cfff9596f1503
+  data.tar.gz: 4214282db7150b1e235f99e8b91c8b453549bb89390aae0af2db2dc6cb404a597725fdb59d027a5d1e71a109c08cfab93fff2d799a17a5cfe38b9a71e39a1223

data/lib/odata/model/query.rb

@@ -11,11 +11,11 @@ module OData
       # Methods mixed in at the class level.
       module ClassMethods
         # Starts a query chain with a filter for a given property's name.
-        # @param property_name [to_sym]
+        # @param property_name [Hash,to_sym]
         # @return [OData::Model::Query]
-        def where(property_name)
+        def where(arguments)
           query_proxy = OData::Model::QueryProxy.new(self)
-          query_proxy.where(property_name.to_sym)
+          query_proxy.where(arguments)
         end
 
         # Starts a query chain with a limit to entities returned.

data/lib/odata/model/query_proxy.rb

@@ -18,11 +18,18 @@ module OData
       end
 
       # Sets up a new criteria for filters for the given property name.
-      # @param property_name [Symbol]
+      # @param argument [Hash,to_sym]
       # @return [self]
       # @api private
-      def where(property_name)
-        @last_criteria = query[target.property_map[property_name]]
+      def where(argument)
+        if argument.is_a?(Hash)
+          argument.each do |property_name, value|
+            self.where(property_name.to_sym).is(eq: value)
+          end
+        else
+          @last_criteria = query[target.property_map[argument.to_sym]]
+        end
+
         self
       end
 

data/lib/odata/model/version.rb

@@ -1,5 +1,5 @@
 module OData
   module Model
-    VERSION = '0.5.15'
+    VERSION = '0.5.16'
   end
 end

data/spec/model/query_proxy_spec.rb

@@ -13,13 +13,28 @@ describe OData::Model::QueryProxy do
 
   it { expect(subject).to respond_to(:where) }
   describe '#where' do
-    let(:subject) { query_proxy.where(:name) }
+    context 'with a symbol' do
+      let(:subject) { query_proxy.where(:name) }
 
-    it { expect(subject).to be_a(OData::Model::QueryProxy) }
+      it { expect(subject).to be_a(OData::Model::QueryProxy) }
+
+      it 'sets up last criteria properly' do
+        expect(subject.last_criteria).to be_a(OData::Query::Criteria)
+        expect(subject.last_criteria.property).to eq(Product.property_map[:name])
+      end
+    end
 
-    it 'sets up last criteria properly' do
-      expect(subject.last_criteria).to be_a(OData::Query::Criteria)
-      expect(subject.last_criteria.property).to eq(Product.property_map[:name])
+    context 'with a hash' do
+      let(:subject) { query_proxy.where(name: 'Bread') }
+
+      it { expect(subject).to be_a(OData::Model::QueryProxy) }
+
+      it 'sets up last criteria properly' do
+        expect(subject.last_criteria).to be_a(OData::Query::Criteria)
+        expect(subject.last_criteria.property).to eq(Product.property_map[:name])
+        expect(subject.last_criteria.operator).to eq(:eq)
+        expect(subject.last_criteria.value).to eq('Bread')
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odata-model
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.5.16
 platform: ruby
 authors:
 - James Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler