run_cl 1.2.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82262100b00def3416d849bfbb1a71f7b3bfa681
-  data.tar.gz: 079229386e79ed2906fada0ae743e9113784dcfd
+  metadata.gz: b3b2acf238e7f70d7ccd620a89b0442d41dcbe9f
+  data.tar.gz: b81bb124df655014b996bda9ec506c0505ecf016
 SHA512:
-  metadata.gz: 91dae2aa8813072d8f8affd0690dd3bda83bb13c88f6aa0aea01e7bbb8d56ef33a65ebd03c26b502b89b28e68151b53578b9adeb6e636ee69337d22ea9469cbb
-  data.tar.gz: 9683a37d9cb9eb4e4fd661cfda282733fcb3aadacd4fc87049f3e1d54abb1d76b7b5d197ab398c25d9fc1b008088479990479cb7a4a1d3263403c4f4c5f751c0
+  metadata.gz: ddc46964bdcc71f716c79a1a4da2deeced75a9f301c1af606ed36614bc4561aff080173e437825d8cd5ba19018cec1e826fb93762a4ca633b6bd16a666f98e02
+  data.tar.gz: 0537a47a9377a4e5620813bbccceb99b47d7a36d1102895529659013069daa0e74c8d0cb211de7d9e680dd8a3d5a6dd1f4be9c05bd5c2c92e26f619f6d1f2ff1

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+# Mac finder artifacts
+.DS_Store

data/README.md

@@ -82,11 +82,21 @@ If you need to format a RUN:
     Run.format('111111111')
       ====>>  11.111.111-1
 
+, or remove the verifying digit:
+
+    Run.format('111111111', false)
+      ====>>  11.111.111
+
 If you need to remove a RUN format:
 
     Run.remove_format('11.111.111-1')
       ====>>  111111111
 
+, or remove the verifying digit:
+
+    Run.remove_format('11.111.111-1', false)
+      ====>>  11111111
+
 ## Assumptions
 
 You are saving the RUN as a string, and that is keeping raw (without dots and dashes).

data/lib/run_cl.rb

@@ -15,23 +15,21 @@ module RunCl
     module ClassMethods
       # include InstanceMethods
       def has_run_cl(name, options = {})
-        if options[:run].nil? or options[:run]
-          if options[:on].present?
-            validates name, run: true, on: options[:on]
-          else
-            validates name, run: true
-          end
+        run                  = options.delete(:run)
+        uniq_run             = options.delete(:uniq_run)
+        skip_db_format_clear = options.delete(:skip_db_format_clear)
+
+        if run.nil? or run
+          validates name, options.merge({run: true})
         end
 
-        if options[:uniq_run].nil? or options[:uniq_run]
-          if options[:on].present?
-            validates name, uniq_run: true, on: options[:on]
-          else
-            validates name, uniq_run: true
-          end
+        if uniq_run.class == Hash and uniq_run.keys.any?
+          validates name, options.merge({uniq_run: uniq_run})
+        elsif uniq_run.nil? or uniq_run == true
+          validates name, options.merge({uniq_run: true})
         end
 
-        if options[:skip_db_format_clear].nil? or options[:skip_db_format_clear] == false
+        if skip_db_format_clear.nil? or skip_db_format_clear == false
           before_validation "make_#{name}_format!"
 
           define_method "make_#{name}_format!" do

data/lib/run_cl/run.rb

@@ -2,7 +2,7 @@ module Run
   extend self
 
   # Formatea un run
-  def self.format run
+  def self.format run, digit=false
     return nil if run.nil?
     pos = 0
     run.reverse
@@ -17,13 +17,23 @@ module Run
       end
       pos += 1
     end
-    reverse.reverse
+
+    if digit
+      reverse.reverse[0..-3]
+    else
+      reverse.reverse
+    end
   end
 
   # Quita el formato de un run
-  def self.remove_format run
+  def self.remove_format run, digit=false
     return nil if run.nil?
-    run.gsub("-", "").gsub(".", "")
+
+    if digit
+      run.gsub("-", "").gsub(".", "")[0..-3]
+    else
+      run.gsub("-", "").gsub(".", "")
+    end
   end
 
   # Generar un run valido segun reglas chilenas y que ademas es unico para el modelo entregado

data/lib/run_cl/run_validator.rb

@@ -8,6 +8,6 @@ class RunValidator < ActiveModel::Validator
   end
 
   private
+  # TODO - locales
   # record.errors[attribute.to_sym] << I18n.t('run.invalid') unless Run.valid? record.send(attribute)
-
 end

data/lib/run_cl/uniq_run_validator.rb

@@ -4,14 +4,25 @@ class UniqRunValidator < ActiveModel::Validator
   def validate record
     options[:attributes].each do |attribute|
       run = Run.remove_format record.send(attribute)
+
+      matchers = []
       if record.new_record?
-        record.errors[attribute.to_sym] << 'ya está en uso!!!' if record.class.where(attribute => run).any?
+        matchers = record.class.where(attribute => run)
       else
-        record.errors[attribute.to_sym] << 'ya está en uso!!!' if record.class.where('? = ? AND id != ?', attribute, run, record.id).any?
+        matchers = record.class.where('? = ? AND id != ?', attribute, run, record.id)
+      end
+
+      if options[:scope]
+        matchers = matchers.where(options[:scope] => record.send(options[:scope]))
       end
+
+      matchers.any?
+
+      record.errors[attribute.to_sym] << 'ya está en uso!!!' if matchers.any?
     end
   end
 
   private
+  # TODO - locales
   # record.errors[attribute.to_sym] << I18n.t('run.in_use') unless Run.valid? record.send(attribute)
 end

data/lib/run_cl/version.rb

@@ -1,3 +1,3 @@
 module RunCl
-  VERSION = "1.2.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: run_cl
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.6.0
 platform: ruby
 authors:
 - mespina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies: []
 description: Formateador/Desformateador, Generador, Validador de Rut Chilenos
 email:
@@ -17,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -37,17 +37,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rut Chilenos