army-negative 3.0.0 → 3.1.0

data/CHANGELOG.rdoc

@@ -1,3 +1,18 @@
+= 3.1.0, release 2011-09-13
+
+* Now version 3.1.0 (through 3.1.x) supports rails 3.1.y.
+* Updated cucumber-based test suite's rails app to rails 3.1.0
+
+= 3.0.0, release 2011-09-13
+
+* Now version 3.0.0 (through 3.0.x) supports rails 3.0.y.
+* Updated cucumber-based test suite's rails app to rails 3.0.10
+
+From now on (version 3.0.0 and above) the major and minor versions of this gem
+will match major and minor version numbers of the supported rails version. Rails
+2.3.x support is still universally supported by any 2.y version of this gem (the
+minor version number doesn't have to match).
+
 = 2.0.0, release 2011-09-12
 
 * Reverted code so that the <tt>2.x</tt> series supports rails <tt>2.3.x</tt> apps.

data/README.rdoc

@@ -4,36 +4,32 @@ This gem is a simple ActiveRecord MySQL (+ARMy+) connection adapter
 monkey-patch. Put it in your +Gemfile+ and all your +true+ are belong to us! Or,
 rather, they'll suddenly become very negative, negative one specifically.
 
-See the *Usage* section below for information on how to use this gem with rails
-<tt>2.3.x</tt>.
-
 == Versioning
 
-As of version <tt>2.0</tt>, a new versioning system has been employed. All
-<tt>2.x</tt> versions of this gem support rails versions <tt>2.3.x</tt>.
+In general, <tt>army-negative</tt> versions are _pinned_ to the supported rails
+version. Specifically, the major and minor version numbers will always match.
 
-Versions <tt>3.x</tt> of the gem will support rails versions <tt>3.x</tt>.
+So, to use <tt>army-negative</tt> in a rails app, you'd use a version specifier
+in its entry in your +Gemfile+.
 
-== Usage
+Examples:
 
-In order to use this gem in your rails <tt>2.3.x</tt> app, first modify your
-<tt>config/environment.rb</tt> and add the following within the configuration
-block:
+  gem "army-negative", "~> 3.0.0" # for all rails 3.0.x apps
+  gem "army-negative", "~> 3.1.0" # for all rails 3.1.x apps
+  gem "army-negative", "~> 4.5.6" # would work in any rails 4.5.x app
+  # etc.
 
-  Rails::Initializer.run do |config|
-    # ...
-    config.gem "army-negative", :version => "~> 2.0"
-    # ...
-  end
+The exception to this rule is in rails <tt>2.3.x</tt> apps (the oldest supported
+rails version). For these versions, you should use the latest <tt>2.x</tt>
+version of <tt>army-negative</tt> (see the rails2 branch in the git repo).
+
+== Usage
 
-You can then run <tt>rake gems:install</tt> in order to install the gem.
+Simply put a line like the following in your +Gemfile+:
 
-Finally, create a new _initializer_ file in <tt>config/initializers</tt> such as
-the following:
+  gem "army-negative", "~> 3.1.0"
 
-  # config/initializers/army-negative.rb
-  require 'army-negative'
-  Army::Negative.activate!
+Then do a <tt>bundle install</tt> on the command-line and you're set.
 
 == What This Does
 

data/army-negative.gemspec

@@ -32,8 +32,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails",  "~> 3.0.0"
-  s.add_dependency "mysql2", "~> 0.2.11"
+  s.add_dependency "rails",  "~> 3.1.0"
+  s.add_dependency "mysql2", "~> 0.3.7"
 
   if s.respond_to?(:add_development_dependency)
     s.add_development_dependency "bundler",  "~> 1.0.18"

data/dummy/Gemfile

@@ -1,5 +1,5 @@
 # encoding: utf-8
 source :rubygems
-gem "rails",     "3.0.10"
-gem "mysql2", "~> 0.2.13"
+gem "rails",     "3.1.0"
+gem "mysql2", "~> 0.3.7"
 gem "army-negative", :path => "../"

data/dummy/Rakefile

@@ -1,4 +1,3 @@
 # encoding: utf-8
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 Dummy::Application.load_tasks

data/dummy/config/application.rb

@@ -1,7 +1,9 @@
 # encoding: utf-8
 require File.expand_path('../boot', __FILE__)
 require 'rails/all'
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+if defined?(Bundler)
+  Bundler.require *Rails.groups(:assets => %w(development test))
+end
 module Dummy
   class Application < Rails::Application
     config.encoding = "utf-8"

data/dummy/config/database.yml

@@ -1,8 +1,11 @@
 # MySQL.  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MySQL driver:
+# 
+# Install the MYSQL driver
 #   gem install mysql2
 #
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem 'mysql2'
+#
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:

data/dummy/db/migrate/20110909225432_create_users.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 class CreateUsers < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :users do |t|
       t.string :username
       t.boolean :enabled
@@ -8,8 +8,4 @@ class CreateUsers < ActiveRecord::Migration
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :users
-  end
 end

data/dummy/db/schema.rb

@@ -1,10 +1,11 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
 # It's strongly recommended to check this file into your version control system.

data/lib/army-negative.rb

@@ -14,10 +14,18 @@ module Army
     # -1's are recognized as true.
     #
     def activate!
-      require 'active_record/connection_adapters/mysql_adapter'
-      ActiveRecord::ConnectionAdapters::Column.send       :extend,  Column
-      ActiveRecord::ConnectionAdapters::Quoting.send      :include, Quoting
-      ActiveRecord::ConnectionAdapters::MysqlAdapter.send :include, MysqlAdapter
+      ActiveRecord::ConnectionAdapters::Column.send  :extend,  Column
+      ActiveRecord::ConnectionAdapters::Quoting.send :include, Quoting
+      # There may be one of two mysql adapters...
+      adapter = 0
+      begin
+        adapter += 1
+        require "active_record/connection_adapters/mysql#{adapter == 1 ? "" : adapter}_adapter"
+      rescue LoadError => e
+        retry unless adapter >= 2
+        raise e
+      end
+      "ActiveRecord::ConnectionAdapters::Mysql#{adapter == 1 ? "" : adapter}Adapter".constantize.send :include, MysqlAdapter
     end
     module_function :activate!
 

data/lib/army-negative/version.rb

@@ -2,7 +2,7 @@ module Army
   module Negative
     module Version
       MAJOR  = 3
-      MINOR  = 0
+      MINOR  = 1
       TINY   = 0
       STRING = [MAJOR, MINOR, TINY].join(".")
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: army-negative
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 3
+  - 1
   - 0
-  - 0
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors: 
 - Kendall Gifford
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 Z
+date: 2011-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 3
+        - 1
         - 0
-        - 0
-        version: 3.0.0
+        version: 3.1.0
   version_requirements: *id001
   name: rails
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 29
         segments: 
         - 0
-        - 2
-        - 11
-        version: 0.2.11
+        - 3
+        - 7
+        version: 0.3.7
   version_requirements: *id002
   name: mysql2
 - !ruby/object:Gem::Dependency 
@@ -136,9 +136,9 @@ files:
 - dummy/config/boot.rb
 - dummy/config/database.yml
 - dummy/config/environment.rb
-- dummy/config/environments/test.rb
 - dummy/db/migrate/20110909225432_create_users.rb
 - dummy/db/schema.rb
+- dummy/db/seeds.rb
 - dummy/test/fixtures/users.yml
 - features/support/env.rb
 - features/support/step_definitions.rb