army-negative 2.0.0 → 3.0.0

data/army-negative.gemspec

@@ -21,7 +21,10 @@ Gem::Specification.new do |s|
     Used for special cases, such as developing rails apps that must, for
     example, work with existing databases that use such a convention.
 
-    Use versions ~> 2.0 for rails 2.x apps. and versions > 2 for rails 3 apps.
+    For a rails app version X.Y.Z, use army-negative version "~> X.Y.0". For
+    example, a rails 3.0.x app should use "~> 3.0.0" and a 3.1.x app would use
+    "~> 3.1.0", etc. The exception is that rails 2.3.x apps should just use
+    "~> 2.0" since 2.3 is the earliest version of rails that's supported.
   DESCRIPTION
 
   s.files         = `git ls-files`.split("\n")
@@ -29,12 +32,12 @@ 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", "~> 2.3.0"
-  s.add_dependency "mysql", "~> 2.8.1"
+  s.add_dependency "rails",  "~> 3.0.0"
+  s.add_dependency "mysql2", "~> 0.2.11"
 
   if s.respond_to?(:add_development_dependency)
     s.add_development_dependency "bundler",  "~> 1.0.18"
-    s.add_development_dependency "cucumber", "~> 1.0.3"
+    s.add_development_dependency "cucumber", "~> 1.0.5"
     s.add_development_dependency "rspec",    "~> 2.6.0"
   end
 

data/dummy/Gemfile

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

data/dummy/Rakefile

@@ -1,8 +1,4 @@
 # encoding: utf-8
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
-
+require File.expand_path('../config/application', __FILE__)
 require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-require 'tasks/rails'
+Dummy::Application.load_tasks

data/dummy/config.ru

@@ -0,0 +1,3 @@
+# encoding: utf-8
+require ::File.expand_path('../config/environment',  __FILE__)
+run Dummy::Application

data/dummy/config/application.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+require File.expand_path('../boot', __FILE__)
+require 'rails/all'
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+module Dummy
+  class Application < Rails::Application
+    config.encoding = "utf-8"
+  end
+end

data/dummy/config/boot.rb

@@ -1,112 +1,4 @@
 # encoding: utf-8
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-      Rails::GemDependency.add_frozen_gem_path
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      if load_error.message =~ /Could not find RubyGem rails/
-        STDERR.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-        exit 1
-      else
-        raise
-      end
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion rescue nil
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        min_version = '1.3.2'
-        require 'rubygems'
-        unless rubygems_version >= min_version
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
-end
-
-# All that for this:
-Rails.boot!
+require 'rubygems'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/dummy/config/database.yml

@@ -1,21 +1,12 @@
 # MySQL.  Versions 4.1 and 5.0 are recommended.
 #
 # Install the MySQL driver:
-#   gem install mysql
-# On Mac OS X:
-#   sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql
-# On Mac OS X Leopard:
-#   sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-#       This sets the ARCHFLAGS environment variable to your native architecture
-# On Windows:
-#   gem install mysql
-#       Choose the win32 build.
-#       Install MySQL and put its /bin directory on your path.
+#   gem install mysql2
 #
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   reconnect: false
   database: dummy_development
@@ -28,7 +19,7 @@ development:
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   reconnect: false
   database: dummy_test
@@ -38,11 +29,11 @@ test:
   socket: /var/run/mysqld/mysqld.sock
 
 production:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   reconnect: false
   database: dummy_production
   pool: 5
   username: root
-  password: 
+  password:
   socket: /var/run/mysqld/mysqld.sock

data/dummy/config/environment.rb

@@ -1,10 +1,3 @@
 # encoding: utf-8
-
-# Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.14' unless defined? RAILS_GEM_VERSION
-
-# Bootstrap the Rails environment, frameworks, and default configuration
-require File.join(File.dirname(__FILE__), 'boot')
-
-Rails::Initializer.run do |config|
-end
+require File.expand_path('../application', __FILE__)
+Dummy::Application.initialize!

data/features/support/step_definitions.rb

@@ -8,9 +8,9 @@ When /^I create a user named '([^']+)' with '([^']+)' set to true$/ do |username
   User.create :username => username, column.intern => true
 end
 
-Then /^the '([^']+)' column for '([^']+)' should be '([^']+)'$/ do |column, username, value|
+Then /^the '([^']+)' column for '([^']+)' should be '(-?\d+)'$/ do |column, username, value|
   user = User.find_by_username(username)
-  user.send("#{column}_before_type_cast").should == value
+  user.send("#{column}_before_type_cast").should == value.to_i
 end
 
 When /^I load a user named '([^']+)' who's '([^']+)' column is '(-?\d+)'$/ do |username, column, value|

data/lib/army-negative.rb

@@ -1,4 +1,5 @@
 require 'army-negative/version'
+require 'army-negative/railtie' if defined?(Rails)
 
 module Army
   module Negative
@@ -8,14 +9,12 @@ module Army
     autoload :MysqlAdapter, 'army-negative/mysql_adapter'
 
     #
-    # Call this in an initializer in order to active army-negative and ensure
-    # all true values get stored as -1 and -1's are recognized as true.
-    #
-    # Example:
-    #   require 'army-negative'
-    #   Army::Negative.activate!
+    # Called during gem initialization (via Army::Negative::Railtie) in order to
+    # active army-negative and ensure all true values get stored as -1 and that
+    # -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

data/lib/army-negative/railtie.rb

@@ -0,0 +1,12 @@
+require 'army-negative'
+require 'rails'
+
+module Army
+  module Negative
+    class Railtie < Rails::Railtie
+      initializer "army-negative.activate" do
+        ActiveSupport.on_load(:active_record) { Army::Negative.activate! }
+      end
+    end
+  end
+end

data/lib/army-negative/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: army-negative
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
-  - 2
+  - 3
   - 0
   - 0
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Kendall Gifford
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-12 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 2
         - 3
         - 0
-        version: 2.3.0
+        - 0
+        version: 3.0.0
   version_requirements: *id001
   name: rails
 - !ruby/object:Gem::Dependency 
@@ -41,14 +41,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 45
+        hash: 1
         segments: 
+        - 0
         - 2
-        - 8
-        - 1
-        version: 2.8.1
+        - 11
+        version: 0.2.11
   version_requirements: *id002
-  name: mysql
+  name: mysql2
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
@@ -73,12 +73,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 29
         segments: 
         - 1
         - 0
-        - 3
-        version: 1.0.3
+        - 5
+        version: 1.0.5
   version_requirements: *id004
   name: cucumber
 - !ruby/object:Gem::Dependency 
@@ -106,7 +106,10 @@ description: |-
   as true as well.
   Used for special cases, such as developing rails apps that must, for
   example, work with existing databases that use such a convention.
-  Use versions ~> 2.0 for rails 2.x apps. and versions > 2 for rails 3 apps.
+  For a rails app version X.Y.Z, use army-negative version "~> X.Y.0". For
+  example, a rails 3.0.x app should use "~> 3.0.0" and a 3.1.x app would use
+  "~> 3.1.0", etc. The exception is that rails 2.3.x apps should just use
+  "~> 2.0" since 2.3 is the earliest version of rails that's supported.
 email: 
 - zettabyte@gmail.com
 executables: []
@@ -125,15 +128,15 @@ files:
 - README.rdoc
 - Rakefile
 - army-negative.gemspec
+- dummy/Gemfile
 - dummy/Rakefile
 - dummy/app/models/user.rb
+- dummy/config.ru
+- dummy/config/application.rb
 - dummy/config/boot.rb
 - dummy/config/database.yml
 - dummy/config/environment.rb
 - dummy/config/environments/test.rb
-- dummy/config/initializers/army-negative.rb
-- dummy/config/initializers/session_store.rb
-- dummy/config/routes.rb
 - dummy/db/migrate/20110909225432_create_users.rb
 - dummy/db/schema.rb
 - dummy/test/fixtures/users.yml
@@ -144,6 +147,7 @@ files:
 - lib/army-negative/column.rb
 - lib/army-negative/mysql_adapter.rb
 - lib/army-negative/quoting.rb
+- lib/army-negative/railtie.rb
 - lib/army-negative/version.rb
 homepage: http://github.com/zettabyte/army-negative
 licenses: 
@@ -174,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Monkey-patches ActiveRecord's MySQL (ARMy) connection adapter to store boolean trues as negative ones

data/dummy/config/initializers/army-negative.rb

@@ -1,3 +0,0 @@
-# encoding: utf-8
-require 'army-negative'
-Army::Negative.activate!

data/dummy/config/initializers/session_store.rb

@@ -1,5 +0,0 @@
-# encoding: utf-8
-ActionController::Base.session = {
-  :key         => '_dummy_session',
-  :secret      => 'b52c736773f335f181876e4c807039d61c64b3416fb814d284f35314c4f869ccc834976ef187cce12b3fa85eea6897f27d23ba458581df8f1b4f622365b2a4b1'
-}

data/dummy/config/routes.rb

@@ -1 +0,0 @@
-# encoding: utf-8