uuids 4.1.7 → 4.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f2013e59ef6e2a13d044673bae11166eb4af94c
-  data.tar.gz: 04cc1fff4fad8d482a81fdbf0877125c95e6b4e1
+  metadata.gz: 13e36a1b5f35a339e4111da9623e53eec0009ebe
+  data.tar.gz: 629d838eb2a302cdb12cc45f247b81105eb5ee07
 SHA512:
-  metadata.gz: 3728db38cef371562e26f03cc68a61ac576670fac93c4b279b6ce17d24c832e124fae0f51dcc077ee24c1780b38851e7ffc0c2989671ec7d80bef535a407fdeb
-  data.tar.gz: 74b3916cc3b38b5d59f2f4f5522751425890a00493d3aec31a6859f3a86ceadb89760422824e42ac2656f9a28280fb71557da949ffd0748eaacdac5ea0566257
+  metadata.gz: e04939b2fc5a1266dfecdd1e9d6cfd7ad07e42c7a0eb8e7e3d594598be53f37ead9424278f9f90cf1c4032a9c5236d26fe5b8e15af4cfc7bc30f0d086c6ae1f0
+  data.tar.gz: 45fc2caa49c7352dac77163c7757310cf56476b08933335575fafb11841ec01c8f21112d3452a089fdd43bf00682fd2832c262776318c1cd2c5b8a1883c35ff2

data/README.rdoc

@@ -125,7 +125,7 @@ all object's UUIDs to another record in advance.
     class Street < ActiveRecord::Base
       include Uuids::Base
 
-      belongs_by_uuid_to :city, class: City
+      belongs_by_uuid_to :city
     end
 
 This will add both getter and setter for the attribute:

data/lib/uuids/base/belongs_to.rb

@@ -9,7 +9,7 @@ module Uuids
     #   city = City.new
     #   city.respond_to? :state   # => true
     #   city.respond_to? :state=  # => true
-    class BelongsTo < Struct.new(:klass, :name, :model)
+    class BelongsTo < Struct.new(:klass, :name)
 
       # @api hide
       # @!attribute klass
@@ -21,11 +21,6 @@ module Uuids
       # The name of the attribute to be added.
       # @return [String, Symbol] The name.
 
-      # @api hide
-      # @!attribute model
-      # The model to be referred by uuid.
-      # @return [ActiveRecord::Base] The model class to be referred to.
-
       # @api hide
       # @!attribute [r] class_name
       # The name of the {#klass} constant.
@@ -34,14 +29,6 @@ module Uuids
         @class_name ||= klass.name
       end
 
-      # @api hide
-      # @!attribute [r] model_name
-      # The name of the {#model} constant.
-      # @return [String] The {#model} name.
-      def model_name
-        @model_name ||= model.name
-      end
-
       # @api hide
       # @!attribute [r] model_name
       # The name of the {#klass} db table column to store reference to the
@@ -57,11 +44,9 @@ module Uuids
       # @param [ActiveRecord::Base] klass The model to add attribute to.
       #   Should have a corresponding column for reference by uuid.
       # @param [String, Symbol] name The name of the attribute to be added.
-      # @param [ActiveRecord::Base] model The model to be referred by uuid.
-      #   Should include the <tt>Uuids::Base</tt> module.
       # @raise (see Uuids::Base::BelongsTo#add)
-      def self.add(klass, name, model)
-        new(klass, name, model).add
+      def self.add(klass, name)
+        new(klass, name).add
       end
 
       # @api hide
@@ -71,7 +56,6 @@ module Uuids
       # @raise [NotImplementedError] if the {#klass} doesn't have the
       #   correspondint {#column_name} column.
       def add
-        check_model
         check_column
         add_getter
         add_setter
@@ -79,12 +63,6 @@ module Uuids
 
       private
 
-      def check_model
-        return if model.ancestors.include? Uuids::Base
-        fail TypeError
-          .new "#{ model_name } class doesn't include the Uuids::Base module"
-      end
-
       def check_column
         return if klass.attribute_names.include? column_name
         fail NotImplementedError
@@ -99,6 +77,10 @@ module Uuids
         klass.class_eval setter
       end
 
+      def uuids
+        "Uuids::Models::Uuid"
+      end
+
       def getter
         "def #{ name };
            uuid = read_attribute :#{ column_name };
@@ -106,14 +88,13 @@ module Uuids
            if Array(@#{ name }.try(:uuids)).map(&:value).include? uuid;
              @#{ name };
            else;
-             @#{ name } = #{ model_name }.by_uuid(uuid).includes(:uuids).first;
+             @#{ name } = #{ uuids }.where(value: uuid).first.try :record;
            end;
          end"
       end
 
       def setter
         "def #{ name }=(value);
-           fail TypeError unless value.nil? || value.is_a?(#{ model_name });
            write_attribute :#{ column_name }, value.try(:uuid);
            #{ name };
          end"

data/lib/uuids/base.rb

@@ -74,9 +74,9 @@ module Uuids
       # @param [Hash] options The options for the association.
       # @option options [Class] :class The model of the attribute.
       # @option options [String] :class_name The name of the attribute's model.
-      def belongs_by_uuid_to(name, options = {})
-        class_name = options[:class] || options[:class_name].constantize
-        BelongsTo.add self, name, class_name
+      def belongs_by_uuid_to(name, opts = nil)
+        warn "[DEPRECATION] .belongs_by_uuid_to options are deprecated" if opts
+        BelongsTo.add self, name
       end
     end
 

data/lib/uuids/version.rb

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

data/spec/uuids/lib/base/belongs_by_uuid_to_spec.rb

@@ -0,0 +1,73 @@
+require "spec_helper"
+
+module Uuids
+  describe "Base.belongs_by_uuid_to" do
+
+    context "when a corresponding _uuid column is absent" do
+
+      it "raises NotImplementedError" do
+        # The city has no "country_uuid" column
+        expect { City.send :belongs_by_uuid_to, :country }
+          .to raise_error { NotImplementedError }
+      end
+    end
+
+    context ":state" do
+
+      let!(:state) { State.create uuid: SecureRandom.uuid }
+
+      before  { City.send :belongs_by_uuid_to, :state }
+      subject { City.new }
+
+      describe "#state" do
+        
+        it "is defined" do
+          expect(subject).to respond_to :state
+          expect(subject.method(:state).arity).to eq 0
+        end
+
+        it "corresponds to #state_uuid" do
+          expect { subject.state_uuid = state.uuid }
+            .to change { subject.state }.to state
+        end
+      end
+
+      describe "#state=" do
+        
+        it "is defined" do
+          expect(subject).to respond_to :state=
+          expect(subject.method(:state=).arity).to eq 1
+        end
+
+        it "sets the #state" do
+          expect { subject.state = state }.to change { subject.state }.to state
+        end
+
+        it "sets the #state_uuid" do
+          expect { subject.state = state }
+            .to change { subject.state_uuid }.to state.uuid
+        end
+
+        it "resets the #state" do
+          subject.state = state
+          expect { subject.state = nil }.to change { subject.state }.to nil
+        end
+
+        it "resets the #state_uuid" do
+          subject.state = state
+          expect { subject.state = nil }.to change { subject.state_uuid }.to nil
+        end
+      end
+
+      # it "resets the object uuid" do
+      #   subject.state = state
+      #   expect { subject.state = nil }.to change { subject.state_uuid }.to nil
+      # end
+
+      # it "sets the object by uuid" do
+      #   expect { subject.state_uuid = state.uuid }
+      #     .to change { subject.state }.to state
+      # end
+    end
+  end
+end

data/spec/uuids/lib/base/has_uuids_spec.rb

@@ -0,0 +1,65 @@
+require "spec_helper"
+
+module Uuids
+  describe "Base.has_uuids" do
+
+    # Dependencies
+    let(:uuids_class) { Uuids::Models::Uuid }
+
+    # 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_class.first.try(:record)).to eq subject
+      expect(subject.uuids.first).to eq uuids_class.first
+    end
+
+    it "defines the #uuid method" do
+      2.times { subject.uuids.new value: SecureRandom.uuid }
+      subject.save!
+      expect(subject.uuid).to eq subject.uuids.map(&:value).sort.first
+    end
+
+    it "defines the #uuid= method" do
+      value = "3ea8fd89-232f-4ed1-90b5-743da173cd7d"
+      subject.uuid = 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 include(value)
+    end
+
+    it "defines +by_uuid+ class scope" do
+      subject.save!
+      subject.uuids.create!
+      values = subject.reload.uuids.map(&:value)
+      expect(City.by_uuid(*values).to_a).to eq [subject]
+      expect(City.by_uuid).to eq City.all
+    end
+
+    it "creates the first uuid by default" do
+      expect(subject.uuid).to be_present
+    end
+
+    it "requires the #uuids attribute" do
+      subject.save!
+      subject.uuids.each(&:delete)
+      expect(subject.reload).not_to be_valid
+    end
+
+    it "forbids destruction if uuids present" do
+      subject.save!
+      expect { subject.destroy! }.to raise_error
+      subject.uuids.each(&:delete)
+      subject.reload
+      expect { subject.destroy! }.not_to raise_error
+    end
+  end
+end

data/spec/uuids/lib/base_spec.rb

@@ -3,149 +3,23 @@ require "spec_helper"
 module Uuids
   describe Base do
 
-    # Dependencies
-    let(:described_module) { Uuids::Base }
-    let(:uuids_class)      { Uuids::Models::Uuid }
+    subject { Uuids::Base }
+    before  { class Test; end }
+    after   { begin; Uuids.send :remove_constant, :Test; rescue; end }
 
     describe ".included" do
 
       context "from non AR class" do
 
-        before { class Test; end }
-        after  do
-          begin; described_module.send :remove_constant, :Test; rescue; end
-        end
-
         it "fails" do
-          expect { Test.include described_module }.to raise_error
+          expect { Test.include subject }.to raise_error
         end
       end
 
       context "from AR model" do
 
         it "doesn't fail" do
-          expect { City.include described_module }.not_to raise_error
-        end
-      end
-    end
-
-    describe ".has_uuids" do
-
-      # 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_class.first.try(:record)).to eq subject
-        expect(subject.uuids.first).to eq uuids_class.first
-      end
-
-      it "defines the #uuid method" do
-        2.times { subject.uuids.new value: SecureRandom.uuid }
-        subject.save!
-        expect(subject.uuid).to eq subject.uuids.map(&:value).sort.first
-      end
-
-      it "defines the #uuid= method" do
-        value = "3ea8fd89-232f-4ed1-90b5-743da173cd7d"
-        subject.uuid = 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 include(value)
-      end
-
-      it "defines +by_uuid+ class scope" do
-        subject.save!
-        subject.uuids.create!
-        values = subject.reload.uuids.map(&:value)
-        expect(City.by_uuid(*values).to_a).to eq [subject]
-        expect(City.by_uuid).to eq City.all
-      end
-
-      it "creates the first uuid by default" do
-        expect(subject.uuid).to be_present
-      end
-
-      it "requires the #uuids attribute" do
-        subject.save!
-        subject.uuids.each(&:delete)
-        expect(subject.reload).not_to be_valid
-      end
-
-      it "forbids destruction if uuids present" do
-        subject.save!
-        expect { subject.destroy! }.to raise_error
-        subject.uuids.each(&:delete)
-        subject.reload
-        expect { subject.destroy! }.not_to raise_error
-      end
-    end
-
-    describe ".belongs_by_uuid_to" do
-
-      context "when a model doesn't include Uuids::Base" do
-
-        it "raises TypeError" do
-          expect { City.send :belongs_by_uuid_to, :state, class: Record }
-            .to raise_error { TypeError }
-        end
-      end
-
-      context "when a class doesn't have column for uuids" do
-
-        it "raises NotImplementedError" do
-          expect { City.send :belongs_by_uuid_to, :country, class: State }
-            .to raise_error { NotImplementedError }
-        end
-      end
-
-      context "with valid arguments" do
-
-        before  { City.send :belongs_by_uuid_to, :state, class: State }
-        subject { City.new }
-
-        let!(:uuid)  { "01234567-89ab-cdef-0123-456789abcdef" }
-        let!(:state) { State.create uuid: uuid }
-
-        it "defines the getter" do
-          expect(subject).to respond_to :state
-          expect(subject.method(:state).arity).to eq 0
-        end
-
-        it "defines the setter" do
-          expect(subject).to respond_to :state=
-          expect(subject.method(:state=).arity).to eq 1
-        end
-
-        it "sets the object" do
-          expect { subject.state = state }.to change { subject.state }.to state
-        end
-
-        it "sets the object uuid" do
-          expect { subject.state = state }
-            .to change { subject.state_uuid }.to state.uuid
-        end
-
-        it "resets the object" do
-          subject.state = state
-          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
-        end
-
-        it "sets the object by uuid" do
-          expect { subject.state_uuid = state.uuid }
-            .to change { subject.state }.to state
+          expect { City.include subject }.not_to raise_error
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuids
 version: !ruby/object:Gem::Version
-  version: 4.1.7
+  version: 4.1.8
 platform: ruby
 authors:
 - Andrew Kozin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hexx-active_record
@@ -256,6 +256,8 @@ files:
 - spec/support/runtime/config/factory_girl.rb
 - spec/support/runtime/config/i18n.rb
 - spec/uuids/bin/uuids_spec.rb
+- spec/uuids/lib/base/belongs_by_uuid_to_spec.rb
+- spec/uuids/lib/base/has_uuids_spec.rb
 - spec/uuids/lib/base_spec.rb
 - spec/uuids/models/uuid_spec.rb
 - spec/uuids/services/add_spec.rb
@@ -285,6 +287,8 @@ specification_version: 4
 summary: UUIDs AR model.
 test_files:
 - spec/uuids/models/uuid_spec.rb
+- spec/uuids/lib/base/belongs_by_uuid_to_spec.rb
+- spec/uuids/lib/base/has_uuids_spec.rb
 - spec/uuids/lib/base_spec.rb
 - spec/uuids/services/add_spec.rb
 - spec/uuids/bin/uuids_spec.rb