uuidable 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 20a81bfd257b2ccc14fcf0d5534cf959dd312e02
-  data.tar.gz: 80d2fd04ee3c6d969c46737ec209e6673fb07a64
+SHA256:
+  metadata.gz: 5628f9ea69f6e8c81ea139b7e9c737b6dd7531560c2f6e46240eee051d6c29bb
+  data.tar.gz: ed36c9a7b63affee80dd3149eaf7d6f5f194b1f6377559ba0b7922af507a52c8
 SHA512:
-  metadata.gz: 826e63ce56cedda8472dda13aaa4032786263743bf9f88fe3ff5a530afba6d9261de75dbed7a4a2f57bf887672f1a653766a8c60957f9cad06b4501c30d6a5d4
-  data.tar.gz: 8c20370fe8c1b20d91e3a96e66deefc6bbe9145ded75024999b363241c0a0029c3bb975fc65da40f28952e6d59f6fcf43c414f61d3dc2ac9ad9d452c5a6ce9d6
+  metadata.gz: b1d5aa768583511f4d4427b6dab13ca72de4193993a05fd0fc29ef7140c9fcf40f55111b2cfab5fa8afde26c568fee1ae58f7ab82dd504effe76e351d14414c2
+  data.tar.gz: 24aa031c103ae8c1958373806335d7de27c0b3cd5ebea17c625d79831610ef6db34784b46d0051163eb991e06e0b54b63f5c72a68fe2b06c216b4906c9f4f6eb

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-- 2.2.4
-before_install: gem install bundler -v 1.11.2
+- 2.5.1
+before_install: gem install bundler -v 1.17.3
 script:
 - bundle exec rubocop
 - bundle exec rspec

data/Gemfile.lock

@@ -0,0 +1,114 @@
+PATH
+  remote: .
+  specs:
+    uuidable (0.2.5)
+      activerecord (>= 4.2, < 6.1)
+      uuidtools (>= 2.1, < 3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.0.3.5)
+      activesupport (= 6.0.3.5)
+    activerecord (6.0.3.5)
+      activemodel (= 6.0.3.5)
+      activesupport (= 6.0.3.5)
+    activesupport (6.0.3.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    addressable (2.4.0)
+    ast (2.3.0)
+    backports (3.6.8)
+    concurrent-ruby (1.1.8)
+    diff-lcs (1.2.5)
+    ethon (0.8.1)
+      ffi (>= 1.3.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.10.0)
+      faraday (>= 0.7.4, < 0.10)
+    ffi (1.13.1)
+    gh (0.14.0)
+      addressable
+      backports
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (>= 2.7)
+      net-http-pipeline
+    highline (1.7.8)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    json (2.3.1)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    minitest (5.14.3)
+    multi_json (1.11.2)
+    multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
+    net-http-pipeline (1.0.1)
+    parallel (1.12.0)
+    parser (2.4.0.2)
+      ast (~> 2.3)
+    powerpack (0.1.1)
+    pusher-client (0.6.2)
+      json
+      websocket (~> 1.0)
+    rainbow (2.2.2)
+      rake
+    rake (13.0.1)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.3)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubocop (0.50.0)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    thread_safe (0.3.6)
+    travis (1.8.2)
+      backports
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.9, >= 0.9.1)
+      gh (~> 0.13)
+      highline (~> 1.6)
+      launchy (~> 2.1)
+      pusher-client (~> 0.4)
+      typhoeus (~> 0.6, >= 0.6.8)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.3.0)
+    uuidtools (2.2.0)
+    websocket (1.2.2)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.11)
+  rake (~> 13.0)
+  rspec (~> 3.0)
+  rubocop
+  travis (~> 1.8, >= 1.8.2)
+  uuidable!
+
+BUNDLED WITH
+   1.17.3

data/lib/uuidable/active_record.rb

@@ -21,7 +21,7 @@ module Uuidable
 
       def uuidable(as_param: true)
         after_initialize { self.uuid = Uuidable.generate_uuid if attributes.keys.include?('uuid') && uuid.blank? }
-        validates :uuid, presence: true, uniqueness: true
+        validates :uuid, presence: true, uniqueness: true, if: :uuid_changed?
 
         if as_param
           define_method :to_param do

data/lib/uuidable/migration.rb

@@ -8,10 +8,12 @@ module Uuidable
   module TableDefinition
     def uuid(opts = {})
       index_opts = opts.delete(:index)
+      index_opts = {} if index_opts.nil?
+
       column_name = opts.delete(:column_name) || COLUMN_NAME
 
       column column_name, COLUMN_TYPE, COLUMN_OPTIONS.merge(opts)
-      index column_name, INDEX_OPTIONS.merge(index_opts) unless index_opts == false
+      index column_name, INDEX_OPTIONS.merge(index_opts) if index_opts
     end
   end
 
@@ -19,11 +21,13 @@ module Uuidable
   module Migration
     def add_uuid_column(table_name, opts = {})
       index_opts = opts.delete(:index)
+      index_opts = {} if index_opts == true
+
       column_name = opts.delete(:column_name) || COLUMN_NAME
 
       add_column table_name, column_name, COLUMN_TYPE, COLUMN_OPTIONS.merge(opts)
 
-      add_uuid_index(index_opts.merge(column_name: column_name)) unless index_opts == false
+      add_uuid_index(table_name, index_opts.merge(column_name: column_name)) if index_opts
     end
 
     def add_uuid_index(table_name, opts = {})

data/lib/uuidable/version.rb

@@ -1,3 +1,3 @@
 module Uuidable
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.5'.freeze
 end

data/uuidable.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'uuidable/version'
@@ -21,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.11'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'travis', '~> 1.8', '>= 1.8.2'
 
+  spec.add_dependency 'activerecord', '>= 4.2', '< 6.1'
   spec.add_dependency 'uuidtools', '>= 2.1', '< 3'
-  spec.add_dependency 'activerecord', '>= 4.2', '< 5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuidable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Sergey Gnuskov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -73,45 +73,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.8.2
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: uuidtools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '2.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '3'
 description: ''
 email:
 - sergey.gnuskov@flant.com
@@ -125,6 +125,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -154,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Helps using uuid everywhere in routes instead of id for ActiveRecord models.