lol_dba 1.3.0 → 1.3.1

data/Gemfile

@@ -3,7 +3,5 @@ source :rubygems
 gem 'activerecord', :require => 'active_record'
 gem 'actionpack'
 gem 'railties'
-gem 'simplecov', :require => false
-gem 'simplecov-html'
-gem 'rspec'
+gem 'rspec-rails'
 gem 'sqlite3'

data/Gemfile.lock

@@ -1,73 +1,73 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.2)
-      activesupport (= 3.2.2)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.2)
-      activemodel (= 3.2.2)
-      activesupport (= 3.2.2)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.2)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
-    builder (3.0.0)
+    builder (3.0.4)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     hike (1.2.1)
-    i18n (0.6.0)
-    journey (1.0.3)
-    json (1.6.5)
-    multi_json (1.1.0)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.5)
+    multi_json (1.5.0)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    railties (3.2.2)
-      actionpack (= 3.2.2)
-      activesupport (= 3.2.2)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    simplecov (0.6.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sprockets (2.1.2)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.0)
+    rspec-rails (2.12.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
+    sqlite3 (1.3.6)
+    thor (0.16.0)
     tilt (1.3.3)
-    tzinfo (0.3.32)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -76,7 +76,5 @@ DEPENDENCIES
   actionpack
   activerecord
   railties
-  rspec
-  simplecov
-  simplecov-html
+  rspec-rails
   sqlite3

data/lib/lol_dba.rb

@@ -4,18 +4,14 @@ module LolDba
   require "lol_dba/migration"
   require "lol_dba/railtie.rb" if defined?(Rails)
 
-  def self.form_migration_content(migration_name, add_index_array, del_index_array)
+  def self.form_migration_content(migration_name, index_array)
     migration = <<EOM
     ## run `rails g migration AddMissingIndexes` and add the following content
 
 
     class #{migration_name} < ActiveRecord::Migration
-      def self.up
-        #{add_index_array.uniq.join("\n        ")}
-      end
-
-      def self.down
-        #{del_index_array.uniq.join("\n        ")}
+      def change
+        #{index_array.uniq.join("\n        ")}
       end
     end
 EOM
@@ -62,7 +58,6 @@ EOM
 
   def self.form_data_for_migration(missing_indexes)
     add = []
-    remove = []
     missing_indexes.each do |table_name, keys_to_add|
       keys_to_add.each do |key|
         next if key.blank?
@@ -70,14 +65,12 @@ EOM
         if key.is_a?(Array)
           keys = key.collect {|k| ":#{k}"}
           add << "add_index :#{table_name}, [#{keys.join(', ')}]"
-          remove << "remove_index :#{table_name}, :column => [#{keys.join(', ')}]"
         else
           add << "add_index :#{table_name}, :#{key}"
-          remove << "remove_index :#{table_name}, :#{key}"
         end
       end
     end
-    return add, remove
+    return add
   end
 
   def self.check_for_indexes(migration_format = false)
@@ -132,12 +125,13 @@ EOM
             # has_many tables are threaten by the other side of the relation
             next unless reflection_options.options[:through]
 
-            table_name = reflection_options.options[:through].to_s.singularize.camelize.constantize.table_name
+            association_clazz = class_name.reflections[reflection_options.options[:through]].klass
+            table_name = association_clazz.table_name
 
             foreign_key = get_through_foreign_key(class_name, reflection_options)
 
             if reflection_options.options[:source]
-              association_class = reflection_options.options[:source].to_s.singularize.camelize.constantize
+              association_class = association_clazz.reflections[reflection_options.options[:source]].klass
               association_foreign_key = get_through_foreign_key(association_class, reflection_options)
             else
               # go to joining model through has_many and find belongs_to
@@ -164,13 +158,14 @@ EOM
             @index_migrations[table_name] += [composite_keys.reverse] unless @index_migrations[table_name].include?(composite_keys.reverse)
           end
         rescue Exception => e
-          p "Some errors here:"
-          p "Please add info after this string in to https://github.com/plentz/lol_dba/issues"
-          p "Class: #{class_name}"
-          p "Association type: #{reflection_options.macro}"
-          p "Association options: #{reflection_options.options}"
-          p e.message
-          p e.backtrace.inspect
+          puts "Some errors here:"
+          puts "Please, create an issue with the following information here https://github.com/plentz/lol_dba/issues:"
+          puts "***************************"
+          puts "Class: #{class_name}"
+          puts "Association type: #{reflection_options.macro}"
+          puts "Association options: #{reflection_options.options}"
+          puts "Exception: #{e.message}"
+          e.backtrace.each{|trace| puts trace}
         end
       end # case end
     end # each_pair end
@@ -191,8 +186,8 @@ EOM
     if indexes.keys.empty?
       puts "Yey, no missing indexes found!"
     else
-      add, remove = form_data_for_migration(indexes)
-      puts form_migration_content(migration_name, add, remove)
+      add = form_data_for_migration(indexes)
+      puts form_migration_content(migration_name, add)
     end
   end
 

data/lib/lol_dba/sql_generator.rb

@@ -12,14 +12,14 @@ module LolDba
     
       def redefine_execute_methods
         save_original_methods
-        connection.class.send(:define_method, :execute) {|*args| Writer.write(args.first) }
-        connection.class.send(:define_method, :do_execute) {|*args| Writer.write(args.first) }
-        connection.class.send(:define_method, :column_for) {|*args| args.last }
-        connection.class.send(:define_method, :change_column) {|*args| [] }
-        connection.class.send(:define_method, :rename_column) {|*args| [] }
-        connection.class.send(:define_method, :tables) {|*args| [] }
-        connection.class.send(:define_method, :select_all) {|*args| [] }
-        connection.class.send(:define_method, :indexes) {|*args| [] }
+        connection.class.send(:define_method, :execute) { |*args| Writer.write(args.first) }
+        connection.class.send(:define_method, :do_execute) { |*args| Writer.write(args.first) }
+        connection.class.send(:define_method, :column_for) { |*args| args.last }
+        connection.class.send(:define_method, :change_column) { |*args| [] }
+        connection.class.send(:define_method, :rename_column) { |*args| [] }
+        connection.class.send(:define_method, :tables) { |*args| [] }
+        connection.class.send(:define_method, :select_all) { |*args| [] }
+        connection.class.send(:define_method, :indexes) { |*args| [] }
       end
 
       def save_original_methods
@@ -46,7 +46,7 @@ module LolDba
       end
         
       def generate
-        generate_instead_of_executing { migrations.each{|file| up_and_down(file) } }
+        generate_instead_of_executing { migrations.each { |file| up_and_down(file) } }
       end
     
       def up_and_down(file)

data/lib/lol_dba/version.rb

@@ -1,3 +1,3 @@
 module LolDba
-  VERSION = "1.3.0" unless defined? LolDba::VERSION
+  VERSION = "1.3.1" unless defined? LolDba::VERSION
 end

data/lol_dba.gemspec

@@ -19,6 +19,4 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '>= 3.0'
   s.add_dependency 'actionpack', '>= 3.0'
   s.add_dependency 'railties', '>= 3.0'
-  s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'rspec'
 end

data/spec/associations_index_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe "Collect indexes based on associations:" do
 
-  before do
+  before(:all) do
     @relationship_indexes, @warning_messages = LolDba.check_for_indexes
   end
 

data/spec/common_function_spec.rb

@@ -4,27 +4,19 @@ describe "Function form_migration_content:" do
 
   before do
     @add = ["add_index :report, :_id_test_plan"]
-    @remove = ["remove_index :report, :_id_test_plan"]
   end
 
   it "print migration skeleton with set name" do
     #$stdout.should_receive(:puts).with(/TestMigration/i)
-    migration = LolDba.form_migration_content("TestMigration", @add, @remove)
+    migration = LolDba.form_migration_content("TestMigration", @add)
     migration.should =~ /class TestMigration/i
   end
 
   it "print migration with add_keys params" do
   #  $stdout.should_receive(:puts).with(/add_index :report, :_id_test_plan/i)
-    migration = LolDba.form_migration_content("TestMigration", @add, @remove)
+    migration = LolDba.form_migration_content("TestMigration", @add)
     migration.should =~ /add_index :report, :_id_test_plan/i
   end
-
-  it "print migration with remove_keys params" do
-  #  $stdout.should_receive(:puts).with(/remove_index :report, :_id_test_plan/i)
-     migration = LolDba.form_migration_content("TestMigration", @add, @remove)
-     migration.should =~ /remove_index :report, :_id_test_plan/i
-  end
-
 end
 
 describe "Function form_data_for_migration:" do
@@ -33,28 +25,25 @@ describe "Function form_data_for_migration:" do
     relationship_indexes = {:users => [:user_id]}
     LolDba.stub(:key_exists?).with(:users, :user_id).and_return(false)
 
-    add_indexes, remove_indexes = LolDba.form_data_for_migration(relationship_indexes)
+    add_indexes = LolDba.form_data_for_migration(relationship_indexes)
 
     add_indexes.first.should == "add_index :users, :user_id"
-    remove_indexes.first.should == "remove_index :users, :user_id"
   end
 
   it "return data for migrations for non-indexed composite key in table" do
     relationship_indexes = {:friends => [[:user_id, :friend_id]]}
     LolDba.stub(:key_exists?).with(:friends, [:user_id, :friend_id]).and_return(false)
 
-    add_indexes, remove_indexes = LolDba.form_data_for_migration(relationship_indexes)
+    add_indexes = LolDba.form_data_for_migration(relationship_indexes)
 
     add_indexes.first.should == "add_index :friends, [:user_id, :friend_id]"
-    remove_indexes.first.should == "remove_index :friends, :column => [:user_id, :friend_id]"
   end
 
   it "ignore empty or nil keys for table" do
     relationship_indexes = {:table => [""], :table2 => [nil]}
-    add_indexes, remove_indexes = LolDba.form_data_for_migration(relationship_indexes)
+    add_indexes = LolDba.form_data_for_migration(relationship_indexes)
 
     add_indexes.should be_empty
-    remove_indexes.should be_empty
   end
 
 end
@@ -93,13 +82,15 @@ describe "Function puts_migration_content:" do
 
   it "print warning messages if they exist" do
     warning = "warning text here"
-    $stdout.should_receive(:puts).with(/warning text here/i)
+    $stdout.should_receive(:puts).at_least(:once).with(warning)
+    $stdout.should_receive(:puts)
 
     LolDba.puts_migration_content("TestMigration", {}, warning)
   end
 
   it "print nothing if no indexes and warning messages exist" do
     $stdout.should_receive(:puts).with("")
+    $stdout.should_receive(:puts).with("Yey, no missing indexes found!")
     LolDba.puts_migration_content("TestMigration",{}, "")
   end
 

data/spec/fixtures/app/models/complex_billable_week.rb

@@ -1,9 +1,9 @@
 class ComplexBillableWeek < ActiveRecord::Base
   # Use for testing custom has_many :through
 
-  set_table_name :complex_billable_week
+  self.table_name = :complex_billable_week
 
-  belongs_to :freelancer
+  belongs_to :slave, :class_name => 'Freelancer'
   belongs_to :complex_timesheet, :foreign_key => :id_complex_timesheet
 
 end

data/spec/fixtures/app/models/complex_timesheet.rb

@@ -2,6 +2,6 @@ class ComplexTimesheet < ActiveRecord::Base
   # Use for testing custom has_many :through
 
   has_many :complex_billable_weeks, :foreign_key => :id_complex_timesheet
-  has_many :workers, :through => :complex_billable_weeks, :source => :freelancer
+  has_many :workers, :through => :complex_billable_weeks, :source => :slave
 
 end

data/spec/fixtures/app/models/freelancer.rb

@@ -1,6 +1,6 @@
 class Freelancer < ActiveRecord::Base
 
-  set_inheritance_column 'worker_type'
+  self.inheritance_column = 'worker_type'
   # use for testing custom class_name FK
   has_and_belongs_to_many :employers, :class_name => "Company"
 

data/spec/fixtures/app/models/gift.rb

@@ -1,6 +1,6 @@
 class Gift < ActiveRecord::Base
 
-  set_primary_key :custom_primary_key
+  self.primary_key = :custom_primary_key
   has_and_belongs_to_many :users, :join_table => "purchases", :association_foreign_key => 'buyer_id', :foreign_key => 'present_id'
 
   def search_all(name, price)

data/spec/fixtures/app/models/timesheet.rb

@@ -1,6 +1,6 @@
 class Timesheet < ActiveRecord::Base
 
-  has_many :paiment_weeks,  :class_name => "BillableWeek"
+  has_many :paiment_weeks, :class_name => "BillableWeek"
   has_many :remote_workers, :through => :paiment_weeks
 
 end

data/spec/spec_helper.rb

@@ -1,21 +1,10 @@
-require 'simplecov'
-
-SimpleCov.adapters.define 'lol_dba' do
-  add_group 'Libraries', 'lib'
-
-  add_filter 'spec'
-end
-
-SimpleCov.start 'lol_dba'
-
-require 'rubygems'
-require 'bundler/setup'
-
 require 'active_record'
 require 'active_support'
 require 'action_controller'
-
 require 'lol_dba'
+require 'rspec/rails'
+
+ENV["RAILS_ENV"] ||= 'test'
 
 ActiveRecord::Base.establish_connection(
   :adapter  => "sqlite3",
@@ -28,14 +17,8 @@ class Rails
   end
 end
 
-RSpec.configure do |config|
-  # some (optional) config here
-  #config.fixture_path = "spec/fixtures"
-end
-
 load 'fixtures/schema.rb'
 
-
 root_dir = File.dirname(__FILE__)
 
 # Load models
@@ -43,7 +26,3 @@ Dir["#{root_dir}/fixtures/app/models/**/*.rb"].each { |f| require f}
 
 # load controllers
 Dir["#{root_dir}/fixtures/app/controllers/**/*.rb"].each { |f| require f}
-
-SimpleCov.at_exit do
-  SimpleCov.result.format!
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lol_dba
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -63,38 +63,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: lol_dba is a small package of rake tasks that scan your application models
   and displays a list of columns that probably should be indexed. Also, it can generate
   .sql migration scripts.
@@ -108,7 +76,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -121,7 +88,6 @@ files:
 - lib/lol_dba/writer.rb
 - lib/tasks/lol_dba.rake
 - lol_dba.gemspec
-- spec/ar_find_index_spec.rb
 - spec/associations_index_spec.rb
 - spec/common_function_spec.rb
 - spec/fixtures/app/controllers/cats_controller.rb
@@ -163,13 +129,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A small package of rake tasks to track down missing database indexes and
   generate sql migration scripts
 test_files:
-- spec/ar_find_index_spec.rb
 - spec/associations_index_spec.rb
 - spec/common_function_spec.rb
 - spec/fixtures/app/controllers/cats_controller.rb

data/.rspec

@@ -1,2 +0,0 @@
---color
---format documentation

data/spec/ar_find_index_spec.rb

@@ -1,33 +0,0 @@
-require 'spec_helper'
-
-describe "Collect indexes based on AR::Base.find calls:" do
-
-  before do
-    @find_by_indexes, @warning_messages = LolDba.ar_find_indexes(false)
-  end
-
-  it "not show indexes for primary keys" do
-    @find_by_indexes["users"].should_not include("id")
-    @find_by_indexes["gifts"].should_not include("custom_primary_key")
-    @find_by_indexes["freelancers"].should_not include("id")
-  end
-
-  it "find_by indexes for self.find_by_email_and_name" do
-    @find_by_indexes["users"].should include(["email", "name"])
-    @find_by_indexes["users"].should include(["name", "email"])
-  end
-
-  it "find_by indexes for Gift.find_all_by_name_and_price" do
-    @find_by_indexes["gifts"].should include(["name", "price"])
-    @find_by_indexes["gifts"].should include(["price", "name"])
-  end
-
-  it "find_by indexes from UsersController" do
-    @find_by_indexes["freelancers"].should include("name")
-  end
-
-  it "do not have warning on test data" do
-    @warning_messages.should be_empty
-  end
-
-end