josevalim-auth_helpers 0.3.2 → 0.4.1

data/CHANGELOG

@@ -9,7 +9,6 @@
 
 * First version with the following modules:
 
-  AuthHelpers::Model::Associatable
   AuthHelpers::Model::Confirmable
   AuthHelpers::Model::Recoverable
   AuthHelpers::Model::Updatable

data/README

@@ -1,6 +1,6 @@
 AuthHelpers
 License: MIT
-Version: 0.3.0
+Version: 0.4.1
 
 You can also read this README in pretty html at the GitHub project Wiki page:
 
@@ -51,19 +51,11 @@ Modules
       a.require_password_confirmation = false
     end
 
-    include AuthHelpers::Model::Associatable
     include AuthHelpers::Model::Confirmable
     include AuthHelpers::Model::Recoverable
     include AuthHelpers::Model::Updatable
   end
 
-== Associatable
-
-This module automatically creates a belongs_to association for the first *_id
-in the table. This module exists because, whenever it's possible, I follow the
-pattern of having an account model and then all accountable objects uses this
-model (it autodetects polymorphic associations too).
-
 == Confirmable
 
 Adds the confirmation handling. It sends an e-mail to the user on account
@@ -99,7 +91,6 @@ All modules come with specs, that's why the library does not have tests per se.
 So if you want to test the Account model declared above, just do:
 
   describe Account do
-    include AuthHelpers::Spec::Associatable
     include AuthHelpers::Spec::Confirmable
     include AuthHelpers::Spec::Recoverable
     include AuthHelpers::Spec::Updatable

data/lib/auth_helpers/spec/confirmable.rb

@@ -54,7 +54,7 @@ module AuthHelpers
             describe 'with an invalid perishable token' do
               it "should set an error message" do
                 record = base.described_class.find_and_confirm(:perishable_token => "invalid token")
-                record.errors.on(:perishable_token).should == record.errors.generate_message(:perishable_token, :invalid_confirmation, :default => [:invalid])
+                record.errors.on(:perishable_token).should == record.errors.generate_message(:perishable_token, :invalid_confirmation, :default => [:"messages.invalid"])
               end
 
               it "should return a new record with the perishable token set" do

data/lib/auth_helpers/spec/recoverable.rb

@@ -32,7 +32,7 @@ module AuthHelpers
 
               it "should not reset password if the given reset password code is invalid" do
                 record = base.described_class.find_and_reset_password(:perishable_token => 'invalid_token', :password => '654321', :password_confirmation => '654321')
-                record.errors.on(:perishable_token).should == record.errors.generate_message(:perishable_token, :invalid_reset_password, :default => [:invalid])
+                record.errors.on(:perishable_token).should == record.errors.generate_message(:perishable_token, :invalid_reset_password, :default => [:"messages.invalid"])
                 @recoverable.reload
                 @recoverable.valid_password?('654321').should be_false
               end

data/lib/auth_helpers.rb

@@ -15,7 +15,7 @@ module AuthHelpers
   def self.new_with_perishable_token_error(klass, message=:invalid, options={})
     record = klass.new(options)
     record.perishable_token = options[:perishable_token]
-    record.errors.add(:perishable_token, message, :default => [:invalid])
+    record.errors.add(:perishable_token, message, :default => [:"messages.invalid"])
     record
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: josevalim-auth_helpers
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-03 00:00:00 -07:00
+date: 2009-05-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: AuthHelpers is a collection of modules to improve your Authlogic models.
+description: AuthHelpers is a collection of modules to improve your Authlogic resources.
 email: jose.valim@gmail.com
 executables: []
 
@@ -41,11 +41,9 @@ files:
 - lib/auth_helpers/controller/confirmable.rb
 - lib/auth_helpers/controller/helpers.rb
 - lib/auth_helpers/controller/recoverable.rb
-- lib/auth_helpers/model/associatable.rb
 - lib/auth_helpers/model/confirmable.rb
 - lib/auth_helpers/model/recoverable.rb
 - lib/auth_helpers/model/updatable.rb
-- lib/auth_helpers/spec/associatable.rb
 - lib/auth_helpers/spec/confirmable.rb
 - lib/auth_helpers/spec/notifier.rb
 - lib/auth_helpers/spec/recoverable.rb
@@ -80,6 +78,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: AuthHelpers is a collection of modules to improve your Authlogic models.
+summary: AuthHelpers is a collection of modules to improve your Authlogic resources.
 test_files: []
 

data/lib/auth_helpers/model/associatable.rb

@@ -1,52 +0,0 @@
-module AuthHelpers
-  module Model
-
-    # Checks for a column that ends with _id in the included model. Then it adds
-    # a belongs_to association, accepts_nested_attributes_for and make the nested
-    # attributes accessible.
-    #
-    # Also includes a hook called remove_association_error, that removes the nested
-    # attribute errors from the parent object.
-    #
-    # Finally, if the *_id in the table has also *_type. It considers a polymorphic
-    # association.
-    #
-    # Whenever using this method with polymorphic association, don't forget to
-    # set the validation scope in AuthLogic.
-    #
-    #   a.validations_scope = :accountable_type
-    #
-    module Associatable
-      def self.included(base)
-        column = base.columns.detect{|c| c.name =~ /_id$/ }
-        raise ScriptError, "Could not find a column that ends with id in #{base.name.tableize}" unless column
-
-        association = column.name.gsub(/_id$/, '').to_sym
-        polymorphic = !!base.columns.detect{ |c| c.name == "#{association}_type" }
-
-        base.class_eval do
-          belongs_to association, :validate => true, :dependent => :destroy,
-                                  :autosave => true, :polymorphic => polymorphic
-
-          accepts_nested_attributes_for association
-          attr_accessible :"#{association}_attributes"
-
-          after_validation :remove_association_error
-        end
-
-        base.class_eval <<-ASSOCIATION
-          # Remove association errors from the message
-          #
-          def remove_association_error
-            self.errors.each do |key, value|
-              next unless key.to_s =~ /^#{association}_/
-              self.errors.instance_variable_get('@errors').delete(key)
-            end
-          end
-          protected :remove_association_error
-        ASSOCIATION
-      end
-    end
-
-  end
-end

data/lib/auth_helpers/spec/associatable.rb

@@ -1,31 +0,0 @@
-module AuthHelpers
-  module Spec
-
-    module Associatable
-      def self.included(base)
-        klass = base.described_class
-
-        column = klass.columns.detect{|c| c.name =~ /_id$/ }
-        raise ScriptError, "Could not find a column that ends with id in #{base.name.tableize}" unless column
-
-        association = column.name.gsub(/_id$/, '').to_sym
-        polymorphic = !!klass.columns.detect{ |c| c.name == "#{association}_type" }
-
-        base.class_eval do
-          it "should validate associated #{association}" do
-            associatable = base.described_class.create(@valid_attributes.merge(:"#{association}_attributes" => {}))
-            associatable.should_not be_valid
-
-            unless associatable.send(association).errors.empty?
-              associatable.errors.should be_empty # this should be blank since errors is
-                                                  # on the associated object.
-
-              associatable.send(association).errors.should_not be_empty
-            end
-          end
-        end
-      end
-    end
-
-  end
-end