has_token 0.5.0 → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/has_token.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_token}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["laserlemon"]
-  s.date = %q{2009-10-26}
+  s.date = %q{2009-12-11}
   s.description = %q{Generate unique tokens on your ActiveRecord models}
   s.email = %q{steve@laserlemon.com}
   s.extra_rdoc_files = [

data/lib/has_token.rb

@@ -25,7 +25,8 @@ module HasToken
         :constructor => proc(&:generate_token),
         :to_param => false,
         :readonly => true,
-        :dependent => :nullify
+        :dependent => :nullify,
+        :callback => :before_create
       )
 
       class_inheritable_accessor :has_token_options
@@ -47,7 +48,7 @@ module HasToken
 
       include InstanceMethods
 
-      before_create :create_token
+      send options[:callback], :create_token
     end
   end
 
@@ -59,6 +60,7 @@ module HasToken
 
       def create_token
         column = has_token_options[:column]
+
         if value = read_attribute(column)
           token = build_global_token(:value => value)
           unless token.save
@@ -70,8 +72,19 @@ module HasToken
             value = has_token_options[:constructor].call(self)
             token = build_global_token(:value => value)
           end until token.save
-          write_attribute(column, value)
+
+          set_token(value)
+        end
+      end
+
+      def set_token(value)
+        setter = case has_token_options[:callback].to_s
+        when /(find|initialize|destroy)$/ then nil
+        when /validation/, /^before/ then :write_attribute
+        else :update_attribute
         end
+
+        send(setter, has_token_options[:column], value) if setter
       end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: has_token
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - laserlemon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -04:00
+date: 2009-12-11 00:00:00 -05:00
 default_executable: 
 dependencies: []