attribute_normalizer 1.1.0 → 1.2.0.a

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzI3ODAzNTM2ZDcwZDg1NWQxYWI5OGI4YzFiM2Y0YjMyMTk1MDg0MA==
+  data.tar.gz: !binary |-
+    OWE0MGFiZWY4NDA1ZmY3ZWY1MjlhMzM0MDkwNWJhZGJhNzJjNjc2OQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODc4YTc2MThlNjZlZWU4YWJkNmU5NTkxYzk5NmE3MzZkM2IyY2VjZWQ1NzYz
+    NmRmZWY3YjhmYzQ5YjJjMzE5YzJkZjI1MTRmN2VmMDcwYzgyNjZlNTMyMjM5
+    N2IxZGI4ZWU2NmU3YTRjNjEzMTFkNWExOGRlZDQzZmVkYTk0Mzk=
+  data.tar.gz: !binary |-
+    MWZkZWRjMTQyODEyOGYyMzZhZTA4MzQ2NTViNjcwZjY4MjA3MWQxZGNmNTgw
+    YjY1ZmRmN2IzZmFiNDEyZDgwNTJkMzkzNDE4YTNmOWMyZDkyNDE5YmFjYjgw
+    YzBmYjJkZDhiMWI3Y2I4MzhkOWEyMjM5YTk5YzhhOGE4MTc1ODI=

data/README.textile

@@ -1,5 +1,7 @@
 h1. Attribute Normalizer
 
+!https://secure.travis-ci.org/mdeering/attribute_normalizer.png?branch=master(Build Status)!:http://travis-ci.org/mdeering/attribute_normalizer
+
 p. A little normalization goes a long way in helping maintain data integrity.
 
 h2. Change History
@@ -167,14 +169,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|
+RSpec.configure do |config|
   config.include AttributeNormalizer::RSpecMatcher, :type => :models
 end</code></pre>
 
 h3. Rails 3
 
 <pre><code># spec/spec_helper.rb
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include AttributeNormalizer::RSpecMatcher, :type => :model
 end</code></pre>
 

data/lib/attribute_normalizer.rb

@@ -27,26 +27,18 @@ module AttributeNormalizer
       @default_normalizers = normalizers.is_a?(Array) ? normalizers : [ normalizers ]
     end
 
-    def default_attributes=(attributes)
-      [attributes].flatten.each do |attribute|
-        add_default_attribute(attribute, :with => default_normalizers)
-      end
-    end
+    def initialize
 
-    def add_default_attribute(attribute, options)
-      @default_attributes[attribute.to_s] = { :with => default_normalizers }.merge(options)
-    end
+      @normalizers = {
+        :blank  => AttributeNormalizer::Normalizers::BlankNormalizer,
+        :phone  => AttributeNormalizer::Normalizers::PhoneNormalizer,
+        :squish => AttributeNormalizer::Normalizers::SquishNormalizer,
+        :strip  => AttributeNormalizer::Normalizers::StripNormalizer
+      }
 
-    def initialize
-      @normalizers = {}
-      @normalizers[ :blank ]   = AttributeNormalizer::Normalizers::BlankNormalizer
-      @normalizers[ :phone ]   = AttributeNormalizer::Normalizers::PhoneNormalizer
-      @normalizers[ :strip ]   = AttributeNormalizer::Normalizers::StripNormalizer
-      @normalizers[ :squish ]  = AttributeNormalizer::Normalizers::SquishNormalizer
       @default_normalizers = [ :strip, :blank ]
-      @default_attributes = {}
-    end
 
+    end
 
   end
 
@@ -64,15 +56,6 @@ def include_attribute_normalizer(class_or_module)
 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

@@ -5,12 +5,13 @@ module AttributeNormalizer
   end
 
   module ClassMethods
+
     def normalize_attributes(*attributes, &block)
       options = attributes.last.is_a?(::Hash) ? attributes.pop : {}
 
-      normalizers      = [ options.delete(:with) ].flatten.compact
-      normalizers      = [ options.delete(:before) ].flatten.compact if block_given? && normalizers.empty?
-      post_normalizers = [ options.delete(:after) ].flatten.compact if block_given?
+      normalizers      = [ options[:with] ].flatten.compact
+      normalizers      = [ options[:before] ].flatten.compact if block_given? && normalizers.empty?
+      post_normalizers = [ options[:after] ].flatten.compact if block_given?
 
       if normalizers.empty? && !block_given?
         normalizers = AttributeNormalizer.configuration.default_normalizers # the default normalizers
@@ -49,19 +50,20 @@ module AttributeNormalizer
 
         if method_defined?(:"#{attribute}=")
           alias_method "old_#{attribute}=", "#{attribute}="
-        end
 
-        define_method "#{attribute}=" do |value|
-          begin
-            super(self.send(:"normalize_#{attribute}", value))
-          rescue NoMethodError
+          define_method "#{attribute}=" do |value|
             normalized_value = self.send(:"normalize_#{attribute}", value)
             self.send("old_#{attribute}=", normalized_value)
           end
+        else
+          define_method "#{attribute}=" do |value|
+            super(self.send(:"normalize_#{attribute}", value))
+          end
         end
 
       end
     end
+
     alias :normalize_attribute :normalize_attributes
 
     def normalize_default_attributes
@@ -70,11 +72,13 @@ module AttributeNormalizer
       end
     end
 
-    def inherited(subclass)
-      super
-      if subclass.respond_to?(:table_exists?) && (subclass.table_exists? rescue false)
-        subclass.normalize_default_attributes
-      end
-    end
+    # def inherited(subclass)
+    #   super
+    #   if subclass.name.present? && subclass.respond_to?(:table_exists?) && (subclass.table_exists? rescue false)
+    #     subclass.normalize_default_attributes
+    #   end
+    # end
+
   end
+
 end

data/lib/attribute_normalizer/version.rb

@@ -0,0 +1,16 @@
+module AttributeNormalizer
+
+  module Version
+
+    MAJOR = 1
+    MINOR = 2
+    PATCH = 0
+    BUILD = 'a'
+
+    def self.to_s
+      [ MAJOR, MINOR, PATCH, BUILD ].compact.join('.')
+    end
+
+  end
+
+end

metadata

@@ -1,84 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: attribute_normalizer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.2.0.a
 platform: ruby
 authors:
 - Michael Deering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-28 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies: []
-description: 
-email: mdeering@mdeering.com
+description: ''
+email:
+- mdeering@mdeering.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.textile
+extra_rdoc_files: []
 files:
-- MIT-LICENSE
-- README.textile
-- Rakefile
-- install.rb
-- install.txt
-- lib/attribute_normalizer.rb
 - lib/attribute_normalizer/model_inclusions.rb
-- lib/attribute_normalizer/normalizers/blank_normalizer.rb
+- lib/attribute_normalizer/rspec_matcher.rb
+- lib/attribute_normalizer/normalizers/strip_normalizer.rb
 - lib/attribute_normalizer/normalizers/phone_normalizer.rb
+- lib/attribute_normalizer/normalizers/blank_normalizer.rb
 - lib/attribute_normalizer/normalizers/squish_normalizer.rb
-- lib/attribute_normalizer/normalizers/strip_normalizer.rb
-- lib/attribute_normalizer/rspec_matcher.rb
-- rails/init.rb
-- spec/article_spec.rb
-- spec/attribute_normalizer_spec.rb
-- spec/author_spec.rb
-- spec/book_spec.rb
-- spec/connection_and_schema.rb
-- spec/journal_spec.rb
-- spec/models/article.rb
-- spec/models/author.rb
-- spec/models/book.rb
-- spec/models/journal.rb
-- spec/test_helper.rb
-homepage: http://github.com/mdeering/attribute_normalizer
+- lib/attribute_normalizer/version.rb
+- lib/attribute_normalizer.rb
+- README.textile
+homepage: https://github.com/mdeering/attribute_normalizer
 licenses: []
+metadata: {}
 post_install_message: 
-rdoc_options:
-- --charset=UTF-8
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3251542831906071239
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
-summary: Attribute normalizer that excepts code blocks.
-test_files:
-- spec/article_spec.rb
-- spec/attribute_normalizer_spec.rb
-- spec/author_spec.rb
-- spec/book_spec.rb
-- spec/connection_and_schema.rb
-- spec/journal_spec.rb
-- spec/models/article.rb
-- spec/models/author.rb
-- spec/models/book.rb
-- spec/models/journal.rb
-- spec/test_helper.rb
+specification_version: 4
+summary: ''
+test_files: []
+has_rdoc: 

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Michael Deering
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,12 +0,0 @@
-require 'rake'
-require 'rdoc/task'
-require 'rspec/core/rake_task'
-require 'bundler/gem_tasks'
-
-desc 'Default: spec tests.'
-task :default => :spec
-
-desc 'Test the attribute_normalizer plugin.'
-RSpec::Core::RakeTask.new do |t|
-end
-

data/install.rb

@@ -1 +0,0 @@
-puts IO.read(File.join(File.dirname(__FILE__), 'install.txt'))

data/install.txt

@@ -1,12 +0,0 @@
------------------------------------------------------------------------
-  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
------------------------------------------------------------------------

data/rails/init.rb

@@ -1 +0,0 @@
-require 'attribute_normalizer'

data/spec/article_spec.rb

@@ -1,49 +0,0 @@
-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') }
-  it { should normalize_attribute(:slug) }
-  it { should normalize_attribute(:slug).from(' Social Life at the Edge of Chaos    ').to('social-life-at-the-edge-of-chaos') }
-  it { should normalize_attribute(:limited_slug) }
-  it { should normalize_attribute(:limited_slug).from(' Social Life at the Edge of Chaos    ').to('social-life') }
-
-  context 'normalization should not interfere with other hooks and aliases on the attribute assignment' do
-    before do
-      @article = Article.create!(:title => 'Original Title')
-    end
-
-    it 'should still reflect that the attribute has been changed through the call to super' do
-      lambda { @article.title = 'New Title' }.should change(@article, :title_changed?).from(false).to(true)
-    end
-  end
-
-  context 'when another instance of the same saved record has been changed' do
-    before do
-      @article = Article.create!(:title => 'Original Title')
-      @article2 = Article.find(@article.id)
-      @article2.update_attributes(:title => 'New Title')
-    end
-
-    it "should reflect the change when the record is reloaded" do
-      lambda { @article.reload }.should change(@article, :title).from('Original Title').to('New Title')
-    end
-  end
-
-  context 'normalization should work with multiple attributes at the same time' do
-    before do
-      @article = Article.new(:title => '  Bad Title   ', :authors => '   Bad Authors   ')
-    end
-
-    it "should apply normalizations to both attributes" do
-      @article.title.should  == 'Bad Title'
-      @article.authors.should == 'Bad Authors'
-    end
-  end
-
-  context 'with the default normalizer changed' do
-    @article = Article.new :authors => 'testing the default normalizer'
-    @article.authors.should == 'testing the default normalizer'
-  end
-
-end

data/spec/attribute_normalizer_spec.rb

@@ -1,26 +0,0 @@
-require File.dirname(File.expand_path(__FILE__)) + '/test_helper'
-
-describe AttributeNormalizer do
-
-  it 'should add the class method Class#normalize_attributes and Class#normalize_attribute when included' do
-    klass = Class.new do
-      include AttributeNormalizer
-    end
-
-    klass.should respond_to(:normalize_attributes)
-    klass.should respond_to(:normalize_attribute)
-  end
-
-  it 'should not fail due to database exceptions raised by table_exists?' do
-    class PGError < RuntimeError; end
-    
-    Class.new(ActiveRecord::Base) do
-      def self.table_exists?
-        raise PGError, "FATAL:  something bad happened trying to probe for table existence"
-      end
-      
-      include AttributeNormalizer
-    end
-    
-  end
-end

data/spec/author_spec.rb

@@ -1,29 +0,0 @@
-require File.dirname(File.expand_path(__FILE__)) + '/test_helper'
-
-describe Author do
-
-  context 'Testing the built in normalizers' do
-    # default normalization [ :strip, :blank ]
-    it { should normalize_attribute(:name) }
-    it { should normalize_attribute(:name).from(' this ').to('this') }
-    it { should normalize_attribute(:name).from('   ').to(nil) }
-
-    # :strip normalizer
-    it { should normalize_attribute(:first_name).from('  this  ').to('this') }
-    it { should normalize_attribute(:first_name).from('    ').to('') }
-
-    # :squish normalizer
-    it { should normalize_attribute(:nickname).from(' this    nickname  ').to('this nickname') }
-
-    # :blank normalizer
-    it { should normalize_attribute(:last_name).from('').to(nil) }
-    it { should normalize_attribute(:last_name).from('  ').to(nil) }
-    it { should normalize_attribute(:last_name).from(' this ').to(' this ') }
-
-    # :phone normalizer
-    it { should normalize_attribute(:phone_number).from('no-numbers-here').to(nil) }
-    it { should normalize_attribute(:phone_number).from('1.877.987.9875').to('18779879875') }
-    it { should normalize_attribute(:phone_number).from('+ 1 (877) 987-9875').to('18779879875') }
-  end
-
-end

data/spec/book_spec.rb

@@ -1,52 +0,0 @@
-require File.dirname(File.expand_path(__FILE__)) + '/test_helper'
-
-describe Book do
-
-  it { should normalize_attribute(:author).from(' Michael Deering ').to('Michael Deering') }
-
-  it { should normalize_attribute(:us_price).from('$3.50').to(3.50) }
-  it { should normalize_attribute(:cnd_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') }
-
-  context 'normalization should not interfere with other hooks and aliases on the attribute assignment' do
-    before do
-      @book = Book.create!(:title => 'Original Title')
-    end
-
-    it 'should still reflect that the attribute has been changed through the call to super' do
-      lambda { @book.title = 'New Title' }.should change(@book, :title_changed?).from(false).to(true)
-    end
-  end
-
-  context 'when another instance of the same saved record has been changed' do
-    before do
-      @book = Book.create!(:title => 'Original Title')
-      @book2 = Book.find(@book.id)
-      @book2.update_attributes(:title => 'New Title')
-    end
-
-    it "should reflect the change when the record is reloaded" do
-      lambda { @book.reload }.should change(@book, :title).from('Original Title').to('New Title')
-    end
-  end
-
-  context 'normalization should work with multiple attributes at the same time' do
-    before do
-      @book = Book.new(:title => '  Bad Title   ', :author => '   Bad Author   ')
-    end
-
-    it "should apply normalizations to both attributes" do
-      @book.title.should  == 'Bad Title'
-      @book.author.should == 'Bad Author'
-    end
-  end
-
-  context 'with the default normalizer changed' do
-    @book = Book.new :author => 'testing the default normalizer'
-    @book.author.should == 'testing the default normalizer'
-  end
-
-end

data/spec/connection_and_schema.rb

@@ -1,35 +0,0 @@
-ActiveRecord::Base.establish_connection({
-  :database => ":memory:",
-  :adapter  => 'sqlite3',
-  :timeout  => 500
-})
-
-ActiveRecord::Schema.define do
-  create_table :authors, :force => true do |t|
-    t.string :name
-    t.string :nickname
-    t.string :first_name
-    t.string :last_name
-    t.string :phone_number
-  end
-
-  create_table :books, :force => true do |t|
-    t.string  :author
-    t.string  :isbn
-    t.decimal :cnd_price
-    t.decimal :us_price
-    t.string  :summary
-    t.string  :title
-  end
-
-  create_table :journals, :force => true do |t|
-    t.string  :name
-  end
-
-  create_table :articles, :force => true do |t|
-    t.string  :title
-    t.string  :authors
-    t.string  :slug
-    t.string  :limited_slug
-  end
-end

data/spec/journal_spec.rb

@@ -1,12 +0,0 @@
-require File.dirname(File.expand_path(__FILE__)) + '/test_helper'
-
-describe Journal do
-
-  context 'Testing the built in normalizers' do
-    # default normalization [ :strip, :blank ]
-    it { should normalize_attribute(:name) }
-    it { should normalize_attribute(:name).from(' Physical Review ').to('Physical Review') }
-    it { should normalize_attribute(:name).from('   ').to(nil) }
-  end
-
-end

data/spec/models/article.rb

@@ -1,11 +0,0 @@
-class Article < ActiveRecord::Base
-
-  normalize_attribute :slug, :with => [ :strip, :blank ] do |value|
-    value.present? && value.is_a?(String) ? value.downcase.gsub(/\s+/, '-') : value
-  end
-
-  normalize_attribute :limited_slug, :before => [ :strip, :blank ], :after => [ { :truncate => { :length => 11, :omission => '' } } ] do |value|
-    value.present? && value.is_a?(String) ? value.downcase.gsub(/\s+/, '-') : value
-  end
-
-end

data/spec/models/author.rb

@@ -1,9 +0,0 @@
-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
-
-end

data/spec/models/book.rb

@@ -1,13 +0,0 @@
-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_attributes :title do |value|
-    value.is_a?(String) ? value.titleize.strip : value
-  end
-
-end

data/spec/models/journal.rb

@@ -1,2 +0,0 @@
-class Journal < ActiveRecord::Base
-end

data/spec/test_helper.rb

@@ -1,49 +0,0 @@
-require 'rubygems'
-require 'rspec'
-require 'active_record'
-require 'mongoid'
-
-$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
-
-require 'attribute_normalizer'
-
-
-AttributeNormalizer.configure do |config|
-
-  config.normalizers[:currency] = lambda do |value, options|
-    value.is_a?(String) ? value.gsub(/[^0-9\.]+/, '') : value
-  end
-
-  config.normalizers[:truncate] = lambda do |text, options|
-    if text.is_a?(String)
-      options.reverse_merge!(:length => 30, :omission => "...")
-      l = options[:length] - options[:omission].mb_chars.length
-      chars = text.mb_chars
-      (chars.length > options[:length] ? chars[0...l] + options[:omission] : text).to_s
-    else
-      text
-    end
-  end
-
-  config.normalizers[:special_normalizer] = lambda do |value, options|
-    (value.is_a?(String) && value.match(/testing the default normalizer/)) ? 'testing the default normalizer' : value
-  end
-
-  config.default_normalizers = :strip, :special_normalizer, :blank
-  config.default_attributes = :name, :title
-  config.add_default_attribute :authors, :strip => true, :blank => true
-
-end
-
-
-require 'connection_and_schema'
-require 'models/book'
-require 'models/author'
-require 'models/journal'
-require 'models/article'
-require 'models/magazine'
-
-
-RSpec.configure do |config|
-  config.include AttributeNormalizer::RSpecMatcher
-end