uuidable 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6bef2a8c5b3ba999fc584d96ab54ca6ea9bfef1f
-  data.tar.gz: cebd3fe34711866eb84f227f0fd41f7b3ffe7d87
+SHA256:
+  metadata.gz: dcd18d2671d63318c004ef81436ee00b6e606780c44cca390b40852bf7f02e36
+  data.tar.gz: c5af166c82e3fa9d61a83082ceb82b3fc2f2cdddafb931401624dca3a524001f
 SHA512:
-  metadata.gz: 9c3e598c79ecfa411932a1b272e31b88e487939e57b0205e08f8b00b32259389a391cce265cea8da36ff716d46f60647a3170b42c8096c662796dceb552fd7d5
-  data.tar.gz: b3dfd81d70a19fa9243f1268107aa077c4cbbe906ead773bfb414f53bff62ecfe174ae00682b4b6201d15aaf3992c282dffa28a990a8486b43a3aa8e0cea724a
+  metadata.gz: ed744b932a2ac2aac350d516a353a0b2f232ab51ececc71ee2772146c594f8ef07872ce4a2fbe36f2c377eba3c9c07388f03ed0ca56e26eebe995a4cc8c0ebff
+  data.tar.gz: a495f3803242998373a70a1fd23244aec3d318fc27e80a9019461bf9fc02f80fa0c6ea9480bfe9c1a03dc64f87e908cf6bfc9a76a7325eb5c0a39371087960c9

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,113 @@
+PATH
+  remote: .
+  specs:
+    uuidable (0.2.6)
+      activerecord (>= 4.2, < 6.2)
+      uuidtools (>= 2.1, < 3)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    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.4)
+    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)
+    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 (2.0.4)
+      concurrent-ruby (~> 1.0)
+    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

@@ -7,11 +7,13 @@ module Uuidable
   # Module adds method to table definition
   module TableDefinition
     def uuid(opts = {})
-      index_opts = opts.delete(:index) || {}
+      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
 
@@ -25,7 +27,7 @@ module Uuidable
 
       add_column table_name, column_name, COLUMN_TYPE, COLUMN_OPTIONS.merge(opts)
 
-      add_uuid_index(table_name, index_opts.merge(column_name: column_name)) unless index_opts.nil?
+      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.1'.freeze
+  VERSION = '0.2.6'.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.2'
   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.1
+  version: 0.2.6
 platform: ruby
 authors:
 - Sergey Gnuskov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2021-03-15 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.2'
   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.2'
 - !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.