acts_as_keyed 0.1.0 → 0.1.1

data/acts_as_keyed.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Jeremy Hubert"]
   s.email       = ["jhubert@gmail.com"]
-  s.homepage    = "http://github.com/jhubert/acts-as-keyed"
+  s.homepage    = "https://github.com/jhubert/acts-as-keyed"
   s.summary     = %q{Automatically key an active record model with a unique key}
   s.description = %q{A simple plugin that automatically generates a key for a model on create. It takes care of protecting the key, automatically generating it and making sure it is unique.}
 

data/lib/acts_as_keyed/class_methods.rb

@@ -10,7 +10,7 @@ module ActsAsKeyed
 
       self.options = options
 
-      raise ArgumentError, "#{self.name} is missing key column" if ActiveRecord::Base.connection.table_exists?(self.table_name) && columns_hash['key'].nil?
+      raise MissingKeyColumnError if ActiveRecord::Base.connection.table_exists?(self.table_name) && columns_hash['key'].nil?
 
       attr_protected :key
 

data/lib/acts_as_keyed/errors.rb

@@ -1,7 +1,12 @@
 module ActsAsKeyed
-  class NoAvailableKeys < StandardError
+  class NoAvailableKeysError < StandardError
     def to_s
       'Very few unique keys are still available. Please change your acts_as_keyed chars or size settings.'
     end
   end
+  class MissingKeyColumnError < StandardError
+    def to_s
+      'The table must have a column named "key"'
+    end
+  end
 end

data/lib/acts_as_keyed/instance_methods.rb

@@ -19,7 +19,7 @@ module ActsAsKeyed
         break if self.class.count(:conditions => { :key => k }) == 0
         k = nil
       end
-      raise NoAvailableKeys if k.nil?
+      raise NoAvailableKeysError if k.nil?
       self.key = k
     end
 

data/lib/acts_as_keyed/version.rb

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

data/test/acts_as_keyed_test.rb

@@ -53,26 +53,19 @@ class ActsAsKeyedTest < ActsAsKeyedBaseTest
   test "should raise an error if no unique keys can be found easily" do
     owk_setup(:chars => ['a'], :size => 1)
 
-    error = false
-    begin
+    assert_raise ActsAsKeyed::NoAvailableKeysError do
       2.times do
         o = ObjectWithKey.create
       end
-    rescue ActsAsKeyed::NoAvailableKeys
-      error = true
     end
-
-    assert error
   end
 
   test "should fail if object doesn't have key column" do
     output = nil
-    begin
+
+    assert_raise ActsAsKeyed::MissingKeyColumnError do
       ObjectWithoutKey.acts_as_keyed
-    rescue ArgumentError => e
-      output = e.message
     end
-    assert_equal "ObjectWithoutKey is missing key column", output
   end
 
   private

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_keyed
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jeremy Hubert
@@ -56,7 +56,7 @@ files:
 - lib/acts_as_keyed/version.rb
 - test/acts_as_keyed_test.rb
 - test/test_helper.rb
-homepage: http://github.com/jhubert/acts-as-keyed
+homepage: https://github.com/jhubert/acts-as-keyed
 licenses: []
 
 post_install_message: