insights_export 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b3cc11cb225f05541df399578423bb370fad699
-  data.tar.gz: bbc9af0241b380c0f91d99a425016e3ccf5e87c9
+  metadata.gz: e98d01f8283e0013cf0deb2d300e0a46de25838b
+  data.tar.gz: 942b09cf743334413456faad9a53dec3666e9c84
 SHA512:
-  metadata.gz: b7ddc9fffe0f31cef0d90059e648eb0f7b21ab153b1056525c1868fc4b989b35f6743756ec990dc088e76cc530c5ce3f4d490e71c122e18cd73240f534809e1e
-  data.tar.gz: b5c8921153667c08f4e5754703781c5700d5ef684b67f209a8fb76e2587933ad2493599eabd9626ba42e46155d17315533fb78e6cd29aadb572f237e77b7783f
+  metadata.gz: 663618afbb6a0ef01aa5f6926397bf4a732e6fa551802c8bf55f054a681409d61c30c39f8c567529349d5f132ea554f8b4fd0b090acc4790cd226bb5e7366b65
+  data.tar.gz: da7917ef0e8bbfa585934080ac41256bbdb293fb79fedcb9a9cb7327eb2f01e6d0aeb8bc6fb085ae5ab2039e6fabf2429b7476031d678ec7aa311e400a0203c2

data/README.md

@@ -12,11 +12,11 @@ InsightsExport.configure do |config|
   config.export_path = "#{Rails.root}/config/insights.yml"
 
   # Export only models in this list
-  # Array of strings to filter or blank to export all.
+  # Array of strings or regexps to filter or blank to export all.
   config.only_models = []
 
   # Exclude these models from the export
-  # Array of strings to filter or blank to export all.
+  # Array of strings or regexps to filter or blank to export all.
   config.except_models = []
 
   # Print a backtrace when the export throws an exception.

data/lib/insights_export/configuration.rb

@@ -5,11 +5,11 @@ module InsightsExport
     attr_accessor :export_path
 
     # Export only models in this list
-    # Array of strings to filter or empty array to export all.
+    # Array of strings or regexps to filter or blank to export all.
     attr_accessor :only_models
 
     # Exclude these models from the export
-    # Array of strings to filter or empty array to export all.
+    # Array of strings or regexps to filter or blank to export all.
     attr_accessor :except_models
 
     # Print a backtrace when the export throws an exception.

data/lib/insights_export/export_models.rb

@@ -53,28 +53,35 @@ module InsightsExport
 
       models = ActiveRecord::Base.descendants
 
+      # skip all abstract classes (e.g. ApplicationRecord)
+      models = models.reject { |m| m.abstract_class? }
+
       # models to include
       only_models = InsightsExport.configuration.only_models
       if only_models.present?
-        models = models.select { |m| m.to_s.in?(only_models) }
+        models = models.select { |m| only_models.select { |lm| lm.is_a?(Regexp) ? lm.match(m.to_s) : lm == m.to_s }.present? }
       end
 
       # models to exclude
       except_models = InsightsExport.configuration.except_models
       if except_models.present?
-        models = models.reject { |m| m.to_s.in?(except_models) }
+        models = models.reject { |m| except_models.select { |lm| lm.is_a?(Regexp) ? lm.match(m.to_s) : lm == m.to_s }.present? }
       end
 
+      # sort them
+      models = models.sort_by { |m| m.to_s }
+
+      # cache the strings
       model_strings = models.map(&:to_s)
 
+      # show that we're doing something
+      puts "InsightsExport: #{model_strings.join(', ')}"
+
+      # this will contain our result
       return_object = {}
 
       models.each do |model|
-        begin
-          columns_hash = model.columns_hash
-        rescue
-          next
-        end
+        columns_hash = model.columns_hash
 
         begin
           model_structure = {
@@ -120,7 +127,6 @@ module InsightsExport
               next unless model_strings.include?(reflection_class)
 
               if reflection.macro == :belongs_to
-                raise 'Bla bla' if model.to_s == 'Product'
                 # reflection_class # User
                 # reflection.foreign_key # user_id
                 # reflection.association_primary_key # id

data/lib/insights_export/version.rb

@@ -1,3 +1,3 @@
 module InsightsExport
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insights_export
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Marius Andra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake