brcpfcnpj 2.0.13 → 2.0.14

data/lib/brcpfcnpj/cpf_cnpj_activerecord.rb

@@ -4,74 +4,57 @@ module CpfCnpjActiveRecord #:nodoc:
   end
   module ClassMethods #:nodoc:
     def usar_como_cpf(*args) #:nodoc:
-      unless args.size.zero?
-        args.each do |name|
-          composed_of name, :class_name => 'Cpf', :mapping => [name.to_s, "numero"], :allow_nil => true do
-            Cpf.new(name[:numero])
-          end
-          name = name.to_s
-          module_eval <<-ADICIONANDO_METODOS_PARA_CPF
-          validate :#{name}_valido?
-
-          def #{name}_valido?
-            value = read_attribute('#{name}')
-            if !value.nil? && value.strip != '' && !#{name}.nil? && !#{name}.valido?
-              self.errors.add('#{name}', 'numero invalido')
-            end
-          end  
-          
-          def #{name}=(value)
-            if value.nil?            
-              write_attribute('#{name}', nil)
-            elsif value.kind_of?(Cpf) 
-              write_attribute('#{name}', value.numero)
-            else
-              begin               
-                write_attribute('#{name}', value)
-              rescue               
-                @#{name} = value
-              end
-            end
-          end
-          ADICIONANDO_METODOS_PARA_CPF
-        end
-      end
+      init(args, 'Cpf')
     end
     
     def usar_como_cnpj(*args) #:nodoc:
+      init(args, 'Cnpj')
+    end
+
+    def init(args, klass)
       unless args.size.zero?
         args.each do |name|
-          composed_of name, :class_name => 'Cnpj', :mapping => [name.to_s, "numero"], :allow_nil => true do
-            Cnpj.new(name[:numero])
-          end
+          add_composed_class(name, klass)
+          module_eval create_code(name.to_s, klass)
+        end
+      end      
+    end
 
-          name = name.to_s
-          module_eval <<-ADICIONANDO_METODOS_PARA_CNPJ
-          validate :#{name}_valido?
+    def add_composed_class(name, klass)
+      options = {:class_name => klass, :mapping => [name.to_s, "numero"], :allow_nil => true}
+      constructor = Proc.new { |numero| eval(klass).new(numero) }
+      converter   = Proc.new { |value| eval(klass).new(value) }
+      begin 
+        composed_of name, options.merge( { :constructor => constructor, :converter => converter } )
+      rescue Exception 
+        composed_of name, options { eval(klass).new(name[:numero]) }
+      end
+    end
 
-          def #{name}_valido?
-            value = read_attribute('#{name}')
-            if !value.nil? && value.strip != '' && !#{name}.nil? && !#{name}.valido?
-              self.errors.add('#{name}', 'numero invalido')
-            end
+    def create_code(name, klass)
+      str = <<-CODE
+        validate :#{name}_valido?
+        def #{name}_valido?
+          value = read_attribute('#{name}')
+          if !value.nil? && value.strip != '' && !#{name}.nil? && !#{name}.valido?
+            self.errors.add('#{name}', 'numero invalido')
           end
-
-          def #{name}=(value)
-            if value.nil?
-              write_attribute('#{name}', nil)
-            elsif value.kind_of?(Cnpj)
-              write_attribute('#{name}', value.numero)
-            else
-              begin
-                write_attribute('#{name}', value)
-              rescue
-                @#{name} = value
-              end
+        end
+        def #{name}=(value)
+          if value.nil?            
+            write_attribute('#{name}', nil)
+          elsif value.kind_of?(#{eval(klass)}) 
+            write_attribute('#{name}', value.numero)
+          else
+            begin               
+              c = #{eval(klass)}.new(value)
+              c.valido? ? write_attribute('#{name}', c.numero) : write_attribute('#{name}', value) 
+            rescue               
+              @#{name} = value
             end
           end
-          ADICIONANDO_METODOS_PARA_CNPJ
         end
-      end      
+      CODE
     end
   end
 end

data/lib/brcpfcnpj/version.rb

@@ -1,5 +1,5 @@
 module BrCpfCnpj
   module VERSION #:nodoc:
-    STRING = "2.0.13"
+    STRING = "2.0.14"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brcpfcnpj
 version: !ruby/object:Gem::Version 
-  version: 2.0.13
+  version: 2.0.14
 platform: ruby
 authors: 
 - "Marcos Tapaj\xC3\xB3s"
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-16 00:00:00 -02:00
+date: 2009-01-20 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency