attribute_normalizer 1.0.0.pre2 → 1.0.0.pre3

data/README.textile

@@ -41,7 +41,7 @@ p. Then just required it.  Rails usages is as follows.
 h3. Rails 2
 
 <pre><code># config/environment.rb
- config.gem 'attribute_normalizer'</code></pre>
+config.gem 'attribute_normalizer'</code></pre>
 
 h3. Rails 3
 <pre><code># Gemfile
@@ -60,7 +60,7 @@ describe Book do
   it { should normalize_attribute(:author) }
   it { should normalize_attribute(:price).from('$3,450.98').to(3450.98) }
   it { should normalize_attribute(:summary).from('   Here is my summary that is a little to long   ').to('Here is m...') }
-  it { should normalize_attribute(:title).from(' pick up chicks with magic tricks  ').to('Pick Up Chicks With Magic Tricks')}
+  it { should normalize_attribute(:title).from(' pick up chicks with magic tricks  ').to('Pick Up Chicks With Magic Tricks') }
 end</code></pre>
 
 p. The following normalizers are already included with the +0.3 version of the gem.
@@ -90,16 +90,16 @@ AttributeNormalizer.configure do |config|
     end
   end
 
-  # The default normalizers if no :with option or block is given is to apply the :strip and :blank normalizers (in that order).
+  # The default normalizers if no normalizers or block is given is to apply the :strip and :blank normalizers (in that order).
   # You can change this if you would like as follows:
-  # config.default_normalizers = :strip, :blank
+  # config.default_normalizers = { :strip => true, :blank => true }
 
-  # You can enable the attribute normalizers automatically if the specified attributes exist in your column_names. It will use 
+  # You can enable the attribute normalizers automatically if the specified attributes exist in your column_names. It will use
   # the default normalizers for each attribute (e.g. config.default_normalizers)
   # config.default_attributes = :name, :title
 
   # Also, You can add an specific attribute to default_attributes using one or more normalizers:
-  # config.add_default_attribute :name, :with => :truncate
+  # config.add_default_attribute :name, :truncate => true
 end
 </code></pre>
 
@@ -112,10 +112,10 @@ The _normalize_attributes_ method is eager loaded into your ORM.  _normalize_att
   normalize_attributes :author, :publisher
 
   # Using one of our predefined normalizers.
-  normalize_attribute  :price, :with => :currency
+  normalize_attribute  :price, :currency => true
 
   # Using more then one of our predefined normalizers including one with options
-  normalize_attribute :summary, :with => [ :strip, { :truncate => { :length => 12 } } ]
+  normalize_attribute :summary, :strip => true, :truncate => { :length => 12 }
 
   # You can also define your normalization block inline.
   normalize_attribute :title do |value|
@@ -142,18 +142,14 @@ p. If you are running RSpec there is matcher available for use.  Usage can been
 h3. Rails 2
 
 <pre><code># spec/spec_helper.rb
-# ...
 Spec::Runner.configure do |config|
-  # ...
-  config.include AttributeNormalizer::RSpecMatcher, :type => :model
+  config.include AttributeNormalizer::RSpecMatcher, :type => :models
 end</code></pre>
 
 h3. Rails 3
 
 <pre><code># spec/spec_helper.rb
-# ...
-RSpec.configure do |config|
-  # ...
+Spec::Runner.configure do |config|
   config.include AttributeNormalizer::RSpecMatcher, :type => :model
 end</code></pre>
 

data/lib/attribute_normalizer/model_inclusions.rb

@@ -6,9 +6,8 @@ module AttributeNormalizer
 
   module ClassMethods
     def normalize_attributes(*attributes, &block)
-      options = attributes.last.is_a?(::Hash) ? attributes.pop : {}
-
-      normalizers    = [options.delete(:with)].flatten.compact
+      normalizers = attributes.last.is_a?(::Hash) ? attributes.pop : {}
+      
       if normalizers.empty? && !block_given?
         normalizers = AttributeNormalizer.configuration.default_normalizers # the default normalizers
       end
@@ -20,18 +19,17 @@ module AttributeNormalizer
           end
         else
           define_method "normalize_#{attribute}" do |value|
-            normalized=value
-            normalizers.each do |normalizer_name|
-              unless normalizer_name.kind_of?(Symbol)
-                normalizer_name,options=normalizer_name.keys[0],normalizer_name[normalizer_name.keys[0]]
+            normalized = value
+            
+            normalizers.each do |key, options|
+              normalizer = AttributeNormalizer.configuration.normalizers[key]
+              raise AttributeNormalizer::MissingNormalizer.new("No normalizer was found for #{key}") unless normalizer
+
+              normalized = if normalizer.respond_to?(:normalize)
+                normalizer.normalize(normalized, TrueClass === options ? {} : options)
+              else
+                normalizer.call(normalized, TrueClass === options ? {} : options)
               end
-
-              normalizer=AttributeNormalizer.configuration.normalizers[normalizer_name]
-              raise AttributeNormalizer::MissingNormalizer.new("No normalizer was found for #{normalizer_name}") unless normalizer
-
-              normalized= normalizer.respond_to?(:normalize) ? normalizer.normalize(normalized,options) :
-                normalizer.call(normalized, options)
-              #puts "#{normalizer_name} : ->'#{normalized}' (#{normalized.class})"
             end
             normalized
           end

data/lib/attribute_normalizer/normalizers/blank_normalizer.rb

@@ -1,7 +1,7 @@
 module AttributeNormalizer
   module Normalizers
     module BlankNormalizer
-      def self.normalize(value, options)
+      def self.normalize(value, options = {})
         value.nil? || (value.is_a?(String) && value !~ /\S/) ? nil : value
       end
     end

data/lib/attribute_normalizer/normalizers/phone_normalizer.rb

@@ -1,7 +1,7 @@
 module AttributeNormalizer
   module Normalizers
     module PhoneNormalizer
-      def self.normalize(value, options)
+      def self.normalize(value, options = {})
         value = value.is_a?(String) ? value.gsub(/[^0-9]+/, '') : value
         value.is_a?(String) && value.empty? ? nil : value
       end

data/lib/attribute_normalizer/normalizers/squish_normalizer.rb

@@ -1,7 +1,7 @@
 module AttributeNormalizer
   module Normalizers
     module SquishNormalizer
-      def self.normalize(value, options)
+      def self.normalize(value, options = {})
         value.is_a?(String) ? value.strip.gsub(/\s+/, ' ') : value
       end
     end

data/lib/attribute_normalizer/normalizers/strip_normalizer.rb

@@ -1,7 +1,7 @@
 module AttributeNormalizer
   module Normalizers
     module StripNormalizer
-      def self.normalize(value, options)
+      def self.normalize(value, options = {})
         value.is_a?(String) ? value.strip : value
       end
     end

data/lib/attribute_normalizer.rb

@@ -10,9 +10,9 @@ module AttributeNormalizer
   class << self
     attr_accessor :configuration
   end
-  
+
   def self.configuration
-    @configuration ||= Configuration.new 
+    @configuration ||= Configuration.new
   end
 
   def self.configure
@@ -24,17 +24,17 @@ module AttributeNormalizer
     attr_accessor :default_normalizers, :normalizers, :default_attributes
 
     def default_normalizers=(normalizers)
-      @default_normalizers = normalizers.is_a?(Array) ? normalizers : [ normalizers ]
+      @default_normalizers = normalizers
     end
 
     def default_attributes=(attributes)
       [attributes].flatten.each do |attribute|
-        add_default_attribute(attribute, :with => default_normalizers)
+        add_default_attribute(attribute, default_normalizers)
       end
     end
 
-    def add_default_attribute(attribute, options={})
-      @default_attributes[attribute.to_s] = { :with => default_normalizers }.merge(options)
+    def add_default_attribute(attribute, normalizers)
+      @default_attributes[attribute.to_s] = normalizers
     end
 
     def initialize

data/spec/models/author.rb

@@ -1,9 +1,9 @@
 class Author < ActiveRecord::Base
 
   normalize_attribute :name
-  normalize_attribute :nickname,     :with => :squish
-  normalize_attribute :first_name,   :with => :strip
-  normalize_attribute :last_name,    :with => :blank
-  normalize_attribute :phone_number, :with => :phone
+  normalize_attribute :nickname,     :squish => true
+  normalize_attribute :first_name,   :strip  => true
+  normalize_attribute :last_name,    :blank  => true
+  normalize_attribute :phone_number, :phone  => true
 
 end

data/spec/models/book.rb

@@ -2,13 +2,9 @@ class Book < ActiveRecord::Base
 
   normalize_attribute  :author
 
-  normalize_attribute  :us_price, :cnd_price, :with => :currency
-
-  normalize_attributes :summary, :with => [ :strip,
-                                            { :truncate => { :length => 12 } },
-                                            :blank
-                                          ]
+  normalize_attribute  :us_price, :cnd_price, :currency => true
 
+  normalize_attributes :summary, :strip => true, :truncate => { :length => 12 }, :blank => true
 
   normalize_attributes :title do |value|
     value.is_a?(String) ? value.titleize.strip : value

data/spec/test_helper.rb

@@ -30,7 +30,7 @@ AttributeNormalizer.configure do |config|
 
   config.default_normalizers = :strip, :special_normalizer, :blank
   config.default_attributes = :name, :title
-  config.add_default_attribute :authors, :with => [:strip, :blank]
+  config.add_default_attribute :authors, :strip => true, :blank => true
 
 end
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: attribute_normalizer
 version: !ruby/object:Gem::Version 
-  hash: -1876988175
-  prerelease: true
+  hash: 1923831951
+  prerelease: 6
   segments: 
   - 1
   - 0
   - 0
-  - pre2
-  version: 1.0.0.pre2
+  - pre
+  - 3
+  version: 1.0.0.pre3
 platform: ruby
 authors: 
 - Michael Deering
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 -07:00
+date: 2011-03-18 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Attribute normalizer that excepts code blocks.