activekit 0.5.0.dev5 → 0.5.0.dev6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '068662b0f0144c92e082fc2a3e5002695a090dc1a4547a79889a945e739b7593'
-  data.tar.gz: a782fef4b69dfd9df1869c78e5826c8699adaf5339ca066ca48531ba391f66c5
+  metadata.gz: 4be51587fe2bc2ef391a14a432ab155a50489acd765845dd88212c56bfbd5328
+  data.tar.gz: 9839b9510d9610ca93573dda2e4e83b05b1cd1aa2c9902ff96f2dc83d2385af4
 SHA512:
-  metadata.gz: c0b3d0c3bd09b6d4de855c802ca0e4e47485a3fa727331088ff9b0ed3f21bf701485f6f15addd0d4b16cabad7442cb5d8d3f256e5b9d524ea36a0c0b2e58ce70
-  data.tar.gz: 6d74e3e1775bd54f86022f40815593f3e0c60d6fdbb3fed1d14054c633f4af2b1456d1ad03018aaf2b9698fd0aadc123c3884edcd996af3f1ad7405238dcc5aa
+  metadata.gz: 5769a0034e566bbe56280904e96cb240e32f309191f7b6e1d20368d8faaf67ea348b90bf19295e810214a845fe639fae2494629b2c0bf3444fdff45d77710b54
+  data.tar.gz: 0e025b165752e96fae3b839420134e111a9c1f264176bafdaff3d8174e3ea9514f59833873bd5f587f8db4a56497ec9be10416ee8112d7abf848d815a1a199de

data/lib/active_kit/export/exportable.rb

@@ -14,11 +14,11 @@ 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
       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)
+          if describer = find_describer_by(describer_name: name)
+            @current_class.class_eval do
+              define_singleton_method describer.name do
+                exporter.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,40 +38,32 @@ module ActiveKit
         end
       end
 
-      private
-
-      def define_describer_method(describer)
+      def 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
+          # 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
 
-      def new_exporting(describer:)
-        Exporting.new(describer: describer)
-      end
+      private
 
       def find_describer_by(describer_name:)
         describer_options = @describers.dig(describer_name)

data/lib/active_kit/version.rb

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