lol_dba 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f8f30bc53bf7278cad306997f434ba8de25169b
-  data.tar.gz: 6420eeecffc2fcb69aca524eca6978d2e294a89d
+  metadata.gz: ed0a092881863ebd48f2561980814fa873e7140c
+  data.tar.gz: c5fba5c48943648577294aafc66d71dc8471e552
 SHA512:
-  metadata.gz: bb7439613b407c72b0cc2d192a57fd291da192aa5835a7e6fbb2787f84834949774b50711838e675e5f21afce8cf741da7acd6cfd7282322ab87a134deeae78c
-  data.tar.gz: ceb284d9f78a6c9821fca67586b6483c033b51e01473ae3f1a51ad9f07eb419db0336848a01c6af69923f175f87053b1b078b9b25adadd4b7a924a702a8425ae
+  metadata.gz: c36497910a4c76bdbd0b30bc4fa1f70ff3feb4219ea57e0af467197d1e9138c4906614d236ff54ab4a5e8191ed168948579faf45349ac8fd4e215526b1dd37a6
+  data.tar.gz: fc5fb00645da95082db6f39c30fe67956824510885bb792a326ea03cfd1f3c68590e23a25631acc5d278f007a2952a55f2fa905c2b153f6b555341ba5bfddb76

data/.gitignore

@@ -1,4 +1,5 @@
 .bundle
 .rvmrc
 .DS_Store
-.gem
+.gem
+.idea

data/Gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'activerecord'
-gem 'actionpack'
-gem 'railties'
+gem 'rails'
 gem 'rspec-rails'
 gem 'sqlite3'

data/Gemfile.lock

@@ -1,67 +1,99 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionmailer (4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.6)
+      actionview (= 4.1.6)
+      activesupport (= 4.1.6)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.0)
-      activesupport (= 4.0.0)
-      builder (~> 3.1.0)
-    activerecord (4.0.0)
-      activemodel (= 4.0.0)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+    actionview (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.6)
+      activesupport (= 4.1.6)
+      builder (~> 3.1)
+    activerecord (4.1.6)
+      activemodel (= 4.1.6)
+      activesupport (= 4.1.6)
+      arel (~> 5.0.0)
+    activesupport (4.1.6)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.0)
-    atomic (1.1.10)
-    builder (3.1.4)
-    diff-lcs (1.2.4)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
-    i18n (0.6.4)
-    minitest (4.7.5)
-    multi_json (1.7.7)
+    hike (1.2.3)
+    i18n (0.6.11)
+    json (1.8.1)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.3)
+    minitest (5.4.1)
+    multi_json (1.10.1)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    railties (4.0.0)
-      actionpack (= 4.0.0)
-      activesupport (= 4.0.0)
+    rails (4.1.6)
+      actionmailer (= 4.1.6)
+      actionpack (= 4.1.6)
+      actionview (= 4.1.6)
+      activemodel (= 4.1.6)
+      activerecord (= 4.1.6)
+      activesupport (= 4.1.6)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.1.6)
+      sprockets-rails (~> 2.0)
+    railties (4.1.6)
+      actionpack (= 4.1.6)
+      activesupport (= 4.1.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
-    rspec-rails (2.14.0)
+    rake (10.3.2)
+    rspec-core (3.1.4)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.1)
+      rspec-support (~> 3.1.0)
+    rspec-rails (3.1.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    sqlite3 (1.3.7)
-    thor (0.18.1)
-    thread_safe (0.1.2)
-      atomic
-    tzinfo (0.3.37)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.0)
+    sprockets (2.12.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.1.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack
-  activerecord
-  railties
+  rails
   rspec-rails
   sqlite3

data/lib/lol_dba.rb

@@ -74,7 +74,7 @@ EOM
   end
 
   def self.check_for_indexes(migration_format = false)
-    Dir.glob(Rails.root + "app/models/**/*.rb").sort.each {|file| require file }
+    Rails.application.eager_load! unless ENV["RAILS_ENV"] == 'test'
 
     model_classes = []
     ObjectSpace.each_object(Module) do |obj|

data/lib/lol_dba/version.rb

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

data/spec/associations_index_spec.rb

@@ -7,64 +7,64 @@ describe "Collect indexes based on associations:" do
   let(:warning_messages){ lol_dba[1] }
 
   it "find relationship indexes" do
-    relationship_indexes.should_not be_empty
+    expect(relationship_indexes).not_to be_empty
 
-    relationship_indexes.should have_key("companies")
-    relationship_indexes.should have_key("companies_freelancers")
-    relationship_indexes.should have_key("addresses")
-    relationship_indexes.should have_key("purchases")
+    expect(relationship_indexes).to have_key("companies")
+    expect(relationship_indexes).to have_key("companies_freelancers")
+    expect(relationship_indexes).to have_key("addresses")
+    expect(relationship_indexes).to have_key("purchases")
   end
 
   it "find indexes for belongs_to" do
-    relationship_indexes["addresses"].should include("country_id")
+    expect(relationship_indexes["addresses"]).to include("country_id")
   end
 
   it "find indexes for belongs_to with custom foreign key" do
-    relationship_indexes["companies"].should include("owner_id")
+    expect(relationship_indexes["companies"]).to include("owner_id")
   end
 
   it "find indexes for has_and_belongs_to_many" do
-    relationship_indexes["companies_freelancers"].should include(["freelancer_id", "company_id"])
+    expect(relationship_indexes["companies_freelancers"]).to include(["freelancer_id", "company_id"])
   end
 
   it "find indexes for has_and_belongs_to_many with custom join_table, primary and foreign keys" do
-    relationship_indexes["purchases"].should include(["present_id", "buyer_id"])
+    expect(relationship_indexes["purchases"]).to include(["present_id", "buyer_id"])
   end
 
   it "do not add an already existing index" do
-    relationship_indexes["companies"].should_not include("country_id")
+    expect(relationship_indexes["companies"]).not_to include("country_id")
   end
 
   it "find indexes for has_many :through" do
-    relationship_indexes["billable_weeks"].should include(["remote_worker_id", "timesheet_id"])
+    expect(relationship_indexes["billable_weeks"]).to include(["remote_worker_id", "timesheet_id"])
   end
 
   it "find indexes for has_many :through with source and foreign key" do
-    relationship_indexes["complex_billable_week"].should include(["freelancer_id", "id_complex_timesheet"])
+    expect(relationship_indexes["complex_billable_week"]).to include(["freelancer_id", "id_complex_timesheet"])
   end
 
   it "do not include wrong class" do
-    relationship_indexes["wrongs"].should be_nil
-    relationship_indexes["addresses_wrongs"].should be_nil
+    expect(relationship_indexes["wrongs"]).to be_nil
+    expect(relationship_indexes["addresses_wrongs"]).to be_nil
   end
 
   it "have warnings(non-existent table) on test data" do
-    warning_messages.should_not be_empty
-    warning_messages.should =~ /\'wrongs\'/
-    warning_messages.should =~ /\'addresses_wrongs\'/
+    expect(warning_messages).not_to be_empty
+    expect(warning_messages).to match(/\'wrongs\'/)
+    expect(warning_messages).to match(/\'addresses_wrongs\'/)
   end
 
   it "find indexes for STI" do
-    relationship_indexes["users"].should include(["id", "type"])
+    expect(relationship_indexes["users"]).to include(["id", "type"])
   end
 
   it "find indexes for STI with custom inheritance column" do
-    relationship_indexes["freelancers"].should include(["id", "worker_type"])
+    expect(relationship_indexes["freelancers"]).to include(["id", "worker_type"])
   end
 
   it "find indexes, than use custom class name option in association" do
-    relationship_indexes["employers_freelancers"].should be_nil
-    relationship_indexes["companies_freelancers"].should include(["freelancer_id", "company_id"])
+    expect(relationship_indexes["employers_freelancers"]).to be_nil
+    expect(relationship_indexes["companies_freelancers"]).to include(["freelancer_id", "company_id"])
   end
 
 end

data/spec/common_function_spec.rb

@@ -7,15 +7,13 @@ describe "Function form_migration_content:" do
   end
 
   it "print migration skeleton with set name" do
-    #$stdout.should_receive(:puts).with(/TestMigration/i)
     migration = LolDba.form_migration_content("TestMigration", @add)
-    migration.should =~ /class TestMigration/i
+    expect(migration).to match(/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)
-    migration.should =~ /add_index :report, :_id_test_plan/i
+    expect(migration).to match(/add_index :report, :_id_test_plan/i)
   end
 end
 
@@ -23,27 +21,27 @@ describe "Function form_data_for_migration:" do
 
   it "return data for migrations for non-indexed single key in table" do
     relationship_indexes = {:users => [:user_id]}
-    LolDba.stub(:key_exists?).with(:users, :user_id).and_return(false)
+    allow(LolDba).to receive(:key_exists?).with(:users, :user_id).and_return(false)
 
     add_indexes = LolDba.form_data_for_migration(relationship_indexes)
 
-    add_indexes.first.should == "add_index :users, :user_id"
+    expect(add_indexes.first).to eq("add_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)
+    allow(LolDba).to receive(:key_exists?).with(:friends, [:user_id, :friend_id]).and_return(false)
 
     add_indexes = LolDba.form_data_for_migration(relationship_indexes)
 
-    add_indexes.first.should == "add_index :friends, [:user_id, :friend_id]"
+    expect(add_indexes.first).to eq("add_index :friends, [:user_id, :friend_id]")
   end
 
   it "ignore empty or nil keys for table" do
     relationship_indexes = {:table => [""], :table2 => [nil]}
     add_indexes = LolDba.form_data_for_migration(relationship_indexes)
 
-    add_indexes.should be_empty
+    expect(add_indexes).to be_empty
   end
 
 end
@@ -51,19 +49,19 @@ end
 describe "Function key_exists?:" do
 
   it "return true if key is already indexed" do
-    LolDba.key_exists?("companies", "country_id").should be_true
+    expect(LolDba.key_exists?("companies", "country_id")).to be_truthy
   end
 
   it "return false if key is not indexed yet" do
-    LolDba.key_exists?("addresses", "country_id").should be_false
+    expect(LolDba.key_exists?("addresses", "country_id")).to be_falsey
   end
 
   it "return true if key is primary key(default)" do
-    LolDba.key_exists?("addresses", "id").should be_true
+    expect(LolDba.key_exists?("addresses", "id")).to be_truthy
   end
 
   it "return true if key is custom primary key" do
-    LolDba.key_exists?("gifts", "custom_primary_key").should be_true
+    expect(LolDba.key_exists?("gifts", "custom_primary_key")).to be_truthy
   end
 
 end
@@ -75,23 +73,23 @@ describe "Function puts_migration_content:" do
   end
 
   it "print migration code" do
-    $stdout.should_receive(:puts).with("")
-    $stdout.should_receive(:puts).with(/TIP/)
-    $stdout.should_receive(:puts).with(/TestMigration/i)
+    expect($stdout).to receive(:puts).with("")
+    expect($stdout).to receive(:puts).with(/TIP/)
+    expect($stdout).to receive(:puts).with(/TestMigration/i)
     LolDba.puts_migration_content("TestMigration", @relationship_indexes, "")
   end
 
   it "print warning messages if they exist" do
     warning = "warning text here"
-    $stdout.should_receive(:puts).at_least(:once).with(warning)
-    $stdout.should_receive(:puts)
+    expect($stdout).to receive(:puts).at_least(:once).with(warning)
+    expect($stdout).to 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!")
+    expect($stdout).to receive(:puts).with("")
+    expect($stdout).to receive(:puts).with("Yey, no missing indexes found!")
     LolDba.puts_migration_content("TestMigration",{}, "")
   end
 

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
-require 'active_record'
-require 'active_support'
-require 'action_controller'
+require 'rails/all'
 require 'lol_dba'
 require 'rspec/rails'
 
@@ -16,7 +14,7 @@ module Rails
     "spec/fixtures/"
   end
 end
-
+Dir.glob("#{Rails.root}/app/models/*.rb").sort.each { |file| require_dependency file }
 load 'fixtures/schema.rb'
 
 root_dir = File.dirname(__FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lol_dba
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Diego Plentz
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord