mascherari 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ea5aa679829edcdf629788b7d7d2ac99299dfae
-  data.tar.gz: b32c17a9be5d43b8d86d383dff3b87681f082e8e
+  metadata.gz: 01c3c81144ed2c7555d9ddf5c58fcadb50186e0b
+  data.tar.gz: 659c760fdd7f93aae15242b1168f26242da43d49
 SHA512:
-  metadata.gz: 4db1d0523ee705215fe12be85bf70824e5cfbcabfe6350f9fcec241948f1a4ddc6f29766b9d3950fa2fa1e38bcbcb011d297b04decac3ee10e4972f086dc50cf
-  data.tar.gz: 693d0f852d119e1c58872959974ecd4d292a952a533d39a26d911442a673479cbd82a46dd8935aad598a7e0a117eb587e40995a7e95bffacefb4fe5d24594bd9
+  metadata.gz: c4e3a1d33f3e0afa8100afe069cf9bce12d69bf45b8540e079f6816f139aa84e0e453568e390b714d8d657de471ac9d71521ca387f35c9753259b2219389c6c7
+  data.tar.gz: cc5ed1b2d04dd5bc54b10a941473f5bb943a4ea4faaf21ba51e4648186b18e81ccff9d416560d6fe06e800876fd77ac902dc9b49e0601f27f66a3362f5e24de5

data/README.md

@@ -1,5 +1,6 @@
 # Mascherari
 
+[![Gem Version](https://badge.fury.io/rb/mascherari.png)](https://badge.fury.io/rb/mascherari)
 [![Build Status](https://travis-ci.org/robsonmarques/mascherari.png)](https://travis-ci.org/robsonmarques/mascherari)
 [![Code Climate](https://codeclimate.com/github/robsonmarques/mascherari.png)](https://codeclimate.com/github/robsonmarques/mascherari)
 
@@ -19,28 +20,40 @@ To create masks for attributes, include Mascherari and set the format:
 class Person
   include Mascherari
 
-  attr_accessor :phone, :mobile
+  attr_accessor :phone
 
-  attr_masked :phone, :mobile, :format => "(##) ####-####"
+  attr_masked :phone, :format => "(##) ####-####"
 end
 ```
 
-That will give you two helpers for each attribute:
+That will give you two helpers to use along with the object:
 
 ```ruby
 # person.phone = "5554212035"
-# person.mobile = "5599213035"
 person.phone_masked
 => "(55) 5421-2035"
-person.mobile_masked
-=> "(55) 9921-3035"
 
 # person.phone = "(55) 5421-2035"
-# person.mobile = "(55) 9921-3035"
 person.phone_unmasked
 => "5554212035"
-person.mobile_unmasked
-=> "5599213035"
+```
+
+You can set a format for more than one attribute:
+
+```ruby
+attr_masked :phone, :mobile, :format => "(##) ####-####"
+```
+
+And also use a different wildcard, if needed:
+
+```ruby
+attr_masked :phone, :format => "(**) ****-****", :wildcard => "*"
+```
+
+For the cases when format can vary, it's possible to set multiple formats:
+
+```ruby
+attr_masked :phone, :format => ["(##) ####-####", "(###) ####-####"]
 ```
 
 ## Rails

data/lib/mascherari/attr_masked.rb

@@ -2,22 +2,19 @@ module Mascherari
   module AttrMasked
     def attr_masked(*attrs, options)
       attrs.each do |attr|
-        formatter = "#{attr}_format"
-        masked    = "#{attr}_masked"
-        unmasked  = "#{attr}_unmasked"
-        ivar      = "@#{formatter}"
+        class_eval %{
+          def #{attr}_format
+            @#{attr}_format ||= Formatter.new(#{options})
+          end
 
-        define_method formatter do
-          instance_variable_get(ivar) || instance_variable_set(ivar, Formatter.new(options))
-        end
+          def #{attr}_masked
+            #{attr}_format.mask #{attr}
+          end
 
-        define_method masked do
-          send(formatter).mask send(attr)
-        end
-
-        define_method unmasked do
-          send(formatter).unmask send(attr)
-        end
+          def #{attr}_unmasked
+            #{attr}_format.unmask #{attr}
+          end
+        }
       end
     end
   end

data/lib/mascherari/formatter.rb

@@ -1,9 +1,7 @@
 module Mascherari
   class Formatter
-    attr_reader :format, :wildcard
-
     def initialize(options = {})
-      @format = options.fetch :format
+      @format_list = Array(options.fetch :format)
       @wildcard = options.fetch :wildcard, "#"
     end
 
@@ -21,44 +19,54 @@ module Mascherari
 
     protected
 
-    attr_reader :value
+    attr_reader :value, :format, :format_list, :wildcard
 
     def prepare_value(raw_value)
       @value = raw_value.to_s
 
-      valid_value?
+      unless find_format
+        raise ArgumentError, "Value size don't match format"
+      end
     end
 
     def add_mask
-      value_chars = value.chars
-
-      format_chars do |char|
-        wildcard?(char) ? value_chars.shift : char
-      end
+      format_sub(wildcard) { |_, index| value[index] }
     end
 
     def remove_mask
-      format_chars do |char, index|
-        value[index] if wildcard?(char)
-      end
+      format_sub { |char, index| value[index] if wildcard?(char) }
+    end
+
+    def format_sub(pattern = /./, &block)
+      format.gsub(pattern).each_with_index { |char, index| yield char, index }
     end
 
-    def format_chars(&block)
-      format.chars.map.with_index { |char, index| yield char, index }.join
+    def format_regexp
+      /\A#{format_sub { |char| format_matcher char }}\z/
+    end
+
+    def format_matcher(char)
+      wildcard?(char) ? '\S' : "\\#{char}"
     end
 
     def formatted?
-      value.size == format.size
+      value =~ format_regexp
+    end
+
+    def wildcard_size?
+      value.size == format.scan(wildcard).size
     end
 
     def wildcard?(char)
       char == wildcard
     end
 
-    def valid_value?
-      unless formatted? || value.size == format.scan(wildcard).size
-        raise ArgumentError, "Value size don't match format"
-      end
+    def find_format
+      format_for { formatted? } || format_for { wildcard_size? }
+    end
+
+    def format_for(&block)
+      format_list.any? { |format| @format = format; yield }
     end
   end
 end

data/lib/mascherari/version.rb

@@ -1,3 +1,3 @@
 module Mascherari
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/attr_masked_spec.rb

@@ -72,4 +72,31 @@ describe Mascherari::AttrMasked do
       end
     end
   end
+
+  context 'when have multiple formats' do
+    describe '#attribute_masked' do
+      it 'masks using right format' do
+        subject.account = "1234567"
+
+        expect(subject.account_masked).to eq "12.345-67"
+
+        subject.account = "123456789"
+
+        expect(subject.account_masked).to eq "123.456.789"
+      end
+    end
+
+    describe '#attribute_unmasked' do
+      it 'unmasks using right format' do
+        subject.account = "12.345-67"
+
+        expect(subject.account_unmasked).to eq "1234567"
+
+        subject.account = "123.456.789"
+
+        expect(subject.account_unmasked).to eq "123456789"
+      end
+    end
+
+  end
 end

data/spec/support/base_classes.rb

@@ -1,7 +1,8 @@
 class Person
   include Mascherari
 
-  attr_accessor :phone, :mobile
+  attr_accessor :phone, :mobile, :account
 
   attr_masked :phone, :mobile, :format => "(##) ####-####"
+  attr_masked :account, :format => ["##.###-##", "###.###.###"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mascherari
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Robson Marques
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake