activekit 0.5.0.dev5 → 0.5.0.dev7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068662b0f0144c92e082fc2a3e5002695a090dc1a4547a79889a945e739b7593'
-  data.tar.gz: a782fef4b69dfd9df1869c78e5826c8699adaf5339ca066ca48531ba391f66c5
+  metadata.gz: 2e3830a0b0d888ffcd7a7f921b282fbf27dc0f2bdde5322772a71ed04755add3
+  data.tar.gz: abb0bbead8a270129c04dfb0998e15999df84a6daeb7c28a3237dac161211f43
 SHA512:
-  metadata.gz: c0b3d0c3bd09b6d4de855c802ca0e4e47485a3fa727331088ff9b0ed3f21bf701485f6f15addd0d4b16cabad7442cb5d8d3f256e5b9d524ea36a0c0b2e58ce70
-  data.tar.gz: 6d74e3e1775bd54f86022f40815593f3e0c60d6fdbb3fed1d14054c633f4af2b1456d1ad03018aaf2b9698fd0aadc123c3884edcd996af3f1ad7405238dcc5aa
+  metadata.gz: a2f82ef282ec1226ac39d8ac42993f5ed621ea89407c22ebd6a0850d40157f32e20be968a946899c833bb041b2fe258914c64247c7746a968709f17da88db6af
+  data.tar.gz: baea0b85ab9b4adbd8e3c1f1eb1e37d62c673b83fc4858233a96cee9b7721a37f7985479a66a0848b16db33137dda1a48553a5d275da5ab0241aa85eee84ebd3

data/lib/active_kit/export/exportable.rb

@@ -14,11 +14,36 @@ module ActiveKit
         end
 
         def export_describer(name, **options)
-          exporter.create_export_describer(name, options)
+          exporter.create_describer(name, options)
         end
 
         def export_attribute(name, **options)
-          exporter.create_export_attribute(name, options)
+          exporter.create_attribute(name, options)
+        end
+
+        def export_describer_method(describer)
+          case describer.kind
+          when :csv
+            # The 'all' relation must be captured outside the Enumerator,
+            # else it will get reset to all the records of the class.
+            all_activerecord_relation = all.includes(describer.includes)
+
+            Enumerator.new do |yielder|
+              ActiveRecord::Base.connected_to(role: :writing, shard: describer.database.call) do
+                exporting = exporter.new_exporting(describer: describer)
+
+                # Add the headings.
+                yielder << CSV.generate_line(exporting.headings) if exporting.headings?
+
+                # Add the values.
+                # find_each will ignore any order if set earlier.
+                all_activerecord_relation.find_each do |record|
+                  lines = exporting.lines_for(record: record)
+                  lines.each { |line| yielder << CSV.generate_line(line) }
+                end
+              end
+            end
+          end
         end
       end
     end

data/lib/active_kit/export/exporter.rb

@@ -6,23 +6,28 @@ module ActiveKit
         @describers = {}
       end
 
-      def create_export_describer(name, options)
+      def create_describer(name, options)
         name = name.to_sym
         options.deep_symbolize_keys!
 
         unless find_describer_by(describer_name: name)
           options.store(:attributes, {})
           @describers.store(name, options)
-          describer = find_describer_by(describer_name: name)
-          define_describer_method(describer)
+          @current_class.class_eval do
+            define_singleton_method name do
+              if describer = exporter.find_describer_by(describer_name: name)
+                export_describer_method(describer)
+              end
+            end
+          end
         end
       end
 
-      def create_export_attribute(name, options)
-        create_export_describer(:to_csv, kind: :csv, database: -> { ActiveRecord::Base.connection_db_config.database.to_sym }) unless @describers.present?
-
+      def create_attribute(name, options)
         options.deep_symbolize_keys!
 
+        create_describer(:to_csv, kind: :csv, database: -> { ActiveRecord::Base.connection_db_config.database.to_sym }) unless @describers.present?
+
         describer_names = Array(options.delete(:describers))
         describer_names = @describers.keys if describer_names.blank?
 
@@ -33,58 +38,26 @@ module ActiveKit
         end
       end
 
-      private
+      def find_describer_by(name:)
+        options = @describers.dig(name)
+        return nil unless options.present?
 
-      def define_describer_method(describer)
-        case describer.kind
-        when :csv
-          @current_class.class_eval do
-            define_singleton_method describer.name do
-              # The 'all' relation must be captured outside the Enumerator,
-              # else it will get reset to all the records of the class.
-              all_activerecord_relation = all.includes(describer.includes)
-
-              Enumerator.new do |yielder|
-                ActiveRecord::Base.connected_to(role: :writing, shard: describer.database.call) do
-                  exporting = exporter.new_exporting(describer: describer)
-
-                  # Add the headings.
-                  yielder << CSV.generate_line(exporting.headings) if exporting.headings?
-
-                  # Add the values.
-                  # find_each will ignore any order if set earlier.
-                  all_activerecord_relation.find_each do |record|
-                    lines = exporting.lines_for(record: record)
-                    lines.each { |line| yielder << CSV.generate_line(line) }
-                  end
-                end
-              end
-            end
-          end
-        end
+        hash = {
+          name: name,
+          kind: options[:kind],
+          database: options[:database],
+          attributes: options[:attributes],
+          includes: options[:attributes].values.map { |options| options.dig(:includes) }.compact.flatten(1).uniq,
+          fields: build_describer_fields(options[:attributes])
+        }
+        OpenStruct.new(hash)
       end
 
       def new_exporting(describer:)
         Exporting.new(describer: describer)
       end
 
-      def find_describer_by(describer_name:)
-        describer_options = @describers.dig(describer_name)
-        return nil unless describer_options.present?
-
-        describer_attributes = describer_options[:attributes]
-        includes = describer_attributes.values.map { |options| options.dig(:includes) }.compact.flatten(1).uniq
-        fields = build_describer_fields(describer_attributes)
-        hash = {
-          name: describer_name,
-          kind: describer_options[:kind],
-          database: describer_options[:database],
-          attributes: describer_attributes,
-          includes: includes,
-          fields: fields
-        }
-        OpenStruct.new(hash)
-      end
+      private
 
       def build_describer_fields(describer_attributes)
         describer_attributes.inject({}) do |fields_hash, (name, options)|

data/lib/active_kit/version.rb

@@ -1,3 +1,3 @@
 module ActiveKit
-  VERSION = '0.5.0.dev5'
+  VERSION = '0.5.0.dev7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activekit
 version: !ruby/object:Gem::Version
-  version: 0.5.0.dev5
+  version: 0.5.0.dev7
 platform: ruby
 authors:
 - plainsource