activerecord_flag_support 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d36f61c0d332ee7ba030aa75c3355d1eb7fe3fb
-  data.tar.gz: 055159e12534c6562cab143d0f8903d445fc6356
+  metadata.gz: 8f48cc4e8849853902aa26c7b407d709693a64ac
+  data.tar.gz: c2a9fa74576f9641f40fbd79dd4e5bf22c5999c5
 SHA512:
-  metadata.gz: 3ddfc6594ff942ed2e52cabe8280f554af317b3b2d8abc43b45cecda8890c4d152a0101c256797bd0ec73295bc53af247520a6a5dc9de1001b86b3796aef3737
-  data.tar.gz: 9109d1c25d6ca98e621d4c94ae357e4909c27a6a8e15ebc5173ffbba5f762b22fc6f8f69c3137b34fe8465e4ba697c188ade04f1e8835da2e25be0b0889a644e
+  metadata.gz: 4a753f57ebf99d57dee8d62a6fc9fa90c7f572555a220f6ca40a0f7fe4efcf137c6e3ed02a84531e6709ea30c436036db86b4762e02d042e03f09c13d00692d2
+  data.tar.gz: 2f7fae1b63c19a7ba0ef859b1786b791614b173c5764eeb2e7ad41ef322ac6ff2a75b98057acaad2e7a81f62e25126172b2e8463bfdb8b1d95dfcfd262119963

data/lib/activerecord_flag_support.rb

@@ -1,67 +1,105 @@
+#
 module ActiveRecordFlagSupport
   # ----------------------------------------------------------------- included
   def self.included(base)
     base.extend(ClassMethods)
   end
+
+  #
   module ClassMethods
     # ------------------------------------------------------ define_flag_methods
-    def define_flag_methods( field, method_hash = nil ) 
+    def define_flag_methods(field, method_hash = nil)
       if method_hash.nil?
         method_hash = field
         field = :flags
       end
-      unless method_hash.is_a?( Hash )
-        col = 1
-        method_hash = method_hash.inject( {} ) do |m,x|
-          m[x] = col
-          col *= 2
-          m
-        end
+      unless method_hash.is_a?(Hash)
+        method_hash = method_hash_from_array(method_hash)
       end
-
-      method_hash.each_pair do |key,value|
-        class_eval( "def #{key}\n return ( #{field} & #{value} ) == #{value}; end" )
-        class_eval( "def #{key}=(v)\n old_value = #{key}; set_flag( :#{field}, v, #{value} ); if old_value != #{key}\n@#{key}_was_changed = true;\nend\n end" )
-        class_eval( "def #{key}_changed?\n new_record? || @#{key}_was_changed\n end" )
-        class_eval( "def #{key}?\n return ( #{field} & #{value} ) == #{value}; end" )
-        class_eval( "def update_#{key}(v)\n set_flag( :#{field}, v, #{value} ); update_attribute( :#{field}, self.#{field} ); end" )
-        konst = "%s_MASK" % key.upcase
-        unless const_defined?( konst )
-          const_set( konst, value )
-        end
+      method_hash.each_pair do |key, value|
+        define_methods_for_flag(key, value)
+        add_flag_const(key, value)
       end
+      setup_flag_class(field, method_hash)
+    end
+
+    ############################################################################
+
+    private
+
+    ############################################################################
+
+    # ------------------------------------------------------ define_flag_methods
+    def define_methods_for_flag(key, value)
+      class_eval("def #{key}\n return (#{field} & #{value}) == #{value}; end",
+                 __FILE__, __LINE__)
+      class_eval("def #{key}=(v)\n old_value = #{key}; set_flag(:#{field}, "\
+                 "v, #{value}); if old_value != #{key}\n@#{key}_was_changed="\
+                 "true;\nend\n end", __FILE__, __LINE__)
+      class_eval('attr_reader :{key}_was_changed', __FILE__, __LINE__)
+      class_eval("def #{key}_changed?\n new_record? || #{key}_was_changed\n "\
+                 'end', __FILE__, __LINE__)
+      class_eval("def #{key}?\n return (#{field} & #{value}) == #{value}; "\
+                 'end', __FILE__, __LINE__)
+      class_eval("def update_#{key}(v)\n set_flag(:#{field}, v, #{value}); "\
+                 "update_attribute(:#{field}, self.#{field}); end", __FILE__,
+                 __LINE__)
+    end
+
+    # --------------------------------------------------------- setup_flag_class
+    def setup_flag_class
       cattr_accessor "#{field}_flag_hash"
-      class_variable_set( "@@#{field}_flag_hash", method_hash )
-      unless method_defined?( :set_flag )
-        class_eval("include ActiveRecordFlagSupport::FlagInstanceMethods")
+      class_variable_set("@@#{field}_flag_hash", method_hash)
+      return if method_defined?(:set_flag)
+      class_eval('include ActiveRecordFlagSupport::FlagInstanceMethods')
+    end
+
+    # ----------------------------------------------------------- add_flag_const
+    def add_flag_const(key, value)
+      konst = format('%s_MASK', key.upcase)
+      const_set(konst, value) unless const_defined?(konst)
+    end
+
+    # --------------------------------------------------- method_hash_from_array
+    def method_hash_from_array
+      col = 1
+      method_hash.each_with_object({}) do |x, m|
+        m[x] = col
+        col *= 2
       end
     end
   end
+
+  #
   module FlagInstanceMethods
-    if ActiveRecord::ConnectionAdapters::Column.respond_to?( :value_to_boolean )
-      # ------------------------------------------------------------------- set_flag
-      def set_flag( field, value, bit_field )
-        value = if value && ActiveRecord::ConnectionAdapters::Column.value_to_boolean( value )
-          ( send(field).to_i | bit_field ) 
-        else
-          ( send(field).to_i & (~bit_field) ) 
-        end
-        self.send( "#{field}=", value )
+    if ActiveRecord::ConnectionAdapters::Column.respond_to?(:value_to_boolean)
+      # --------------------------------------------------------------- set_flag
+      def set_flag(field, value, bit_field)
+        is_true = value &&
+                  ActiveRecord::ConnectionAdapters::Column.value_to_boolean(value)
+        value = if is_true
+                  (send(field).to_i | bit_field)
+                else
+                  (send(field).to_i & ~bit_field)
+                end
+        send("#{field}=", value)
         attributes_before_type_cast[field] = value
       end
     else
-      # ------------------------------------------------------------------- set_flag
-      def set_flag( field, value, bit_field )
-        value = if value && ActiveRecord::Type::Boolean.new.send( :cast_value, value )
-          ( send(field).to_i | bit_field ) 
-        else
-          ( send(field).to_i & (~bit_field) ) 
-        end
-        self.send( "#{field}=", value )
+      # --------------------------------------------------------------- set_flag
+      def set_flag(field, value, bit_field)
+        is_true = value && ActiveRecord::Type::Boolean.new.send(:cast_value,
+                                                                value)
+        value = if is_true
+                  (send(field).to_i | bit_field)
+                else
+                  (send(field).to_i & ~bit_field)
+                end
+        send("#{field}=", value)
         attributes_before_type_cast[field] = value
       end
     end
   end
 end
 require 'active_record'
-ActiveRecord::Base.send( :include, ActiveRecordFlagSupport )
+ActiveRecord::Base.send(:include, ActiveRecordFlagSupport)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_flag_support
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Adam Palmblad
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Boolean flag support for active record