Fix and some refactoring

README.md

@@ -30,6 +30,20 @@ class Project < ActiveRecord::Base
 end
 ```
 
+You can use special methods in migrations:
+```ruby
+class CreateProjects < ActiveRecord::Migration
+ def change
+ create_table :projects do |t|
+ t.uuid
+ #...
+ end
+ # Or
+ add_uuid_column :projects
+ end
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

lib/uuidable.rb

@@ -1,41 +1,14 @@
 require 'uuidable/version'
-require 'uuidable/migration'
-
 require 'active_support'
 
 # Main module
 module Uuidable
- extend ActiveSupport::Concern
-
- class UuidChangeError < Exception; end
-
- # ClassMethods
- module ClassMethods
- def uuidable
- after_initialize { self.uuid = self.class.generate_uuid if uuid.blank? }
- validates :uuid, presence: true, uniqueness: true
-
- define_method :to_param do
- uuid
- end
-
- define_method :uuid= do |val|
- raise UuidChangeError, 'Uuid changing is bad idea!' unless new_record? || uuid.blank? || uuid == val
+ module_function
 
- super(val)
- end
- end
- end
-
- def short_uuid
- UUIDTools::UUID.parse(uuid).hexdigest
- end
-
- def self.generate_uuid
+ def generate_uuid
  SecureRandom.uuid
  end
 end
 
-ActiveSupport.on_load(:active_record) do
- ActiveRecord::Base.send(:include, Uuidable)
-end
+require 'uuidable/migration'
+require 'uuidable/active_record'

lib/uuidable/active_record.rb

@@ -0,0 +1,34 @@
+module Uuidable
+ # ActiveRecord mixin
+ module ActiveRecord
+ extend ActiveSupport::Concern
+
+ class UuidChangeError < Exception; end
+
+ # ClassMethods
+ module ClassMethods
+ def uuidable
+ after_initialize { self.uuid = Uuidable.generate_uuid if uuid.blank? }
+ validates :uuid, presence: true, uniqueness: true
+
+ define_method :to_param do
+ uuid
+ end
+
+ define_method :uuid= do |val|
+ raise UuidChangeError, 'Uuid changing is bad idea!' unless new_record? || uuid.blank? || uuid == val
+
+ super(val)
+ end
+ end
+ end
+
+ def short_uuid
+ UUIDTools::UUID.parse(uuid).hexdigest
+ end
+ end
+end
+
+ActiveSupport.on_load(:active_record) do
+ ActiveRecord::Base.send(:include, Uuidable::ActiveRecord)
+end

lib/uuidable/version.rb

@@ -1,3 +1,3 @@
 module Uuidable
- VERSION = '0.0.1'.freeze
+ VERSION = '0.0.2'.freeze
 end