apartment 0.13.1 → 0.14.0

data/README.md

@@ -1,16 +1,6 @@
 # Apartment
 *Multitenancy for Rails 3*
 
-> IMPORTANT! While I will do everything possible to get Apartment working for Rails 3.1, I haven't, as of yet, had this opportunity.  
-
-> There have been significant changes in the adapters such as prepared statements that might cause some issues.  
-
-> If anyone is successfully using Apartment with 3.1 please let me know, but please ensure that you're testing data integrity properly (ie. that queries are made in the right schema) as prepared_statements
-> could really throw a wrench in that one.
-
-> I know for a fact that Rails 3.1 missed a patch to make postgresql more schema aware, but it seems to have made it into Rails 3.1.1.  So at the very least, use 3.1.1
-
-
 Apartment provides tools to help you deal with multiple databases in your Rails
 application. If you need to have certain data sequestered based on account or company,
 but still allow some data to exist in a common database, Apartment can help.
@@ -129,11 +119,7 @@ from `Apartment.database_names`
 
 ### Delayed::Job
 
-In Apartment's current state, it doesn't seem to queue jobs properly using DJ.  For whatever reason, DJ jobs are created in the current schema, even though the DJ 
-is part of the ignored models.  I have to look into this further, but until then use `Apartment::Delayed::Job.enqueue` to ensure that queues are placed in the public schema
-
-In order to make ActiveRecord models play nice with DJ and Apartment, include `Apartment::Delayed::Requirements` in any model that is being serialized by DJ.  Also ensure
-that a `database` attribute is set on this model *before* it is serialized, to ensure that when it is fetched again, it is done so in the proper Apartment db context.  For example:
+In order to make ActiveRecord models play nice with DJ and Apartment, include `Apartment::Delayed::Requirements` in any model that is being serialized by DJ.  Also ensure that the `database` attribute (provided by Apartment::Delayed::Requirements) is set on this model *before* it is serialized, to ensure that when it is fetched again, it is done so in the proper Apartment db context.  For example:
 
     class SomeModel < ActiveRecord::Base
       include Apartment::Delayed::Requirements
@@ -151,8 +137,10 @@ that a `database` attribute is set on this model *before* it is serialized, to e
       end
     end
 
-## Contributing
+## Development
 
+* The Local setup for development assumes that a root user with no password exists for both mysql and postgresl
+* Rake tasks (see the Rakefile) will help you setup your dbs necessary to run tests
 * Please issue pull requests to the `development` branch.  All development happens here, master is used for releases
 * Ensure that your code is accompanied with tests.  No code will be merged without tests
 

data/Rakefile

@@ -5,28 +5,28 @@ Bundler::GemHelper.install_tasks
 require "rspec"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
+RSpec::Core::RakeTask.new(:spec => "db:test:prepare") do |spec|
   spec.pattern = "spec/**/*_spec.rb"
 end
 
 namespace :spec do
   
   [:tasks, :unit, :adapters, :integration].each do |type|
-    RSpec::Core::RakeTask.new(type) do |spec|
+    RSpec::Core::RakeTask.new(type => :spec) do |spec|
       spec.pattern = "spec/#{type}/**/*_spec.rb"
     end
   end
   
-  namespace :unit do
-    RSpec::Core::RakeTask.new(:adapters) do |spec|
-      spec.pattern = "spec/unit/adapters/**/*_spec.rb"
-    end
-  end
-
 end
 
 task :default => :spec
 
+namespace :db do
+  namespace :test do
+    task :prepare => %w{postgres:drop_db postgres:build_db mysql:drop_db mysql:build_db}
+  end
+end
+
 namespace :postgres do
   require 'active_record'
   require "#{File.join(File.dirname(__FILE__), 'spec', 'support', 'config')}"
@@ -35,7 +35,7 @@ namespace :postgres do
   task :build_db do
     %x{ createdb -E UTF8 #{pg_config['database']} } rescue "test db already exists"
     ActiveRecord::Base.establish_connection pg_config
-    load 'spec/dummy/db/schema.rb'
+    ActiveRecord::Migrator.migrate('spec/dummy/db/migrate')
   end
   
   desc "drop the PostgreSQL test database"
@@ -54,13 +54,13 @@ namespace :mysql do
   task :build_db do
     %x{ mysqladmin -u root create #{my_config['database']} } rescue "test db already exists"
     ActiveRecord::Base.establish_connection my_config
-    load 'spec/dummy/db/schema.rb'
+    ActiveRecord::Migrator.migrate('spec/dummy/db/migrate')
   end
   
   desc "drop the MySQL test database"
   task :drop_db do
     puts "dropping database #{my_config['database']}"
-    %x{ mysqladmin -u root drop #{my_config['database']} }
+    %x{ mysqladmin -u root drop #{my_config['database']} --force}
   end
     
 end

data/apartment.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   
-  s.add_dependency 'rails', '~> 3.1.1'   # must be >= 3.0.10 due to poor schema support pre 3.0.10, but < 3.1 because it hasn't been fully tested yet
+  s.add_dependency 'rails', '~> 3.1.2'
   s.add_development_dependency 'rake', '~> 0.8.7'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'rspec', '~> 2.6.0'
   s.add_development_dependency 'rspec-rails', '~> 2.6.1'
   s.add_development_dependency 'capybara', '1.0.0'
   s.add_development_dependency 'pg', '~> 0.11.0'
-  s.add_development_dependency 'mysql2', '0.2.7'
+  s.add_development_dependency 'mysql2', '~> 0.3.7'
   s.add_development_dependency "silent-postgres", "~> 0.1.1"
   s.add_development_dependency 'delayed_job', '~> 2.1.4'
 end

data/lib/apartment.rb

@@ -13,11 +13,7 @@ module Apartment
     
     # Be careful not to use `return` here so both Proc and lambda can be used without breaking
     def database_names
-      if @database_names.respond_to?(:call)
-        @database_names.call
-      else
-        @database_names
-      end
+      @database_names.respond_to?(:call) ? @database_names.call : @database_names
     end
     
     # Default to none

data/lib/apartment/adapters/abstract_adapter.rb

@@ -49,7 +49,7 @@ module Apartment
         ActiveRecord::Base.connection.execute("DROP DATABASE #{environmentify(database)}" )
         
       rescue ActiveRecord::StatementInvalid => e
-  		  raise DatabaseNotFound, "The database #{environmentify(database)} cannot be found"
+        raise DatabaseNotFound, "The database #{environmentify(database)} cannot be found"
       end
       
       #   Prepend the environment if configured and the environment isn't already there
@@ -59,35 +59,35 @@ module Apartment
       # 
       def environmentify(database)
         Apartment.prepend_environment && !database.include?(Rails.env) ? "#{Rails.env}_#{database}" : database
-  		end
-  		
+      end
+
       #   Connect to db, do your biz, switch back to previous db
       # 
       #   @param {String?} database Database or schema to connect to
       # 
       def process(database = nil)
         current_db = current_database
-		    switch(database)
-		    yield if block_given?
-		    
-		  ensure
-  		  switch(current_db) rescue reset
-	    end
-	    
-	    #   Establish a new connection for each specific excluded model
+        switch(database)
+        yield if block_given?
+
+      ensure
+        switch(current_db) rescue reset
+      end
+
+      #   Establish a new connection for each specific excluded model
       # 
       def process_excluded_models
         # All other models will shared a connection (at ActiveRecord::Base) and we can modify at will
-  	    Apartment.excluded_models.each do |excluded_model|
-  	      # Note that due to rails reloading, we now take string references to classes rather than
+        Apartment.excluded_models.each do |excluded_model|
+          # Note that due to rails reloading, we now take string references to classes rather than
           # actual object references.  This way when we contantize, we always get the proper class reference
           if excluded_model.is_a? Class
             warn "[Deprecation Warning] Passing class references to excluded models is now deprecated, please use a string instead"
             excluded_model = excluded_model.name
           end
           
-  				excluded_model.constantize.establish_connection @config
-  			end
+          excluded_model.constantize.establish_connection @config
+        end
       end
       
       #   Reset the database connection to the default
@@ -102,17 +102,17 @@ module Apartment
       # 
       def switch(database = nil)
         # Just connect to default db and return
-  			return reset if database.nil?
+        return reset if database.nil?
 
         connect_to_new(database)
-  		end
+      end
 
       #   Load the rails seed file into the db
       #   
-  		def seed_data
-  		  silence_stream(STDOUT){ load_or_abort("#{Rails.root}/db/seeds.rb") } # Don't log the output of seeding the db
+      def seed_data
+        silence_stream(STDOUT){ load_or_abort("#{Rails.root}/db/seeds.rb") } # Don't log the output of seeding the db
       end
-	    alias_method :seed, :seed_data
+      alias_method :seed, :seed_data
       
     protected
     
@@ -137,22 +137,22 @@ module Apartment
 
       rescue ActiveRecord::StatementInvalid => e
         raise DatabaseNotFound, "The database #{environmentify(database)} cannot be found."
-  	  end
+      end
       
       #   Import the database schema
       # 
-	    def import_database_schema
-	      ActiveRecord::Schema.verbose = false    # do not log schema load output.
-	      load_or_abort("#{Rails.root}/db/schema.rb")
-	    end
-	    
-	    #   Return a new config that is multi-tenanted
+      def import_database_schema
+        ActiveRecord::Schema.verbose = false    # do not log schema load output.
+        load_or_abort("#{Rails.root}/db/schema.rb")
+      end
+      
+      #   Return a new config that is multi-tenanted
       # 
       def multi_tenantify(database)
-  			@config.clone.tap do |config|
-  			  config[:database] = environmentify(database)
-			  end
-  		end
+        @config.clone.tap do |config|
+          config[:database] = environmentify(database)
+        end
+      end
       
       #   Load a file or abort if it doesn't exists
       # 
@@ -166,9 +166,9 @@ module Apartment
       
       #   Remove all non-alphanumeric characters
       # 
-	    def sanitize(database)
-	      warn "[Deprecation Warning] Sanitize is no longer used, client should ensure proper database names"
-	      database.gsub(/[\W]/,'')
+      def sanitize(database)
+        warn "[Deprecation Warning] Sanitize is no longer used, client should ensure proper database names"
+        database.gsub(/[\W]/,'')
       end
       
     end

data/lib/apartment/adapters/postgresql_adapter.rb

@@ -27,8 +27,8 @@ module Apartment
         super
       rescue PGError => e
         raise DatabaseNotFound, "Cannot find database #{environmentify(database)}"
-		  end
-		  
+      end
+      
     end
     
     # Separate Adapter for Postgresql when using schemas
@@ -93,7 +93,6 @@ module Apartment
       # 
       def connect_to_new(database = nil)
         return reset if database.nil?
-        ActiveRecord::Base.connection.clear_cache!
         ActiveRecord::Base.connection.schema_search_path = database
 
       rescue ActiveRecord::StatementInvalid => e

data/lib/apartment/database.rb

@@ -3,15 +3,15 @@ require 'active_support/core_ext/module/delegation'
 module Apartment
   
   #   The main entry point to Apartment functions
-	module Database
-	  
-	  extend self
+  module Database
+    
+    extend self
 
-    delegate :create, :current_database, :process, :process_excluded_models, :reset, :seed, :switch, :to => :adapter
+    delegate :create, :current_database, :drop, :process, :process_excluded_models, :reset, :seed, :switch, :to => :adapter
 
     #   Initialize Apartment config options such as excluded_models
     # 
-	  def init
+    def init
       process_excluded_models
     end
     
@@ -20,10 +20,10 @@ module Apartment
     #   @return {subclass of Apartment::AbstractAdapter}
     # 
     def adapter
-	    @adapter ||= begin
-		    adapter_method = "#{config[:adapter]}_adapter"
-	    
-		    begin
+      @adapter ||= begin
+        adapter_method = "#{config[:adapter]}_adapter"
+
+        begin
           require "apartment/adapters/#{adapter_method}"
         rescue LoadError => e
           raise "The adapter `#{config[:adapter]}` is not yet supported"
@@ -44,8 +44,8 @@ module Apartment
       @config = nil
     end
     
-	private
-	
+  private
+  
     #   Fetch the rails database configuration
     # 
     def config
@@ -53,5 +53,5 @@ module Apartment
     end
     
   end
-	
+  
 end

data/lib/apartment/migrator.rb

@@ -5,19 +5,19 @@ module Apartment
     extend self
   
     # Migrate to latest
-		def migrate(database)
-			Database.process(database){ ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_path) }
-		end
-	
+    def migrate(database)
+      Database.process(database){ ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_path) }
+    end
+  
     # Migrate up/down to a specific version
-		def run(direction, database, version)
-		  Database.process(database){ ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_path, version) }
-	  end
+    def run(direction, database, version)
+      Database.process(database){ ActiveRecord::Migrator.run(direction, ActiveRecord::Migrator.migrations_path, version) }
+    end
   
     # rollback latest migration `step` number of times
-		def rollback(database, step = 1)
-		  Database.process(database){ ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_path, step) }
-	  end
+    def rollback(database, step = 1)
+      Database.process(database){ ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_path, step) }
+    end
   end
-	  
+    
 end

data/lib/apartment/railtie.rb

@@ -1,12 +1,14 @@
 require 'rails'
 
 module Apartment
-	class Railtie < Rails::Railtie
-	  
-    # Set up our default config options
-    # Do this before the app initializers run so we don't override custom settings
-	  config.before_initialize do
-	    Apartment.configure do |config|
+  class Railtie < Rails::Railtie
+    
+    # 
+    #   Set up our default config options
+    #   Do this before the app initializers run so we don't override custom settings
+    # 
+    config.before_initialize do
+      Apartment.configure do |config|
         config.excluded_models = []
         config.use_postgres_schemas = true
         config.database_names = []
@@ -18,20 +20,26 @@ module Apartment
     #   Hook into ActionDispatch::Reloader to ensure Apartment is properly initialized
     #   Note that this doens't entirely work as expected in Development, because this is called before classes are reloaded
     #   See the above middleware/console declarations below to help with this.  Hope to fix that soon.
+    # 
     config.to_prepare do
       Apartment::Database.init
     end
-	  
-		rake_tasks do
-			load 'tasks/apartment.rake'
-		end
-		
-    # The following initializers are a workaround to the fact that I can't properly hook into the rails reloader
-    # Note this is technically valid for any environment where cache_classes is false, for us, it's just development
+    
+    # 
+    #   Ensure rake tasks are loaded
+    # 
+    rake_tasks do
+      load 'tasks/apartment.rake'
+    end
+    
+    # 
+    #   The following initializers are a workaround to the fact that I can't properly hook into the rails reloader
+    #   Note this is technically valid for any environment where cache_classes is false, for us, it's just development
+    # 
     if Rails.env.development?
       
       # Apartment::Reloader is middleware to initialize things properly on each request to dev
-  		initializer 'apartment.init' do |app|
+      initializer 'apartment.init' do |app|
         app.config.middleware.use "Apartment::Reloader"
       end
     
@@ -42,5 +50,5 @@ module Apartment
       
     end
     
-	end
+  end
 end

data/lib/apartment/reloader.rb

@@ -6,18 +6,17 @@ module Apartment
     #   Necessary due to code reload (annoying).  I couldn't figure out how to properly hook into
     #   the Rails reload process *after* files are reloaded, so I've used this in the meantime.
     # 
-    #   Note that this has one MAJOR caveat.  Doing  `reload!` in the console in development WILL NOT run init again
-    #   Thus, excluded models will not be processed again and will be queried from the current_schema rather than public.  
-    #   I hope to fix this soon
-	  def initialize(app)
-	    @app = app
+    #   Also see apartment/console for the re-definition of reload! that re-init's Apartment
+    # 
+    def initialize(app)
+      @app = app
     end
     
     def call(env)
       Database.init
       @app.call(env)
     end
-	  
+    
   end
   
 end

data/lib/apartment/version.rb

@@ -1,3 +1,3 @@
 module Apartment
-  VERSION = "0.13.1"
+  VERSION = "0.14.0"
 end

data/lib/tasks/apartment.rake

@@ -1,59 +1,59 @@
 apartment_namespace = namespace :apartment do
 
-	desc "Migrate all multi-tenant databases"
-	task :migrate => 'db:migrate' do
-	  
-		Apartment.database_names.each do |db| 
-		  puts("Migrating #{db} database")
-		  Apartment::Migrator.migrate db
-	  end
-	end
-	
-	desc "Seed all multi-tenant databases"
-	task :seed => 'db:seed' do
+  desc "Migrate all multi-tenant databases"
+  task :migrate => 'db:migrate' do
 
-	  Apartment.database_names.each do |db| 
+    Apartment.database_names.each do |db|
+      puts("Migrating #{db} database")
+      Apartment::Migrator.migrate db
+    end
+  end
+
+  desc "Seed all multi-tenant databases"
+  task :seed => 'db:seed' do
+
+    Apartment.database_names.each do |db|
       puts("Seeding #{db} database")
       Apartment::Database.process(db) do
         Apartment::Database.seed
       end
     end
   end
-	
-	desc "Rolls the schema back to the previous version (specify steps w/ STEP=n) across all multi-tenant dbs."
+
+  desc "Rolls the schema back to the previous version (specify steps w/ STEP=n) across all multi-tenant dbs."
   task :rollback => 'db:rollback' do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
 
-    Apartment.database_names.each do |db| 
+    Apartment.database_names.each do |db|
       puts("Rolling back #{db} database")
       Apartment::Migrator.rollback db, step
     end
   end
-	
-	namespace :migrate do
-	  
-	  desc 'Runs the "up" for a given migration VERSION across all multi-tenant dbs.'
-	  task :up => 'db:migrate:up' do
-	    version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+
+  namespace :migrate do
+
+    desc 'Runs the "up" for a given migration VERSION across all multi-tenant dbs.'
+    task :up => 'db:migrate:up' do
+      version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
-      
-      Apartment.database_names.each do |db| 
+
+      Apartment.database_names.each do |db|
         puts("Migrating #{db} database up")
         Apartment::Migrator.run :up, db, version
       end
     end
-	  
-	  desc 'Runs the "down" for a given migration VERSION across all multi-tenant dbs.'
-	  task :down => 'db:migrate:down' do
-	    version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+
+    desc 'Runs the "down" for a given migration VERSION across all multi-tenant dbs.'
+    task :down => 'db:migrate:down' do
+      version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
       raise 'VERSION is required' unless version
-      
-      Apartment.database_names.each do |db| 
+
+      Apartment.database_names.each do |db|
         puts("Migrating #{db} database down")
         Apartment::Migrator.run :down, db, version
       end
     end
-    
+
     desc  'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
     task :redo => 'db:migrate:redo' do
       if ENV['VERSION']
@@ -64,7 +64,7 @@ apartment_namespace = namespace :apartment do
         apartment_namespace['migrate'].invoke
       end
     end
-    
+
   end
-  
+
 end

data/spec/adapters/postgresql_adapter_spec.rb

@@ -48,7 +48,6 @@ describe Apartment::Adapters::PostgresqlAdapter do
       end
       
       it "should yield to block if passed" do
-        Apartment::Test.migrate   # ensure we have latest schema in the public 
         subject.drop(schema2) # so we don't get errors on creation
         
         @count = 0  # set our variable so its visible in and outside of blocks

data/spec/dummy/config/database.yml

@@ -7,6 +7,7 @@ test:
   min_messages: WARNING
   pool: 5
   timeout: 5000
+  
 development:
   adapter: postgresql
   database: apartment_postgresql_development

data/spec/dummy/config/initializers/apartment.rb

@@ -0,0 +1,4 @@
+Apartment.configure do |config|
+  config.excluded_models = ["Company"]
+  config.database_names = lambda{ Company.scoped.collect(&:database) }
+end

data/spec/dummy/db/migrate/20110613152810_create_dummy_models.rb

@@ -33,4 +33,5 @@ class CreateDummyModels < ActiveRecord::Migration
     drop_table :users
     drop_table :delayed_jobs
   end
+
 end

data/spec/dummy/db/migrate/20111202022214_create_table_books.rb

@@ -0,0 +1,13 @@
+class CreateTableBooks < ActiveRecord::Migration
+  def up
+    create_table :books do |t|
+      t.string :name
+      t.integer :pages
+      t.datetime :published
+    end
+  end
+
+  def down
+    drop_table :books
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,13 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110613152810) do
+ActiveRecord::Schema.define(:version => 20111202022214) do
+
+  create_table "books", :force => true do |t|
+    t.string   "name"
+    t.integer  "pages"
+    t.datetime "published"
+  end
 
   create_table "companies", :force => true do |t|
     t.boolean "dummy"

data/spec/integration/apartment_rake_integration_spec.rb

@@ -3,14 +3,16 @@ require 'rake'
 
 describe "apartment rake tasks" do
   
-  before :all do
-    Apartment::Test.migrate   # ensure we have latest schema in the public 
-  end
-  
   before do
     @rake = Rake::Application.new
     Rake.application = @rake
     Dummy::Application.load_tasks
+
+    # somehow this misc.rake file gets lost in the shuffle
+    # it defines a `rails_env` task that our db:migrate depends on
+    # No idea why, but during the tests, we somehow lose this tasks, so we get an error when testing migrations
+    # This is STUPID!
+    load "rails/tasks/misc.rake"    
   end
   
   after do
@@ -25,23 +27,25 @@ describe "apartment rake tasks" do
   end
 
   context "with x number of databases" do
+    
+    let(:x){ 1 + rand(5) }    # random number of dbs to create
+    let(:db_names){ x.times.map{|y| "database_#{y}" } }
+
     before do
-      @db_names = []
-      @x = 1 + rand(5).times do |x| 
-        @db_names << db_name = "schema_#{x}"
-        Apartment::Database.create db_name
+      db_names.collect do |db_name|
+        Apartment::Database.create(db_name)
         Company.create :database => db_name
       end
     end
     
     after do
-      @db_names.each{ |db| Apartment::Test.drop_schema(db) }
+      db_names.each{ |db| Apartment::Database.drop(db) }
       Company.delete_all
     end
     
     describe "#migrate" do
       it "should migrate all databases" do
-        Apartment::Migrator.should_receive(:migrate).exactly(@db_names.length).times
+        Apartment::Migrator.should_receive(:migrate).exactly(db_names.length).times
         
         @rake['apartment:migrate'].invoke
       end
@@ -49,17 +53,18 @@ describe "apartment rake tasks" do
     
     describe "#rollback" do
       it "should rollback all dbs" do
-        @db_names.each do |name|
+        db_names.each do |name|
           Apartment::Migrator.should_receive(:rollback).with(name, anything)
         end
         
         @rake['apartment:rollback'].invoke
+        @rake['apartment:migrate'].invoke   # migrate again so that our next test 'seed' can run (requires migrations to be complete)
       end
     end
     
     describe "apartment:seed" do
       it "should seed all databases" do
-        Apartment::Database.should_receive(:seed).exactly(@db_names.length).times
+        Apartment::Database.should_receive(:seed).exactly(db_names.length).times
         
         @rake['apartment:seed'].invoke
       end

metadata

@@ -2,7 +2,7 @@
 name: apartment
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors: 
 - Ryan Brunner
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 -05:00
+date: 2011-12-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.1
+        version: 3.1.2
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -96,9 +96,9 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.7
+        version: 0.3.7
   type: :development
   prerelease: false
   version_requirements: *id008
@@ -178,6 +178,7 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/apartment.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
@@ -186,13 +187,11 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20110613152810_create_dummy_models.rb
+- spec/dummy/db/migrate/20111202022214_create_table_books.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/fake_dj_class.rb
-- spec/dummy/log/development.log
-- spec/dummy/log/production.log
-- spec/dummy/log/server.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -226,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2586480540333121746
+      hash: 538032595049641835
       segments: 
       - 0
       version: "0"
@@ -235,7 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2586480540333121746
+      hash: 538032595049641835
       segments: 
       - 0
       version: "0"