flexite 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 306473e426e0b8dc5558ad5e2a5888225529c412
-  data.tar.gz: 92484b6de2f9fa00135090fdc528150eff775d84
+  metadata.gz: 63dfd3a5a6e385f71c19663ad3baa5638e8fc29e
+  data.tar.gz: 189ee657807f3b2d7e502a542252c57b6993db85
 SHA512:
-  metadata.gz: 353a687cd67cc63e11d5dab0cbe2dff41f1443eb39e1e6110c23979ad07a30273885452a96c8eeb859fe6977d1136322891d44e97dc25ed45ad760098e8162c2
-  data.tar.gz: 56e88c74a1893daae25344f50b742991f7888effeb72d0ddf10a82bdf51e303cfa4db92ec12d0086f7f7aefcf80ae8476133f87aa77fa326f4c3d28384604fe3
+  metadata.gz: 12025176c14c3c4ef1559e9cfc385181fc37e319c7732ddc07319ed6101932e4062684038106257df654d19cce3709d7527da1faf81719441b895f958b38c4b0
+  data.tar.gz: 6b712735f3a2e606f2ca5ee2a20fc5de1de6dfbed5a4edb248b23f3d8a17f1af3fddf610d4a41e5fb3a930e516b545754b97e29394e947403715255dafd9e7ec

data/app/controllers/flexite/configs_controller.rb

@@ -18,7 +18,7 @@ module Flexite
       result = ServiceFactory.instance.get(:config_create, Config::Form.new(config_params)).call
 
       if result.succeed?
-        @node = result.data[:record].to_tree_node
+        @node = result.record.to_tree_node
         @parent_id = config_params[:config_id]
       end
 
@@ -34,7 +34,7 @@ module Flexite
       result = ServiceFactory.instance.get(:update_config, Config::Form.new(config_params)).call
 
       if result.succeed?
-        @node = result.data[:record].to_tree_node
+        @node = result.record.to_tree_node
       end
 
       service_flash(result)

data/app/controllers/flexite/entries_controller.rb

@@ -10,12 +10,10 @@ module Flexite
     end
 
     def create
-      klass = entry_params[:type].constantize
-      form = klass.form(entry_params)
-      result = ServiceFactory.instance.get(klass.service(:create), form).call
+      result = call_service_for(:create, entry_params)
 
       if result.succeed?
-        @entry = result.data[:record]
+        @entry = result.record
         @entry_form = @entry.class.form(@entry.form_attributes)
       end
 
@@ -29,16 +27,18 @@ module Flexite
     end
 
     def update
-      klass = entry_params[:type].constantize
-      form = klass.form(entry_params)
-      result = ServiceFactory.instance.get(klass.service(:update), form).call
+      result = call_service_for(:update, entry_params)
+      @entry = Entry.find(entry_params[:id])
+      @entry_form = @entry.class.form(@entry.form_attributes)
       service_flash(result)
       service_response(result)
     end
 
     def new_array_entry
       klass = params[:type].constantize
-      @form_options = [params[:prefix]]
+
+      @prefix = params[:prefix]
+      @form_options = [@prefix]
 
       if (@form_index = params[:form_index]).present?
         @form_options << { index: @form_index }
@@ -57,9 +57,7 @@ module Flexite
     end
 
     def destroy
-      klass = params[:type].constantize
-      form = klass.form(id: params[:id])
-      result = ServiceFactory.instance.get(klass.service(:destroy), form).call
+      result = call_service_for(:destroy, params)
 
       if result.succeed?
         @parent_id = result.data[:parent_id]
@@ -78,5 +76,11 @@ module Flexite
     def entry_params
       params[:entry]
     end
+
+    def call_service_for(type, entry)
+      klass = entry[:type].constantize
+      form = klass.form(entry)
+      ServiceFactory.instance.get(klass.service(type), form).call
+    end
   end
 end

data/app/helpers/flexite/entries_helper.rb

@@ -9,7 +9,7 @@ module Flexite
     ].freeze
 
     def render_entries(entries, form)
-      content_tag :div, id: "array-entries-#{form.options[:index]}" do
+      content_tag :div, id: "#{form.object_name}-array-entries-#{form.options[:index]}" do
         entries.each_with_index do |entry, index|
           concat render_entry(entry, form, index)
         end

data/app/services/flexite/action_service/result.rb

@@ -1,4 +1,6 @@
 class Flexite::ActionService::Result
+  attr_accessor :options
+
   def initialize(options = {})
     @options = options
     @errors = Hash.new { |h, k| h[k] = [] }

data/app/services/flexite/action_service.rb

@@ -1,7 +1,6 @@
 class Flexite::ActionService
-  def self.inherited(child)
-    child.const_set(:Result, Result)
-  end
+  extend ActiveSupport::Autoload
+  autoload :Result
 
   def initialize(form, params = {})
     @form = form
@@ -14,12 +13,9 @@ class Flexite::ActionService
 
   protected
 
-  def success
-    raise NotImplementedError
-  end
-
   def failure
-    raise NotImplementedError
+    save_errors
+    Result.new(success: false, endpoint: { status: 400 })
   end
 
   def save_errors(result)
@@ -27,4 +23,13 @@ class Flexite::ActionService
       result.add_errors(key, values)
     end
   end
+
+  def save_inner_service_errors(result, inner_result)
+    return if inner_result.errors.blank?
+    result.options[:succeed] = false if result.succeed?
+
+    inner_result.errors.each do |name, values|
+      result.add_errors(name, values)
+    end
+  end
 end

data/app/services/flexite/config/create_service.rb

@@ -19,7 +19,7 @@ module Flexite
 
     def success
       Result.new(flash: { type: :success, message: 'Config was created!' },
-                 data: { record: @record })
+                 data: @record)
     end
   end
 end

data/app/services/flexite/config/update_service.rb

@@ -21,7 +21,7 @@ module Flexite
       end
 
       def success
-        Result.new(flash: { type: :success, message: 'Config was updated!' }, data: { record: @record })
+        Result.new(flash: { type: :success, message: 'Config was updated!' }, data: @record)
       end
     end
   end

data/app/services/flexite/entry/array_create_service.rb

@@ -3,6 +3,8 @@ require_dependency 'flexite/action_service'
 module Flexite
   class Entry
     class ArrayCreateService < ActionService
+      include InnerProcessable
+
       def call
         if @form.invalid?
           return failure
@@ -19,51 +21,37 @@ module Flexite
           record.parent_type = @form.parent_type
         end
 
-        Entry.transaction do
-          create_entries(@form.new_entries, @record.id)
+        Entry.transaction(requires_new: true) do
+          create_entries(@form.new_entries)
+        end
+
+        if @process_result.succeed?
+          @process_result.options[:data] = @record
         end
 
-        success
-      rescue => exc
-        exc_failure(exc)
+        process_result('Entry was created')
       end
 
-      def create_entries(new_entries, parent_id)
+      def create_entries(new_entries)
         return if new_entries.blank?
 
         new_entries.each do |_, entry|
-          if respond_to?("save_#{entry[:type].demodulize.underscore}", true)
-            send("save_#{entry[:type].demodulize.underscore}", entry, parent_id)
-          else
-            save_entry(entry, parent_id)
-          end
+          entry[:parent_id] = @record.id
+          entry[:parent_type] = @form.type.constantize.base_class.sti_name
+          save_entry(entry)
         end
       end
 
-      def save_arr_entry(entry, parent_id)
-        klass = entry[:type].constantize
-        record = klass.create({ parent_id: parent_id, parent_type: klass.base_class.sti_name }, without_protection: true)
-        create_entries(entry[:new_entries], record.id)
-      end
-
-      def save_entry(entry, parent_id)
-        klass = entry[:type].constantize
-        klass.create({ parent_id: parent_id, parent_type: klass.base_class.sti_name, value: entry[:value] }, without_protection: true)
+      def save_entry(entry)
+        call_service_for(:create, entry)
       end
 
       protected
 
       def failure
+        save_errors
         Result.new(success: false, endpoint: { status: 400 })
       end
-
-      def exc_failure(exc)
-        Result.new(success: false, message: exc.message, endpoint: { status: 500 })
-      end
-
-      def success
-        Result.new(flash: { type: :success, message: 'Entry was created!' }, data: { record: @record })
-      end
     end
   end
 end

data/app/services/flexite/entry/array_update_service.rb

@@ -1,69 +1,55 @@
 require_dependency 'flexite/action_service'
 
 module Flexite
-  class Entry::ArrayUpdateService < ActionService
-    def call
-      if @form.invalid?
-        return failure
+  class Entry
+    class ArrayUpdateService < ActionService
+      include InnerProcessable
+
+      def call
+        if @form.invalid?
+          return failure
+        end
+
+        process_entry
       end
 
-      process_entries
-    end
+      private
 
-    private
+      def process_entry
+        Entry.transaction(requires_new: true) do
+          update_entries(@form.entries)
+          create_entries
+        end
 
-    def process_entries
-      Entry.transaction do
-        update_entries(@form.entries)
-        create_entries(@form.new_entries, @form.id)
+        process_result('Entry was updated')
       end
 
-      success
-    rescue => exc
-      exc_failure(exc)
-    end
-
-    def update_entries(entries)
-      entries.each do |_, entry|
-        if respond_to?("save_#{entry[:type].demodulize.underscore}", true)
-          send("save_#{entry[:type].demodulize.underscore}", entry)
-        else
+      def update_entries(entries)
+        entries.each do |_, entry|
           save_entry(entry)
         end
       end
-    end
 
-    def create_entries(new_entries, parent_id)
-      return if new_entries.blank?
-
-      new_entries.each do |_, entry|
-        klass = entry[:type].constantize
-        klass.create({parent_id: parent_id, parent_type: klass.base_class.sti_name, value: entry[:value]}, without_protection: true)
+      def save_entry(entry)
+        call_service_for(:update, entry)
       end
-    end
 
+      def create_entries
+        return if @form.new_entries.blank?
 
-    def save_arr_entry(entry)
-      update_entries(entry[:entries])
-      create_entries(entry[:new_entries], entry[:id])
-    end
-
-    def save_entry(entry)
-      entry[:type].constantize.update(entry[:id], value: entry[:value])
-    end
-
-    protected
-
-    def failure
-      Result.new(success: false, endpoint: { status: 400 })
-    end
+        @form.new_entries.each do |_, entry|
+          entry[:parent_id] = @form.id
+          entry[:parent_type] = @form.type.constantize.base_class.sti_name
+          call_service_for(:create, entry)
+        end
+      end
 
-    def exc_failure(exc)
-      Result.new(success: false, message: exc.message, endpoint: { status: 500 })
-    end
+      protected
 
-    def success
-      Result.new(flash: { type: :success, message: 'Entry was updated!' })
+      def failure
+        save_errors
+        Result.new(success: false, endpoint: { status: 400 })
+      end
     end
   end
 end

data/app/services/flexite/entry/create_service.rb

@@ -20,11 +20,7 @@ module Flexite
       private
 
       def success
-        Result.new(flash: { type: :success, message: 'Entry was created!' }, data: { record: @record })
-      end
-
-      def failure
-        Result.new(success: false, endpoint: { status: 400 })
+        Result.new(flash: { type: :success, message: 'Entry was created!' }, data: @record)
       end
     end
   end

data/app/services/flexite/entry/inner_processable.rb

@@ -0,0 +1,32 @@
+module Flexite
+  class Entry
+    module InnerProcessable
+      extend ActiveSupport::Concern
+
+      def initialize(*)
+        super
+        @process_result = ActionService::Result.new
+      end
+
+      private
+
+      def call_service_for(type, entry)
+        klass = entry[:type].constantize
+        form = klass.form(entry)
+        result = ServiceFactory.instance.get(klass.service(type), form).call
+
+        if result.failed?
+          save_inner_service_errors(@process_result, result)
+        end
+      end
+
+      def process_result(success_message)
+        if @process_result.succeed?
+          @process_result.options[:flash] = { type: :success, message: success_message }
+        end
+
+        @process_result
+      end
+    end
+  end
+end

data/app/services/flexite/entry/update_service.rb

@@ -16,6 +16,7 @@ module Flexite
     protected
 
     def failure
+      save_errors
       Result.new(success: false, endpoint: { status: 400 })
     end
 

data/app/views/flexite/entries/new_array_entry.js.haml

@@ -1 +1 @@
-$flexite("#array-entries-#{@form_index}").append("#{j render 'new_array_entry_form'}");
+$flexite("[id='#{@prefix}-array-entries-#{@form_index}']").append("#{j render 'new_array_entry_form'}");

data/app/views/flexite/entries/update.js.haml

@@ -1 +1,2 @@
+$flexite("#section-2").html("#{j render 'form'}");
 = render 'flexite/shared/show_flash'

data/lib/flexite/version.rb

@@ -1,3 +1,3 @@
 module Flexite
-  VERSION = "0.0.2"
+  VERSION = '0.0.3'
 end

data/test/dummy/config/initializers/flexite.rb

@@ -2,4 +2,5 @@ Flexite.configure do |c|
   c.paths = {
     app: ["#{Rails.root}/config/application.yml"]
   }
+  c.app_name = 'Dummy'
 end