flag_shih_tzu 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2714d0ae0f43d03bd6e24a3ac96ec0a5a2126ec
-  data.tar.gz: 5f31617f4cb4c1ef1e3ad3ccc3db9a813004bfa7
+  metadata.gz: f838aaf59bd28697db5750c2102f66f23dfaed0b
+  data.tar.gz: e61cc31873a236b52648fce2815f58b090ffd69d
 SHA512:
-  metadata.gz: 4494baacf8d5733f126459e7880e5cb33e8465a59de8d709262da9734c447c49085d5b165c7bbfc468ec7479f9965371384b6a55d0f43ef9edb227783c1cafe1
-  data.tar.gz: bd3ef847e260134e8ed842fe6c176473f56538e677ec3396285babfba7d4c5213acf920a141667620c7351de8696316b84500503d29def67ec4c854475627ed2
+  metadata.gz: 02d87e4ec423ab7053d0b460bc51a889ba5a96ad343f6939f46b2056c024ed858520349b788a7d2a608a380d01e8eaae2374d945be4e3912eb3d3abe707c5d91
+  data.tar.gz: 0a0b3097c2b6494b838a3b0536c7407117a6d6f4a78cca2cac19b677b03acf6ea6506d130604b2de06fb9b319e52f47a0fe98eec0ab8fff8f16c308e85c1d53f

data/.gitignore

@@ -8,4 +8,5 @@ Gemfile.lock
 gemfiles/*.lock
 pkg/*
 rdoc/*
-.rvmrc
+.ruby-version
+.ruby-gemset

data/.travis.yml

@@ -1,8 +1,9 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
-  - 2.2.1
+  - 2.1.5
+  - 2.2.3
+  - jruby
 gemfile:
   - gemfiles/Gemfile.activerecord-2.3.x
   - gemfiles/Gemfile.activerecord-3.0.x
@@ -10,35 +11,42 @@ gemfile:
   - gemfiles/Gemfile.activerecord-3.2.x
   - gemfiles/Gemfile.activerecord-4.0.x
   - gemfiles/Gemfile.activerecord-4.1.x
+  - gemfiles/Gemfile.activerecord-4.2.x
 matrix:
   exclude:
-    - rvm: 2.2.1
+    - rvm: jruby
       gemfile: gemfiles/Gemfile.activerecord-2.3.x
-    - rvm: 2.2.1
+    - rvm: jruby
       gemfile: gemfiles/Gemfile.activerecord-3.0.x
-    - rvm: 2.2.1
+    - rvm: jruby
       gemfile: gemfiles/Gemfile.activerecord-3.1.x
-    - rvm: 2.2.1
+    - rvm: jruby
       gemfile: gemfiles/Gemfile.activerecord-3.2.x
-    - rvm: 2.2.1
+    - rvm: jruby
       gemfile: gemfiles/Gemfile.activerecord-4.0.x
-    - rvm: 2.1.2
+    - rvm: 2.2.3
       gemfile: gemfiles/Gemfile.activerecord-2.3.x
-    - rvm: 2.1.2
+    - rvm: 2.2.3
       gemfile: gemfiles/Gemfile.activerecord-3.0.x
-    - rvm: 2.1.2
+    - rvm: 2.2.3
       gemfile: gemfiles/Gemfile.activerecord-3.1.x
-    - rvm: 2.1.2
+    - rvm: 2.2.3
+      gemfile: gemfiles/Gemfile.activerecord-3.2.x
+    - rvm: 2.2.3
+      gemfile: gemfiles/Gemfile.activerecord-4.0.x
+    - rvm: 2.1.5
       gemfile: gemfiles/Gemfile.activerecord-2.3.x
-    - rvm: 2.1.2
+    - rvm: 2.1.5
       gemfile: gemfiles/Gemfile.activerecord-3.0.x
-    - rvm: 2.1.2
+    - rvm: 2.1.5
       gemfile: gemfiles/Gemfile.activerecord-3.1.x
     - rvm: 2.0.0
       gemfile: gemfiles/Gemfile.activerecord-2.3.x
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.activerecord-4.2.x
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.activerecord-4.2.x
     - rvm: 1.9.3
       gemfile: gemfiles/Gemfile.activerecord-4.1.x
-    - rvm: 1.9.2
+    - rvm: 1.9.3
       gemfile: gemfiles/Gemfile.activerecord-4.0.x
-    - rvm: 1.9.2
-      gemfile: gemfiles/Gemfile.activerecord-4.1.x

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-Version 0.3.13 - MAR.13.2015
+# HEAD - UNRELEASED
+
+* Work merged into master branch goes here until it is released.
+
+# Version 0.3.14 - OCT.08.2015
+
+* Allow use without ActiveRecord (experimental) by jfcaiceo
+* Many net-zero code cleanups to follow Ruby Style Guide
+* Improved local testing script rake test:all
+* Testing on Travis: added Ruby 1.9.3, 2.1.5, 2.2.3, jruby
+* Testing on Travis: removed Ruby 2.1.2
+
+# Version 0.3.13 - MAR.13.2015
 
 * methods for use with form builders like simple_form by Peter Boling
 
@@ -11,7 +23,7 @@ Version 0.3.13 - MAR.13.2015
 * Testing on Travis: added Ruby 2.2.1
 * Testing on Travis: removed Ruby 1.9.2
 
-Version 0.3.12 - OCT.01.2014
+# Version 0.3.12 - OCT.01.2014
 
 * Improve testing instructions in readme by Peter Boling
 * fix check_flag_column to return false after warn by Peter Boling
@@ -22,41 +34,41 @@ Version 0.3.12 - OCT.01.2014
 * Adds specs for ActiveRecord version 4.1 by Peter Boling
 * Use Kernel#warn instead of puts by Peter Boling
 
-Version 0.3.11 - JUL.09.2014
+# Version 0.3.11 - JUL.09.2014
 
 * Rename some ambigously-named methods mixed into AR::Base by jdelStrother
 * Add dynamic ".*_values_for" helpers by atipugin
 
-Version 0.3.10 - NOV.26.2013
+# Version 0.3.10 - NOV.26.2013
 
 * Can run tests without coverage by specifying NOCOVER=true by Peter Boling
 * Improved test coverage by Peter Boling
 * Improved documentation by Peter Boling
 * Readme converted to Markdown by Peter Boling
 
-Version 0.3.9 - NOV.25.2013
+# Version 0.3.9 - NOV.25.2013
 
 * Removed runtime dependency on active record and active support by Peter Boling
 * Fixed Coveralls Configuration by Peter Boling
 * Improved Readme by Peter Boling
 
-Version 0.3.8 - NOV.24.2013
+# Version 0.3.8 - NOV.24.2013
 
 * Improved Readme / Documentation by Peter Boling
 * Added Badges by Peter Boling
 * Configured Coveralls by Peter Boling
 * Added Code Climate, Coveralls, Gemnasium, and Version Badges by Peter Boling
 
-Version 0.3.7 - OCT.25.2013
+# Version 0.3.7 - OCT.25.2013
 
 * Change `sql_in_for_flag` to consider values from the range [0, 2 * max - 1] by Blake Thomson
 
-Version 0.3.6 - AUG.29.2013
+# Version 0.3.6 - AUG.29.2013
 
 * Allow use with any gem manager by Peter Boling
 * No need to alter Ruby's load path by Peter Boling
 
-Version 0.3.5 - AUG.06.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)
@@ -64,7 +76,7 @@ Version 0.3.5 - AUG.06.2013
   - optionally syncs the instance with new flag value, by default it does not.
 * Update gemspec by Peter Boling
 
-Version 0.3.4 - JUN.20.2013
+# 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
@@ -80,11 +92,11 @@ Version 0.3.4 - 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
+# Version 0.3.3 - JUN.20.2013
 
 - Does not exist.
 
-Version 0.3.2 - NOV.06.2012
+# Version 0.3.2 - NOV.06.2012
 
 * Adds skip column check option :check_for_column - from arturaz
 * Adds a 'smart' set_flag_sql method which will auto determine the correct column for the given flag - from arturaz
@@ -93,12 +105,12 @@ Version 0.3.2 - NOV.06.2012
   - Now there is a test ensuring that the generated SQL can be executed by a real DB
   - This improved sql_set_for_flag underlies the public set_flag_sql method
 
-Version 0.3.1 - NOV.06.2012
+# Version 0.3.1 - NOV.06.2012
 
 * Adds new methods (for a flag column named 'bar', with many individual flags within) - from ddidier
   - all_bar, selected_bar, select_all_bar, unselect_all_bar, selected_bar=(selected_flags), has_bar?
 
-Version 0.3.0 - NOV.05.2012 - first version maintained by Peter Boling
+# Version 0.3.0 - NOV.05.2012 - first version maintained by Peter Boling
 
 * ClassWithHasFlags.set_#{flag_name}_sql # Returns the sql string for setting a flag for use in customized SQL
 * ClassWithHasFlags.unset_#{flag_name}_sql # Returns the sql string for unsetting a flag for use in customized SQL
@@ -106,12 +118,12 @@ Version 0.3.0 - NOV.05.2012 - first version maintained by Peter Boling
 * has_flags :strict => true # DuplicateFlagColumnException raised when a single DB column is declared as a flag column twice
 * Less verbosity for expected conditions when the DB connection for the class is unavailable.
 * Tests for additional features, but does not change any behavior of 0.2.3 / 0.2.4 by default.
-* Easily migrate from 0.2.3 / 0.2.4. Goal is no code changes required. Minor version bump to encourage caution.
+* Easily migrate from 0.2.3 and 0.2.4. Goal is no code changes required. Minor version bump to encourage caution.
 
-Version 0.2.4 - NOV.05.2012 - released last few changes from XING master
+# Version 0.2.4 - NOV.05.2012 - released last few changes from XING master
 
 * Fix deprecation warning for set_table_name
 * Optional bang methods
 * Complete Ruby 1.9(\.[^1]) and Rails 3.2.X compatibility
 
-Version 0.2.3 - last version maintained by XING AG
+# Version 0.2.3 - last version maintained by XING AG

data/Gemfile

@@ -1,4 +1,7 @@
 source "http://rubygems.org"
 
+# SO the gem can run the simple test suite against the raw bundled gems without the complex BUNDLE_GEMFILE setup
+gem "sqlite3", :platforms => [:ruby]
+
 # Specify your gem's dependencies in flag_shih_tzu.gemspec
 gemspec

data/README.md

@@ -48,9 +48,14 @@ What is a ["Shih Tzu"](http://en.wikipedia.org/wiki/Shih_Tzu)?
 The gem is actively being tested with:
 
 * MySQL, PostgreSQL and SQLite3 databases
-* ActiveRecord versions 2.3.x, 3.0.x, 3.1.x, 3.2.x, 4.0.x, 4.1.x ;)
-* Ruby 1.9.2, 1.9.3, 2.0.0, 2.1.2 (see .travis.yml for the matrix)
-* Legacy Ruby 1.8.7 compatibility is in the [0.2.X branch](https://github.com/pboling/flag_shih_tzu/tree/0.2.X)
+* ActiveRecord versions 2.3.x, 3.0.x, 3.1.x, 3.2.x, 4.0.x, 4.1.x, 4.2.x ;)
+* Ruby 1.9.3, 2.0.0, 2.1.5, 2.2.3
+* Travis tests the most important builds. See [.travis.yml](https://github.com/pboling/flag_shih_tzu/blob/master/.travis.yml) for the matrix.
+* All of the supported builds are run locally by me.  See [bin/test.bash](https://github.com/pboling/flag_shih_tzu/blob/master/bin/test.bash)
+
+**Legacy**
+
+* Ruby 1.8.7 compatibility is in the [0.2.X branch](https://github.com/pboling/flag_shih_tzu/tree/0.2.X) and no further releases are expected.  If you need a patch submit a pull request.
 
 ## Installation
 
@@ -58,7 +63,9 @@ The gem is actively being tested with:
 
 In environment.rb:
 
-    config.gem 'flag_shih_tzu'
+```ruby
+config.gem 'flag_shih_tzu'
+```
 
 Then:
 
@@ -68,7 +75,9 @@ Then:
 
 In Gemfile:
 
-    gem 'flag_shih_tzu'
+```ruby
+gem 'flag_shih_tzu'
+```
 
 Then:
 
@@ -92,23 +101,27 @@ should have a default value of `0`.
 
 I like to document the intent of the `flags` column in the migration when I can...
 
-    change_table :spaceships do |t|
-      t.integer     :flags, :null => false, :default => 0 # flag_shih_tzu-managed bit field
-      # Effective booleans which will be stored on the flags column:
-      # t.boolean      :warpdrive
-      # t.boolean      :shields
-      # t.boolean      :electrolytes
-    end
+```ruby
+change_table :spaceships do |t|
+  t.integer     :flags, :null => false, :default => 0 # flag_shih_tzu-managed bit field
+  # Effective booleans which will be stored on the flags column:
+  # t.boolean      :warpdrive
+  # t.boolean      :shields
+  # t.boolean      :electrolytes
+end
+```
 
 ### Adding to the Model
 
-    class Spaceship < ActiveRecord::Base
-      include FlagShihTzu
+```ruby
+class Spaceship < ActiveRecord::Base
+  include FlagShihTzu
 
-      has_flags 1 => :warpdrive,
-                2 => :shields,
-                3 => :electrolytes
-    end
+  has_flags 1 => :warpdrive,
+            2 => :shields,
+            3 => :electrolytes
+end
+```
 
 `has_flags` takes a hash. The keys must be positive integers and represent
 the position of the bit being used to enable or disable the flag.
@@ -161,16 +174,17 @@ The default column name to store the flags is `flags`, but you can provide a
 custom column name using the `:column` option. This allows you to use
 different columns for separate flags:
 
-    has_flags 1 => :warpdrive,
-              2 => :shields,
-              3 => :electrolytes,
-              :column => 'features'
-
-    has_flags 1 => :spock,
-              2 => :scott,
-              3 => :kirk,
-              :column => 'crew'
+```ruby
+has_flags 1 => :warpdrive,
+          2 => :shields,
+          3 => :electrolytes,
+          :column => 'features'
 
+has_flags 1 => :spock,
+          2 => :scott,
+          3 => :kirk,
+          :column => 'crew'
+```
 
 ### Generated boolean patterned instance methods
 
@@ -239,7 +253,9 @@ Alternatively, if you do want to *save a flag* to the database, while still avoi
 
 Example:
 
-    update_flag!(flag_name, flag_value, update_instance = false)
+```ruby
+update_flag!(flag_name, flag_value, update_instance = false)
+```
 
 
 ### Generated class methods
@@ -247,24 +263,30 @@ Example:
 Calling `has_flags` as shown above creates the following class methods
 on Spaceship:
 
-    Spaceship.flag_columns      # [:features, :crew]
+```ruby
+Spaceship.flag_columns      # [:features, :crew]
+```
 
 
 ### Generated named scopes
 
 The following named scopes become available:
 
-    Spaceship.warpdrive         # :conditions => "(spaceships.flags in (1,3,5,7))"
-    Spaceship.not_warpdrive     # :conditions => "(spaceships.flags not in (1,3,5,7))"
-    Spaceship.shields           # :conditions => "(spaceships.flags in (2,3,6,7))"
-    Spaceship.not_shields       # :conditions => "(spaceships.flags not in (2,3,6,7))"
-    Spaceship.electrolytes      # :conditions => "(spaceships.flags in (4,5,6,7))"
-    Spaceship.not_electrolytes  # :conditions => "(spaceships.flags not in (4,5,6,7))"
+```ruby
+Spaceship.warpdrive         # :conditions => "(spaceships.flags in (1,3,5,7))"
+Spaceship.not_warpdrive     # :conditions => "(spaceships.flags not in (1,3,5,7))"
+Spaceship.shields           # :conditions => "(spaceships.flags in (2,3,6,7))"
+Spaceship.not_shields       # :conditions => "(spaceships.flags not in (2,3,6,7))"
+Spaceship.electrolytes      # :conditions => "(spaceships.flags in (4,5,6,7))"
+Spaceship.not_electrolytes  # :conditions => "(spaceships.flags not in (4,5,6,7))"
+```
 
 If you do not want the named scopes to be defined, set the
 `:named_scopes` option to false when calling `has_flags`:
 
-    has_flags 1 => :warpdrive, 2 => :shields, 3 => :electrolytes, :named_scopes => false
+```ruby
+has_flags 1 => :warpdrive, 2 => :shields, 3 => :electrolytes, :named_scopes => false
+```
 
 In a Rails 3+ application, FlagShihTzu will use `scope` internally to generate
 the scopes. The option on `has_flags` is still named `:named_scopes` however.
@@ -272,18 +294,20 @@ the scopes. The option on `has_flags` is still named `:named_scopes` however.
 
 ### Examples for using the generated methods
 
-    enterprise = Spaceship.new
-    enterprise.warpdrive = true
-    enterprise.shields = true
-    enterprise.electrolytes = false
-    enterprise.save
+```ruby
+enterprise = Spaceship.new
+enterprise.warpdrive = true
+enterprise.shields = true
+enterprise.electrolytes = false
+enterprise.save
 
-    if enterprise.shields?
-      # ...
-    end
+if enterprise.shields?
+  # ...
+end
 
-    Spaceship.warpdrive.find(:all)
-    Spaceship.not_electrolytes.count
+Spaceship.warpdrive.find(:all)
+Spaceship.not_electrolytes.count
+```
 
 
 ### Support for manually building conditions
@@ -291,17 +315,20 @@ the scopes. The option on `has_flags` is still named `:named_scopes` however.
 The following class methods may support you when manually building
 ActiveRecord conditions:
 
-    Spaceship.warpdrive_condition         # "(spaceships.flags in (1,3,5,7))"
-    Spaceship.not_warpdrive_condition     # "(spaceships.flags not in (1,3,5,7))"
-    Spaceship.shields_condition           # "(spaceships.flags in (2,3,6,7))"
-    Spaceship.not_shields_condition       # "(spaceships.flags not in (2,3,6,7))"
-    Spaceship.electrolytes_condition      # "(spaceships.flags in (4,5,6,7))"
-    Spaceship.not_electrolytes_condition  # "(spaceships.flags not in (4,5,6,7))"
+```ruby
+Spaceship.warpdrive_condition         # "(spaceships.flags in (1,3,5,7))"
+Spaceship.not_warpdrive_condition     # "(spaceships.flags not in (1,3,5,7))"
+Spaceship.shields_condition           # "(spaceships.flags in (2,3,6,7))"
+Spaceship.not_shields_condition       # "(spaceships.flags not in (2,3,6,7))"
+Spaceship.electrolytes_condition      # "(spaceships.flags in (4,5,6,7))"
+Spaceship.not_electrolytes_condition  # "(spaceships.flags not in (4,5,6,7))"
+```
 
 These methods also accept a `:table_alias` option that can be used when
 generating SQL that references the same table more than once:
-
-    Spaceship.shields_condition(:table_alias => 'evil_spaceships') # "(evil_spaceships.flags in (2,3,6,7))"
+```ruby
+Spaceship.shields_condition(:table_alias => 'evil_spaceships') # "(evil_spaceships.flags in (2,3,6,7))"
+```
 
 
 ### Choosing a query mode
@@ -316,22 +343,26 @@ For MySQL, depending on your MySQL settings, this can even hit the
 In this case, consider changing the flag query mode to `:bit_operator`
 instead of `:in_list`, like so:
 
-    has_flags 1 => :warpdrive,
-              2 => :shields,
-              :flag_query_mode => :bit_operator
+```ruby
+has_flags 1 => :warpdrive,
+          2 => :shields,
+          :flag_query_mode => :bit_operator
+```
 
 This will modify the generated condition and named_scope methods to use bit
 operators in the SQL instead of an `IN()` list:
 
-    Spaceship.warpdrive_condition     # "(spaceships.flags & 1 = 1)",
-    Spaceship.not_warpdrive_condition # "(spaceships.flags & 1 = 0)",
-    Spaceship.shields_condition       # "(spaceships.flags & 2 = 2)",
-    Spaceship.not_shields_condition   # "(spaceships.flags & 2 = 0)",
+```ruby
+Spaceship.warpdrive_condition     # "(spaceships.flags & 1 = 1)",
+Spaceship.not_warpdrive_condition # "(spaceships.flags & 1 = 0)",
+Spaceship.shields_condition       # "(spaceships.flags & 2 = 2)",
+Spaceship.not_shields_condition   # "(spaceships.flags & 2 = 0)",
 
-    Spaceship.warpdrive     # :conditions => "(spaceships.flags & 1 = 1)"
-    Spaceship.not_warpdrive # :conditions => "(spaceships.flags & 1 = 0)"
-    Spaceship.shields       # :conditions => "(spaceships.flags & 2 = 2)"
-    Spaceship.not_shields   # :conditions => "(spaceships.flags & 2 = 0)"
+Spaceship.warpdrive     # :conditions => "(spaceships.flags & 1 = 1)"
+Spaceship.not_warpdrive # :conditions => "(spaceships.flags & 1 = 0)"
+Spaceship.shields       # :conditions => "(spaceships.flags & 2 = 2)"
+Spaceship.not_shields   # :conditions => "(spaceships.flags & 2 = 0)"
+```
 
 The drawback is that due to the [bitwise operation][bitwise_operation] being done on the SQL side,
 this query can not use an index on the flags column.
@@ -341,19 +372,25 @@ this query can not use an index on the flags column.
 If you need to do mass updates without initializing object for each row, you can
 use `#set_flag_sql` method on your class. Example:
 
-    Spaceship.set_flag_sql(:warpdrive, true) # "flags = flags | 1"
-    Spaceship.set_flag_sql(:shields, false)  # "flags = flags & ~2"
+```ruby
+Spaceship.set_flag_sql(:warpdrive, true) # "flags = flags | 1"
+Spaceship.set_flag_sql(:shields, false)  # "flags = flags & ~2"
+```
 
 And then use it in:
 
-    Spaceship.update_all Spaceship.set_flag_sql(:shields, false)
+```ruby
+Spaceship.update_all Spaceship.set_flag_sql(:shields, false)
+```
 
 Beware that using multiple flag manipulation sql statements in the same query
 probably will not have the desired effect (at least on sqlite3, not tested
 on other databases), so you *should not* do this:
 
-    Spaceship.update_all "#{Spaceship.set_flag_sql(:shields, false)},#{
-      Spaceship.set_flag_sql(:warpdrive, true)}"
+```ruby
+Spaceship.update_all "#{Spaceship.set_flag_sql(:shields, false)},#{
+  Spaceship.set_flag_sql(:warpdrive, true)}"
+```
 
 General rule of thumb: issue only one flag update per update statement.
 
@@ -366,33 +403,23 @@ Sometimes this may not be a wanted behaviour (e.g. when loading model without
 database connection established) so you can set `:check_for_column` option to
 false to avoid it.
 
-    has_flags 1 => :warpdrive,
-              2 => :shields,
-              :check_for_column => false
+```ruby
+has_flags 1 => :warpdrive,
+          2 => :shields,
+          :check_for_column => false
+```
 
 
 ## Running the gem tests
 
-First, run some infrequent setup:
+WARNING: You may want to read [bin/test.bash](https://github.com/pboling/flag_shih_tzu/blob/master/bin/test.bash) first.
+Running the test script will switch rubies, create gemsets, install gems, and get a lil' crazy with the hips.
 
-    $ rvm use 1.9.3
-    $ bundle install
-    $ BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-2.3.x' bundle update --quiet
-    $ BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-3.0.x' bundle update --quiet
-    $ BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-3.1.x' bundle update --quiet
-    $ BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-3.2.x' bundle update --quiet
-    $ BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-4.0.x' bundle update --quiet
-    $ rvm use 2.1.2
-    $ bundle install
-    $ BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-3.2.x' bundle update --quiet
-    $ BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-4.0.x' bundle update --quiet
-    $ BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-4.1.x' bundle update --quiet
-
-Then just:
+Just:
 
-    $ bundle exec rake test:all
+    $ rake test:all
 
-This will internally use rvm and bundler to load specific ActiveRecord versions
+This will internally use rvm and bundler to load specific Rubies and ActiveRecord versions
 before executing the tests (see `gemfiles/`), e.g.:
 
     $ NOCOVER=true BUNDLE_GEMFILE='gemfiles/Gemfile.activerecord-4.1.x' bundle exec rake test
@@ -404,6 +431,16 @@ specify which config from `test/database.yml` to use, e.g.:
 
     $ NOCOVER=true DB=mysql bundle exec rake
 
+You will also need to create, and configure access to, the test databases for any adapters you want to test, e.g. mysql:
+
+    mysql> CREATE USER 'foss'@'localhost';
+    Query OK, 0 rows affected (0.00 sec)
+    
+    mysql> GRANT ALL PRIVILEGES ON *.* TO 'foss'@'localhost';
+    Query OK, 0 rows affected (0.00 sec)
+    
+    mysql> CREATE DATABASE flag_shih_tzu_test;
+    Query OK, 1 row affected (0.00 sec)
 
 ## Authors
 
@@ -458,12 +495,13 @@ dependency on this gem using the [Pessimistic Version Constraint](http://docs.ru
 
 For example:
 
-    spec.add_dependency 'flag_shih_tzu', '~> 4.0'
-
+```ruby
+spec.add_dependency 'flag_shih_tzu', '~> 4.0'
+```
 
 ## 2012 Change of Ownership and 0.3.X Release Notes
 
-FlagShihTzu was originally a [XING AG][http://www.xing.com/] project.  [Peter Boling](http://peterboling.com) was a long time contributor and watcher of the project.
+FlagShihTzu was originally a [XING AG](http://www.xing.com/) project.  [Peter Boling](http://peterboling.com) was a long time contributor and watcher of the project.
 In September 2012 XING transferred ownership of the project to Peter Boling.  Peter Boling had been maintaining a
 fork with extended capabilities.  These additional features become a part of the 0.3 line.  The 0.2 line of the gem will
 remain true to XING's original.  The 0.3 line aims to maintain complete parity and compatibility with XING's original as