frozen_record 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ea4f7773d19e5117d8b6f23c0d084f69d9b9536
-  data.tar.gz: 55b940e5665ae50fbde6f2a39ea5cd3ef5a441f1
+  metadata.gz: 3d4e63aa52d9052aae870362fdf7fdb9694b9b7a
+  data.tar.gz: e9c04cee1e8f9d9d9fa092210fd8136ca511020f
 SHA512:
-  metadata.gz: f0bd1f71685d2bac36df3311bf9b8d97697d755eb910a7c7903a64add5543f51b98d975f99813c4c9aa8d2df7c8968f040e28f5478af061469fb964282e06d08
-  data.tar.gz: bc8c7766b4100563913f824bd6cb2e95e75439eb8a20cec2ad204195e48b1c8916dc17fcc61f7e9a81a35e0c5b5eef6095477893cf0cd573dc950f1c9a42526f
+  metadata.gz: 267fb24b52944b467872711210dd37813fe47076a0115524194c004c2dfcb8b1f6119bd883aa6d3a0d298864f8dda4b51e4eaa0bf07ed28e857e16c4ea5c0616
+  data.tar.gz: 2d843d62ac21f9541bdff32b988b2830bbf496c754027555947d0c9c6ad515a4d4a52158f283737d90c0f9b51d4bb8e77e875292d3f4aeb865c5b350a53834bb

data/lib/frozen_record/scope.rb

@@ -139,8 +139,8 @@ module FrozenRecord
       return records if @where_values.empty? && @where_not_values.empty?
 
       records.select do |record|
-        @where_values.all? { |attr, value| record[attr] == value } &&
-        @where_not_values.all? { |attr, value| record[attr] != value }
+        @where_values.all? { |attr, value| compare_value(record[attr], value) } &&
+        @where_not_values.all? { |attr, value| !compare_value(record[attr], value) }
       end
     end
 
@@ -172,7 +172,7 @@ module FrozenRecord
 
     def method_missing(method_name, *args, &block)
       if array_delegable?(method_name)
-        to_a.public_send(method_name, *args, &block) 
+        to_a.public_send(method_name, *args, &block)
       elsif @klass.respond_to?(method_name)
         delegate_to_class(method_name, *args, &block)
       else
@@ -215,5 +215,10 @@ module FrozenRecord
       self
     end
 
+    private
+    def compare_value(actual, requested)
+      return actual == requested unless requested.is_a?(Array) || requested.is_a?(Range)
+      requested.include?(actual)
+    end
   end
 end

data/lib/frozen_record/version.rb

@@ -1,3 +1,3 @@
 module FrozenRecord
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/frozen_record_spec.rb

@@ -64,35 +64,35 @@ describe FrozenRecord::Base do
     let(:present) { Country.new(id: 42, name: 'Groland', nato: true, king: Object.new) }
 
     it 'considers `0` as missing' do
-      expect(blank.id?).to be_false
+      expect(blank.id?).to be false
     end
 
     it 'considers `""` as missing' do
-      expect(blank.name?).to be_false
+      expect(blank.name?).to be false
     end
 
     it 'considers `false` as missing' do
-      expect(blank.nato?).to be_false
+      expect(blank.nato?).to be false
     end
 
     it 'considers `nil` as missing' do
-      expect(blank.king?).to be_false
+      expect(blank.king?).to be false
     end
 
     it 'considers other numbers than `0` as present' do
-      expect(present.id?).to be_true
+      expect(present.id?).to be true
     end
 
     it 'considers other strings than `""` as present' do
-      expect(present.name?).to be_true
+      expect(present.name?).to be true
     end
 
     it 'considers `true` as present' do
-      expect(present.nato?).to be_true
+      expect(present.nato?).to be true
     end
 
     it 'considers not `nil` objects as present' do
-      expect(present.king?).to be_true
+      expect(present.king?).to be true
     end
 
   end

data/spec/scope_spec.rb

@@ -151,7 +151,17 @@ describe 'querying' do
 
     it 'is chainable' do
       countries = Country.where(name: 'France').where(id: 1)
-      expect(countries).to be_empty
+      expect(countries.length).to be == 0
+    end
+
+    it 'can be used with arrays' do
+      countries = Country.where(id: [1,2])
+      expect(countries.length).to be == 2
+    end
+
+    it 'can be used with ranges' do
+      countries = Country.where(id: (1..2))
+      expect(countries.length).to be == 2
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frozen_record
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord like interface to read only access and query static YAML files