flexite 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a88e76842f315c82ea98a437022148f5094cf069
-  data.tar.gz: 6c3f408e1707d11e1d0343beec283e12e3261ae1
+  metadata.gz: 2e56e14f785289341cecf9f123fcdff29203d6c3
+  data.tar.gz: df1b2dd7892a9aa29bc89fc80523eaac105db6bf
 SHA512:
-  metadata.gz: 2f84344a75804aa160887f74a590d9873e8c819affbed1b39ff92eff7cdcd238f020b31b8b652a331e6898b203c1bd7912324e86b02851a1e16c64a3c08808fb
-  data.tar.gz: 1b2c5596ac5f3fc0b7c0d4b438f48a6afa779a2d43ca24cbebc0252f6a7d69a943691f342c3df7a29002219ea7a727063fa3310e277dd6505a5b56137dd950f6
+  metadata.gz: 358346c815e81f5f9e08e23a020dba9604872b8d52b65e448a0d96c1e5d8019a597ba2471c564f28f80ee205b5f4e4c8b592f7f57629c8b1c888a71665d96e63
+  data.tar.gz: 2127e0c6ded192a39a38ce9ffb7b95fd7d9b981281e173cf016f3e16744b21d8ede07484e499f829992060aab63151a32f7996dae9f187dd2a608385eea96cb6

data/app/assets/javascripts/flexite/tree.js.erb

@@ -58,6 +58,7 @@ function Tree(selector) {
                 },
                 onNodeUnselected: function (event, node) {
                     $flexite("#section-2").html("");
+                    $flexite("#section-3").html("");
                 }
             })
         })
@@ -68,6 +69,12 @@ function Tree(selector) {
         self.init();
     }
 
+    this.unselectAll = function () {
+        tree.treeview("getSelected").forEach(function (node) {
+            tree.treeview("unselectNode", node);
+        });
+    }
+
     this.addNode = function (jsonNode, parentId) {
         tree.treeview(true).addToParent(JSON.parse(jsonNode), parentId);
     }

data/app/controllers/flexite/application_controller.rb

@@ -2,12 +2,6 @@ require_dependency 'flexite/service_factory'
 
 module Flexite
   class ApplicationController < ActionController::Base
-    append_view_path File.join(Flexite::Engine.root, "app/views/flexite/#{controller_name}")
-
-    def self.inherited(subclass)
-      subclass.append_view_path File.join(Flexite::Engine.root, "app/views/flexite/#{subclass.controller_name}")
-    end
-
     private
 
     def service_response(result)

data/app/controllers/flexite/histories_controller.rb

@@ -0,0 +1,14 @@
+require_dependency 'flexite/application_controller'
+
+module Flexite
+  class HistoriesController < ApplicationController
+    def index
+      @histories = History.includes(:history_attributes).where(entity_id: params[:entity_id], entity_type: params[:entity_type].camelize)
+    end
+
+    def restore
+      History.includes(:history_attributes).find(params[:id]).restore
+      flash[:success] = 'Entity was restored from history'
+    end
+  end
+end

data/app/forms/flexite/config/form.rb

@@ -8,5 +8,9 @@ module Flexite
     def self.model_name
       Config.model_name
     end
+
+    def history_type
+      Config.name.underscore
+    end
   end
 end

data/app/forms/flexite/entry/array_form.rb

@@ -6,6 +6,10 @@ module Flexite
       def entries
         @entries ||= []
       end
+
+      def with_history?
+        false
+      end
     end
   end
 end

data/app/forms/flexite/entry/form.rb

@@ -12,5 +12,13 @@ module Flexite
     def view_type
       type.demodulize.underscore
     end
+
+    def history_type
+      Entry.name.underscore
+    end
+
+    def with_history?
+      persisted?
+    end
   end
 end

data/app/helpers/flexite/entries_helper.rb

@@ -33,11 +33,12 @@ module Flexite
         concat(form.simple_fields_for(:entries, entry_form, index: index) do |fields|
           delete_link = link_to 'Delete', destroy_array_entries_path(id: entry.id, selector: "#{fields.object_name}-#{index}-#{entry.id}"),
                                 remote: true, method: :delete, class: 'btn btn-danger'
+          history_link = link_to 'History', entity_history_path(entry_form.id, entry_form.history_type), remote: true, class: 'btn btn-default'
 
           concat(content_tag(:div, id: "#{fields.object_name}-#{index}-#{entry.id}") do
             concat fields.input :id, as: :hidden
             concat fields.input :type, as: :hidden
-            concat render "types/#{entry_form.view_type}", f: fields, delete_link: delete_link
+            concat render "flexite/entries/types/#{entry_form.view_type}", f: fields, delete_link: delete_link, history_link: history_link
           end)
         end)
       end

data/app/models/concerns/flexite/with_history.rb

@@ -0,0 +1,49 @@
+module Flexite
+  module WithHistory
+    extend ActiveSupport::Concern
+
+    included do
+      after_save :save_history
+
+      def self.history_attributes(*attributes)
+        define_method :history_attributes do
+          attributes
+        end
+      end
+    end
+
+    def restore(history)
+      history.history_attributes.each do |attr|
+        self[attr.name] = attr.value
+      end
+
+      self.class.skip_callback(:save, :after, :save_history)
+
+      begin
+        save!
+      ensure
+        self.class.set_callback(:save, :after, :save_history)
+      end
+    end
+
+    private
+
+    def save_history
+      return unless changed?
+
+      history = histories.build
+
+      History.transaction do
+        history_attributes.each do |attr|
+          history.history_attributes.build(name: attr, value: self[attr])
+        end
+
+        history.save
+      end
+
+      if history.invalid?
+        errors.set(:history, history.full_messages)
+      end
+    end
+  end
+end

data/app/models/flexite/bool_entry.rb

@@ -1,7 +1,7 @@
 module Flexite
   class BoolEntry < Entry
     def value
-      self[:value].to_i  == 1 ? true : false
+      self[:value].to_i == 1 ? true : false
     end
 
     def form
@@ -11,8 +11,14 @@ module Flexite
     private
 
     def check_value
+      unless self[:value].respond_to?(:to_i)
+        errors.add(:value, 'should respond to #to_i')
+        return false
+      end
+
       unless [1, 0].include?(self[:value].to_i)
-        errors.add(:value, 'not a boolean')
+        errors.add(:value, 'not a valid boolean')
+        false
       end
     end
   end

data/app/models/flexite/config.rb

@@ -1,13 +1,18 @@
 module Flexite
   class Config < ActiveRecord::Base
+    include WithHistory
     attr_accessible :name
+    history_attributes :name, :config_id
+    delegate :value, to: :entry, allow_nil: true
+
     belongs_to :config, touch: true
     belongs_to :owner, foreign_key: :created_by
     has_one :entry, as: :parent, dependent: :destroy
     has_many :configs, dependent: :destroy
+    has_many :histories, as: :entity, dependent: :destroy
 
     scope :not_selectable, -> { select([:id, :name]).where(selectable: false) }
-    delegate :value, to: :entry, allow_nil: true
+
     validates :name, uniqueness: { scope: :config_id }
 
     def to_tree_node

data/app/models/flexite/entry.rb

@@ -1,7 +1,12 @@
 module Flexite
   class Entry < ActiveRecord::Base
-    belongs_to :parent, polymorphic: true, touch: true
+    include WithHistory
     attr_accessible :value
+    history_attributes :value
+
+    belongs_to :parent, polymorphic: true, touch: true
+    has_many :histories, as: :entity, dependent: :destroy
+
     before_save :check_value, :cast_value
 
     def view_value

data/app/models/flexite/history.rb

@@ -0,0 +1,21 @@
+module Flexite
+  class History < ActiveRecord::Base
+    belongs_to :entity, polymorphic: true
+    has_many :history_attributes, dependent: :destroy
+
+    after_save :check_limit
+
+    validates_presence_of :entity
+
+    def restore
+      entity.restore(self)
+    end
+
+    private
+
+    def check_limit
+      return if entity.histories.count <= Flexite.config.history_limit
+      entity.histories.order(:id).first.destroy
+    end
+  end
+end

data/app/models/flexite/history_attribute.rb

@@ -0,0 +1,6 @@
+module Flexite
+  class HistoryAttribute < ActiveRecord::Base
+    attr_accessible :name, :value
+    belongs_to :history
+  end
+end

data/app/models/flexite/int_entry.rb

@@ -9,5 +9,6 @@ class Flexite::IntEntry < Flexite::Entry
     self[:value].to_i
   rescue
     errors.add(:value, 'not an Integer')
+    false
   end
 end

data/app/models/flexite/sym_entry.rb

@@ -13,5 +13,6 @@ class Flexite::SymEntry < Flexite::Entry
     self[:value].to_sym
   rescue
     errors(:value, 'cannot be casted to Symbol')
+    false
   end
 end

data/app/services/flexite/action_service.rb

@@ -1,6 +1,4 @@
 class Flexite::ActionService
-  extend ActiveSupport::Autoload
-  autoload :Result
 
   def initialize(form, params = {})
     @form = form
@@ -33,3 +31,5 @@ class Flexite::ActionService
     end
   end
 end
+
+require_dependency 'flexite/action_service/result'

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

@@ -6,8 +6,13 @@ module Flexite
       if @form.invalid?
         return failure
       end
+      record = @form.type.constantize.find(@form.id)
+      record.value = @form.value
+
+      if record.changed?
+        record.save
+      end
 
-      @form.type.constantize.update(@form.id, value: @form.value)
       success
     end
 

data/app/views/flexite/configs/_form.html.haml

@@ -5,3 +5,6 @@
             input_html: { class: 'form-control', placeholder: 'Parent' }, label: false, prompt: 'Select parent'
   = f.input :selectable, as: :boolean, label: false, wrapper_html: { class: 'checkbox' }
   = f.button :submit, class: 'btn btn-success'
+
+  - if @config_form.persisted?
+    = link_to 'History', entity_history_path(@config_form.id, @config_form.history_type), remote: true, class: 'btn btn-default'

data/app/views/flexite/entries/_form.html.haml

@@ -1,6 +1,6 @@
 = simple_form_for @entry_form, remote: true do |f|
   - if @entry_form.type.present?
-    = render "types/#{@entry_form.view_type}", f: f
+    = render "flexite/entries/types/#{@entry_form.view_type}", f: f
   = f.input :id, as: :hidden
   = f.input :type, as: :hidden
   = f.input :parent_id, as: :hidden
@@ -9,3 +9,5 @@
 
   - if @entry_form.persisted?
     = link_to 'Delete', entry_path(f.object, type: @entry_form.type), method: :delete, remote: true, class: 'btn btn-danger'
+  - if @entry_form.with_history?
+    = link_to 'History', entity_history_path(@entry_form.id, @entry_form.history_type), remote: true, class: 'btn btn-default'

data/app/views/flexite/entries/types/_bool_entry.html.haml

@@ -2,3 +2,5 @@
   = f.input :value, collection: [[:true, 1], [:false, 0]], input_html: { class: 'form-control' }, include_blank: false, label: false
   - if local_assigns[:delete_link].present?
     = delete_link
+  - if local_assigns[:history_link].present?
+    = history_link

data/app/views/flexite/entries/types/_int_entry.html.haml

@@ -2,3 +2,5 @@
   = f.input :value, as: :integer, input_html: { class: 'form-control', placeholder: 'Number' }, label: false
   - if local_assigns[:delete_link].present?
     = delete_link
+  - if local_assigns[:history_link].present?
+    = history_link

data/app/views/flexite/entries/types/_str_entry.html.haml

@@ -2,3 +2,5 @@
   = f.input :value, as: :string, input_html: { class: 'form-control', placeholder: 'String' }, label: false
   - if local_assigns[:delete_link].present?
     = delete_link
+  - if local_assigns[:history_link].present?
+    = history_link

data/app/views/flexite/entries/types/_sym_entry.html.haml

@@ -1 +1 @@
-= render 'types/str_entry', f: f, delete_link: local_assigns[:delete_link]
+= render 'flexite/entries/types/str_entry', f: f, delete_link: local_assigns[:delete_link]

data/app/views/flexite/histories/_history.html.haml

@@ -0,0 +1,11 @@
+- history.history_attributes.each do |attr|
+  .history-attribute
+    = "#{attr.name}: "
+    = attr.value
+
+.history-created-at
+  created at:
+  = history.created_at.to_s(:db)
+
+.history-restore
+  = link_to 'Restore', history_restore_path(history), remote: true, class: 'btn btn-warning'

data/app/views/flexite/histories/index.js.haml

@@ -0,0 +1 @@
+$flexite("#section-3").html("#{j render @histories}");

data/app/views/flexite/histories/restore.js.haml

@@ -0,0 +1,4 @@
+= render 'flexite/shared/show_flash'
+$flexite("#section-2").html("");
+$flexite("#section-3").html("");
+tree.unselectAll();

data/config/routes.rb

@@ -13,5 +13,7 @@ Flexite::Engine.routes.draw do
     get :reload, on: :collection
   end
 
+  get ':entity_id/:entity_type/history', to: 'histories#index', as: :entity_history, constraints: { entity_type: /.*/ }
+  get ':id/restore', to: 'histories#restore', as: :history_restore
   root to: 'application#index'
 end

data/db/migrate/20180618104507_create_flexite_histories.rb

@@ -0,0 +1,12 @@
+class CreateFlexiteHistories < ActiveRecord::Migration
+  def change
+    create_table :flexite_histories do |t|
+      t.references :entity, polymorphic: true
+
+      t.timestamps
+    end
+
+    add_index :flexite_histories, :entity_id
+    add_index :flexite_histories, :entity_type
+  end
+end

data/db/migrate/20180618115057_create_flexite_history_attributes.rb

@@ -0,0 +1,13 @@
+class CreateFlexiteHistoryAttributes < ActiveRecord::Migration
+  def change
+    create_table :flexite_history_attributes do |t|
+      t.references :history
+      t.string :name
+      t.string :value
+
+      t.timestamps
+    end
+
+    add_index :flexite_history_attributes, :history_id
+  end
+end

data/lib/flexite/configuration.rb

@@ -1,7 +1,7 @@
 module Flexite
   class Configuration
     attr_accessor :paths, :root_cache_key, :source_roots, :hierarchy
-    attr_accessor :app_link, :app_name
+    attr_accessor :app_link, :app_name, :history_limit
     attr_reader :cache
 
     def initialize
@@ -11,6 +11,7 @@ module Flexite
       @app_link = '/'
       @source_roots = {}
       @hierarchy = {}
+      @history_limit = 10
     end
 
     def cache_store=(*args)

data/lib/flexite/engine.rb

@@ -14,5 +14,6 @@ module Flexite
     end
 
     config.action_controller.include_all_helpers = false
+    config.paths.add 'app/models/concerns', eager_load: true
   end
 end

data/lib/flexite/version.rb

@@ -1,3 +1,3 @@
 module Flexite
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end