uuidable 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7243fffe7adb312c2dbf701e37b459c4e5d3cd12
-  data.tar.gz: 9925352679e6fba0c5a6df14497f72d47170a939
+  metadata.gz: 20a81bfd257b2ccc14fcf0d5534cf959dd312e02
+  data.tar.gz: 80d2fd04ee3c6d969c46737ec209e6673fb07a64
 SHA512:
-  metadata.gz: 28fe8675eee77c1d8b6ae4ca32603fe0a020533e0f3bf5cac68bf72e5b8a3e1d0447be37331d3d7d8569081e9c30e1d704417d2ef3b5ed698ce59d1c12087c81
-  data.tar.gz: 594ab432715ebbe4a4a9872550c967a4f476e3d0682eb11813ad835ab902b7f13aa12a52f9494b56213b1da49e49173f5e83eb0f4517955109f332c0a5ec56ae
+  metadata.gz: 826e63ce56cedda8472dda13aaa4032786263743bf9f88fe3ff5a530afba6d9261de75dbed7a4a2f57bf887672f1a653766a8c60957f9cad06b4501c30d6a5d4
+  data.tar.gz: 8c20370fe8c1b20d91e3a96e66deefc6bbe9145ded75024999b363241c0a0029c3bb975fc65da40f28952e6d59f6fcf43c414f61d3dc2ac9ad9d452c5a6ce9d6

data/lib/uuidable/migration.rb

@@ -1,22 +1,39 @@
 module Uuidable
   COLUMN_NAME = :uuid
   COLUMN_TYPE = :binary
-  COLUMN_OPTIONS = { limit: 36, null: false, index: true }.freeze
+  COLUMN_OPTIONS = { limit: 36, null: false }.freeze
+  INDEX_OPTIONS = { unique: true }.freeze
 
   # Module adds method to table definition
   module TableDefinition
     def uuid(opts = {})
-      column COLUMN_NAME, COLUMN_TYPE, opts.merge(COLUMN_OPTIONS)
+      index_opts = opts.delete(:index)
+      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
     end
   end
 
   # Module adds method to alter table migration
   module Migration
     def add_uuid_column(table_name, opts = {})
-      add_column table_name, COLUMN_NAME, COLUMN_TYPE, opts.merge(COLUMN_OPTIONS)
+      index_opts = opts.delete(:index)
+      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
+    end
+
+    def add_uuid_index(table_name, opts = {})
+      column_name = opts.delete(:column_name) || COLUMN_NAME
+
+      add_index table_name, column_name, INDEX_OPTIONS.merge(opts)
     end
   end
 end
+
 if defined? ActiveRecord::ConnectionAdapters::TableDefinition
   ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Uuidable::TableDefinition
 end

data/lib/uuidable/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uuidable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergey Gnuskov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Helps using uuid everywhere in routes instead of id for ActiveRecord models.