uuids 4.1.8 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13e36a1b5f35a339e4111da9623e53eec0009ebe
-  data.tar.gz: 629d838eb2a302cdb12cc45f247b81105eb5ee07
+  metadata.gz: 72e0a9cef8fe8d5f5d1d5e1d45ffc3e643206451
+  data.tar.gz: 310a7a7683a3f13efc9508356db7dac15212ae0f
 SHA512:
-  metadata.gz: e04939b2fc5a1266dfecdd1e9d6cfd7ad07e42c7a0eb8e7e3d594598be53f37ead9424278f9f90cf1c4032a9c5236d26fe5b8e15af4cfc7bc30f0d086c6ae1f0
-  data.tar.gz: 45fc2caa49c7352dac77163c7757310cf56476b08933335575fafb11841ec01c8f21112d3452a089fdd43bf00682fd2832c262776318c1cd2c5b8a1883c35ff2
+  metadata.gz: af0282a25d822e67dd26a0669bcb98b8ea5fd800efdd468625e6fc2674830f06645cd7f3c41c7031eecc3794a2e72c1ce90e6af49f5789941b1c516f5b872341
+  data.tar.gz: 23200cb8731e33487ddf03b3d1342f823cd496639c8ee064a2114f3a83b291c7e489b13d32c8e1dddad1be110440075f1e2dc47f1525534393f19250280b3081

data/app/queries/by_uuid.rb

@@ -29,30 +29,15 @@ module Uuids
     #   result =  ByUuid.select MyModel
     #   result == MyModel.all # => true
     class ByUuid < Hexx::Scope
-
-      # @api hide
-      # Initializes the query object.
-      # @param [ActiveRecord::Base, #uuids] model The model for selecting
-      #   records of.
-      # @param [Array<String>, nil] values The values to select records by.
-      def initialize(model, *values)
-        super(model)
-        @values = values.flatten
-      end
-
-      # @api hide
-      # Runs and returns the query
-      # @return [ActiveRecord::Relation] The updated scope.
-      def select
-        values.any? ? by_uuid : model.all
-      end
-
       private
 
-      attr_reader :values
+      def update_scope
+        return if values == []
+        @scope = joins(:uuids).where(uuids_uuids: { value: values }).uniq
+      end
 
-      def by_uuid
-        model.joins(:uuids).where(uuids_uuids: { value: values }).uniq
+      def values
+        @values ||= Array(options[:values]).flatten.compact
       end
     end
   end

data/bin/uuids

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
-require "active_record_install"
+require "hexx-active_record"
 
 # Initializes the 'uuids' gem inside application.
-ActiveRecordInstall::Generator.start(
+Hexx::ActiveRecord::Install.start(
   [File.expand_path("../..", __FILE__), "uuids"] + ARGV[1..-1]
 )

data/lib/uuids/base.rb

@@ -58,7 +58,7 @@ module Uuids
       #   class City < ActiveRecord::Base
       #     include Uuids::Base
       #
-      #     belongs_by_uuid_to :state, class: State
+      #     belongs_by_uuid_to :state
       #   end
       #
       #   city = City.new
@@ -74,8 +74,7 @@ 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, opts = nil)
-        warn "[DEPRECATION] .belongs_by_uuid_to options are deprecated" if opts
+      def belongs_by_uuid_to(name)
         BelongsTo.add self, name
       end
     end

data/lib/uuids/base/has_uuids.rb

@@ -33,7 +33,7 @@ module Uuids
         #   records by.
         # @return [ActiveRecord::Relation] scope.
         def by_uuid(*values)
-          Queries::ByUuid.select(self, *values)
+          Queries::ByUuid.select(self, values: values)
         end
 
         private

data/lib/uuids/version.rb

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

data/spec/spec_helper_dev.rb

@@ -4,9 +4,6 @@
 require "coveralls"
 Coveralls.wear! "rails"
 
-# Loads generators
-require "active_record_install"
-
 # Loads support files
 spec = File.expand_path "..", __FILE__
 Dir[

data/spec/{uuids → tests}/bin/uuids_spec.rb

@@ -30,9 +30,9 @@ describe "$ uuids", :sandbox do
       end
     end
 
-    describe "-f folder" do
+    describe "-d folder" do
 
-      before { run_in_sandbox "uuids install -f folder" }
+      before { run_in_sandbox "uuids install -d folder" }
 
       it "copies migrations to `folder/db/migrate`" do
         migrations.each do |migration|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuids
 version: !ruby/object:Gem::Version
-  version: 4.1.8
+  version: 5.0.0
 platform: ruby
 authors:
 - Andrew Kozin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-01 00:00:00.000000000 Z
+date: 2015-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hexx-active_record
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
-- !ruby/object:Gem::Dependency
-  name: hexx-generators
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: inch
   requirement: !ruby/object:Gem::Requirement
@@ -255,12 +241,12 @@ files:
 - spec/support/runtime/config/database_cleaner.rb
 - 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
+- spec/tests/bin/uuids_spec.rb
+- spec/tests/lib/base/belongs_by_uuid_to_spec.rb
+- spec/tests/lib/base/has_uuids_spec.rb
+- spec/tests/lib/base_spec.rb
+- spec/tests/models/uuid_spec.rb
+- spec/tests/services/add_spec.rb
 homepage: https://github.com/nepalez/uuids
 licenses:
 - MIT
@@ -286,14 +272,14 @@ signing_key:
 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
 - spec/spec_helper_dev.rb
 - spec/spec_helper.rb
+- spec/tests/models/uuid_spec.rb
+- spec/tests/lib/base/belongs_by_uuid_to_spec.rb
+- spec/tests/lib/base/has_uuids_spec.rb
+- spec/tests/lib/base_spec.rb
+- spec/tests/services/add_spec.rb
+- spec/tests/bin/uuids_spec.rb
 - spec/dummy/config/environment.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/initializers/seed_loader.rb