attr_uuid 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 203bfad60d62588e004febd0e0da42650e7d5f07
-  data.tar.gz: a97228bf96e15b6016f8e718fa0da4decc9a0078
+  metadata.gz: 51a0b80b942f58b334cbb9458874a24f5e598c84
+  data.tar.gz: 418ae9bd4ca21a79cdeee77914f45a27bff8550b
 SHA512:
-  metadata.gz: 7b2a471a2ca67c0d1085242449b8d7e74d943bd1a3ddfca08dce40598ff8004ec7174c5aa9e3b70e6ebc82f6748d56be2cbb0254cdc5cc02492aa8caf63d9df4
-  data.tar.gz: b653111918be2f358917c557393e9160796b009d367e32a332f5e9eb814b2883e581282270f94a34128e36ba442d7c38ee976658b685e58a9b44dcb6be79f9e4
+  metadata.gz: 998bdb4e35cc4709ac9367ba97f77023049cdd23ccd3999f502bea4bcd90de702b42bebd2e758938390fbe1aae33920224c7dc6e3bf067dcf51c565f58b28524
+  data.tar.gz: a927a2066c26ac3c366276398d99fca182adfaf327ea75a9facb0014f1a3e899dce3d2f4ba502bca7e6f996395050dfe3b20d3d8db0882917a605e211802cdc2

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 gemspec
-gem "json", "~> 1.7.7"
+gem "json", "~> 1.8.3"

data/README.md

@@ -52,10 +52,13 @@ Or install it yourself as:
         user.formatted_id  #=> "9f648b40-fa6e-11e3-a3ac-0800200c9a66"
 
 
-5. `attr_uuid` also adds `.find_by_hex_id` and `.find_by_formatted_id` method to retrive model from data store with an uuid string.
+5. `attr_uuid` also adds `.find_by_hex_id`, `.find_by_formatted_id`, `.find_all_by_hex_id` and `.find_all_by_formatted_id`
+methods to retrive model from data store with an uuid string.
 
         User.find_by_hex_id("337e0576cb664151a2e1e0fc04fb33d1")
         User.find_by_formatted_id("337e0576-cb66-4151-a2e1-e0fc04fb33d1")
+        User.find_all_by_hex_id(["337e0576cb664151a2e1e0fc04fb33d1", "5a038fcdfcd644b5bffa0245c7cfd7fa", "165a33cff2a947549d960d95adfd119a"])
+        User.find_all_by_formatted_id(["337e0576-cb66-4151-a2e1-e0fc04fb33d1", "5a038fcd-fcd6-44b5-bffa-0245c7cfd7fa", "165a33cf-f2a9-4754-9d96-0d95adfd119a"])
 
 ## Contributing
 

data/lib/attr_uuid.rb

@@ -49,6 +49,22 @@ module AttrUuid
 
       if self < ActiveRecord::Base
         (class << self; self end).class_eval do
+          define_method "find_all_by_formatted_#{name}" do |value|
+            begin
+              ids = (Array.try_convert(value) || []).map { |o| UUIDTools::UUID.parse(o).raw }
+              self.where(column_name => ids)
+            rescue
+              return []
+            end
+          end
+          define_method "find_all_by_hex_#{name}" do |value|
+            begin
+              ids = (Array.try_convert(value) || []).map { |o| UUIDTools::UUID.parse_hexdigest(o).raw }
+              self.where(column_name => ids)
+            rescue
+              return []
+            end
+          end
           define_method "find_by_formatted_#{name}" do |value|
             begin
               uuid = UUIDTools::UUID.parse(value)

data/lib/attr_uuid/version.rb

@@ -1,3 +1,3 @@
 module AttrUuid
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/config/database.json.sample

@@ -1,7 +1,7 @@
 {
     "adapter": "mysql2",
-    "username": "user"
-    "password": "password"
+    "username": "user",
+    "password": "password",
     "database": "attr_uuid_test",
     "encoding": "utf8"
 }

data/spec/lib/attr_uuid_spec.rb

@@ -68,9 +68,9 @@ describe AttrUuid do
 
     describe "#formatted_xxx=" do
       it "updates original attribute" do
-        uuid = UUIDTools::UUID.parse("d8354fff-f782-4b86-b4a7-7db46a5426d7")
-        model.formatted_uuid = uuid.to_s
-        expect(model.uuid).to eq uuid.raw
+        o = UUIDTools::UUID.parse("d8354fff-f782-4b86-b4a7-7db46a5426d7")
+        model.formatted_uuid = o.to_s
+        expect(model.uuid).to eq o.raw
       end
     end
 
@@ -87,9 +87,9 @@ describe AttrUuid do
 
     describe "#hex_xxx=" do
       it "updates original attribute" do
-        uuid = UUIDTools::UUID.parse("d8354fff-f782-4b86-b4a7-7db46a5426d7")
-        model.hex_uuid = uuid.hexdigest
-        expect(model.uuid).to eq uuid.raw
+        o = UUIDTools::UUID.parse("d8354fff-f782-4b86-b4a7-7db46a5426d7")
+        model.hex_uuid = o.hexdigest
+        expect(model.uuid).to eq o.raw
       end
     end
   end
@@ -112,24 +112,28 @@ describe AttrUuid do
         it { expect(model.uuid).to be_nil }
       end
 
-      subject(:model) do
-        uuid = UUIDTools::UUID.parse("faea220a-e94e-442c-9ca0-5b39753e3549")
-        Dummy.new {|o| o.uuid = uuid.raw }
+      let(:model) do
+        id = UUIDTools::UUID.parse("faea220a-e94e-442c-9ca0-5b39753e3549")
+        Dummy.new {|o| o.uuid = id.raw }
       end
 
       describe ".attr_uuid" do
+        subject { model }
         it { is_expected.to respond_to :formatted_uuid }
         it { is_expected.to respond_to :formatted_uuid= }
         it { is_expected.to respond_to :hex_uuid }
         it { is_expected.to respond_to :hex_uuid= }
+        it { expect(Dummy).to respond_to :find_all_by_formatted_uuid }
+        it { expect(Dummy).to respond_to :find_all_by_hex_uuid }
         it { expect(Dummy).to respond_to :find_by_formatted_uuid }
         it { expect(Dummy).to respond_to :find_by_hex_uuid }
       end
 
       describe ".find_by_formatted_xxx" do
-        before { model.save! }
         subject(:result) { Dummy.find_by_formatted_uuid(uuid) }
 
+        before { model.save! }
+
         context "when uuid matched" do
           let(:uuid) { "faea220a-e94e-442c-9ca0-5b39753e3549" }
           it { expect(result).to eq model }
@@ -156,6 +160,76 @@ describe AttrUuid do
         end
       end
 
+      describe ".find_all_by_formatted_xxx" do
+        subject(:result) { Dummy.find_all_by_formatted_uuid(uuid) }
+
+        let!(:model1) { Dummy.new {|o| o.uuid = UUIDTools::UUID.parse("faea220a-e94e-442c-9ca0-5b39753e3549").raw }.tap(&:save!) }
+        let!(:model2) { Dummy.new {|o| o.uuid = UUIDTools::UUID.parse("e7a8d36b-9bca-4a82-bebb-5fbd08cac267").raw }.tap(&:save!) }
+        let!(:model3) { Dummy.new {|o| o.uuid = UUIDTools::UUID.parse("fd7d3422-450d-4066-8810-5970281879b4").raw }.tap(&:save!) }
+        let!(:model4) { Dummy.new {|o| o.uuid = UUIDTools::UUID.parse("97fceb6b-db8d-42fb-b842-4b4371f8e795").raw }.tap(&:save!) }
+        let!(:model5) { Dummy.new {|o| o.uuid = UUIDTools::UUID.parse("84ce3004-753f-4667-a9fa-b1177b37d989").raw }.tap(&:save!) }
+
+        context "when uuid matched" do
+          let(:uuid) { ["faea220a-e94e-442c-9ca0-5b39753e3549", "fd7d3422-450d-4066-8810-5970281879b4", "97fceb6b-db8d-42fb-b842-4b4371f8e795" ] }
+          it { expect(result).to eq [model1, model3, model4] }
+        end
+
+        context "when no uuid matched" do
+          let(:uuid) { ["00000000-e94e-442c-9ca0-5b39753e3549"] }
+          it { expect(result).to eq [] }
+        end
+
+        context "when uuid is nil" do
+          let(:uuid) { nil }
+          it { expect(result).to eq [] }
+        end
+
+        context "when uuid isn't String" do
+          let(:uuid) { 1 }
+          it { expect(result).to eq [] }
+        end
+
+        context "when uuid format is invalid" do
+          let(:uuid) { ["invalid"] }
+          it { expect(result).to eq [] }
+        end
+      end
+
+      describe ".find_all_by_hex_xxx" do
+        subject(:result) { Dummy.find_all_by_hex_uuid(uuid) }
+
+        let!(:model1) { Dummy.new {|o| o.uuid = UUIDTools::UUID.parse_hexdigest("faea220ae94e442c9ca05b39753e3549").raw }.tap(&:save!) }
+        let!(:model2) { Dummy.new {|o| o.uuid = UUIDTools::UUID.parse_hexdigest("e7a8d36b9bca4a82bebb5fbd08cac267").raw }.tap(&:save!) }
+        let!(:model3) { Dummy.new {|o| o.uuid = UUIDTools::UUID.parse_hexdigest("fd7d3422450d406688105970281879b4").raw }.tap(&:save!) }
+        let!(:model4) { Dummy.new {|o| o.uuid = UUIDTools::UUID.parse_hexdigest("97fceb6bdb8d42fbb8424b4371f8e795").raw }.tap(&:save!) }
+        let!(:model5) { Dummy.new {|o| o.uuid = UUIDTools::UUID.parse_hexdigest("84ce3004753f4667a9fab1177b37d989").raw }.tap(&:save!) }
+
+        context "when uuid matched" do
+          let(:uuid) { ["faea220ae94e442c9ca05b39753e3549", "fd7d3422450d406688105970281879b4", "97fceb6bdb8d42fbb8424b4371f8e795" ] }
+          it { expect(result).to eq [model1, model3, model4] }
+        end
+
+        context "when no uuid matched" do
+          let(:uuid) { ["00000000e94e442c9ca05b39753e3549"] }
+          it { expect(result).to eq [] }
+        end
+
+        context "when uuid is nil" do
+          let(:uuid) { nil }
+          it { expect(result).to eq [] }
+        end
+
+        context "when uuid isn't String" do
+          let(:uuid) { 1 }
+          it { expect(result).to eq [] }
+        end
+
+        context "when uuid format is invalid" do
+          let(:uuid) { ["invalid"] }
+          it { expect(result).to eq [] }
+        end
+      end
+
       describe ".find_by_hex_xxx" do
         before { model.save! }
         subject(:result) { Dummy.find_by_hex_uuid(uuid) }
@@ -205,8 +279,8 @@ describe AttrUuid do
       end
 
       subject(:model) do
-        uuid = UUIDTools::UUID.parse("faea220a-e94e-442c-9ca0-5b39753e3549")
-        Dummy.new {|o| o.x_uuid = uuid.raw }
+        id = UUIDTools::UUID.parse("faea220a-e94e-442c-9ca0-5b39753e3549")
+        Dummy.new {|o| o.x_uuid = id.raw }
       end
 
       describe ".attr_uuid" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attr_uuid
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Shou Takenaka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2016-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Easy to use binay uuid attribute