activekit 0.5.0.dev6 → 0.5.0.dev7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4be51587fe2bc2ef391a14a432ab155a50489acd765845dd88212c56bfbd5328
-  data.tar.gz: 9839b9510d9610ca93573dda2e4e83b05b1cd1aa2c9902ff96f2dc83d2385af4
+  metadata.gz: 2e3830a0b0d888ffcd7a7f921b282fbf27dc0f2bdde5322772a71ed04755add3
+  data.tar.gz: abb0bbead8a270129c04dfb0998e15999df84a6daeb7c28a3237dac161211f43
 SHA512:
-  metadata.gz: 5769a0034e566bbe56280904e96cb240e32f309191f7b6e1d20368d8faaf67ea348b90bf19295e810214a845fe639fae2494629b2c0bf3444fdff45d77710b54
-  data.tar.gz: 0e025b165752e96fae3b839420134e111a9c1f264176bafdaff3d8174e3ea9514f59833873bd5f587f8db4a56497ec9be10416ee8112d7abf848d815a1a199de
+  metadata.gz: a2f82ef282ec1226ac39d8ac42993f5ed621ea89407c22ebd6a0850d40157f32e20be968a946899c833bb041b2fe258914c64247c7746a968709f17da88db6af
+  data.tar.gz: baea0b85ab9b4adbd8e3c1f1eb1e37d62c673b83fc4858233a96cee9b7721a37f7985479a66a0848b16db33137dda1a48553a5d275da5ab0241aa85eee84ebd3

data/lib/active_kit/export/exportable.rb

@@ -20,6 +20,31 @@ module ActiveKit
         def 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
   end

data/lib/active_kit/export/exporter.rb

@@ -13,10 +13,10 @@ module ActiveKit
         unless find_describer_by(describer_name: name)
           options.store(:attributes, {})
           @describers.store(name, options)
-          if describer = find_describer_by(describer_name: name)
-            @current_class.class_eval do
-              define_singleton_method describer.name do
-                exporter.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
@@ -38,51 +38,27 @@ module ActiveKit
         end
       end
 
-      def 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 = Exporting.new(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
-
-      private
-
-      def find_describer_by(describer_name:)
-        describer_options = @describers.dig(describer_name)
-        return nil unless describer_options.present?
+      def find_describer_by(name:)
+        options = @describers.dig(name)
+        return nil unless 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
+          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
+
+      private
+
       def build_describer_fields(describer_attributes)
         describer_attributes.inject({}) do |fields_hash, (name, options)|
           enclosed_attributes = Array(options.dig(:attributes))

data/lib/active_kit/version.rb

@@ -1,3 +1,3 @@
 module ActiveKit
-  VERSION = '0.5.0.dev6'
+  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.dev6
+  version: 0.5.0.dev7
 platform: ruby
 authors:
 - plainsource