acts_as_keyed 0.1.1 → 0.1.2

data/lib/acts_as_keyed/class_methods.rb

@@ -5,23 +5,30 @@ module ActsAsKeyed
       class_attribute :options
 
       options[:as_param] ||= false
+      options[:column] ||= 'key'
       options[:size] ||= 10
       options[:chars] ||= ('a'..'z').to_a + ('A'..'Z').to_a + (1..9).to_a - ['l','I','O']
 
       self.options = options
 
-      raise MissingKeyColumnError if ActiveRecord::Base.connection.table_exists?(self.table_name) && columns_hash['key'].nil?
+      options[:column] = options[:column].to_s
 
-      attr_protected :key
+      raise MissingKeyColumnError if ActiveRecord::Base.connection.table_exists?(self.table_name) && columns_hash[options[:column]].nil?
+
+      attr_protected options[:column]
 
       class << self
         def find(*args)
           if self.options[:as_param] && args.first.is_a?(String)
-            find_by_key(args)
+            send("find_by_#{options[:column]}", args)
           else
             super(*args)
           end
         end
+
+        def key_exists?(k)
+          exists?(["#{options[:column]} = ?", k])
+        end
       end
     
       include InstanceMethods

data/lib/acts_as_keyed/instance_methods.rb

@@ -10,13 +10,21 @@ module ActsAsKeyed
       self.save
     end
 
+    def key=(val)
+      write_attribute(options[:column], val)
+    end
+
+    def key
+      read_attribute(options[:column])
+    end
+
     protected
 
     def create_key
       k = nil
       100.times do
         k = random_key
-        break if self.class.count(:conditions => { :key => k }) == 0
+        break if !self.class.key_exists?(k)
         k = nil
       end
       raise NoAvailableKeysError if k.nil?

data/lib/acts_as_keyed/version.rb

@@ -1,3 +1,3 @@
 module ActsAsKeyed
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/acts_as_keyed_test.rb

@@ -60,6 +60,20 @@ class ActsAsKeyedTest < ActsAsKeyedBaseTest
     end
   end
 
+  test "should use a different column if specified as a string" do
+    ObjectWithoutKey.acts_as_keyed(:column => 'name')
+
+    o = ObjectWithoutKey.create()
+    assert_not_nil o.name
+  end
+
+  test "should use a different column if specified as a symbol" do
+    ObjectWithoutKey.acts_as_keyed(:column => :name)
+
+    o = ObjectWithoutKey.create()
+    assert_not_nil o.name
+  end
+
   test "should fail if object doesn't have key column" do
     output = nil
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_keyed
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jeremy Hubert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-04 00:00:00 Z
+date: 2012-02-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord