maskable_attribute 0.0.2 → 0.0.3

data/Gemfile.lock

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

data/lib/maskable_attribute/mask.rb

@@ -4,14 +4,14 @@ module MaskableAttribute
 
     #:bar
     #:foo => :bar
-    #:foo => [ :bar, baz, :qux ]
+    #:foo => Proc.new { |object| object.size * 3 }
     #:foo => { :format => :two_digit }
     #:foo => { :formats => [ :two_digit, :upcase, :downcase ] }
     #:bar => { :exclusive_format => { :capitalized => Proc.new{ |mask| mask.captialized } } }
     #:bar => { :exclusive_formats => { :capitalized => Proc.new{ |mask| mask.captialized }, :titleized => :titleize } }
     #:baz => { :default_format => :titleize }
-    #:bar => [ :quux, { :formats => ... } ]
-    #:bar => [ Proc.new { |object| object.size * 3 }, { :formats => ... } ]
+    #:bar => { :method => :quux, { :formats => ... } }
+    #:bar => { :method => Proc.new { |object| object.size * 3 }, :formats => ... }
     def initialize(masks)
       @masks = masks.map do |mask|
         if mask.is_a? Array
@@ -58,7 +58,9 @@ module MaskableAttribute
           @method = options
           options = {}
         else
-          if options.is_a? Array
+          if options.is_a? Hash
+            @method = options.delete(:method) || name.to_sym
+          elsif options.is_a? Array
             @method = options.shift
             options = options.extract_options!
           else

data/lib/maskable_attribute/version.rb

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

data/test/maskable_attribute_test.rb

@@ -160,4 +160,18 @@ class MaskableAttributeTest < ActiveSupport::TestCase
       Hickwell.maskable_attribute :qux
     end
   end
+
+  test "should be able to handle a proc and a format" do
+    class Tickwell < Hickwell
+      maskable_attribute :bar, { :foo => {
+                                   :method => Proc.new { "2" },
+                                   :default_format => Proc.new { |value| format "%02d", value }
+                                 }
+                               }
+    end
+
+    @hickwell = Tickwell.create! :bar => "{foo}"
+
+    assert_equal "02", @hickwell.bar, "Did not retrieve mask having a proc and a format specified"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maskable_attribute
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000Z
+date: 2012-07-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70349364129120 !ruby/object:Gem::Requirement
+  requirement: &70272994594940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 2.3.10
   type: :runtime
   prerelease: false
-  version_requirements: *70349364129120
+  version_requirements: *70272994594940
 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: