validates_cpf 0.2.2 → 1.0.0

data/.gitignore

@@ -2,4 +2,4 @@
 .bundle
 .rvmrc
 Gemfile.lock
-pkg/*
+pkg/*

data/LICENSE

@@ -0,0 +1,20 @@
+(The MIT License)
+
+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/README.rdoc

@@ -1,6 +1,6 @@
 = ValidatesCPF {<img src="https://secure.travis-ci.org/plribeiro3000/validates_cpf.png" />}[http://travis-ci.org/plribeiro3000/validates_cpf]
 
-Rails gem to validate CPF. Don't forget to check {ValidatesCnpj}[https://github.com/plribeiro3000/validates_cnpj] and {ValidatesTelephone}[https://github.com/plribeiro3000/validates_telephone].
+Rails gem to validate CPF. Don't forget to check {ValidatesCnpj}[https://github.com/plribeiro3000/validates_cnpj], {ValidatesTelephone}[https://github.com/plribeiro3000/validates_telephone] and {ValidatesHost}[https://github.com/plribeiro3000/validates_host].
 
 == Install
 
@@ -10,23 +10,24 @@ gem install validates_cpf
 
 Lets say you have a model with "cpf" string column that you want to be a valid CPF. Just add this to your model:
 
+```ruby
 class User < ActiveRecord::Base
     validates :cpf, :cpf => true
 end
+```
 
 == Test
 
-This gem has matchers for shoulda-matchers and remarkable.
-
-If you are using shoulda-matchers, add this line to your spec_helper.rb :
-    require "validates_cpf/shoulda-matchers/validate_as_cpf_matcher"
-If you are using remarkable, add this line to your spec_helper.rb :
-    require "validates_cpf/remarkable/validate_as_cpf_matcher"
+This gem has buitin matchers for shoulda-matchers and remarkable.
 
 === How?
 
-You should use validates_as_cpf(:attribute) just like any other shoulda or remarkable matcher.
+You should use require_a_valid_cpf(:attribute) or skip the attribute part if the attribute name is cpf.
 
 == Goal
 
-This project is based on brcpfcnpj gem and his intention it to mantain a cleaner code to validate CPF and easy matchers to test it.
+This project is based on brcpfcnpj gem and his intention it to mantain a cleaner code to validate CPF and easy matchers to test it.
+
+== Contribute
+
+Fork the project and send me a Pull Request. =D

data/lib/validates_cpf/remarkable/require_a_valid_cpf_matcher.rb

@@ -0,0 +1,29 @@
+require 'remarkable/active_model'
+
+module Remarkable
+  module ActiveModel
+    module Matchers
+      class RequireAValidCpfMatcher < Remarkable::ActiveModel::Base
+        arguments :cpf
+
+        collection_assertions :disallow_invalid_value, :allow_valid_value
+
+        protected
+
+        def disallow_invalid_value
+          @subject.cpf = '123456'
+          @subject.valid?.errors[:cpf].should == ['is invalid']
+        end
+
+        def allow_valid_value
+          @subject.cpf = '764.579.437-21'
+          @subject.valid?.errors[:cpf].should == []
+        end
+      end
+
+      def require_a_valid_cpf(*args, &block)
+        RequireAValidCpfMatcher.new(*args, &block).spec(self)
+      end
+    end
+  end
+end

data/lib/validates_cpf/shoulda-matchers/{validate_as_cpf_matcher.rb → require_a_valid_cpf_matcher.rb}

@@ -3,27 +3,23 @@ require "shoulda-matchers"
 module Shoulda
   module Matchers
     module ActiveModel
-      def validate_as_cpf(attr)
-        ValidateAsCpfMatcher.new(attr)
+      def require_a_valid_cpf(attr = :cpf)
+        RequireAValidCpfMatcher.new(attr)
       end
 
-      class ValidateAsCpfMatcher < ValidationMatcher
+      class RequireAValidCpfMatcher < ValidationMatcher
         def initialize(attribute)
           @attribute = attribute
         end
 
         def description
-          "validate #{@attribute} as a valid CPF number"
-        end
-
-        def failure_message
-          "expected #{@attribute} to be validated as a valid CPF number"
+          "require a valid CPF number"
         end
 
         def matches?(subject)
           super(subject)
 
-          disallows_invalid_value and allows_valid_value and allows_nil_value
+          disallows_invalid_value and allows_valid_value
         end
 
         private
@@ -35,10 +31,6 @@ module Shoulda
         def allows_valid_value
           allows_value_of("897.546.112-20")
         end
-
-        def allows_nil_value
-          allows_value_of(nil)
-        end
       end
     end
   end

data/lib/validates_cpf/version.rb

@@ -1,3 +1,3 @@
 module ValidatesCpf
-  VERSION = "0.2.2"
+  VERSION = "1.0.0"
 end

data/lib/validates_cpf.rb

@@ -1,6 +1,9 @@
-require "active_model"
 require "validates_cpf/cpf"
 
+#Rspec Matchers
+require "validates_cpf/shoulda-matchers/require_a_valid_cpf_matcher" if defined?(::Shoulda)
+require "validates_cpf/remarkable/require_a_valid_cpf_matcher" if defined?(::Remarkable)
+
 class CpfValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     record.errors[attribute] << I18n.t("errors.messages.invalid") unless CPF.new(value).valid?

data/spec/fake_app/db/create_admins.rb

@@ -1,7 +1,8 @@
 class CreateAdmins < ActiveRecord::Migration
   def self.up
-    create_table :admins do |u|
-      u.string :cpf
+    create_table :admins do |a|
+      a.string :cpf
+      a.string :name
     end
   end
 

data/spec/fake_app/db/create_users.rb

@@ -2,6 +2,7 @@ class CreateUsers < ActiveRecord::Migration
   def self.up
     create_table :users do |u|
       u.string :cpf
+      u.string :name
     end
   end
 

data/spec/validates_cpf/remarkable/require_a_valid_cpf_matcher_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'remarkable/active_model'
+
+describe Remarkable::ActiveModel::Matchers::RequireAValidCpfMatcher do
+  before :each do
+    @user = User.new
+  end
+
+  it "should accept on cpf" do
+    @user.should require_a_valid_cpf(:cpf)
+  end
+
+  it "should accept without a specified attribute" do
+    @user.should require_a_valid_cpf
+  end
+
+  it "should reject on name" do
+    @user.should_not require_a_valid_cpf(:name)
+  end
+end

data/spec/validates_cpf/shoulda-matchers/require_a_valid_cpf_matcher_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'shoulda-matchers'
+
+describe Shoulda::Matchers::ActiveModel::RequireAValidCpfMatcher do
+  before :each do
+    @user = User.new
+  end
+
+  it "should accept on cpf" do
+    @user.should require_a_valid_cpf(:cpf)
+  end
+
+  it "should accept without a specified attribute" do
+    @user.should require_a_valid_cpf
+  end
+
+  it "should reject on name" do
+    @user.should_not require_a_valid_cpf(:name)
+  end
+end

data/spec/validates_cpf_spec.rb

@@ -10,7 +10,7 @@ describe CpfValidator do
       @user.valid?.should be_false
     end
 
-    it "should set an error on attribute" do
+    it "should set an error message on attribute" do
       @user.valid?
       @user.errors[:cpf].should == ['is invalid']
     end
@@ -25,7 +25,7 @@ describe CpfValidator do
       @user.valid?.should be_true
     end
 
-    it "should not set an error on attribute" do
+    it "should not set an error message on attribute" do
       @user.valid?
       @user.errors[:cpf].should be_blank
     end

data/validates_cpf.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", ">= 2.0.0"
-  s.add_development_dependency "shoulda-matchers", ">= 1.0.0"
-  s.add_development_dependency "remarkable_activerecord", "= 4.0.0.alpha4"
+  s.add_development_dependency "shoulda-matchers", ">= 1.2.0"
+  s.add_development_dependency "remarkable_activerecord", ">= 4.0.0.alpha4"
   s.add_development_dependency "sqlite3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_cpf
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &19547780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *19547780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19545400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19545400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &19543920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,32 +53,47 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *19543920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
-  requirement: &19542960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *19542960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: remarkable_activerecord
-  requirement: &19541760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.0.0.alpha4
   type: :development
   prerelease: false
-  version_requirements: *19541760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0.alpha4
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19541020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19541020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Validates CPF and test it with matchers in a simple way.
 email: plribeiro3000@gmail.com
 executables: []
@@ -86,21 +116,22 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- LICENSE
 - README.rdoc
 - Rakefile
 - lib/validates_cpf.rb
 - lib/validates_cpf/cpf.rb
-- lib/validates_cpf/remarkable/validate_as_cpf_matcher.rb
-- lib/validates_cpf/shoulda-matchers/validate_as_cpf_matcher.rb
+- lib/validates_cpf/remarkable/require_a_valid_cpf_matcher.rb
+- lib/validates_cpf/shoulda-matchers/require_a_valid_cpf_matcher.rb
 - lib/validates_cpf/version.rb
 - spec/fake_app/admin.rb
 - spec/fake_app/db/create_admins.rb
 - spec/fake_app/db/create_users.rb
 - spec/fake_app/user.rb
-- spec/remarkable/validate_as_cpf_matcher_spec.rb
-- spec/shoulda-matchers/validate_as_cpf_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/validates_cpf/cpf_spec.rb
+- spec/validates_cpf/remarkable/require_a_valid_cpf_matcher_spec.rb
+- spec/validates_cpf/shoulda-matchers/require_a_valid_cpf_matcher_spec.rb
 - spec/validates_cpf_spec.rb
 - validates_cpf.gemspec
 homepage: ''
@@ -123,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: validates_cpf
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: CPF Validation GEM

data/lib/validates_cpf/remarkable/validate_as_cpf_matcher.rb

@@ -1,34 +0,0 @@
-require 'remarkable/active_record'
-
-module Remarkable
-  module ActiveRecord
-    module Matchers
-      class ValidateAsCpfMatcher < Remarkable::ActiveRecord::Base
-        arguments :cpf
-
-        collection_assertions :cpf_valid?, :allow_nil?, :formatted_number?
-
-        protected
-
-        def cpf_valid?
-          @subject.cpf = '123456'
-          @subject.valid?.errors[:cpf].should == ['is invalid']
-        end
-
-        def allow_nil?
-          @subject.cpf = nil
-          @subject.valid?.errors[:cpf].should == []
-        end
-
-        def formatted_number?
-          @subject.cpf = '55658208394'
-          @subject.valid?.cpf.should == '556.582.083-94'
-        end
-      end
-
-      def validate_as_cpf(*args, &block)
-        ValidateAsCpfMatcher.new(*args, &block).spec(self)
-      end
-    end
-  end
-end

data/spec/remarkable/validate_as_cpf_matcher_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-require 'remarkable/active_record'
-
-describe Remarkable::ActiveRecord::Matchers::ValidateAsCpfMatcher do
-  context "on a attribute which validates cpf" do
-    it "should require a valid CPF" do
-      @user = User.new(:cpf => '123456')
-      @user.should validate_as_cpf(:cpf)
-    end
-
-    it "should allow a nil value" do
-      @user = User.new(:cpf => nil)
-      @user.should validate_as_cpf(:cpf)
-    end
-  end
-
-  context "on a attribute which not validates cpf" do
-    before do
-      @user = Admin.new(:cpf => '123456')
-    end
-
-    it "should not require a valid CPF" do
-      @user.should_not validate_as_cpf(:cpf)
-    end
-  end
-end

data/spec/shoulda-matchers/validate_as_cpf_matcher_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-require 'shoulda-matchers'
-
-describe Shoulda::Matchers::ActiveModel::ValidateAsCpfMatcher do
-  context "on a attribute which validates cpf" do
-    it "should require a valid CPF" do
-      @user = User.new(:cpf => '123456')
-      @user.should validate_as_cpf(:cpf)
-    end
-
-    it "should allow a nil value" do
-      @user = User.new(:cpf => nil)
-      @user.should validate_as_cpf(:cpf)
-    end
-  end
-
-  context "on a attribute which not validates cpf" do
-    before do
-      @user = Admin.new(:cpf => '123456')
-    end
-
-    it "should not require a valid CPF" do
-      @user.should_not validate_as_cpf(:cpf)
-    end
-  end
-end