has_token 0.3.4 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.4.0

data/has_token.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_token}
-  s.version = "0.3.4"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["laserlemon"]
-  s.date = %q{2009-10-07}
+  s.date = %q{2009-10-22}
   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

@@ -1,56 +1,72 @@
 require 'token'
 
-module LaserLemon
-  module HasToken
-    def self.included(base)
-      base.extend ClassMethods
-    end
+module HasToken
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+    def has_token(*args)
+      options = args.extract_options!.symbolize_keys
+      options.merge!(
+        :column => args.first || :token
+      ).reverse_merge!(
+        :length => 6,
+        :characters => [('a'..'z'), ('A'..'Z'), ('0'..'9')].map(&:to_a).sum,
+        :constructor => proc(&:generate_token),
+        :to_param => false,
+        :readonly => true
+      )
 
-    module ClassMethods
-      def has_token(*args)
-        options = args.extract_options!.symbolize_keys
-        options[:column] = (args.first || :token)
-        options.reverse_merge!(
-          :length => 6,
-          :characters => [('a'..'z'), ('A'..'Z'), ('0'..'9')].map(&:to_a).sum,
-          :constructor => proc(&:has_token_value),
-          :to_param => false,
-          :readonly => true
-        )
-
-        cattr_accessor :has_token_options
-        return(false) if self.has_token_options.present?
-        self.has_token_options = options
-
-        attr_readonly(options[:column]) if options[:readonly]
-        define_method(:to_param){ read_attribute(options[:column]) } if options[:to_param]
-
-        has_one :global_token, :class_name => 'Token', :as => :parent, :autosave => true, :dependent => :nullify
-
-        include InstanceMethods
-        before_create :set_token
+      class_inheritable_accessor :has_token_options
+      return false unless self.has_token_options.nil?
+      self.has_token_options = options
+
+      if options[:to_param]
+        def to_param_with_token
+          read_attribute(options[:column])
+        end
+
+        alias_method_chain :to_param, :token
       end
-    end
 
-    module InstanceMethods
-      def has_token_options
-        self.class.has_token_options
+      if options[:readonly]
+        attr_readonly(options[:column])
       end
 
-      def has_token_value
+      has_one :global_token, :class_name => 'Token', :as => :parent, :dependent => :nullify
+
+      include InstanceMethods
+
+      before_create :create_token
+    end
+  end
+
+  module InstanceMethods
+    private
+      def generate_token
         Array.new(has_token_options[:length]){ has_token_options[:characters].rand }.join
       end
 
-      def set_token
-        begin
-          token_value = has_token_options[:constructor].call(self)
-        end while Token.exists?(:value => token_value)
+      def create_token
+        column = has_token_options[:column]
+        value = read_attribute(column)
 
-        build_global_token(:value => token_value)
-        write_attribute(has_token_options[:column], token_value)
+        if value
+          token = build_global_token(:value => value)
+          unless token.save
+            errors.add(column, token.errors.on(:value))
+            return false
+          end
+        else
+          begin
+            value = has_token_options[:constructor].call(self)
+            token = build_global_token(:value => value)
+          end until token.save
+          write_attribute(column, value)
+        end
       end
-    end
   end
 end
 
-ActiveRecord::Base.send(:include, LaserLemon::HasToken)
+ActiveRecord::Base.send(:include, HasToken)

data/lib/token.rb

@@ -1,7 +1,7 @@
 class Token < ActiveRecord::Base
   belongs_to :parent, :polymorphic => true
 
-  named_scope :for, lambda{|k| {:conditions => {:parent_type => k.to_s.classify}} }
+  validates_uniqueness_of :value
 
   def self.get(value)
     find_by_value(value).try(:parent)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: has_token
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors: 
 - laserlemon
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 -04:00
+date: 2009-10-22 00:00:00 -04:00
 default_executable: 
 dependencies: []