partial_ks 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 642d94cc600de50ae308e592033b37eb76332797
-  data.tar.gz: 7df7585728a3fe621ed0200d0a83451e3ee0855e
+  metadata.gz: d6f2760377220a11179eb98450908820dbfd86ca
+  data.tar.gz: 39e16a10891aad2aea68916f57f4e3b8392d88f2
 SHA512:
-  metadata.gz: ca7b7e3247cfa18f6ba92aa9de44bb2e52f5cee6ff42a61ff64f9c2e6214b61a78f7bcb29d707f210b7062e998abd09c7dd4e4f224f7a1f27b2ce8e4081e989d
-  data.tar.gz: eee97be3e6b61d8f3e05a077217ef7d3b6b0659bf663e45c5b06899c7dd58ca8729811c298cef16c09f0c9fa8de01587997fec3e2d52e0cdc972181e4c24c317
+  metadata.gz: a039c6bf09d0a69a55cb4f36676ea3e5f92365a009dd5f688d832cc2d82563bb5cfa0ef0725bc4c0e91cacb0543eaa80662e2f53d016d1706951bd72da2055c2
+  data.tar.gz: 0c9adb839f994ed6f3d350f526d61faa21d5c15054df366527fd29c3f617f5017a5477583b0c70927496faa457bbcb31c4ad84491cf3955fb1ce1ce2bc2cc830

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# 0.6.0
+
+Propogate filters down the tree. If the parent downloads the whole table, do the same for the child.
+
 # 0.5.0
 
 * New single entry point, `PartialKs::KitchenSync`. This means that Runner and ConfigurationGenerator are now internal concerns

data/CONTRIBUTING.md

@@ -2,7 +2,7 @@ This document should tell all you need to know for contributing to this project.
 
 # Testing
 
-Tested with activerecord 4.2.7.1, 4.2.8, 5.0.2, 5.1.0 (on Ruby 2.3.3)
+Tested with activerecord 4.2.10, 5.0.6, 5.1.4 (on Ruby 2.3.5)
 
 
 To install and run tests :
@@ -23,3 +23,7 @@ The building of the filter is done on the target DB.
 
 Filters are run on the source DB.
   - Note that a SQL statement from the target DB will behave differently on the source DB.
+
+## Dependencies
+
+KitchenSync -> (ModelList -> Table) -> Runner -> (FilteredTable -> Table)

data/lib/partial_ks/all_rails_models.rb

@@ -1,6 +1,6 @@
 module PartialKs
   def self.all_rails_models
-    if defined?(Rails)
+    if defined?(Rails) && Rails.respond_to?(:application)
       ::Rails.application.eager_load!
       ::Rails::Engine.subclasses.map(&:eager_load!)
     end

data/lib/partial_ks/filtered_table.rb

@@ -1,26 +1,28 @@
 module PartialKs
   class FilteredTable
-    attr_reader :table, :parent_model, :custom_filter_relation
+    attr_reader :table, :parent, :custom_filter_relation
     delegate :table_name, :to => :table
 
-    def initialize(model, parent_model, custom_filter_relation: nil)
+    def initialize(model, parent, custom_filter_relation: nil)
       @table = PartialKs::Table.new(model)
-      @parent_model = parent_model
+      @parent = parent
       @custom_filter_relation = custom_filter_relation
     end
 
     def kitchen_sync_filter
       if custom_filter_relation
         {"only" => filter_based_on_custom_filter_relation}
-      elsif parent_model
-        {"only" => filter_based_on_parent_model}
+      elsif parent && parent.kitchen_sync_filter.nil?
+        nil
+      elsif parent
+        {"only" => filter_based_on_parent_model(parent.table.model)}
       else
         nil
       end
     end
 
     protected
-    def filter_based_on_parent_model
+    def filter_based_on_parent_model(parent_model)
       table.relation_for_associated_model(parent_model).where_sql.to_s.sub(where_regexp, "")
     end
 
@@ -28,7 +30,7 @@ module PartialKs
       relation = custom_filter_relation.respond_to?(:call) ? custom_filter_relation.call : custom_filter_relation
 
       if relation.is_a?(ActiveRecord::Relation) || relation.respond_to?(:where_sql)
-        relation.where_sql.to_s.sub(where_regexp, "")
+        relation.to_sql.to_s.sub(where_regexp, "")
       elsif relation.is_a?(String)
         relation.sub(where_regexp, "")
       end

data/lib/partial_ks/runner.rb

@@ -24,16 +24,6 @@ module PartialKs
       end
     end
 
-    def report
-      result = []
-      each_generation.with_index do |generation, depth|
-        generation.each do |table|
-          result << [table.table_name, table.parent_model, table.custom_filter_relation, depth]
-        end
-      end
-      result
-    end
-
     def each_generation
       return enum_for(:each_generation) unless block_given?
 
@@ -43,9 +33,6 @@ module PartialKs
     end
 
     protected
-    def filtered_tables
-      @filtered_tables ||= models_list.map {|model, parent, custom_filter| PartialKs::FilteredTable.new(model, parent, custom_filter_relation: custom_filter)}
-    end
 
     def generations
       return @generations if defined?(@generations)
@@ -53,8 +40,8 @@ module PartialKs
       @generations = []
       q = []
 
-      filtered_tables.each do |filtered_table|
-        q << filtered_table if filtered_table.parent_model.nil?
+      models_list.each do |model, parent, filter|
+        q << PartialKs::FilteredTable.new(model, nil, custom_filter_relation: filter) if parent.nil?
       end
 
       until q.empty?
@@ -62,8 +49,9 @@ module PartialKs
 
         next_generation = []
         q.each do |table|
-          filtered_tables.each do |child_table|
-            next_generation << child_table if child_table.parent_model && child_table.parent_model.table_name == table.table_name
+          models_list.each do |child_model, parent, filter|
+            # I have access to parent here - link model to child_model
+            next_generation << PartialKs::FilteredTable.new(child_model, table, custom_filter_relation: filter) if parent && parent.table_name == table.table_name
           end
         end
 

data/lib/partial_ks/version.rb

@@ -1,3 +1,3 @@
 module PartialKs
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/test/filtered_table_test.rb

@@ -2,12 +2,13 @@ require 'test_helper'
 
 describe "kitchen sync filter" do
   let(:model) { PostTag }
-  let(:parent) { Minitest::Mock.new }
+  let(:parent_model) { BlogPost }
 
   it "proxies to Table if there's parent only" do
     table_parent_relation_method = :relation_for_associated_model
     relation_mock = Minitest::Mock.new
     relation_mock.expect :where_sql, "WHERE tag_id IN (0)"
+    parent = PartialKs::FilteredTable.new(parent, nil, custom_filter_relation: BlogPost.where("1=0"))
 
     filtered_table = PartialKs::FilteredTable.new(model, parent)
     filtered_table.table.stub table_parent_relation_method, relation_mock do
@@ -15,6 +16,12 @@ describe "kitchen sync filter" do
     end
   end
 
+  it "short-circuits evaluation if the parent has no filter" do
+    parent = PartialKs::FilteredTable.new(parent, nil)
+    filtered_table = PartialKs::FilteredTable.new(model, parent)
+    filtered_table.kitchen_sync_filter.must_be_nil
+  end
+
   it "uses the custom filter if provided" do
     filter = PostTag.where(:id => [1, 2])
     filtered_table = PartialKs::FilteredTable.new(model, nil, custom_filter_relation: filter)
@@ -45,4 +52,9 @@ describe "kitchen sync filter" do
     filtered_table.kitchen_sync_filter.must_be_nil
   end
 
+  it "generates a complete where fragment from a custom filter" do
+    filter = PostTag.where(:id => 2)
+    filtered_table = PartialKs::FilteredTable.new(model, nil, custom_filter_relation: filter)
+    filtered_table.kitchen_sync_filter.must_equal({"only" => '"post_tags"."id" = 2'})
+  end
 end

data/test/runner_test.rb

@@ -26,14 +26,6 @@ describe 'running based on output from generator' do
 
   let(:runner) { PartialKs::Runner.new(generator_output) }
 
-  it "reports everything" do
-    runner.report.must_equal [
-      ["users", nil, User.where(:id => [1]), 0],
-      ["tags", nil, nil, 0],
-      ["blog_posts", User, nil, 1],
-    ]
-  end
-
   it "yields all table names" do
     expected_table_names = [User, Tag, BlogPost].map(&:table_name)
     actual_table_names   = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: partial_ks
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Thong Kuah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Partial KS