attribute_normalizer 1.0.0.pre3 → 1.0.0.pre4

data/README.textile

@@ -4,6 +4,11 @@ p. A little normalization goes a long way in helping maintain data integrity.
 
 h2. Recent Changes
 
+* 1.0.0.pre
+* -DSL Changes-
+* Default attributes to normalize
+* mongid support
+
 * 0.3.0
 ** Normalizer Chaining
 ** Built-in common normalizers
@@ -90,16 +95,16 @@ AttributeNormalizer.configure do |config|
     end
   end
 
-  # The default normalizers if no normalizers or block is given is to apply the :strip and :blank normalizers (in that order).
+  # The default normalizers if no :with option 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 => true, :blank => true }
+  # config.default_normalizers = :strip, :blank
 
   # 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, :truncate => true
+  # config.add_default_attribute :name, :with => :truncate
 end
 </code></pre>
 
@@ -112,10 +117,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, :currency => true
+  normalize_attribute  :price, :with => :currency
 
   # Using more then one of our predefined normalizers including one with options
-  normalize_attribute :summary, :strip => true, :truncate => { :length => 12 }
+  normalize_attribute :summary, :with => [ :strip, { :truncate => { :length => 12 } } ]
 
   # You can also define your normalization block inline.
   normalize_attribute :title do |value|

data/Rakefile

@@ -1,42 +1,7 @@
 require 'rake'
 require 'rake/rdoctask'
 require 'spec/rake/spectask'
-
-begin
-  AUTHOR   = "Michael Deering"
-  EMAIL    = "mdeering@mdeering.com"
-  GEM      = "attribute_normalizer"
-  HOMEPAGE = "http://github.com/mdeering/attribute_normalizer"
-  SUMMARY  = "Attribute normalizer that excepts code blocks."
-
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.author       = AUTHOR
-    s.email        = EMAIL
-    s.files        = %w(install.rb install.txt MIT-LICENSE README.textile Rakefile) + Dir.glob("{rails,lib,spec}/**/*")
-    s.homepage     = HOMEPAGE
-    s.name         = GEM
-    s.require_path = 'lib'
-    s.summary      = SUMMARY
-    s.post_install_message = %q[
------------------------------------------------------------------------
-  Attribute Normalizer News:
-
-  New with the 0.3.X release is the ability to change the default
-  normalization and also the ability to chain normalizers together.
-
-  After the flow of patches slows down on this release I will likely
-  freeze the feature set and API for a 1.0 release of the gem.
-
-  Cheers,
-  Michael Deering http://mdeering.com
------------------------------------------------------------------------
-    ]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
-end
+require 'bundler/gem_tasks'
 
 desc 'Default: spec tests.'
 task :default => :spec
@@ -47,18 +12,3 @@ Spec::Rake::SpecTask.new('spec') do |t|
   t.spec_opts = ["-c"]
 end
 
-desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('examples_with_rcov') do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', '/opt,spec,Library']
-end
-
-desc 'Generate documentation for the attribute_normalizer plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'AttributeNormalizer'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.textile')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/attribute_normalizer.rb

@@ -24,17 +24,17 @@ module AttributeNormalizer
     attr_accessor :default_normalizers, :normalizers, :default_attributes
 
     def default_normalizers=(normalizers)
-      @default_normalizers = normalizers
+      @default_normalizers = normalizers.is_a?(Array) ? normalizers : [ normalizers ]
     end
 
     def default_attributes=(attributes)
       [attributes].flatten.each do |attribute|
-        add_default_attribute(attribute, default_normalizers)
+        add_default_attribute(attribute, :with => default_normalizers)
       end
     end
 
-    def add_default_attribute(attribute, normalizers)
-      @default_attributes[attribute.to_s] = normalizers
+    def add_default_attribute(attribute, options)
+      @default_attributes[attribute.to_s] = { :with => default_normalizers }.merge(options)
     end
 
     def initialize
@@ -63,6 +63,16 @@ def include_attribute_normalizer(class_or_module)
   end
 end
 
+
+
 include_attribute_normalizer(ActiveModel::Base)     if defined?(ActiveModel::Base)
 include_attribute_normalizer(ActiveRecord::Base)    if defined?(ActiveRecord::Base)
 include_attribute_normalizer(CassandraObject::Base) if defined?(CassandraObject::Base)
+
+if defined?(Mongoid::Document)
+  Mongoid::Document.class_eval do
+    included do
+      include AttributeNormalizer
+    end
+  end
+end

data/lib/attribute_normalizer/model_inclusions.rb

@@ -6,8 +6,10 @@ module AttributeNormalizer
 
   module ClassMethods
     def normalize_attributes(*attributes, &block)
-      normalizers = attributes.last.is_a?(::Hash) ? attributes.pop : {}
-      
+      options = attributes.last.is_a?(::Hash) ? attributes.pop : {}
+
+      normalizers    = [ options.delete(:with) ].flatten.compact
+
       if normalizers.empty? && !block_given?
         normalizers = AttributeNormalizer.configuration.default_normalizers # the default normalizers
       end
@@ -20,16 +22,14 @@ module AttributeNormalizer
         else
           define_method "normalize_#{attribute}" do |value|
             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)
+
+            normalizers.each do |normalizer_name|
+              unless normalizer_name.kind_of?(Symbol)
+                normalizer_name, options = normalizer_name.keys[0], normalizer_name[ normalizer_name.keys[0] ]
               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)
             end
             normalized
           end
@@ -37,8 +37,17 @@ module AttributeNormalizer
 
         self.send :private, "normalize_#{attribute}"
 
+        if method_defined?(:"#{attribute}=")
+          alias_method "old_#{attribute}=", "#{attribute}="
+        end
+
         define_method "#{attribute}=" do |value|
-          super(self.send(:"normalize_#{attribute}", value))
+          begin
+            super(self.send(:"normalize_#{attribute}", value))
+          rescue NoMethodError
+            normalized_value = self.send(:"normalize_#{attribute}", value)
+            self.send("old_#{attribute}=", normalized_value)
+          end
         end
 
       end
@@ -46,14 +55,16 @@ module AttributeNormalizer
     alias :normalize_attribute :normalize_attributes
 
     def normalize_default_attributes
-      AttributeNormalizer.configuration.default_attributes.each do |attribute_name, options| 
+      AttributeNormalizer.configuration.default_attributes.each do |attribute_name, options|
         normalize_attribute(attribute_name, options) if self.column_names.include?(attribute_name)
       end
     end
 
     def inherited(subclass)
       super
-      subclass.normalize_default_attributes if subclass.table_exists?
+      if subclass.respond_to?(:table_exists?) && subclass.table_exists?
+        subclass.normalize_default_attributes
+      end
     end
   end
 end

data/spec/article_spec.rb

@@ -1,10 +1,10 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper'
 
 describe Article do
   it { should normalize_attribute(:title).from(' Social Life at the Edge of Chaos    ').to('Social Life at the Edge of Chaos') }
   it { should normalize_attribute(:authors).from(' Octavio Miramontes and Pedro Miramontes ').to('Octavio Miramontes and Pedro Miramontes') }
 
-  context 'normalization should not interfear with other hooks and aliases on the attribute assignment' do
+  context 'normalization should not interfere with other hooks and aliases on the attribute assignment' do
     before do
       @article = Article.create!(:title => 'Original Title')
     end

data/spec/attribute_normalizer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper'
 
 describe AttributeNormalizer do
 

data/spec/author_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper'
 
 describe Author do
 

data/spec/book_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper'
 
 describe Book do
 
@@ -11,7 +11,7 @@ describe Book do
 
   it { should normalize_attribute(:title).from('pick up chicks with magic tricks').to('Pick Up Chicks With Magic Tricks') }
 
-  context 'normalization should not interfear with other hooks and aliases on the attribute assignment' do
+  context 'normalization should not interfere with other hooks and aliases on the attribute assignment' do
     before do
       @book = Book.create!(:title => 'Original Title')
     end

data/spec/journal_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper'
+require File.dirname(File.expand_path(__FILE__)) + '/test_helper'
 
 describe Journal do
 

data/spec/models/author.rb

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

data/spec/models/book.rb

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

data/spec/test_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'spec'
 require 'active_record'
+require 'mongoid'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 
@@ -40,6 +41,7 @@ require 'models/book'
 require 'models/author'
 require 'models/journal'
 require 'models/article'
+require 'models/magazine'
 
 
 Spec::Runner.configure do |config|

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: attribute_normalizer
 version: !ruby/object:Gem::Version 
-  hash: 1923831951
+  hash: 1923831937
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - pre
-  - 3
-  version: 1.0.0.pre3
+  - 4
+  version: 1.0.0.pre4
 platform: ruby
 authors: 
 - Michael Deering
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 -06:00
+date: 2011-07-28 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -58,9 +58,7 @@ has_rdoc: true
 homepage: http://github.com/mdeering/attribute_normalizer
 licenses: []
 
-post_install_message: "\n\
-  -----------------------------------------------------------------------\n  Attribute Normalizer News:\n\n  New with the 0.3.X release is the ability to change the default\n  normalization and also the ability to chain normalizers together.\n\n  After the flow of patches slows down on this release I will likely\n  freeze the feature set and API for a 1.0 release of the gem.\n\n  Cheers,\n  Michael Deering http://mdeering.com\n\
-  -----------------------------------------------------------------------\n    "
+post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -88,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Attribute normalizer that excepts code blocks.