flag_shih_tzu 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39037feb3a3b52c19a177cfdd173334d4f94d841
-  data.tar.gz: f5f735bb7b3cea9470b224fbc4dc43661b883bf4
+  metadata.gz: 33880b74805cf7ad653f77e4d0d4768c2c2c6e4c
+  data.tar.gz: 0dcaec06a2d68885d2225bf66e43cadff4c2bd9d
 SHA512:
-  metadata.gz: d50b56dc9b3217ca2766f0795f92846ad0a88356ff38a3f3153283ac5f65c220d0be7f1a7a4c22a46d2538e45d2106b9b1d8df15e28a73ada846cc7d199753ed
-  data.tar.gz: 198b808f2f9004c159620075678939ff19efdb383c30a349d5940e68c39e250f159e2f05c73bb347e68e12ad5eb7c69b3b0d9ca525f6c9fed252f501727a0cd3
+  metadata.gz: 87e72860a03ca9de17d788bf274f7caf75cfe8c895447f22b576d7ccf03b201e7cea41c8846a46c401521764c3320f4493cbf32046ed3a0b91a05c65dd92032e
+  data.tar.gz: cbf558efa240f5ad6e1e9a0ee9af6aefc1b1ebb5f04c44f06aa892cff13c059e6bac424e8ba63a506f1831e0e616495770c984de1dc7d9df4c6cad287fe71e75

data/.travis.yml

@@ -2,8 +2,18 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
 gemfile:
   - gemfiles/Gemfile.activerecord-2.3.x
   - gemfiles/Gemfile.activerecord-3.0.x
   - gemfiles/Gemfile.activerecord-3.1.x
   - gemfiles/Gemfile.activerecord-3.2.x
+  - gemfiles/Gemfile.activerecord-4.0.x
+matrix:
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.activerecord-2.3.x
+    - rvm: 1.8.7
+      gemfile: gemfiles/Gemfile.activerecord-4.0.x
+    - rvm: 1.9.2
+      gemfile: gemfiles/Gemfile.activerecord-4.0.x

data/CHANGELOG

@@ -1,4 +1,12 @@
-Version 0.3.3 - JUN.20.2013
+Version 0.3.5 - AUG.06.2013
+* Fix Travis Build & Add Rails 4 by Peter M. Goldstein
+* Implemented update_flag! by Peter Boling (see https://github.com/pboling/flag_shih_tzu/issues/27)
+  - sets a flag on a record without triggering callbacks or validations
+  - optionally syncs the instance with new flag value
+* Update gemspec by Peter Boling
+
+Version 0.3.4 - JUN.20.2013
+
 * Allow non sequential flag numbers by Thomas Jachmann
 * Report correct source location for class_evaled methods. by Sebastian Korfmann
 * Implemented chained_flags_with, which allows optimizing the bit search by Tatsuhiko Miyagawa
@@ -13,6 +21,9 @@ Version 0.3.3 - JUN.20.2013
 * convenience methods now have default parameter so `all_flags` works with arity 0. by Peter Boling
 * Many more tests, including arity tests by Peter Boling
 
+Version 0.3.3 - JUN.20.2013
+- Does not exist.
+
 Version 0.3.2 - NOV.06.2012
 
 * Adds skip column check option :check_for_column - from arturaz

data/flag_shih_tzu.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.licenses    = ['MIT']
   s.email       = 'peter.boling@gmail.com'
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Patryk Peszko", "Sebastian Roebke", "David Anderson", "Tim Payton"]
-  s.homepage    = "https://github.com/xing/flag_shih_tzu"
+  s.authors     = ["Peter Boling", "Patryk Peszko", "Sebastian Roebke", "David Anderson", "Tim Payton"]
+  s.homepage    = "https://github.com/pboling/flag_shih_tzu"
   s.summary     = %q{Bit fields for ActiveRecord}
   s.description = <<-EODOC
 Bit fields for ActiveRecord:

data/gemfiles/Gemfile.activerecord-4.0.x

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+gemspec :path => '..'
+
+gem "activerecord", "~>4.0.0"

data/lib/flag_shih_tzu.rb

@@ -38,7 +38,7 @@ module FlagShihTzu
       end
       colmn = opts[:column]
       if opts[:check_for_column] && !check_flag_column(colmn)
-        puts "FlagShihTzu says: Flag column #{colmn} appears to be missing!\nTo turn off this warning set check_for_colum: false in has_flags definition here: #{caller.first}"
+        puts "FlagShihTzu says: Flag column #{colmn} appears to be missing!\nTo turn off this warning set check_for_column: false in has_flags definition here: #{caller.first}"
         return
       end
 
@@ -192,7 +192,11 @@ module FlagShihTzu
     end
 
     def chained_flags_with(*args)
-      where(chained_flags_condition(*args))
+      if (ActiveRecord::VERSION::MAJOR >= 3)
+        where(chained_flags_condition(*args))
+      else
+        all(:conditions => chained_flags_condition(*args))
+      end
     end
 
     def chained_flags_condition(colmn, *args)
@@ -213,7 +217,7 @@ module FlagShihTzu
         val = (1..(2 * max_flag_value_for_column(colmn))).to_a
         args.each do |flag|
           neg = false
-          if flag.match /^not_/
+          if flag.to_s.match /^not_/
             neg = true
             flag = flag.to_s.sub(/^not_/, '').to_sym
           end
@@ -384,6 +388,25 @@ module FlagShihTzu
     not selected_flags(colmn).empty?
   end
 
+  # returns true if successful
+  # third parameter allows you to specify that `self` should also have its in-memory flag attribute updated.
+  def update_flag!(flag, value, update_instance = false)
+    truthy = FlagShihTzu::TRUE_VALUES.include?(value)
+    sql = self.class.set_flag_sql(flag.to_sym, truthy)
+    if update_instance
+      if truthy
+        self.enable_flag(flag)
+      else
+        self.disable_flag(flag)
+      end
+    end
+    if (ActiveRecord::VERSION::MAJOR <= 3)
+      self.class.update_all(sql, self.class.primary_key => id) == 1
+    else
+      self.class.where("#{self.class.primary_key} = ?", id).update_all(sql) == 1
+    end
+  end
+
   private
 
     def get_bit_for(flag, colmn)

data/lib/flag_shih_tzu/validators.rb

@@ -1,54 +1,57 @@
-module ActiveModel
-  module Validations
+if ActiveRecord::VERSION::MAJOR >= 3
 
-    class PresenceOfFlagsValidator < EachValidator
-      def validate_each(record, attribute, value)
-        value = record.send(:read_attribute_for_validation, attribute)
-        check_flag(record, attribute)
-        record.errors.add(attribute, :blank, options) if value.blank? or value == 0
-      end
+  module ActiveModel
+    module Validations
+
+      class PresenceOfFlagsValidator < EachValidator
+        def validate_each(record, attribute, value)
+          value = record.send(:read_attribute_for_validation, attribute)
+          check_flag(record, attribute)
+          record.errors.add(attribute, :blank, options) if value.blank? or value == 0
+        end
 
-      private
+        private
 
-      def check_flag(record, attribute)
-        unless record.class.flag_columns.include? attribute.to_s
-          raise ArgumentError.new("#{attribute} is not one of the flags columns (#{record.class.flag_columns.join(', ')})")
+        def check_flag(record, attribute)
+          unless record.class.flag_columns.include? attribute.to_s
+            raise ArgumentError.new("#{attribute} is not one of the flags columns (#{record.class.flag_columns.join(', ')})")
+          end
         end
       end
-    end
 
-    module HelperMethods
-      # Validates that the specified attributes are flags and are not blank.
-      # Happens by default on save. Example:
-      #
-      #  class Spaceship < ActiveRecord::Base
-      #    include FlagShihTzu
-      #
-      #    has_flags({ 1 => :warpdrive, 2 => :hyperspace }, :column => 'engines')
-      #    validates_presence_of_flags :engines
-      #  end
-      #
-      # The engines attribute must be a flag in the object and it cannot be blank.
-      #
-      # Configuration options:
-      # * <tt>:message</tt> - A custom error message (default is: "can't be blank").
-      # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
-      #   validation contexts by default (+nil+), other options are <tt>:create</tt>
-      #   and <tt>:update</tt>.
-      # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if
-      #   the validation should occur (e.g. <tt>:if => :allow_validation</tt>, or
-      #   <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The method, proc
-      #   or string should return or evaluate to a true or false value.
-      # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine
-      #   if the validation should not occur (e.g. <tt>:unless => :skip_validation</tt>,
-      #   or <tt>:unless => Proc.new { |spaceship| spaceship.warp_step <= 2 }</tt>). The method,
-      #   proc or string should return or evaluate to a true or false value.
-      # * <tt>:strict</tt> - Specifies whether validation should be strict.
-      #   See <tt>ActiveModel::Validation#validates!</tt> for more information.
-      def validates_presence_of_flags(*attr_names)
-        validates_with PresenceOfFlagsValidator, _merge_attributes(attr_names)
+      module HelperMethods
+        # Validates that the specified attributes are flags and are not blank.
+        # Happens by default on save. Example:
+        #
+        #  class Spaceship < ActiveRecord::Base
+        #    include FlagShihTzu
+        #
+        #    has_flags({ 1 => :warpdrive, 2 => :hyperspace }, :column => 'engines')
+        #    validates_presence_of_flags :engines
+        #  end
+        #
+        # The engines attribute must be a flag in the object and it cannot be blank.
+        #
+        # Configuration options:
+        # * <tt>:message</tt> - A custom error message (default is: "can't be blank").
+        # * <tt>:on</tt> - Specifies when this validation is active. Runs in all
+        #   validation contexts by default (+nil+), other options are <tt>:create</tt>
+        #   and <tt>:update</tt>.
+        # * <tt>:if</tt> - Specifies a method, proc or string to call to determine if
+        #   the validation should occur (e.g. <tt>:if => :allow_validation</tt>, or
+        #   <tt>:if => Proc.new { |user| user.signup_step > 2 }</tt>). The method, proc
+        #   or string should return or evaluate to a true or false value.
+        # * <tt>:unless</tt> - Specifies a method, proc or string to call to determine
+        #   if the validation should not occur (e.g. <tt>:unless => :skip_validation</tt>,
+        #   or <tt>:unless => Proc.new { |spaceship| spaceship.warp_step <= 2 }</tt>). The method,
+        #   proc or string should return or evaluate to a true or false value.
+        # * <tt>:strict</tt> - Specifies whether validation should be strict.
+        #   See <tt>ActiveModel::Validation#validates!</tt> for more information.
+        def validates_presence_of_flags(*attr_names)
+          validates_with PresenceOfFlagsValidator, _merge_attributes(attr_names)
+        end
       end
-    end
 
+    end
   end
 end

data/lib/flag_shih_tzu/version.rb

@@ -1,3 +1,3 @@
 module FlagShihTzu
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/test/flag_shih_tzu_test.rb

@@ -54,16 +54,6 @@ class SpaceshipWith3CustomFlagsColumn < ActiveRecord::Base
   has_flags({ 1 => :power, 2 => :anti_ax_routine }, :column => 'hal3000')
 end
 
-class SpaceshipWithSymbolAndStringFlagColumns < ActiveRecord::Base
-  self.table_name = 'spaceships_with_symbol_and_string_flag_columns'
-  include FlagShihTzu
-
-  has_flags({ 1 => :warpdrive, 2 => :hyperspace }, :column => :peace, :check_for_column => true)
-  has_flags({ 1 => :photon, 2 => :laser, 3 => :ion_cannon, 4 => :particle_beam }, :column => :love, :check_for_column => true)
-  has_flags({ 1 => :power, 2 => :anti_ax_routine }, :column => 'happiness', :check_for_column => true)
-  validates_presence_of_flags :peace, :love
-end
-
 class SpaceshipWithBitOperatorQueryMode < ActiveRecord::Base
   self.table_name = 'spaceships'
   include FlagShihTzu
@@ -89,31 +79,43 @@ end
 class SpaceCarrier < Spaceship
 end
 
-class SpaceshipWithValidationsAndCustomFlagsColumn < ActiveRecord::Base
-  self.table_name = 'spaceships_with_custom_flags_column'
-  include FlagShihTzu
+if (ActiveRecord::VERSION::MAJOR >= 3)
+  class SpaceshipWithSymbolAndStringFlagColumns < ActiveRecord::Base
+    self.table_name = 'spaceships_with_symbol_and_string_flag_columns'
+    include FlagShihTzu
 
-  has_flags(1 => :warpdrive, 2 => :hyperspace, :column => 'bits')
-  validates_presence_of_flags :bits
-end
+    has_flags({ 1 => :warpdrive, 2 => :hyperspace }, :column => :peace, :check_for_column => true)
+    has_flags({ 1 => :photon, 2 => :laser, 3 => :ion_cannon, 4 => :particle_beam }, :column => :love, :check_for_column => true)
+    has_flags({ 1 => :power, 2 => :anti_ax_routine }, :column => 'happiness', :check_for_column => true)
+    validates_presence_of_flags :peace, :love
+  end
 
-class SpaceshipWithValidationsAnd3CustomFlagsColumn < ActiveRecord::Base
-  self.table_name = 'spaceships_with_3_custom_flags_column'
-  include FlagShihTzu
+  class SpaceshipWithValidationsAndCustomFlagsColumn < ActiveRecord::Base
+    self.table_name = 'spaceships_with_custom_flags_column'
+    include FlagShihTzu
 
-  has_flags({ 1 => :warpdrive, 2 => :hyperspace }, :column => 'engines')
-  has_flags({ 1 => :photon, 2 => :laser, 3 => :ion_cannon, 4 => :particle_beam }, :column => 'weapons')
-  has_flags({ 1 => :power, 2 => :anti_ax_routine }, :column => 'hal3000')
+    has_flags(1 => :warpdrive, 2 => :hyperspace, :column => 'bits')
+    validates_presence_of_flags :bits
+  end
 
-  validates_presence_of_flags :engines, :weapons
-end
+  class SpaceshipWithValidationsAnd3CustomFlagsColumn < ActiveRecord::Base
+    self.table_name = 'spaceships_with_3_custom_flags_column'
+    include FlagShihTzu
 
-class SpaceshipWithValidationsOnNonFlagsColumn < ActiveRecord::Base
-  self.table_name = 'spaceships_with_custom_flags_column'
-  include FlagShihTzu
+    has_flags({ 1 => :warpdrive, 2 => :hyperspace }, :column => 'engines')
+    has_flags({ 1 => :photon, 2 => :laser, 3 => :ion_cannon, 4 => :particle_beam }, :column => 'weapons')
+    has_flags({ 1 => :power, 2 => :anti_ax_routine }, :column => 'hal3000')
 
-  has_flags(1 => :warpdrive, 2 => :hyperspace, :column => 'bits')
-  validates_presence_of_flags :id
+    validates_presence_of_flags :engines, :weapons
+  end
+
+  class SpaceshipWithValidationsOnNonFlagsColumn < ActiveRecord::Base
+    self.table_name = 'spaceships_with_custom_flags_column'
+    include FlagShihTzu
+
+    has_flags(1 => :warpdrive, 2 => :hyperspace, :column => 'bits')
+    validates_presence_of_flags :id
+  end
 end
 
 # table planets is missing intentionally to see if flagshihtzu handles missing tables gracefully
@@ -311,8 +313,17 @@ class FlagShihTzuClassMethodsTest < Test::Unit::TestCase
     spaceship.enable_flag(:electrolytes)
     spaceship.save!
 
-    Spaceship.update_all Spaceship.set_flag_sql(:warpdrive, true),
+    assert_equal false, spaceship.warpdrive
+    assert_equal true, spaceship.shields
+    assert_equal true, spaceship.electrolytes
+
+    if (ActiveRecord::VERSION::MAJOR <= 3)
+      Spaceship.update_all Spaceship.set_flag_sql(:warpdrive, true),
                          ["id=?", spaceship.id]
+    else
+      Spaceship.where("id=?", spaceship.id).update_all Spaceship.set_flag_sql(:warpdrive, true)
+    end
+
     spaceship.reload
 
     assert_equal true, spaceship.warpdrive
@@ -325,8 +336,17 @@ class FlagShihTzuClassMethodsTest < Test::Unit::TestCase
     spaceship.enable_flag(:electrolytes)
     spaceship.save!
 
-    Spaceship.update_all Spaceship.set_flag_sql(:shields, false),
-                         ["id=?", spaceship.id]
+    assert_equal true, spaceship.warpdrive
+    assert_equal true, spaceship.shields
+    assert_equal true, spaceship.electrolytes
+
+    if (ActiveRecord::VERSION::MAJOR <= 3)
+      Spaceship.update_all Spaceship.set_flag_sql(:shields, false),
+                           ["id=?", spaceship.id]
+    else
+      Spaceship.where("id=?", spaceship.id).update_all Spaceship.set_flag_sql(:shields, false)
+    end
+
     spaceship.reload
 
     assert_equal true, spaceship.warpdrive
@@ -904,55 +924,134 @@ class FlagShihTzuInstanceMethodsTest < Test::Unit::TestCase
     assert_equal 'bits', @big_spaceship.class.determine_flag_colmn_for(:warpdrive)
   end
 
-  # --------------------------------------------------
+  def test_update_flag_without_updating_instance!
+    my_spaceship = SpaceshipWith2CustomFlagsColumn.new
+    my_spaceship.enable_flag(:jeanlucpicard)
+    my_spaceship.disable_flag(:warpdrive)
+    my_spaceship.save
 
-  def test_validation_should_raise_if_not_a_flag_column
-    spaceship = SpaceshipWithValidationsOnNonFlagsColumn.new
-    assert_raises ArgumentError do
-      spaceship.valid?
-    end
-  end
+    assert_equal true, my_spaceship.jeanlucpicard
+    assert_equal false, my_spaceship.warpdrive
 
-  def test_validation_should_succeed_with_a_blank_optional_flag
-    spaceship = Spaceship.new
-    assert_equal true, spaceship.valid?
-  end
+    assert_equal true, my_spaceship.update_flag!(:jeanlucpicard, false)
+    assert_equal true, my_spaceship.update_flag!(:warpdrive, true)
 
-  def test_validation_should_fail_with_a_nil_required_flag
-    spaceship = SpaceshipWithValidationsAndCustomFlagsColumn.new
-    spaceship.bits = nil
-    assert_equal false, spaceship.valid?
-    assert_equal ["can't be blank"], spaceship.errors.messages[:bits]
-  end
+    # Not updating the instance here, so it won't reflect the result of the SQL update until after reloaded
+    assert_equal true, my_spaceship.jeanlucpicard
+    assert_equal false, my_spaceship.warpdrive
 
-  def test_validation_should_fail_with_a_blank_required_flag
-    spaceship = SpaceshipWithValidationsAndCustomFlagsColumn.new
-    assert_equal false, spaceship.valid?
-    assert_equal ["can't be blank"], spaceship.errors.messages[:bits]
-  end
+    my_spaceship.reload
 
-  def test_validation_should_succeed_with_a_set_required_flag
-    spaceship = SpaceshipWithValidationsAndCustomFlagsColumn.new
-    spaceship.warpdrive = true
-    assert_equal true, spaceship.valid?
+    assert_equal false, my_spaceship.jeanlucpicard
+    assert_equal true, my_spaceship.warpdrive
   end
 
-  def test_validation_should_fail_with_a_blank_required_flag_among_2
-    spaceship = SpaceshipWithValidationsAnd3CustomFlagsColumn.new
-    assert_equal false, spaceship.valid?
-    assert_equal ["can't be blank"], spaceship.errors.messages[:engines]
-    assert_equal ["can't be blank"], spaceship.errors.messages[:weapons]
+  def test_update_flag_with_updating_instance!
+    my_spaceship = SpaceshipWith2CustomFlagsColumn.new
+    my_spaceship.enable_flag(:jeanlucpicard)
+    my_spaceship.disable_flag(:warpdrive)
+    my_spaceship.save
+
+    assert_equal true, my_spaceship.jeanlucpicard
+    assert_equal false, my_spaceship.warpdrive
+
+    assert_equal true, my_spaceship.update_flag!(:jeanlucpicard, false, true)
+    assert_equal true, my_spaceship.update_flag!(:warpdrive, true, true)
+
+    # Updating the instance here, so it will reflect the result of the SQL update before and after reload
+    assert_equal false, my_spaceship.jeanlucpicard
+    assert_equal true, my_spaceship.warpdrive
 
-    spaceship.warpdrive = true
-    assert_equal false, spaceship.valid?
-    assert_equal ["can't be blank"], spaceship.errors.messages[:weapons]
+    my_spaceship.reload
+
+    assert_equal false, my_spaceship.jeanlucpicard
+    assert_equal true, my_spaceship.warpdrive
   end
 
-  def test_validation_should_succeed_with_a_set_required_flag_among_2
-    spaceship = SpaceshipWithValidationsAnd3CustomFlagsColumn.new
-    spaceship.warpdrive = true
-    spaceship.photon = true
-    assert_equal true, spaceship.valid?
+  # --------------------------------------------------
+
+  if (ActiveRecord::VERSION::MAJOR >= 3)
+
+    def test_validation_should_raise_if_not_a_flag_column
+      spaceship = SpaceshipWithValidationsOnNonFlagsColumn.new
+      assert_raises ArgumentError do
+        spaceship.valid?
+      end
+    end
+
+    def test_validation_should_succeed_with_a_blank_optional_flag
+      spaceship = Spaceship.new
+      assert_equal true, spaceship.valid?
+    end
+
+    def test_validation_should_fail_with_a_nil_required_flag
+      spaceship = SpaceshipWithValidationsAndCustomFlagsColumn.new
+      spaceship.bits = nil
+      assert_equal false, spaceship.valid?
+      error_message =
+        if spaceship.errors.respond_to?(:messages)
+          spaceship.errors.messages[:bits]
+        else
+          spaceship.errors.get(:bits)
+        end
+      assert_equal ["can't be blank"], error_message
+    end
+
+    def test_validation_should_fail_with_a_blank_required_flag
+      spaceship = SpaceshipWithValidationsAndCustomFlagsColumn.new
+      assert_equal false, spaceship.valid?
+      error_message =
+        if spaceship.errors.respond_to?(:messages)
+          spaceship.errors.messages[:bits]
+        else
+          spaceship.errors.get(:bits)
+        end
+      assert_equal ["can't be blank"], error_message
+    end
+
+    def test_validation_should_succeed_with_a_set_required_flag
+      spaceship = SpaceshipWithValidationsAndCustomFlagsColumn.new
+      spaceship.warpdrive = true
+      assert_equal true, spaceship.valid?
+    end
+
+    def test_validation_should_fail_with_a_blank_required_flag_among_2
+      spaceship = SpaceshipWithValidationsAnd3CustomFlagsColumn.new
+      assert_equal false, spaceship.valid?
+      engines_error_message =
+        if spaceship.errors.respond_to?(:messages)
+          spaceship.errors.messages[:engines]
+        else
+          spaceship.errors.get(:engines)
+        end
+      assert_equal ["can't be blank"], engines_error_message
+
+      weapons_error_message =
+        if spaceship.errors.respond_to?(:messages)
+          spaceship.errors.messages[:weapons]
+        else
+          spaceship.errors.get(:weapons)
+        end
+      assert_equal ["can't be blank"], weapons_error_message
+
+      spaceship.warpdrive = true
+      assert_equal false, spaceship.valid?
+
+      weapons_error_message =
+        if spaceship.errors.respond_to?(:messages)
+          spaceship.errors.messages[:weapons]
+        else
+          spaceship.errors.get(:weapons)
+        end
+      assert_equal ["can't be blank"], weapons_error_message
+    end
+
+    def test_validation_should_succeed_with_a_set_required_flag_among_2
+      spaceship = SpaceshipWithValidationsAnd3CustomFlagsColumn.new
+      spaceship.warpdrive = true
+      spaceship.photon = true
+      assert_equal true, spaceship.valid?
+    end
   end
 
 end
@@ -1046,8 +1145,10 @@ class FlagShihTzuClassMethodsTest < Test::Unit::TestCase
     assert_equal Spaceship.flag_columns, ['flags']
     assert_equal SpaceshipWith2CustomFlagsColumn.flag_columns, ['bits', 'commanders']
     assert_equal SpaceshipWith3CustomFlagsColumn.flag_columns, ['engines', 'weapons', 'hal3000']
-    assert_equal SpaceshipWithValidationsAnd3CustomFlagsColumn.flag_columns, ["engines", "weapons", "hal3000"]
-    assert_equal SpaceshipWithSymbolAndStringFlagColumns.flag_columns, ['peace', 'love', 'happiness']
+    if (ActiveRecord::VERSION::MAJOR >= 3)
+      assert_equal SpaceshipWithValidationsAnd3CustomFlagsColumn.flag_columns, ["engines", "weapons", "hal3000"]
+      assert_equal SpaceshipWithSymbolAndStringFlagColumns.flag_columns, ['peace', 'love', 'happiness']
+    end
   end
 
 end

metadata

@@ -1,9 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: flag_shih_tzu
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
+- Peter Boling
 - Patryk Peszko
 - Sebastian Roebke
 - David Anderson
@@ -11,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -106,6 +107,7 @@ files:
 - gemfiles/Gemfile.activerecord-3.0.x
 - gemfiles/Gemfile.activerecord-3.1.x
 - gemfiles/Gemfile.activerecord-3.2.x
+- gemfiles/Gemfile.activerecord-4.0.x
 - init.rb
 - lib/flag_shih_tzu.rb
 - lib/flag_shih_tzu/validators.rb
@@ -114,7 +116,7 @@ files:
 - test/flag_shih_tzu_test.rb
 - test/schema.rb
 - test/test_helper.rb
-homepage: https://github.com/xing/flag_shih_tzu
+homepage: https://github.com/pboling/flag_shih_tzu
 licenses:
 - MIT
 metadata: {}
@@ -143,4 +145,3 @@ test_files:
 - test/flag_shih_tzu_test.rb
 - test/schema.rb
 - test/test_helper.rb
-has_rdoc: