active_preview 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3064d283634c7dac6ebd82658a795efc68b5e097732cb8cdcef8c3bc0bf9bdaf
-  data.tar.gz: f30d54a086aa9ecc8804ec882980152492e4093ae90072832b9fde027104ed84
+  metadata.gz: 889b89b88ed0233e99903e3476854a4ac7b0b0c0d46da07df3f6a5221bcb57d7
+  data.tar.gz: 4396bc99b473040e8e01997874d59219b06e81a5a37fce73f48e9abdc26747b1
 SHA512:
-  metadata.gz: e987815ad60a34626e10a82eeee2843bc8952110f992955dd04d6e70bceb60b38c85c025b8057824b4cdb21a1696b3b1ec6c1d8be0ace5dd6e0e9fe7b8841137
-  data.tar.gz: 560b7ecf7d57496750aa0a1bce9c2845cd2cc6e9f90786e0943674e03de22b22329ad45717d1f4c462f642a7b0fcbcd1822e243304bd1081d35d0e9f42827643
+  metadata.gz: 7018167fdb991cdd0b1a35e9e8977cdea558fe752f30ea95ea02ecfb6c7cce4311b332670158cc9d14dda12078d7988e3b5ea6ccf78014be314c6a0fa4906dde
+  data.tar.gz: 9b14a4d453741b1519724a7c3d9fa0492c3c6cef05f973a4f12f940cbcedfd6898a5cde168be8a2a59fa14c3af5c094f1160919a7cabe3d45f07e0c1d1e4cf21

data/lib/active_preview/association_helper.rb

@@ -7,8 +7,20 @@ module AssociationHelper
     klass.reflect_on_all_associations.map { |a| a.name.to_s }
   end
 
-  def association_class(klass:, key:)
-    klass.reflect_on_association(association_from_key(key)).klass
+  def class_of_association(base_class:, key: nil, association: nil)
+    association = association_from_key(key) if key
+    klass.reflect_on_association(association).klass
+  end
+
+  # Used to properly set parent in has_many previews
+  def association_inverse(parent_class:, child_class:)
+    parent = parent_class.to_s.downcase
+    set = associations(child_class)
+    return parent if set.include? parent
+    set.each do |a|
+      next unless singular? a
+      return a if association_class(klass: child_class, association: a)
+    end
   end
 
   def singular?(name)

data/lib/active_preview/batch_builder.rb

@@ -0,0 +1,35 @@
+module ActivePreview
+  class BatchBuilder
+    def self.build(**args)
+      new(**args).build
+    end
+
+    def initialize(klass:, saved_models:, params: nil, parent: nil)
+      @klass = klass
+      @saved_models = saved_models
+      @params_set = params
+      @parent = parent
+    end
+
+    def build
+      objects_with_new_attrs.map do |obj, attrs|
+        obj ||= klass.new
+        attrs ||= {}
+        Builder.build(model: obj, params: attrs, parent: parent)
+      end
+    end
+
+    private
+
+    attr_reader :klass, :saved_models, :params_set, :parent
+
+    def objects_with_new_attrs
+      return saved_models unless params_set
+      if saved_models.size > params_set.size
+        saved_models.zip(params_set)
+      else
+        params_set.zip(saved_models).map(&:reverse!)
+      end
+    end
+  end
+end

data/lib/active_preview/builder.rb

@@ -0,0 +1,84 @@
+module ActivePreview
+  class Builder
+    include AssociationHelper
+
+    def self.build(**args)
+      new(**args).build
+    end
+
+    def initialize(model:, params: {}, parent: nil)
+      @model = model
+      @params = params
+      @klass = model.class
+      @parent = parent
+    end
+
+    def build
+      build_preview_object
+      update_associations
+      associate_parent
+      load_associations
+      return preview
+    end
+
+    private
+
+    attr_reader :model, :params, :klass, :preview, :updated_associations,
+      :parent
+
+    def build_preview_object
+      @preview ||= preview_class.new(klass.new(model.attributes.merge(params)))
+    end
+
+    def preview_class
+      "#{klass}Preview".constantize
+    end
+
+    def update_associations
+      @updated_associations ||= child_params_keys.map do |params_key|
+        association_from_key(params_key).tap do |a|
+          preview.send("#{a}=", build_children(params_key, a))
+        end
+      end
+    end
+
+    def child_params_keys
+      @child_params_keys ||= params.map do |k, _|
+        a = association_from_key(k)
+        # TODO: singular associations
+        k if associations(klass).include?(a) && !singular?(a)
+      end.compact
+    end
+
+    def build_children(params_key, association)
+      child_params = params[params_key].to_h.values
+                                       .sort! { |a, b| a["id"] <=> b["id"] }
+      saved = model.send(association).order(:id)
+      child_klass = class_of_association(base_class: klass,
+                                         association: association)
+      BatchPreviewBuilder.build(klass: child_klass, saved_models: saved,
+                                params: child_params, parent: preview)
+    end
+
+    def associate_parent
+      return unless parent
+      association = association_inverse(parent_class: parent.model_object.class,
+                                        child_class: klass)
+      preview.send("#{association}=", parent)
+      @updated_associations << association
+    end
+
+    def load_associations
+      associations(klass).each do |a|
+        next if updated_associations.include?(a)
+        saved = [*model.send(a)]
+        next if saved.empty?
+        to_assign = BatchPreviewBuilder.build(klass: saved.first.class,
+                                              saved_models: saved,
+                                              parent: preview)
+        to_assign = to_assign.first if singular? a
+        preview.send("#{a}=", to_assign)
+      end
+    end
+  end
+end

data/lib/active_preview/preview.rb

@@ -10,7 +10,7 @@ module ActivePreview
       super(record)
     end
 
-    def original
+    def model_object
       __getobj__
     end
 
@@ -22,12 +22,18 @@ module ActivePreview
 
     def redefine_associations(record)
       associations(record.class).each do |a|
-        next if respond_to? a # avoid redefining methods
+        next if respond_to? "#{a}=" # avoid redefining methods
         methods = singular?(a) ? SINGULAR : COLLECTION
         methods.each do |method|
           self.class.send(:define_method, method.gsub("~", a)) {}
         end
-        self.class.send(:attr_accessor, a)
+        self.class.send(:define_method, "#{a}=") do |associated|
+          instance_variable_set("@#{a}", associated)
+          unless instance_variable_get("@#{a}_defined")
+            define_singleton_method(a) { instance_variable_get "@#{a}" }
+            instance_variable_set("@#{a}_defined", true)
+          end
+        end
       end
     end
   end

data/lib/active_preview/previewing.rb

@@ -1,66 +1,9 @@
 module ActivePreview
   module Previewing
     extend ActiveSupport::Concern
-    include AssociationHelper
 
-    included do
-      def self.collection_preview(saved, params)
-        child_args(saved, params).map do |obj, attrs|
-          if obj
-            obj.preview(attrs)
-          else
-            self.new(attrs).preview
-          end
-        end
-      end
-
-      private
-
-      def self.child_args(saved, child_attrs)
-        if saved.size > child_attrs.size
-          saved.zip(child_attrs)
-        else
-          child_attrs.zip(saved).map(&:reverse!)
-        end
-      end
-    end
-
-    # Returns an unsaved object with updated attributes, along with any
-    # child objects and their updated attributes.
-    # Note that the associations are not assigned, so parent.children will be
-    # empty
     def preview(params)
-      merged_object(params).tap do |p|
-        child_keys(params).each do |params_key|
-          association = association_from_key(params_key)
-          next unless associations(self.class).include?(association)
-          p.send("#{association}=", generate_children(params, params_key))
-        end
-      end
-    end
-
-    private
-
-    def merged_object(new_attrs)
-      preview_class.new(self.class.new(self.attributes.merge(new_attrs)))
-    end
-
-    def preview_class
-      "#{self.class}Preview".constantize
-    end
-
-    def child_keys(hash)
-      hash.map do |k, v|
-        k if v.is_a?(ActionController::Parameters) || v.is_a?(Hash)
-      end.compact
-    end
-
-    def generate_children(params, *params_keys)
-      child_params = params.dig(*params_keys).to_h.values
-        .sort! { |a, b| a["id"] <=> b["id"] }
-      klass = association_class(klass: self.class, key: params_keys.last)
-      saved = klass.where(id: child_params.map { |p| p["id"] }).order(:id)
-      klass.collection_preview(saved, child_params)
+      PreviewBuilder.build(model: self, params: params)
     end
   end
 end

data/lib/active_preview/version.rb

@@ -1,3 +1,3 @@
 module ActivePreview
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/active_preview.rb

@@ -1,7 +1,8 @@
 require "active_preview/association_helper"
+require "active_preview/batch_builder"
+require "active_preview/builder"
 require "active_preview/preview"
 require "active_preview/previewing"
 
 module ActivePreview
-  # Your code goes here...
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_preview
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Syd Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-05 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -133,6 +133,8 @@ files:
 - Rakefile
 - lib/active_preview.rb
 - lib/active_preview/association_helper.rb
+- lib/active_preview/batch_builder.rb
+- lib/active_preview/builder.rb
 - lib/active_preview/override_persistence.rb
 - lib/active_preview/preview.rb
 - lib/active_preview/previewing.rb