ehon 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cfe34ca1049b454d6f6c9ad5901e9655f2154c4
-  data.tar.gz: 3a036d5f298836e064c98d21d6a87f386797dbef
+  metadata.gz: f9c13a185fe95b0d199bf1410fbe6fe91dc802c7
+  data.tar.gz: ad8065fb8d46742bb40a972d5d638ea69c91170b
 SHA512:
-  metadata.gz: 0e9d45b8c90d1c7d628fab88eadbcfd87f277fe3297b2f60b8c09fcf02038d60312dde8fd7ed14cf52de034860ae5a0537a9a12aba11aec9182992d53adeb6a9
-  data.tar.gz: 827789868d73ed13b1f6e238b010cb9824ee9bcde60e60f8bffbf988a0f5051b8b1340bc9eea684abc212ccf526c4102bdf17b29a6d21d53933282c11f67df3f
+  metadata.gz: d234f5a6feb3ac2d85071a9e89135b87e30094ce7df8e09a1564d6cd01327a49c5e18880004b067bdf5d0dc73a074081543c6889285468ec99d179b3b1d478a6
+  data.tar.gz: 0761da4e00b3feae6c837a60cc3a9ead44450e2ea01c62e3cba202a6fd5c3dc6dadebbfa8a506e1c4a03633237d555e4c4ebc0d16bed1ea9b40d4fd09cc9b7d1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.3
+
+* Add multiple returning item support
+
 ## 0.1.2
 
 * Add create_{accessors,readers,writers}! method

data/lib/ehon.rb

@@ -67,11 +67,16 @@ module Ehon
       queries.flatten!
       findeds = queries.map {|query|
         next self.contents[query] unless query.is_a?(Hash)
-        self.contents.values.find {|instance|
+        self.contents.values.select {|instance|
           query.all? {|key, value| instance.read_attribute(key) == value }
         }
-      }.compact
-      queries.size == 1 ? findeds.first : findeds
+      }.flatten.compact
+      single = if queries.any? {|query| query.is_a?(Hash) }
+        queries.size == 1 && findeds.size <= 1
+      else
+        queries.size == 1
+      end
+      single ? findeds.first : findeds
     end
     alias [] find
 

data/lib/ehon/version.rb

@@ -1,3 +1,3 @@
 module Ehon
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/ehon_spec.rb

@@ -220,6 +220,7 @@ describe Ehon do
       subject.enum 1,   name: 'potion',      value: 5
       subject.enum 2,   name: 'high potion', value: 10
       subject.enum '3', name: 'scroll'
+      subject.enum 4,   name: 'stone',       value: 5
     end
 
     context 'with key' do
@@ -255,8 +256,8 @@ describe Ehon do
         expect(finded.map(&:name)).to eq(['potion', 'high potion'])
       end
 
-      it 'find with id [4, 8] should return empty array' do
-        finded = subject.find([4, 8])
+      it 'find with id [5, 8] should return empty array' do
+        finded = subject.find([5, 8])
         expect(finded).to eq([])
       end
     end
@@ -267,9 +268,9 @@ describe Ehon do
         expect(finded.id).to eq(2)
       end
 
-      it "find with `{value: 5}` should return item id 1" do
-        finded = subject.find(value: 5)
-        expect(finded.id).to eq(1)
+      it "find with `{value: 10}` should return item id 1" do
+        finded = subject.find(value: 10)
+        expect(finded.id).to eq(2)
       end
 
       it "find with `{id: '3'}` should return item id '3'" do
@@ -282,6 +283,11 @@ describe Ehon do
         expect(finded).to be_nil
       end
 
+      it 'find with `{value: 5}` should return 2 items' do
+        finded = subject.find(value: 5)
+        expect(finded.size).to eq(2)
+      end
+
       context 'AND search' do
         it "find with `{name: 'potion', value: 5}` should return item id 1" do
           finded = subject.find(name: 'potion', value: 5)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ehon
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tomohiro Nishimura