uuids 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26ab118cb2345e2661d2db7cd4dfeda6729531b8
-  data.tar.gz: e86f8c257d37ecd12e95d05301f1973ef92bf9d8
+  metadata.gz: b31b167f908d6ec2456b1925dc598826d6a071bc
+  data.tar.gz: a792ea83d4f4d187d64c71915f8068fad8e6a1ba
 SHA512:
-  metadata.gz: 30236a707e43fd13e383659b3b50b3d304ccf26a078d288b07789253c2ae1421114bf6dd37a4adc566305795fd8f823b1431bb8ad8e8e2d0fe7b5ab4a1bd26d0
-  data.tar.gz: 78b2169f231d9a70ec7786a1d7940d7ced442fca689884d42078b6f8dfb08945e4e7944f603cfa9c1e3b6584c79091563f43fe978690adb24b7cf57ac0b18bfe
+  metadata.gz: 4e6a91b697ebca4e978525666048c5c884b120345519dc889f72f307c09942bb9f949fc5314317b2964b2c9f8132d9164316b62bf49e7d318ff0b9b7d7d9e3fc
+  data.tar.gz: 5187b791e2878df7896f4a7d49e9fc742810e398649f95fa5cecab9ecd91cca3fc888d95f22be68f3fe50010eb014f1d5b84ec68208855ae597d9422c5028aa7

data/lib/uuids/version.rb

@@ -1,5 +1,5 @@
 module Uuids
 
   # Current release.
-  VERSION = "4.1.3"
+  VERSION = "4.1.4"
 end

data/spec/support/all/matchers/correspond_to.rb

@@ -0,0 +1,11 @@
+# Checks if an object has method values as in given hash
+#
+#   expect(object).to correspond_to hash
+RSpec::Matchers.define :correspond_to do |hash|
+  match do |object|
+    hash.each do |key, value|
+      expect(object).not_to be_blank
+      expect(object.send key).to eq value
+    end
+  end
+end

data/spec/uuids/bin/uuids_spec.rb

@@ -5,7 +5,7 @@ describe "$ uuids", :sandbox do
 
   describe "install" do
 
-    let!(:root)       { File.expand_path("../../..", __FILE__) }
+    let!(:root)       { File.expand_path("../../../..", __FILE__) }
     let!(:migrations) { Dir["#{ root }/db/migrate/*.rb"] }
 
     describe "without options" do

data/spec/uuids/lib/base_spec.rb

@@ -3,38 +3,44 @@ require "spec_helper"
 module Uuids
   describe Base do
 
+    # Dependencies
+    let(:described_module) { Uuids::Base }
+    let(:uuids_class)      { Uuids::Models::Uuid }
+
     describe ".included" do
 
       context "from non AR class" do
 
         before { class Test; end }
-        after  { begin; Uuids::Base.send :remove_constant, :Test; rescue; end }
+        after  do
+          begin; described_module.send :remove_constant, :Test; rescue; end
+        end
 
         it "fails" do
-          expect { Test.include Uuids::Base }.to raise_error
+          expect { Test.include described_module }.to raise_error
         end
       end
 
       context "from AR model" do
 
         it "doesn't fail" do
-          expect { City.include Uuids::Base }.not_to raise_error
+          expect { City.include described_module }.not_to raise_error
         end
       end
     end
 
     describe ".has_uuids" do
 
-      # For running this specification, the City AR model prepared in the
-      # `spec dummy/app/models/item.rb`. The model included Uuids::Base.
+      # For this specification, the City AR model has been prepared in the
+      # `spec dummy/app/models/city.rb`. The model included Uuids::Base.
       before  { City.send :has_uuids }
       subject { City.new }
 
       it "defines the #uuids attribute" do
         subject.uuids.new value: SecureRandom.uuid
         subject.save!
-        expect(Uuids::Models::Uuid.first.try(:record)).to eq subject
-        expect(subject.uuids.first).to eq Uuids::Models::Uuid.first
+        expect(uuids_class.first.try(:record)).to eq subject
+        expect(subject.uuids.first).to eq uuids_class.first
       end
 
       it "defines the #uuid method" do
@@ -46,13 +52,13 @@ module Uuids
       it "defines the #uuid= method" do
         value = "3ea8fd89-232f-4ed1-90b5-743da173cd7d"
         subject.uuid = value
-        expect(subject.uuids.map(&:value)).to be_include(value)
+        expect(subject.uuids.map(&:value)).to include(value)
       end
 
       it "defines the #uuids= method" do
         value = "3ea8fd89-232f-4ed1-90b5-743da173cd7d"
         subject.uuids = [value]
-        expect(subject.uuids.map(&:value)).to be_include(value)
+        expect(subject.uuids.map(&:value)).to include(value)
       end
 
       it "defines +by_uuid+ class scope" do
@@ -64,7 +70,7 @@ module Uuids
       end
 
       it "creates the first uuid by default" do
-        expect(subject.uuid).not_to be_blank
+        expect(subject.uuid).to be_present
       end
 
       it "requires the #uuids attribute" do
@@ -119,8 +125,7 @@ module Uuids
         end
 
         it "sets the object" do
-          expect { subject.state = state }
-            .to change { subject.state }.to state
+          expect { subject.state = state }.to change { subject.state }.to state
         end
 
         it "sets the object uuid" do
@@ -130,14 +135,12 @@ module Uuids
 
         it "resets the object" do
           subject.state = state
-          expect { subject.state = nil }
-            .to change { subject.state }.to nil
+          expect { subject.state = nil }.to change { subject.state }.to nil
         end
 
         it "resets the object uuid" do
           subject.state = state
-          expect { subject.state = nil }
-            .to change { subject.state_uuid }.to nil
+          expect { subject.state = nil }.to change { subject.state_uuid }.to nil
         end
 
         it "sets the object by uuid" do

data/spec/uuids/models/uuid_spec.rb

@@ -3,26 +3,26 @@ require "spec_helper"
 module Uuids::Models
   describe Uuid do
 
+    let!(:value) { SecureRandom.uuid }
+
     describe "#value" do
 
       before { subject.record = create(:record) }
 
       it "can be assigned manually" do
-        value = SecureRandom.uuid
         subject.value = value
         subject.save!
         expect(subject.reload.value).to eq value
       end
 
       it "assigned by default" do
-        expect(subject.value).not_to be_blank
+        expect(subject.value).to be_present
       end
     end
 
     describe "#value=" do
 
       let!(:subject) { build :uuid }
-      let!(:value)   { SecureRandom.uuid }
 
       it "sets #value before creation" do
         subject.value = value
@@ -57,7 +57,7 @@ module Uuids::Models
       end
 
       it "fails with wrong value" do
-        subject.value = "not a valid uuid"
+        subject.value = "wrong"
         expect(subject).not_to be_valid
       end
     end

data/spec/uuids/services/add_spec.rb

@@ -4,18 +4,28 @@ require "spec_helper"
 module Uuids::Services
   describe Add do
 
+    # Models dependency injection
+    let(:uuids_class) { Uuids::Models::Uuid }
+
+    # Parameters by default
     let!(:record) { create :record }
     let!(:params) do
       {
         "record" => record,
-        "value"  => "47027502-4574-3434-0547-032453443434",
+        "value"  => SecureRandom.uuid,
         "wrong"  => "wrong"
       }
     end
 
-    describe ".new" do
+    # The service and its listener
+    let(:listener) { spy "listener" }
+    subject do
+      service = described_class.new params
+      service.subscribe listener
+      service
+    end
 
-      subject { Add.new params }
+    describe ".new" do
 
       it "sets #record" do
         expect(subject.record).to eq params["record"]
@@ -32,41 +42,35 @@ module Uuids::Services
 
     describe "#run" do
 
-      let(:listener) { double "listener" }
-
       context "with valid params" do
 
-        subject { Add.new params }
-
         it "adds a uuid to the record" do
-          expect { subject.run }.to change { Uuids::Models::Uuid.count }.by 1
-          uuid = Uuids::Models::Uuid.last
-          expect(uuid.record).to eq params["record"]
-          expect(uuid.value).to  eq params["value"]
+          expect { subject.run }.to change { uuids_class.count }.by 1
+          expect(uuids_class.last).to correspond_to subject.params
         end
 
         it "publishes :created" do
-          subject.subscribe listener
-          expect(listener).to receive(:created) do |uuid, messages|
-            expect(uuid).to eq Uuids::Models::Uuid.last
-            expect(messages).not_to be_blank
-          end
           subject.run
+          expect(listener).to have_received(:created) do |uuid, messages|
+            expect(uuid).to eq uuids_class.last
+            expect(messages).to be_present
+          end
         end
       end
 
       context "with a wrong value" do
 
-        subject { Add.new params.merge(value: "wrong") }
+        before { params.merge! "value" => "wrong" }
 
         it "doesn't create a uuid" do
-          expect { subject.run }.not_to change { Uuids::Models::Uuid.all }
+          expect { subject.run }.not_to change { uuids_class.all }
         end
 
         it "publishes :error" do
-          subject.subscribe listener
-          expect(listener).to receive(:error)
           subject.run
+          expect(listener).to have_received(:error) do |messages|
+            expect(messages).to be_present
+          end
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuids
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - Andrew Kozin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hexx-active_record
@@ -244,6 +244,7 @@ files:
 - spec/support/all/config/garbage_collection.rb
 - spec/support/all/config/random_order.rb
 - spec/support/all/config/rspec.rb
+- spec/support/all/matchers/correspond_to.rb
 - spec/support/development/config/sandbox.rb
 - spec/support/development/config/timecop.rb
 - spec/support/development/helpers/capture_stdout.rb
@@ -317,6 +318,7 @@ test_files:
 - spec/support/all/config/focus.rb
 - spec/support/all/config/random_order.rb
 - spec/support/all/config/rspec.rb
+- spec/support/all/matchers/correspond_to.rb
 - spec/support/runtime/config/i18n.rb
 - spec/support/runtime/config/factory_girl.rb
 - spec/support/runtime/config/database_cleaner.rb