activekit 0.5.0.dev4 → 0.5.0.dev6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eff7a049cd21979e76253d095e0d0ba722b289370a15426cf4b87c922d2bab66
-  data.tar.gz: 27b310f65547d08961b9044fe43bc606cfb78f0766487052c9488a2fa3e78ed8
+  metadata.gz: 4be51587fe2bc2ef391a14a432ab155a50489acd765845dd88212c56bfbd5328
+  data.tar.gz: 9839b9510d9610ca93573dda2e4e83b05b1cd1aa2c9902ff96f2dc83d2385af4
 SHA512:
-  metadata.gz: ce4750f37977c8e2a63a6ec85ad4def621877f3789eb64e598d214066f840463c3cbe7a60b5e4853d9a639a2f83cd480a953c0436535547acf8a9b55b5113de9
-  data.tar.gz: c3813bb2b5df232389c25c8bc0ecf35f5875d6fdc34060d67993643f728bca9c0b6d0d81c85abed349dfb52bef8b0ac2a392ce88ce72a37adc722c3d533e1f64
+  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,22 +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)
-          define_describer_method(kind: options[:kind], name: name)
+          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?
 
@@ -32,43 +38,32 @@ module ActiveKit
         end
       end
 
-      private
-
-      def define_describer_method(kind:, name:)
-        case kind
+      def describer_method(describer)
+        case describer.kind
         when :csv
-          @current_class.class_eval do
-            define_singleton_method name do
-              describer = exporter.find_describer_by(describer_name: name)
-              raise "could not find describer for the describer name '#{name}'" unless describer.present?
-
-              # 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.dev4'
+  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.dev4
+  version: 0.5.0.dev6
 platform: ruby
 authors:
 - plainsource