hashtrain-acts_as_random_id 0.1.2 → 1.0.0

data/README

@@ -19,4 +19,4 @@ Example
     acts_as_random_id :generator => Proc.new { Time.now.to_i }
   end
 
-Copyright (c) 2009 hashtrain.com, released under the MIT license
+Copyright (c) 2009 hashtrain.com and author idea Stanislav Pogrebnyak (stanislav.pogrebnyak@gmail.com), released under the MIT license

data/Rakefile

@@ -38,8 +38,8 @@ PKG_FILES = FileList[
 
 spec = Gem::Specification.new do |s| 
    s.name             = "acts_as_random_id" 
-   s.version          = "0.1.2.3"
-   s.author           = "hashtrain.com and author idea Stanislav Pogrebnyak"
+   s.version          = "1.0.0"
+   s.author           = "hashtrain.com and author idea Stanislav Pogrebnyak (stanislav.pogrebnyak@gmail.com)"
    s.email            = "mail@hashtrain.com"
    s.homepage         = "http://github.com/hashtrain/acts_as_random_id/"
    s.platform         = Gem::Platform::RUBY

data/lib/acts_as_random_id.rb

@@ -1,49 +1,28 @@
 module ActsAsRandomId
+
   def self.included(base)
-    base.send :extend, ClassMethods 
+    base.send :extend, ClassMethods
+    
+    def ensure_unique_id
+      begin
+        self.id = yield
+      end while self.class.exists?(:id => self.id)
+    end
   end
 
-  module ClassMethods 
-    def acts_as_random_id(options = {})
-      cattr_accessor :random_id_generator 
-      before_create  :generate_random_id
-
-      self.random_id_generator = (options[:generator] || :random_id)
-
-      def generate_random_id
-        if self.random_id_generator.is_a?(Proc)
-          self.random_id_generator.call
-        elsif self.random_id_generator == :auto_increment
-          self.auto_increment
+  module ClassMethods
+    def acts_as_random_id(options={}, &block)
+      before_create do |record|
+        if block
+          record.ensure_unique_id(&block)
         else
-          self.random_id
+          record.ensure_unique_id do
+            rand(2_147_483_647) + 1 #- mysql type "int 4 bytes"
+          end
         end
       end
-
-      protected
-      def auto_increment
-        current_id  = ActiveRecord::Base.connection.select_value("SELECT max(#{self.primary_key}) FROM #{self.table_name}").to_i
-        current_id += rand(10) + 1
-      end
-
-      def random_id
-        begin
-          rand_id = rand(2_147_483_647) + 1 #- mysql type "int 4 bytes"
-        end until ActiveRecord::Base.connection.select_value("SELECT #{self.primary_key} FROM #{self.table_name} WHERE #{self.primary_key} = #{rand_id}").blank?
-        rand_id
-      end
-
-      send :include, InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    protected
-    def generate_random_id
-      self.id = self.class.generate_random_id
     end
   end
-
 end
 
 ActiveRecord::Base.send :include, ActsAsRandomId

data/test/acts_as_random_id_test.rb

@@ -7,35 +7,33 @@ class ActsAsRandomIdTest < Test::Unit::TestCase
   class Comment < ActiveRecord::Base
     acts_as_random_id
   end
-  
+
   class Group < ActiveRecord::Base
-    acts_as_random_id :generator => :auto_increment
+    acts_as_random_id do
+      rand(9) + 1
+    end
   end
   
   class Article < ActiveRecord::Base
-    acts_as_random_id :generator => Proc.new { Time.now.to_i }
+    acts_as_random_id do
+      Time.now.to_i
+    end
   end
-
-  def test_should_empty
-    assert_equal [], Comment.all
-  end
-  
-  def test_type_random_id
-    assert Comment.generate_random_id
+ 
+  def test_random_id
     assert Comment.create
   end
-  
-  def test_type_auto_incriment
-    assert Group.generate_random_id
-    g1 = Group.create
-    g2 = Group.create
-    
-    assert g1.id < g2.id 
+
+  def test_generator_rand_9
+    9.times do 
+      g = Group.create
+      assert g.id <= 9 && g.id > 0
+    end
   end
-  
-  def test_generator_proc
-    puts Article.generate_random_id
-    assert Article.generate_random_id
+
+  def test_generator_with_time_now
+    a = Article.create
+    assert_equal Time.now.to_i, a.id
   end
 
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: hashtrain-acts_as_random_id
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors: 
 - hashtrain.com
-- Author idea Stanislav Pogrebnyak
+- Author idea Stanislav Pogrebnyak (stanislav.pogrebnyak@gmail.com)
 autorequire: 
 bindir: bin
 cert_chain: []