has_normalized_attributes 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91dc221ce7007d6265c70324eb766a71b7d094a0
-  data.tar.gz: f3d16b28f11791f70d98356f950b2fe346c8db2f
+  metadata.gz: a479787ffc5dfe1a582733208d00010519996423
+  data.tar.gz: 85ea06aec0c4cf71a84833c61af8bb425ea6e8c6
 SHA512:
-  metadata.gz: d1fe3bacd965a7ef3880ccb64d38081413c5ccba78d3448a8babffd0be09219992d58f8dc619ab11d0cef93df74e5af3e3fa42257bd38946465adac08c7dbfc3
-  data.tar.gz: 211acf70d9871c0d78bdaa4c053d347970370256580831a84a3df63a7588016788d016475774057855a8a3afb0d9b1b458e3a02fff198eb3c5e8f25964822b95
+  metadata.gz: e631a8404fddbedc845f6f3e8f47ee21d1f69e7d3ee61d076b8ee868034bac601f340dce4807ab25fa38142f2c0b2a5b0531e25fd40a21ffcee321eb223cf9a5
+  data.tar.gz: 564da1e595406546904f1ccd251bd71d75bf414dbdd0e6aed8765ed73673dce13270165545e21cfb4b927888f5dc21186abc61d4e97980c99114b99804e796b4

data/lib/has_normalized_attributes.rb

@@ -1,25 +1,5 @@
 module HasNormalizedAttributes
-  extend ActiveSupport::Concern
-
-  # Prepending a dynamically defined module to add functionality to the current normalize_ methods.
-  # This is similar to alias_method_chain, but accomplished in a cleaner way using inheritance.
-  prepend Module.new {
-    def self.normalizations(*args)
-      args.each do |arg|
-        # Convert outer parentheses into a negative (-) sign on the result of the super method.
-        # E.g. `normalize_dollar` will first call the original `normalize_dollar` method (super)
-        # and then use the result from that to check for parentheses.
-        define_method "normalize_#{ arg }" do
-          result = super()
-          result.is_a?(String) ? result.sub(/\A\((.*)\)\Z/, '-\1') : result
-        end
-      end
-    end
-
-    normalizations :number, :dollar
-  }
-
-  #CONSTANT
+  #CONSTANTS - Do not mix these into ActiveRecord!!!
   ZIPCODE                  = /[-.\s)(,]/
   PHONE                    = /[-.\s)(,]|(^0)/
   SSN                      = /[-.\s)(,]/
@@ -29,49 +9,74 @@ module HasNormalizedAttributes
   PERCENT                  = /[%,\s]/
   SPACES                   = /\s/
 
-  #instance methods
-  def self.normalizations(*args)
-    args.each do |arg|
-      define_method "normalize_#{arg}" do
-        if arg == :strip
-          self ? self.strip : self
-        else
-          reg_exp = HasNormalizedAttributes.const_get(arg.upcase)
-          self && is_a?(String) && match(reg_exp) ? gsub(reg_exp,'') : self
+  module CoreExtensions
+    extend ActiveSupport::Concern
+
+    # Prepending a dynamically defined module to add functionality to the current normalize_ methods.
+    # This is similar to alias_method_chain, but accomplished in a cleaner way using inheritance.
+    prepend Module.new {
+      def self.normalizations(*args)
+        args.each do |arg|
+          # Convert outer parentheses into a negative (-) sign on the result of the super method.
+          # E.g. `normalize_dollar` will first call the original `normalize_dollar` method (super)
+          # and then use the result from that to check for parentheses.
+          define_method "normalize_#{ arg }" do
+            result = super()
+            result.is_a?(String) ? result.sub(/\A\((.*)\)\Z/, '-\1') : result
+          end
+        end
+      end
+
+      normalizations :number, :dollar
+    }
+
+    #instance methods
+    def self.normalizations(*args)
+      args.each do |arg|
+        define_method "normalize_#{arg}" do
+          if arg == :strip
+            self ? self.strip : self
+          else
+            reg_exp = HasNormalizedAttributes.const_get(arg.upcase)
+            self && is_a?(String) && match(reg_exp) ? gsub(reg_exp,'') : self
+          end
         end
       end
     end
-  end
 
-  #loading all methods dynamically
-  normalizations :phone, :zipcode, :ssn, :taxid, :dollar, :number, :percent, :spaces, :strip
+    #loading all methods dynamically
+    normalizations :phone, :zipcode, :ssn, :taxid, :dollar, :number, :percent, :spaces, :strip
+  end
 
+  module ActiveRecord
+    extend ActiveSupport::Concern
 
-  module ClassMethods
-    def has_normalized_attributes(args = {})
+    module ClassMethods
+      def has_normalized_attributes(args = {})
 
-      if args.blank? || !args.is_a?(Hash)
-        raise ArgumentError, 'Must define the fields you want to be normalize with has_normalized_attributes :field_one => "phone", :field_two => "zipcode"'
-      end
+        if args.blank? || !args.is_a?(Hash)
+          raise ArgumentError, 'Must define the fields you want to be normalize with has_normalized_attributes :field_one => "phone", :field_two => "zipcode"'
+        end
 
-      args.each do |field, normalization_type|
-        define_method "#{field.to_s}=" do |value|
-          if value.present?
-            normalized_value = value.send("normalize_#{normalization_type.downcase}".to_sym)
-          else
-            normalized_value = value
+        args.each do |field, normalization_type|
+          define_method "#{field.to_s}=" do |value|
+            if value.present?
+              normalized_value = value.send("normalize_#{normalization_type.downcase}".to_sym)
+            else
+              normalized_value = value
+            end
+            super normalized_value
           end
-          super normalized_value
         end
-      end
 
+      end
     end
   end
 end
 
 #extend these classes - Numeric is a parent class for all of Ruby's numeric types.
 [String, Numeric, NilClass].each do |klass|
-  klass.send(:include, HasNormalizedAttributes)
+  klass.send(:include, HasNormalizedAttributes::CoreExtensions)
 end
 #include activerecord
-ActiveRecord::Base.send :include, HasNormalizedAttributes
+ActiveRecord::Base.send :include, HasNormalizedAttributes::ActiveRecord

data/lib/version.rb

@@ -1,3 +1,3 @@
 module HasNormalizedAttributes
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_normalized_attributes
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Kyle Ginavan