lol_dba 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ba7fdc2c7953969c50ccd82353b9e9162b6e21c
-  data.tar.gz: 4e15e8ce2c0c07dd96a8cbd29a6eac62b06fe117
+  metadata.gz: 0f58898cf4d34daf83b52dbf1329aacfa7ea1531
+  data.tar.gz: a04f250fa27a24a68958f2393f4ff9344ddf73ab
 SHA512:
-  metadata.gz: e05dbb7d70f02e178a53a28014b3bd0ca56be77bde892512e8b6f4e124e4c25853548f44bbb4a531a7c1545d69c7925c9986b67ef3b881d547a056bbfa020afc
-  data.tar.gz: 0b005f850e1dc737e699c9052591c0a4e54454a3cda1deac9680e79f94384f332c2ff4ad271726e6721001e0ad4bfc1eeaff0908507b54f0946b78c891a2c840
+  metadata.gz: 102dfb9b0aa89fbc7829579f98aef6faf4371a971b5dfc1c2bd493871977ddab2567935a89aec59d908e85513f0dfd1bffd8e308d4b32740fb578f5e28b4dac3
+  data.tar.gz: c17fa9267d528fa442d3144a60efaaa6b906c6c6d2098fed54c60209db25642a2aa8e1b925c3892625c000a2afe205912dd13b9c7de4a3b80daf2b66bccb47e8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lol_dba (1.6.7)
+    lol_dba (2.0.0)
       actionpack (>= 3.0, < 5.0)
       activerecord (>= 3.0, < 5.0)
       railties (>= 3.0, < 5.0)
@@ -9,36 +9,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.4)
+      actionview (= 4.2.4)
+      activesupport (= 4.2.4)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.4)
+      activesupport (= 4.2.4)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.4)
+      activesupport (= 4.2.4)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.4)
+      activemodel (= 4.2.4)
+      activesupport (= 4.2.4)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -48,86 +48,80 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    arel (6.0.0)
+    arel (6.0.3)
     builder (3.2.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    globalid (0.3.3)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
-    hike (1.2.3)
     i18n (0.7.0)
-    json (1.8.2)
-    loofah (2.0.1)
+    json (1.8.3)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
+    mime-types (2.6.2)
     mini_portile (0.6.2)
-    minitest (5.5.1)
-    multi_json (1.11.0)
+    minitest (5.8.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    power_assert (0.2.3)
-    rack (1.6.0)
+    power_assert (0.2.4)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.4)
+      actionmailer (= 4.2.4)
+      actionpack (= 4.2.4)
+      actionview (= 4.2.4)
+      activejob (= 4.2.4)
+      activemodel (= 4.2.4)
+      activerecord (= 4.2.4)
+      activesupport (= 4.2.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.4)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.4)
+      actionpack (= 4.2.4)
+      activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rspec-core (3.2.2)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-mocks (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-rails (3.2.1)
+      rspec-support (~> 3.3.0)
+    rspec-rails (3.3.3)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-      rspec-support (~> 3.2.0)
-    rspec-support (3.2.2)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    sprockets (3.4.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
-    test-unit (3.0.9)
+    sqlite3 (1.3.11)
+    test-unit (3.1.5)
       power_assert
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -141,3 +135,6 @@ DEPENDENCIES
   rspec-rails
   sqlite3
   test-unit
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -78,6 +78,8 @@ All feedback, bug reports and thoughts on this gratefully received.
 * [Philipp Weissensteiner](http://philippweissensteiner.com)
 * [Leung Ho Kuen](https://twitter.com/PikachuEXE)
 * [Lucas Mazza](https://twitter.com/lucasmazza)
+* [Larry Reaves](https://github.com/yrral86)
+* [James Bowles](https://github.com/jamesbowles)
 
 ### License
 

data/gemfiles/rails_3_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (1.6.7)
+    lol_dba (2.0.0)
       actionpack (>= 3.0, < 5.0)
       activerecord (>= 3.0, < 5.0)
       railties (>= 3.0, < 5.0)

data/gemfiles/rails_4_0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (1.6.7)
+    lol_dba (2.0.0)
       actionpack (>= 3.0, < 5.0)
       activerecord (>= 3.0, < 5.0)
       railties (>= 3.0, < 5.0)

data/gemfiles/rails_4_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (1.6.7)
+    lol_dba (2.0.0)
       actionpack (>= 3.0, < 5.0)
       activerecord (>= 3.0, < 5.0)
       railties (>= 3.0, < 5.0)

data/gemfiles/rails_4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    lol_dba (1.6.7)
+    lol_dba (2.0.0)
       actionpack (>= 3.0, < 5.0)
       activerecord (>= 3.0, < 5.0)
       railties (>= 3.0, < 5.0)

data/lib/lol_dba.rb

@@ -115,18 +115,18 @@ EOM
             index_name = [association_foreign_key, foreign_key].sort
           when :has_many
             # has_many tables are threaten by the other side of the relation
-            next unless reflection_options.options[:through]
+            next unless reflection_options.options[:through] && reflections[reflection_options.options[:through].to_s]
             through_class = reflections[reflection_options.options[:through].to_s].klass
             table_name = through_class.table_name
 
             foreign_key = get_through_foreign_key(class_name, reflection_options)
 
-            if reflection_options.options[:source]
-              association_class = through_class.reflections.stringify_keys[reflection_options.options[:source].to_s].klass
+            if source = reflection_options.options[:source]
+              association_class = through_class.reflections.stringify_keys[source.to_s].klass
               association_foreign_key = get_through_foreign_key(association_class, reflection_options)
-            else
+            elsif through_reflections = through_class.reflections.stringify_keys[reflection_name.singularize]
               # go to joining model through has_many and find belongs_to
-              association_foreign_key = through_class.reflections.stringify_keys[reflection_name.singularize].options[:foreign_key]
+              association_foreign_key = through_reflections.options[:foreign_key]
             end
 
             #FIXME currently we don't support :through => :another_regular_has_many_and_non_through_relation

data/lib/lol_dba/version.rb

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

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

@@ -0,0 +1,3 @@
+class Component < ActiveRecord::Base
+  has_many :groups, through: :group_components
+end

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

@@ -0,0 +1,4 @@
+class Group < ActiveRecord::Base
+  has_many :group_components
+  has_many :components, through: :group_components
+end

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

@@ -0,0 +1,4 @@
+class GroupComponent < ActiveRecord::Base
+  belongs_to :profile_group
+  belongs_to :profile_component
+end

data/spec/fixtures/schema.rb

@@ -66,4 +66,17 @@ ActiveRecord::Schema.define do
   create_table "countries", :force => true do |t|
     t.column "name", :string
   end
-end
+
+  create_table "components", force: :cascade do |t|
+  end
+
+  create_table "group_components", force: :cascade do |t|
+    t.column "group_id",   :integer
+    t.column "component_id", :integer
+  end
+
+  create_table "groups", force: :cascade do |t|
+  end
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lol_dba
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Diego Plentz
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -133,10 +133,13 @@ files:
 - spec/fixtures/app/models/company.rb
 - spec/fixtures/app/models/complex_billable_week.rb
 - spec/fixtures/app/models/complex_timesheet.rb
+- spec/fixtures/app/models/component.rb
 - spec/fixtures/app/models/country.rb
 - spec/fixtures/app/models/freelancer.rb
 - spec/fixtures/app/models/gift.rb
 - spec/fixtures/app/models/god.rb
+- spec/fixtures/app/models/group.rb
+- spec/fixtures/app/models/group_component.rb
 - spec/fixtures/app/models/timesheet.rb
 - spec/fixtures/app/models/user.rb
 - spec/fixtures/app/models/worker.rb
@@ -165,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A small package of rake tasks to track down missing database indexes and
@@ -178,10 +181,13 @@ test_files:
 - spec/fixtures/app/models/company.rb
 - spec/fixtures/app/models/complex_billable_week.rb
 - spec/fixtures/app/models/complex_timesheet.rb
+- spec/fixtures/app/models/component.rb
 - spec/fixtures/app/models/country.rb
 - spec/fixtures/app/models/freelancer.rb
 - spec/fixtures/app/models/gift.rb
 - spec/fixtures/app/models/god.rb
+- spec/fixtures/app/models/group.rb
+- spec/fixtures/app/models/group_component.rb
 - spec/fixtures/app/models/timesheet.rb
 - spec/fixtures/app/models/user.rb
 - spec/fixtures/app/models/worker.rb