validates_cnpj 0.1.2 → 1.0.0

data/.rvmrc

@@ -1 +1 @@
-rvm use 1.9.3-p0@validates_cnpj
+rvm use 1.9.3-p194@validates_cnpj

data/lib/validates_cnpj.rb

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

data/lib/validates_cnpj/remarkable/require_a_valid_cnpj_matcher.rb

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

data/lib/validates_cnpj/shoulda-matchers/{validate_as_cnpj_matcher.rb → require_a_valid_cnpj_matcher.rb}

@@ -3,27 +3,23 @@ require "shoulda-matchers"
 module Shoulda
   module Matchers
     module ActiveModel
-      def validate_as_cnpj(attr)
-        ValidateAsCnpjMatcher.new(attr)
+      def require_a_valid_cnpj(attr = :cnpj)
+        RequireAValidCnpjMatcher.new(attr)
       end
 
-      class ValidateAsCnpjMatcher < ValidationMatcher
+      class RequireAValidCnpjMatcher < ValidationMatcher
         def initialize(attribute)
           @attribute = attribute
         end
 
         def description
-          "validate #{@attribute} as a valid CNPJ number"
-        end
-
-        def failure_message
-          "expected #{@attribute} to be validated as a valid CNPJ number"
+          "require a valid CNPJ 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("51.114.450/0001-46")
         end
-
-        def allows_nil_value
-          allows_value_of(nil)
-        end
       end
     end
   end

data/lib/validates_cnpj/version.rb

@@ -1,3 +1,3 @@
 module ValidatesCnpj
-  VERSION = "0.1.2"
+  VERSION = "1.0.0"
 end

data/spec/fake_app/db/create_companies.rb

@@ -1,7 +1,8 @@
 class CreateCompanies < ActiveRecord::Migration
   def self.up
-    create_table :companies do |u|
-      u.string :cnpj
+    create_table :companies do |c|
+      c.string :cnpj
+      c.string :name
     end
   end
 

data/spec/validates_cnpj/remarkable/validate_as_cnpj_matcher_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'remarkable/active_model'
+
+describe Remarkable::ActiveModel::Matchers::RequireAValidCnpjMatcher do
+  before :each do
+    @company = Company.new
+  end
+
+  it "should accept on cnpj" do
+    @company.should require_a_valid_cnpj(:cnpj)
+  end
+
+  it "should accept without a specified attribute" do
+    @company.should require_a_valid_cnpj
+  end
+
+  it "should reject on name" do
+    @company.should_not require_a_valid_cnpj(:name)
+  end
+end

data/spec/validates_cnpj/shoulda-matchers/validate_as_cnpj_matcher_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'shoulda-matchers'
+
+describe Shoulda::Matchers::ActiveModel::RequireAValidCnpjMatcher do
+  before :each do
+    @company = Company.new
+  end
+
+  it "should accept on cnpj" do
+    @company.should require_a_valid_cnpj(:cnpj)
+  end
+
+  it "should accept without a specified attribute" do
+    @company.should require_a_valid_cnpj
+  end
+
+  it "should reject on name" do
+    @company.should_not require_a_valid_cnpj(:name)
+  end
+end

data/validates_cnpj.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 "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_cnpj
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &12750240 !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: *12750240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12748560 !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: *12748560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12748020 !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: *12748020
+  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: &12747500 !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: *12747500
+  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: &12746940 !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: *12746940
+  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: &12746500 !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: *12746500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Validates CNPJ and test it with matchers in a simple way.
 email: plribeiro3000@gmail.com
 executables: []
@@ -92,17 +122,17 @@ files:
 - Rakefile
 - lib/validates_cnpj.rb
 - lib/validates_cnpj/cnpj.rb
-- lib/validates_cnpj/remarkable/validate_as_cnpj_matcher.rb
-- lib/validates_cnpj/shoulda-matchers/validate_as_cnpj_matcher.rb
+- lib/validates_cnpj/remarkable/require_a_valid_cnpj_matcher.rb
+- lib/validates_cnpj/shoulda-matchers/require_a_valid_cnpj_matcher.rb
 - lib/validates_cnpj/version.rb
 - spec/fake_app/admin.rb
 - spec/fake_app/company.rb
 - spec/fake_app/db/create_admins.rb
 - spec/fake_app/db/create_companies.rb
-- spec/remarkable/validate_as_cnpj_matcher_spec.rb
-- spec/shoulda-matchers/validate_as_cnpj_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/validates_cnpj/cnpj_spec.rb
+- spec/validates_cnpj/remarkable/validate_as_cnpj_matcher_spec.rb
+- spec/validates_cnpj/shoulda-matchers/validate_as_cnpj_matcher_spec.rb
 - spec/validates_cnpj_spec.rb
 - validates_cnpj.gemspec
 homepage: ''
@@ -125,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: validates_cnpj
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: CNPJ Validation GEM

data/lib/validates_cnpj/remarkable/validate_as_cnpj_matcher.rb

@@ -1,34 +0,0 @@
-require 'remarkable/active_record'
-
-module Remarkable
-  module ActiveRecord
-    module Matchers
-      class ValidateAsCnpjMatcher < Remarkable::ActiveRecord::Base
-        arguments :cnpj
-
-        collection_assertions :cnpj_valid?, :allow_nil?, :formatted_number?
-
-        protected
-
-        def cnpj_valid?
-          @subject.cnpj = '123456'
-          @subject.valid?.errors[:cnpj].should == ['is invalid']
-        end
-
-        def allow_nil?
-          @subject.cnpj = nil
-          @subject.valid?.errors[:cnpj].should == []
-        end
-
-        def formatted_number?
-          @subject.cnpj = '51114450000146'
-          @subject.valid?.cnpj.should == '51.114.450/0001-46'
-        end
-      end
-
-      def validate_as_cnpj(*args, &block)
-        ValidateAsCnpjMatcher.new(*args, &block).spec(self)
-      end
-    end
-  end
-end

data/spec/remarkable/validate_as_cnpj_matcher_spec.rb

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

data/spec/shoulda-matchers/validate_as_cnpj_matcher_spec.rb

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