maskable_attribute 0.0.3 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    maskable_attribute (0.0.2)
+    maskable_attribute (0.0.4)
       rails (>= 2.3.10)
 
 GEM

data/lib/maskable_attribute/acts_as_maskable_attribute.rb

@@ -12,13 +12,16 @@ module MaskableAttribute
       # ==== Examples
       #
       # class Foo < ActiveRecord::Base
-      #   maskable_attrribute :some_attribute, [ :some_method_be_used_as_a_mask, :another_attribute_mask ]
+      #   maskable_attrribute :some_attribute,
+      #                       [ :some_method_be_used_as_a_mask, :another_attribute_mask ],
+      #                       :protected_prefixes => [ 'prefix' ]
       # end
 
-      def maskable_attribute(attribute_to_mask, masks)
+      def maskable_attribute(attribute_to_mask, masks, options = {})
         raise ArgumentError, "invalid argument (expected attribute)" unless column_names.include? attribute_to_mask.to_s
 
         cattr_accessor :masks
+
         self.masks ||= {}
         self.masks[attribute_to_mask] = masks
         self.masks
@@ -28,19 +31,19 @@ module MaskableAttribute
         end
 
         define_method "#{attribute_to_mask}=" do |value|
-          write_attribute attribute_to_mask, masked_attribute(attribute_to_mask).set(value)
+          write_attribute attribute_to_mask, masked_attribute(attribute_to_mask, options).set(value)
         end
 
         define_method "maskable_#{attribute_to_mask}" do
-          masked_attribute attribute_to_mask
+          masked_attribute attribute_to_mask, options
         end
       end
     end
 
     attr_accessor :masked_attribute
 
-    def masked_attribute(attribute)
-      @masked_attribute ||= MaskableAttribute.new self, attribute, self.class.masks[attribute]
+    def masked_attribute(attribute, options)
+      @masked_attribute ||= MaskableAttribute.new self, attribute, self.class.masks[attribute], options
     end
   end
 end

data/lib/maskable_attribute/formatting.rb

@@ -58,12 +58,16 @@ module MaskableAttribute
       end
 
       def apply(input)
-        if @method.is_a? Symbol
-          input.send(@method)
-        elsif @method.is_a? Proc
-          @method.call input
-        else
-          input
+        begin
+          if @method.is_a? Symbol
+            input.send(@method)
+          elsif @method.is_a? Proc
+            @method.call input
+          else
+            input
+          end
+        rescue
+          nil
         end
       end
     end

data/lib/maskable_attribute/mask.rb

@@ -87,7 +87,7 @@ module MaskableAttribute
     def unmask(*args)
       object = args.first
       options = args.extract_options!
-      format = options[:formatted] || accessor.sub("_" + name.to_s, "").strip.to_sym
+      format = (options[:formatted] || accessor).to_s.sub("_" + name.to_s, "").strip.to_sym
 
       formats.apply format do
         begin

data/lib/maskable_attribute/maskable_attribute.rb

@@ -2,10 +2,11 @@ module MaskableAttribute
   class MaskableAttribute
     attr_accessor :object, :attribute, :masks
 
-    def initialize(object, attribute, masks)
+    def initialize(object, attribute, masks, options)
       @object = object
       @attribute = attribute
       @masks = Masks.new masks
+      @protected_prefixes = Array.wrap(options.delete(:protected_prefixes) || options.delete(:protected_prefix)).join('|')
     end
 
     def masks
@@ -37,7 +38,7 @@ module MaskableAttribute
       unless value.blank?
         @masks.each do |mask|
           mask.accessed_by.each do |mask_accessor|
-            value.sub! /#{mask.unmask(@object, :formatted => mask_accessor)}(?![^{]*})/, "{#{mask_accessor}}" unless mask.unmask(@object).blank?
+            value.sub! /#{"(?<!#{@protected_prefixes})" unless @protected_prefixes.blank?}#{mask.unmask(@object, :formatted => mask_accessor)}(?![^{]*})/, "{#{mask_accessor}}" unless mask.unmask(@object).blank?
           end
         end
       end

data/lib/maskable_attribute/version.rb

@@ -1,3 +1,3 @@
 module MaskableAttribute
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/test/formatting_test.rb

@@ -13,6 +13,14 @@ class FormattingTest < ActiveSupport::TestCase
     assert_equal "SUCCESS", format.apply("success")
   end
 
+  test "should return nil when formatting methods raise exceptions" do
+    format = MaskableAttribute::Formatting::Format.new Proc.new { |value| raise 'I meant to do this...' }
+
+    assert_nothing_raised do
+      assert_nil format.apply("success")
+    end
+  end
+
   #describe Formats
   test "should accept a hash of a single format" do
     formats = MaskableAttribute::Formatting::Formats.new :formats => :upcase

data/test/maskable_attribute_test.rb

@@ -174,4 +174,35 @@ class MaskableAttributeTest < ActiveSupport::TestCase
 
     assert_equal "02", @hickwell.bar, "Did not retrieve mask having a proc and a format specified"
   end
+
+  test "should not confuse masks' formatting" do
+    class Pickwell < Hickwell
+      maskable_attribute :bar, { :foo => {
+                                   :method => Proc.new { "2" },
+                                   :format => { :two_digit => Proc.new { |value| format "%02d", value } }
+                                 }
+                               }
+    end
+
+    @pickwell = Pickwell.create! :bar => "{foo}"
+
+    assert_equal "2", @pickwell.bar
+    @pickwell.bar = "2"
+    assert_equal "{foo}", @pickwell.maskable_bar.unmasked
+    @pickwell.bar = "02"
+    assert_equal "{two_digit_foo}", @pickwell.maskable_bar.unmasked
+    assert_equal "02", @pickwell.bar
+  end
+
+  test "should not mask if specified as a non-maskable prefix" do
+    class Zickwell < Hickwell
+      maskable_attribute :bar, { :foo => { :method => Proc.new { "TEST" } } }, { :protected_prefixes => [ "prefix" ] }
+    end
+
+    @zickwell = Zickwell.create! :bar => "TEST"
+    assert_equal "{foo}", @zickwell.maskable_bar.unmasked, "Mask not being replaced"
+
+    @zickwell.update_attribute :bar, "prefixTEST"
+    assert_equal "prefixTEST", @zickwell.maskable_bar.unmasked, "Incorrectly masked for non-maskable prefix"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maskable_attribute
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70272994594940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: 2.3.10
   type: :runtime
   prerelease: false
-  version_requirements: *70272994594940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.10
 description: A maskable attribute is an attribute that is made up of other attributes
   (masks), this ordering is set in the masked attribute and preserved across updates.
 email:
@@ -116,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: maskable_attribute
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Allows Ruby on Rails to have a maskable attribute.