normalize_attributes 0.1.5 → 0.1.6

data/.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+pkg

data/Gemfile

@@ -1,5 +1,3 @@
 source :rubygems
 
-gem "rspec", "2.0.0"
-gem "activerecord", "3.0.1"
-gem "sqlite3-ruby"
+gemspec

data/Gemfile.lock

@@ -1,6 +1,23 @@
+PATH
+  remote: .
+  specs:
+    normalize_attributes (0.1.5)
+      activerecord (>= 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    actionpack (3.0.1)
+      activemodel (= 3.0.1)
+      activesupport (= 3.0.1)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
     activemodel (3.0.1)
       activesupport (= 3.0.1)
       builder (~> 2.1.2)
@@ -11,28 +28,50 @@ GEM
       arel (~> 1.0.0)
       tzinfo (~> 0.3.23)
     activesupport (3.0.1)
+    archive-tar-minitar (0.5.2)
     arel (1.0.1)
       activesupport (~> 3.0.0)
     builder (2.1.2)
+    columnize (0.3.2)
     diff-lcs (1.1.2)
-    i18n (0.4.1)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-    sqlite3-ruby (1.3.1)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.4.2)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
+    sqlite3-ruby (1.3.2)
     tzinfo (0.3.23)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 3.0.1)
-  rspec (= 2.0.0)
+  actionpack
+  activerecord (>= 3.0.0)
+  normalize_attributes!
+  rspec (>= 2.0.0)
+  ruby-debug19
   sqlite3-ruby

data/README.rdoc

@@ -11,39 +11,46 @@ To install:
 Then on your model:
 
   class User < ActiveRecord::Base
-    normalize_attribute :email, :with => :downcase
+    normalize :email, :with => :downcase
   end
 
 The example above will normalize your <tt>:email</tt> attribute on the <tt>before_save</tt> callback.
 
 You can specify multiple attributes
 
-  normalize_attributes :email, :username, :with => :downcase
+  normalize :email, :username, :with => :downcase
 
 You can use a block
 
-  normalize_attribute :name do |value|
+  normalize :name do |value|
     value.squish
   end
 
 You can combine both
 
-  normalize_attribute :name, :with => :downcase do |value|
+  normalize :name, :with => :downcase do |value|
     value.squish
   end
 
 The <tt>squish</tt> method is the default normalizer for strings. All you need to is specify the attribute:
 
-  normalize_attribute :content
+  normalize :content
 
 The <tt>compact</tt> method is the default normalizer for arrays (when using <tt>serialize</tt> method):
 
   class User < ActiveRecord::Base
     serialize :preferences, Array
-    normalize_attribute :preferences
+    normalize :preferences
   end
 
-The <tt>normalize_attributes</tt> method is aliased as <tt>normalize</tt>, <tt>normalize_attribute</tt>, <tt>normalize_attr</tt>, and <tt>normalize_attrs</tt>.
+The <tt>normalize</tt> method is aliased as <tt>normalize_attributes</tt>, <tt>normalize_attribute</tt>, <tt>normalize_attr</tt>, and <tt>normalize_attrs</tt>.
+
+You can normalize the attribute before type casting; this is specially useful for normalizing
+dates and numbers.
+
+  class Product
+    normalize(:price, :raw => true) {|v| Money.new(v).to_f}
+  end
 
 == Maintainer
 

data/Rakefile

@@ -1,32 +1,5 @@
-require "rake"
-require "rspec/core/rake_task"
-require "./lib/normalize_attributes/version"
-
-desc "Default: run specs."
-task :default => :spec
-
-desc "Run the specs"
-RSpec::Core::RakeTask.new do |t|
-  t.ruby_opts = %w[-Ilib -Ispec]
-end
+require "bundler"
+Bundler::GemHelper.install_tasks
 
-begin
-  require "jeweler"
-
-  JEWEL = Jeweler::Tasks.new do |gem|
-    gem.name = "normalize_attributes"
-    gem.version = NormalizeAttributes::Version::STRING
-    gem.summary = "Normalize ActiveRecord attributes"
-    gem.description = "Normalize ActiveRecord attributes"
-    gem.authors = ["Nando Vieira"]
-    gem.email = "fnando.vieira@gmail.com"
-    gem.homepage = "http://github.com/fnando/normalize_attributes"
-    gem.has_rdoc = false
-    gem.add_dependency "activerecord"
-    gem.files = FileList["{Gemfile,Gemfile.lock,Rakefile,MIT-LICENSE,normalize_attributes.gemspec,README.rdoc}", "{lib,spec,templates}/**/*"]
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError => e
-  puts "You don't Jeweler installed, so you won't be able to build gems."
-end
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new

data/lib/normalize_attributes.rb

@@ -2,3 +2,5 @@ require "active_record"
 require "active_support/core_ext/string/filters"
 require "normalize_attributes/version"
 require "normalize_attributes/active_record"
+
+ActiveRecord::Base.send :include, NormalizeAttributes::ActiveRecord

data/lib/normalize_attributes/active_record.rb

@@ -7,65 +7,72 @@ module NormalizeAttributes
         before_validation :normalize_attributes
 
         class << self
-          attr_accessor :normalize_attributes_options
+          attr_accessor :normalize_options
         end
       end
     end
 
     module ClassMethods
-      def normalize_attributes(*args, &block)
-        self.normalize_attributes_options ||= {}
+      def normalize(*args, &block)
+        self.normalize_options ||= {}
         options = args.extract_options!
 
         args.each do |attr_name|
           attr_name = attr_name.to_sym
 
-          normalize_attributes_options.tap do |o|
+          normalize_options.tap do |o|
             o[attr_name] ||= []
-            o[attr_name] << options[:with] if options[:with]
-            o[attr_name] << block if block_given?
+            o[attr_name] << [[block, options[:with]].flatten.compact, options.except(:with)]
           end
         end
       end
 
-      alias_method :normalize, :normalize_attributes
-      alias_method :normalize_attribute, :normalize_attributes
-      alias_method :normalize_attr, :normalize_attributes
-      alias_method :normalize_attrs, :normalize_attributes
+      alias_method :normalize_attributes, :normalize
+      alias_method :normalize_attribute, :normalize
+      alias_method :normalize_attr, :normalize
+      alias_method :normalize_attrs, :normalize
     end
 
     module InstanceMethods
       private
       def normalize_attributes
-        options = self.class.normalize_attributes_options || {}
+        return unless self.class.normalize_options
 
-        options.each do |attr_name, normalizers|
-          value = self.send("#{attr_name}_before_type_cast")
-
-          if normalizers.empty?
-            case value
-            when String
-              normalizers << :squish
-            when Array
-              normalizers << :compact
-            end
+        self.class.normalize_options.each do |name, items|
+          items.each do |item|
+            apply_normalizers name, *item
           end
+        end
+      end
+
+      def apply_normalizers(name, normalizers, options)
+        if options[:raw] && respond_to?("#{name}_before_type_cast")
+          value = send("#{name}_before_type_cast")
+        else
+          value = send(name)
+        end
 
-          [normalizers].flatten.each do |normalizer|
-            if normalizer.respond_to?(:call)
-              value = normalizer.call(value)
-            elsif value.respond_to?(normalizer)
-              value = value.send(normalizer)
-            else
-              value = send(normalizer, value)
-            end
+        if normalizers.empty?
+          case value
+          when String
+            normalizers << :squish
+          when Array
+            normalizers << :compact
           end
+        end
 
-          write_attribute attr_name, value
+        normalizers.each do |normalizer|
+          if normalizer.respond_to?(:call)
+            value = normalizer.call(value)
+          elsif value.respond_to?(normalizer)
+            value = value.send(normalizer)
+          elsif respond_to?(normalizer)
+            value = send(normalizer, value)
+          end
         end
+
+        write_attribute name, value
       end
     end
   end
 end
-
-ActiveRecord::Base.send :include, NormalizeAttributes::ActiveRecord

data/lib/normalize_attributes/version.rb

@@ -2,7 +2,7 @@ module NormalizeAttributes
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 5
+    PATCH = 6
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/normalize_attributes.gemspec

@@ -1,59 +1,25 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "normalize_attributes/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{normalize_attributes}
-  s.version = "0.1.5"
+  s.name        = "normalize_attributes"
+  s.version     = NormalizeAttributes::Version::STRING
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Nando Vieira"]
+  s.email       = ["fnando.vieira@gmail.com"]
+  s.homepage    = "http://rubygems.org/gems/normalize_attributes"
+  s.summary     = "Normalize ActiveRecord attributes"
+  s.description = "Normalize ActiveRecord attributes"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nando Vieira"]
-  s.date = %q{2010-10-18}
-  s.description = %q{Normalize ActiveRecord attributes}
-  s.email = %q{fnando.vieira@gmail.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "Gemfile",
-     "Gemfile.lock",
-     "README.rdoc",
-     "Rakefile",
-     "lib/normalize_attributes.rb",
-     "lib/normalize_attributes/active_record.rb",
-     "lib/normalize_attributes/version.rb",
-     "normalize_attributes.gemspec",
-     "spec/normalize_attributes_spec.rb",
-     "spec/schema.rb",
-     "spec/spec_helper.rb",
-     "spec/support/token.rb",
-     "spec/support/user.rb"
-  ]
-  s.homepage = %q{http://github.com/fnando/normalize_attributes}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Normalize ActiveRecord attributes}
-  s.test_files = [
-    "spec/normalize_attributes_spec.rb",
-     "spec/schema.rb",
-     "spec/spec_helper.rb",
-     "spec/support/token.rb",
-     "spec/support/user.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 0"])
-  end
+  s.add_dependency "activerecord", ">= 3.0.0"
+  s.add_development_dependency "rspec", ">= 2.0.0"
+  s.add_development_dependency "sqlite3-ruby"
+  s.add_development_dependency "actionpack"
+  s.add_development_dependency "ruby-debug19"
 end
-

data/spec/normalize_attributes_spec.rb

@@ -2,46 +2,47 @@ require "spec_helper"
 
 describe "Normalize Attributes" do
   before do
-    User.normalize_attributes_options = {}
+    User.normalize_options = {}
   end
 
   it "should respond to aliases" do
     User.should respond_to(:normalize)
-    User.should respond_to(:normalize_attrs)
     User.should respond_to(:normalize_attr)
+    User.should respond_to(:normalize_attrs)
     User.should respond_to(:normalize_attribute)
+    User.should respond_to(:normalize_attributes)
   end
 
   it "should apply single normalization method" do
-    User.normalize_attribute :email, :with => :downcase
+    User.normalize :email, :with => :downcase
     user = User.create(:email => "JOHN@DOE.COM")
 
     user.email.should == "john@doe.com"
   end
 
   it "should apply multiple normalization methods" do
-    User.normalize_attribute :email, :with => [:downcase, :reverse]
+    User.normalize :email, :with => [:downcase, :reverse]
     user = User.create(:email => "JOHN@DOE.COM")
 
     user.email.should == "moc.eod@nhoj"
   end
 
   it "should apply proc" do
-    User.normalize_attribute(:email) {|v| v.downcase }
+    User.normalize(:email) {|v| v.downcase }
     user = User.create(:email => "JOHN@DOE.COM")
 
     user.email.should == "john@doe.com"
   end
 
   it "should apply instance method" do
-    User.normalize_attribute(:username, :with => :normalize_username)
+    User.normalize(:username, :with => :normalize_username)
     user = User.create(:username => "JOHNDOE")
 
     user.username.should == "johndoe"
   end
 
   it "should use value before type casting" do
-    User.normalize_attribute(:age) do |v|
+    User.normalize(:age, :raw => true) do |v|
       v.should == "1.2"
       v.to_f * 10
     end
@@ -50,15 +51,19 @@ describe "Normalize Attributes" do
     user.age.should == 12
   end
 
+  it "should apply normalizers to accessor" do
+    # User.normalize()
+  end
+
   it "should combine both method names and procs as normalization methods" do
-    User.normalize_attribute(:email, :with => :downcase) {|v| v.reverse }
+    User.normalize(:email, :with => :downcase) {|v| v.reverse }
     user = User.create(:email => "JOHN@DOE.COM")
 
     user.email.should == "moc.eod@nhoj"
   end
 
   it "should normalize multiple attributes" do
-    User.normalize_attributes :email, :username, :with => :downcase
+    User.normalize :email, :username, :with => :downcase
     user = User.create(:email => "JOHN@DOE.COM", :username => "JOHN")
 
     user.email.should == "john@doe.com"
@@ -66,7 +71,7 @@ describe "Normalize Attributes" do
   end
 
   it "should not apply on associations" do
-    User.normalize_attributes :email, :with => :downcase
+    User.normalize :email, :with => :downcase
     user = User.create(:email => "JOHN@DOE.COM", :username => "JOHN")
 
     expect {
@@ -75,24 +80,33 @@ describe "Normalize Attributes" do
   end
 
   it "should apply default filter on strings" do
-    User.normalize_attributes :email
+    User.normalize :email
     user = User.create(:email => "    \n\t    john@doe.com    \t\t\n\r\n", :username => "john")
 
     user.email.should == "john@doe.com"
   end
 
   it "should apply default filter on arrays" do
-    User.normalize_attributes :preferences
+    User.normalize :preferences
     user = User.create(:preferences => [nil, :games, :music])
     user.preferences.should == [:games, :music]
   end
 
   it "should not apply default filter on unknown objects" do
-    User.normalize_attributes :username
+    User.normalize :username
 
     expect {
       user = User.create(:username => 100)
       user.username.should == 100
     }.to_not raise_error
   end
+
+  it "should not apply filter when object do not respond to normalizer" do
+    User.normalize :username, :with => :missing
+
+    expect {
+      user = User.create(:username => nil)
+      user.save
+    }.to_not raise_error
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -02:00
+date: 2010-11-07 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,19 +26,77 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Normalize ActiveRecord attributes
-email: fnando.vieira@gmail.com
+email: 
+- fnando.vieira@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -53,12 +111,12 @@ files:
 - spec/support/token.rb
 - spec/support/user.rb
 has_rdoc: true
-homepage: http://github.com/fnando/normalize_attributes
+homepage: http://rubygems.org/gems/normalize_attributes
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement