dropkiq 0.1.5 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b29aa33cb5696a6b569e4d7db891b71d8b554551
-  data.tar.gz: 33f3a5353cd519dbf1577aaed5e8a2738f39755b
+SHA256:
+  metadata.gz: 3263d78f3e1091246733f08a91a94939c30bbdfaa4f04bb2f2fc5c78a8df2fc9
+  data.tar.gz: f06abae5d94474fb36fa2f85b640a795be8db9435e2bb46b89202ed7739c2d1a
 SHA512:
-  metadata.gz: cf739265bf1d2fac61eef26c0d5ed00a700e2ee9fe8f4597abfeac118e7f3eba3b9165f8fac5c3bd9b0c754cf554bc1ad926c6a410a5979172af4c9f1a407ae2
-  data.tar.gz: 8a3cd96c060f04f75a16f67c2b3a917715f4996015987d4330e653b782dc365666cf47ae3465e061f7b38d0fe7d3f99ab5d9f9822c651b14d209ce07ce154e38
+  metadata.gz: 1f5c246119d1704a2235ce9c1f49b37db9383ff037b2acd8b118528951a19df0cbf460099460ed32f89ad81cfa9e7bc0d963d35d77c45db21c7c266d0f2c9699
+  data.tar.gz: '01138583a8ecdd63d3c88cf5cf53139b2dc35178dc8023343ca9455b6e70225d45e55f20c56ba8b4c7e135b3de40cb4f5a1f4977e5c1ca15be0cbdae6585f8c5'

data/Gemfile.lock

@@ -1,27 +1,26 @@
 PATH
   remote: .
   specs:
-    dropkiq (0.1.5)
+    dropkiq (0.1.11)
       activerecord (>= 4.2)
       liquid (~> 4.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activerecord (5.2.4.1)
-      activemodel (= 5.2.4.1)
-      activesupport (= 5.2.4.1)
-      arel (>= 9.0)
-    activesupport (5.2.4.1)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2, >= 2.2.2)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     liquid (4.0.3)
@@ -33,11 +32,12 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
+    rake (13.0.1)
     sqlite3 (1.3.13)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -49,7 +49,7 @@ DEPENDENCIES
   minitest-focus (~> 1.1.2)
   mocha (~> 1.11.2)
   pry (~> 0.12.2)
-  rake (~> 10.0)
+  rake (~> 13.0)
   sqlite3 (~> 1.3.13)
 
 BUNDLED WITH

data/README.md

@@ -30,7 +30,7 @@ Or install it yourself as:
 
 This Gem makes several assumptions about your Ruby on Rails application:
 
-* Drop classes are expected to have the same name as the corresponding Rails model. For example, if you have an ActiveRecord model with name of `Person`, the drop class is expected to be called `PersonDrop`
+* Drop classes are expected to have the same name as the corresponding Rails model. For example, if you have an ActiveRecord model with name of `Person`, the drop class is expected to be called `PersonDrop` (Ruby on Rails applications using the legacy `liquid_methods` method with [PR #568](https://github.com/Shopify/liquid/pull/568) are also supported.)
 * Drop class methods are expected to return the same data type as the corresponding Rails-model getter methods for relationships and columns.
 * This Gem has not been tested with Rails models that have non-default primary key (other than `id`).
 
@@ -44,7 +44,7 @@ bundle exec rake dropkiq:schema
 
 You should now have a `db/dropkiq_schema.yaml` file. This file describes all tables associated to Drop classes in your application, along with all methods avaialble to the Drop class. It is important that you **DO** allow this file to be checked in to version control so that you can maintain your Dropkiq schema over time as you add/remove/modify your Drop classes.
 
-Notice that `type` has NOT been set on all methods. The Dropkiq Gem is only able to infer the method type for methods that correspond to a column or relationship on the ActiveRecord model. Please take a moment to manually add `type` values for all methods that were not able to be inferred. Notice that if you run `bundle exec rake dropkiq:schema` again, your changes are saved!
+Notice that `type` has NOT been set on all methods. The Dropkiq Gem is only able to infer the method type for methods that correspond to a column or relationship on the ActiveRecord model. Please take a moment to manually add `type` values for all methods that were not able to be inferred. (Hint: Search the dropkiq_schema.yaml file for the word "CHANGEME" to see what needs manual attention.) Notice that if you run `bundle exec rake dropkiq:schema` again, your changes are saved!
 
 
 #### Ruby on Rails Column to Dropkiq Data Type Mappings
@@ -122,6 +122,45 @@ class ProductDrop < Liquid::Drop
 end
 ```
 
+#### Dropkiq Method Classification
+
+In the event that a liquid method is not an exact match to a column or association, the Dropkiq Ruby Gem will attempt to make a best guess about the data type of the method based on the name. The rules for matching are as follows:
+
+| Method Name Ends With | Dropkiq Data Type |
+| --- | --- |
+| `_id` | `ColumnTypes::Numeric` |
+| `_count` | `ColumnTypes::Numeric` |
+| `?` | `ColumnTypes::Boolean` |
+| `_present` | `ColumnTypes::Boolean` |
+| `_changed` | `ColumnTypes::Boolean` |
+| `description` | `ColumnTypes::Text` |
+| `name` | `ColumnTypes::String` |
+| `password` | `ColumnTypes::String` |
+| `type` | `ColumnTypes::String` |
+| `title` | `ColumnTypes::String` |
+| `to_s` | `ColumnTypes::String` |
+| `to_string` | `ColumnTypes::String` |
+| `_url` | `ColumnTypes::String` |
+| `_email` | `ColumnTypes::String` |
+| `_partial` | `ColumnTypes::String` |
+| `_email_address` | `ColumnTypes::String` |
+| `_uuid` | `ColumnTypes::String` |
+
+The Dropkiq Ruby Gem will also attempt to classify liquid methods by creating a sample instance of the Liquid Drop class to test. The liquid method will be called, and the value will attempt to be classified using the foollowing:
+
+| Value Result | Dropkiq Data Type |
+| --- | --- |
+| `TrueClass` | `ColumnTypes::Boolean` |
+| `FalseClass` | `ColumnTypes::Boolean` |
+| `String` | `ColumnTypes::String` |
+| `Symbol` | `ColumnTypes::String` |
+| `Numeric` | `ColumnTypes::Numeric` |
+| `Date` | `ColumnTypes::DateTime` |
+| `Time` | `ColumnTypes::DateTime` |
+| `DateTime` | `ColumnTypes::DateTime` |
+
+Dropkiq will attempt to classify relationships in the event the method returns a single ActiveRecord object (`ColumnTypes::HasOne`), or a collection or ActiveRecord objects (`ColumnTypes::HasMany`).
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/dropkiq.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "sqlite3", "~> 1.3.13"
   spec.add_development_dependency "mocha", "~> 1.11.2"

data/lib/dropkiq.rb

@@ -1,4 +1,3 @@
-require "pry"
 require "liquid"
 require 'active_record'
 
@@ -7,6 +6,8 @@ require "dropkiq/constants"
 
 require "dropkiq/drop_class_analyzer"
 require "dropkiq/drop_method_analyzer"
+require "dropkiq/drop_method_name_classifier"
+require "dropkiq/drop_method_instance_simulator"
 require 'dropkiq/railtie' if defined?(Rails)
 
 module Dropkiq

data/lib/dropkiq/constants.rb

@@ -1,5 +1,6 @@
 module Dropkiq
   DEFAULT_DROP_PATH = "/app/drops"
+  DEFAULT_MODEL_PATH = "/app/models"
 
   DEFAULT_LIQUID_DROP_CLASSES = [
     Liquid::ForloopDrop,

data/lib/dropkiq/drop_class_analyzer.rb

@@ -12,7 +12,7 @@ module Dropkiq
       self.active_record_class ||= find_active_record_class_from_shim
 
       if active_record_class.blank?
-        puts "WARNING: No ActiveRecord Class found for #{liquid_drop_class.name}"
+        puts "WARNING: No ActiveRecord Class found for #{liquid_drop_class.name} (skipping)"
         return
       end
 
@@ -52,8 +52,14 @@ module Dropkiq
       default_methods  = (Liquid::Drop.instance_methods + Object.instance_methods)
       instance_methods = (liquid_drop_class.instance_methods - default_methods)
 
+      sample_instance = active_record_class.first
+      sample_drop = begin
+        liquid_drop_class.new(sample_instance)
+      rescue
+      end
+
       instance_methods.inject({}) do |hash, method|
-        analyzer = Dropkiq::DropMethodAnalyzer.new(self, method)
+        analyzer = Dropkiq::DropMethodAnalyzer.new(self, method, sample_drop)
         analyzer.analyze
         hash.merge!(analyzer.to_param)
       end.sort_by { |key| key }.to_h

data/lib/dropkiq/drop_method_analyzer.rb

@@ -1,13 +1,16 @@
 module Dropkiq
   class DropMethodAnalyzer
+    CHANGEME = "CHANGEME"
+
     attr_accessor :drop_class_analyzer, :drop_method,
-      :dropkiq_type, :foreign_table_name
+      :dropkiq_type, :foreign_table_name, :sample_drop
 
     delegate :active_record_class, to: :drop_class_analyzer
 
-    def initialize(drop_class_analyzer, drop_method)
+    def initialize(drop_class_analyzer, drop_method, sample_drop=nil)
       self.drop_class_analyzer = drop_class_analyzer
       self.drop_method = drop_method
+      self.sample_drop = sample_drop
     end
 
     def analyze
@@ -15,13 +18,21 @@ module Dropkiq
         relationship_to_dropkiq_type_classifier
       elsif is_column?
         column_to_dropkiq_type_classifier
+      else
+        Dropkiq::DropMethodNameClassifier.new(drop_method).classify
+      end
+
+      if dropkiq_type.blank?
+        result = Dropkiq::DropMethodInstanceSimulator.new(drop_method, sample_drop).classify
+        self.dropkiq_type = result.dropkiq_type
+        self.foreign_table_name = result.foreign_table_name
       end
     end
 
     def to_param
       {
         "#{drop_method}" => {
-          "type"               => dropkiq_type,
+          "type"               => (dropkiq_type.presence || CHANGEME),
           "foreign_table_name" => foreign_table_name
         }
       }
@@ -43,8 +54,8 @@ module Dropkiq
       begin
         self.foreign_table_name = reflection.class_name.constantize.table_name
       rescue
-        puts "Table not found for reflect_on_association value: #{reflection.inspect}"
-        raise
+        puts "WARNING: Could not find #{drop_method} on #{active_record_class.name}"
+        return
       end
 
       case reflection

data/lib/dropkiq/drop_method_instance_simulator.rb

@@ -0,0 +1,58 @@
+module Dropkiq
+  class DropMethodInstanceSimulator
+    attr_accessor :drop_method, :sample_drop
+    attr_accessor :dropkiq_type, :foreign_table_name
+
+    def initialize(drop_method, sample_drop=nil)
+      self.drop_method = drop_method.to_s
+      self.sample_drop = sample_drop
+    end
+
+    def classify
+      value = begin
+        sample_drop.try(drop_method)
+      rescue
+      end
+
+      self.dropkiq_type = ruby_data_type_to_dropkiq_type(value)
+      self.dropkiq_type ||= test_for_relationship(value)
+
+      self
+    end
+
+    private
+
+    def test_for_relationship(value)
+      if value.is_a?(ActiveRecord::Base)
+        self.foreign_table_name = value.class.table_name
+        return Dropkiq::HAS_ONE_TYPE
+      elsif value.respond_to?(:first) && value.first.is_a?(ActiveRecord::Base)
+        self.foreign_table_name = value.first.class.table_name
+        return Dropkiq::HAS_MANY_TYPE
+      end
+    end
+
+    def ruby_data_type_to_dropkiq_type(value)
+      case value
+      when NilClass
+      when TrueClass
+        Dropkiq::BOOLEAN_TYPE
+      when FalseClass
+        Dropkiq::BOOLEAN_TYPE
+      when String
+        Dropkiq::STRING_TYPE
+      when Symbol
+        Dropkiq::STRING_TYPE
+      when Numeric
+        Dropkiq::NUMERIC_TYPE
+      when Date
+        Dropkiq::DATE_TIME_TYPE
+      when Time
+        Dropkiq::DATE_TIME_TYPE
+      when DateTime
+        Dropkiq::DATE_TIME_TYPE
+      else
+      end
+    end
+  end
+end

data/lib/dropkiq/drop_method_name_classifier.rb

@@ -0,0 +1,52 @@
+module Dropkiq
+  class DropMethodNameClassifier
+    attr_accessor :drop_method
+
+    def initialize(drop_method)
+      self.drop_method = drop_method.to_s
+    end
+
+    def classify
+      if numeric_type_match?
+        Dropkiq::NUMERIC_TYPE
+      elsif boolean_type_match?
+        Dropkiq::BOOLEAN_TYPE
+      elsif text_type_match?
+        Dropkiq::TEXT_TYPE
+      elsif string_type_match?
+        Dropkiq::STRING_TYPE
+      end
+    end
+
+    private
+
+    def numeric_type_match?
+      drop_method.ends_with?("_id") ||
+        drop_method.ends_with?("_count")
+    end
+
+    def boolean_type_match?
+      drop_method.ends_with?("?") ||
+        drop_method.ends_with?("_present") ||
+        drop_method.ends_with?("_changed")
+    end
+
+    def text_type_match?
+      drop_method.ends_with?("description")
+    end
+
+    def string_type_match?
+      drop_method.ends_with?("name") ||
+        drop_method.ends_with?("password") ||
+        drop_method.ends_with?("type") ||
+        drop_method.ends_with?("title") ||
+        drop_method.ends_with?("to_s") ||
+        drop_method.ends_with?("to_string") ||
+        drop_method.ends_with?("_url") ||
+        drop_method.ends_with?("_email") ||
+        drop_method.ends_with?("_partial") ||
+        drop_method.ends_with?("_email_address") ||
+        drop_method.ends_with?("_uuid")
+    end
+  end
+end

data/lib/dropkiq/tasks/dropkiq/schema.rake

@@ -1,9 +1,23 @@
+require 'stringio'
+
 namespace :dropkiq do
   desc "Generate the fixture schema based on Liquid::Drop classes"
   task :schema do
     require "#{Rails.root}/config/environment.rb"
+
     Dir.glob("#{Rails.root}#{Dropkiq::DEFAULT_DROP_PATH}/**/*.rb").each { |f| load f }
 
+    # http://alphahydrae.com/2013/09/capturing-output-in-pure-ruby/
+    stdout, stderr = StringIO.new, StringIO.new
+    $stdout, $stderr = stdout, stderr
+    Dir.glob("#{Rails.root}#{Dropkiq::DEFAULT_MODEL_PATH}/**/*.rb").each do |f|
+      begin
+        load f
+      rescue
+      end
+    end
+    $stdout, $stderr = STDOUT, STDERR
+
     existing_schema_yaml = begin
       File.read("#{Rails.root}/db/dropkiq_schema.yaml")
     rescue Errno::ENOENT

data/lib/dropkiq/version.rb

@@ -1,3 +1,3 @@
 module Dropkiq
-  VERSION = "0.1.5"
+  VERSION = "0.1.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dropkiq
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.12
 platform: ruby
 authors:
 - Adam Darrah
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +160,8 @@ files:
 - lib/dropkiq/constants.rb
 - lib/dropkiq/drop_class_analyzer.rb
 - lib/dropkiq/drop_method_analyzer.rb
+- lib/dropkiq/drop_method_instance_simulator.rb
+- lib/dropkiq/drop_method_name_classifier.rb
 - lib/dropkiq/railtie.rb
 - lib/dropkiq/tasks/dropkiq/schema.rake
 - lib/dropkiq/version.rb
@@ -182,8 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Integrate your Ruby on Rails application with Dropkiq for easy Liquid editing