has_many_booleans 0.9.1 → 0.9.3

data/README.rdoc

@@ -49,6 +49,7 @@ The <tt>:append</tt> option lets you modify the suffix to append to the boolean
             :lazy  => false,
             :self  => 'model_available',
             :self_value => true,
+            :unkown_value => false,
   end
 
 The <tt>:field</tt> option lets you change the database field in which the integer gets stored (default is +booleans+).
@@ -57,6 +58,10 @@ When the <tt>:lazy</tt> option is set to +false+, the bitset integer gets change
 
 The <tt>:self</tt> option is just another virtual boolean, which's method name you can freely assign.
 
+The <tt>:unknown_value</tt> is the new value for booleans, which are assigned a new value, but it is not in the <tt>:false_values</tt> or <tt>:true_values</tt> option arrays. Default is +true+, set it to +false+ to get ActiveRecord behaviour.
+
+The default <tt>false_</tt> and <tt>true_values</tt> are the same as in ActiveRecord.
+
 === Scopes
 The plugin also generates a <tt>.true</tt> and a <tt>.false</tt> scope for the model. You have to pass a boolean name as parameter to filter for this value. If you pass multiple boolean names, they get connected with 'or'. To get an 'and' condition, chain multiple scopes. If you don't pass any boolean names (or +nil+), the special <tt>:self</tt> boolean is meant.
 

data/Rakefile

@@ -27,7 +27,7 @@ end
 PKG_FILES = FileList[ '[a-zA-Z]*', 'lib/**/*', 'rails/**/*', 'test/**/*' ]
 spec = Gem::Specification.new do |s|
   s.name = "has_many_booleans"
-  s.version = "0.9.1"
+  s.version = "0.9.3"
   s.author = "Jan Lelis"
   s.email = "mail@janlelis.de"
   s.homepage = "http://github.com/janlelis/has_many_booleans"

data/lib/has_many_booleans.rb

@@ -5,8 +5,8 @@ require 'has_many_booleans/simple_bitset'
 module HasManyBooleans #:nodoc:
   RAILS2  = if ENV['RAILS_GEM_VERSION']
     ENV['RAILS_GEM_VERSION'] < '3'
-else
-    true
+  else
+    Rails::VERSION::STRING < '3'
   end
 
   module ClassMethods
@@ -35,7 +35,9 @@ else
     #[<tt>:append</tt>] The name to append to the listed booleans. The underscore is added automatically. +nil+ is also possible. Default is +activated+.
     #[<tt>:field</tt>] The database field used. Defaults to +booleans+.
     #[<tt>:suffixes</tt>] Specifies, which "alias" methods are created. Defaults to <tt>["?", "=", "!"]</tt>. You cannot add new ones, you can only forbid some of them.
-    #[<tt>:false_values</tt>] All the values in the array can be used to set a boolean to +false+ (when used with the <tt>=</tt> method). <b>Example:</b> Set this to <tt>["0"]</tt> and then call <tt>some_boolean_activated = "0"</tt>, it will set the boolean to +false+. Default settings is +false+ (deactivated).
+    #[<tt>:false_values</tt>] All the values in the array can be used to set a boolean to +false+ (when used with the <tt>=</tt> method). <b>Example:</b> Set this to <tt>["0"]</tt> and then call <tt>some_boolean_activated = "0"</tt>, it will set the boolean to +false+. By default, this is set to ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES.
+    #[<tt>:true_values</tt>] Which values should be true (if <tt>:unkown_value</tt> is set to +false+) Default is ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.
+    #[<tt>:unkown_value</tt>] What should be the value of a boolean, if it is not found in the <tt>:false_</tt> or <tt>:true_values</tt>? Default is +true+, set this to +false+ to get ActiveRecord behaviour.
     #[<tt>:lazy</tt>]  When the <tt>:lazy</tt> option is set to +false+, the bitset integer gets changed every time you assign a new value for a boolean. The default setting is +true+, which means, the integer gets only updated when the object is saved.
     #[<tt>:self</tt>] This is just another virtual boolean. You can freely assign the name. It is always stored as first bit in the bitset integer (so if the bitset integer is odd, this special boolean is set). You can also set this to +true+, which means, the <tt>:append</tt> value is used as method name. Default: +false+.
     #[<tt>:self_value</tt>] The default value for the special <tt>:self</tt> boolean above.
@@ -161,7 +163,9 @@ else
         :field    => 'booleans',
         :suffixes => %w| ! = ? |,
         :true     => [],
-        :false_values => [], # e.g. [0, "0", ""],
+        :false_values => ActiveRecord::ConnectionAdapters::Column::FALSE_VALUES,
+        :true_values  => ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES,
+        :unknown_value => true,
         :self     => false,
         :self_value => false,
         :lazy     => true,
@@ -269,8 +273,7 @@ else
             @booleans_data[name][1] = true
             save_booleans  if !self.class.booleans_options[:lazy]
           when '='
-            @booleans_data[name][1] =
-            !!( new_value[0] && !self.class.booleans_options[:false_values].member?(new_value[0]) )
+            @booleans_data[name][1] = set_value new_value[0]
             save_booleans  if !self.class.booleans_options[:lazy]
           end
           @booleans_data[name][1]
@@ -278,6 +281,17 @@ else
       end
     end
 
+    def set_value(v)
+      case
+      when !v        || self.class.booleans_options[:false_values].member?(v)
+        false
+      when v == true || self.class.booleans_options[:true_values].member?(v)
+        true
+      else
+        self.class.booleans_options[:unknown_value]
+      end
+    end
+
     def each_suffix(&block)
       ( [''] + self.class.booleans_options[:suffixes] ).each{ |suffix|
         yield suffix
@@ -286,11 +300,36 @@ else
 
 
 
+
     # hook in callbacks part 2 (to not overwrite after_initialize)
-    #TODO run callback after booleans have been fetched
-    def initialize(*args, &block) # :nodoc:
-      super *args, &block
+    # TODO someday: run callback after booleans have been fetched
+    def initialize(attributes = nil) # :nodoc:
+
+      if init_callback_defined = respond_to?(:after_initialize)
+        instance_eval do
+          alias tmp_after_initialize after_initialize
+          undef after_initialize
+        end
+      end
+
+      super()
       initialize_booleans
+      self.attributes = attributes unless attributes.nil?
+      result = yield self if block_given?
+
+      if init_callback_defined
+        instance_eval do
+          alias after_initialize tmp_after_initialize
+          undef tmp_after_initialize
+          if RAILS2
+            callback(:after_initialize)
+          else
+            _run_initialize_callbacks
+          end
+        end
+      end
+
+      result
     end
 
     if respond_to? :initialize_copy