flexite 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fafe03dff2fb801bc056c93267c78ce5f256a7ea
-  data.tar.gz: daaffa1e0587f510ddaed4cc5a32778ab21bce4a
+  metadata.gz: e032838d9d874df9e0acc442083e551c8e0d760a
+  data.tar.gz: 9ae676c5872e54b2b9e902221a52b117cc78b77f
 SHA512:
-  metadata.gz: 434294461fd2e452fd08897cce0c85fead85f19b9db56e595b01be2c720f9d78adc84934729aae6977093fe87027c113509cdbe2db1c599f328ab4f178212fdb
-  data.tar.gz: 7ddb6b724832435c25e75cdc5996ceff687263d23987b4cd61343edacca4a30adb70d86941d720b3c3da537d3e0477c9af42dc18e71e0f5d08cf8b008d3a2634
+  metadata.gz: bc06b67c75a5af494f6878078a4501ea879f2552f710a9b7a9bdd476573d2bcb6a854fa448b5d3ed650bc2df9a75d0d8ee104d92c28286ebcfd54ed95486d763
+  data.tar.gz: 628fba6f9199cfd136972b0ca4266308b574898f7b546e2f3064f55afea3a6ad332f6a8e7885d8b8a27bf22c57d3c91efe28cdbb868decfd24534d798e6784a7

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

@@ -26,7 +26,7 @@ $flexite(window).on('load', function () {
     });
 
     $flexite("#show-diff").on("click", function () {
-        $flexite.get("<%= diff_path %>" + "?url=" + $flexite("select[id='stage']").val() + "&stage=" + $flexite("select[id='stage']").text());
+        $flexite.get("<%= get_diff_path %>" + "?url=" + $flexite("select[id='stage']").val() + "&stage=" + $flexite("select[id='stage']").text());
     });
 
     $flexite("#new-node-btn").on("click", function () {

data/app/controllers/flexite/api_controller.rb

@@ -0,0 +1,18 @@
+module Flexite
+  class ApiController < ApplicationController
+    before_filter :check_token
+
+    def configs
+      @nodes = Config.t_nodes
+      render json: @nodes
+    end
+
+    private
+
+    def check_token
+      if Diff::Token.new(params[:token]).invalid?
+        render json: { status: 'error', code: 401, message: 'unauthorized user' }
+      end
+    end
+  end
+end

data/app/controllers/flexite/diffs_controller.rb

@@ -26,19 +26,12 @@ module Flexite
     end
 
     def show
-      result = ServiceFactory.instance.get("#{Flexite.config.diff_approach}_show_diff".to_sym, params[:stage], params[:url]).call
-
-      if result.succeed?
-        @data = result.data
-        @stage = params[:stage]
-        @url = params[:url]
-      end
-
-      if result.flash.present?
-        service_flash(result)
-      end
+      @result = ServiceFactory.instance.get(:show_diff, params[:name]).call
+    end
 
-      service_response(result)
+    def get
+      @result = ServiceFactory.instance.get(:get_diff, params[:stage], params[:url]).call
+      render :show
     end
   end
 end

data/app/factories/flexite/service_factory.rb

@@ -13,12 +13,10 @@ module Flexite
         arr_entry_destroy: 'Entry::DestroyService',
         destroy_array_entry: 'Entry::DestroyArrayEntryService',
         update_config: 'Config::UpdateService',
-        sync_check_diff: 'Diff::SyncCheckService',
-        async_check_diff: 'Diff::AsyncCheckService',
-        sync_show_diff: 'Diff::SyncShowService',
-        async_show_diff: 'Diff::AsyncShowService',
         apply_diff: 'Diff::ApplyService',
-        push_diff: 'Diff::PushService'
+        push_diff: 'Diff::PushService',
+        get_diff: 'Diff::GetService',
+        show_diff: 'Diff::ShowService'
       }
     end
   end

data/app/jobs/show_diff_job.rb

@@ -0,0 +1,21 @@
+ShowDiffJob = Struct.new(:other_tree, :file_name ) do
+  def before
+    Flexite::JobReport.create(file_name: file_name, status: Flexite::JobReport::STATUS[:in_progress])
+  end
+
+  def perform
+    Flexite::Diff::CheckService.new(other_tree, file_name).call
+  end
+
+  def success
+    Flexite::JobReport
+      .find_by_file_name(file_name)
+      .update_attributes(status: Flexite::JobReport::STATUS[:done])
+  end
+
+  def error
+    Flexite::JobReport
+      .find_by_file_name(file_name)
+      .update_attributes(status: Flexite::JobReport::STATUS[:error])
+  end
+end

data/app/models/flexite/job_report.rb

@@ -0,0 +1,9 @@
+module Flexite
+  class JobReport < ActiveRecord::Base
+    attr_accessible :file_name, :status
+
+    STATUS = { in_progress: 1,
+               done: 2,
+               error: 3 }.freeze
+  end
+end

data/app/services/flexite/diff/check_service.rb

@@ -0,0 +1,38 @@
+module Flexite
+  class Diff
+    class CheckService
+      def initialize(other_tree, file_name)
+        @other_tree = other_tree
+        @current_tree = Config.t_nodes
+        @file_name = file_name
+      end
+
+      def call
+        check
+        save
+      end
+
+      protected
+
+      def check
+        diffs = HashDiff.diff(@current_tree, @other_tree, array_path: true)
+
+        if diffs.blank?
+          return {}
+        end
+
+        @view_diffs = { '+': [], '-': [], '~': [] }
+
+        diffs.each do |type, depth, *changes|
+          @view_diffs[type.to_sym] << [depth, *changes]
+        end
+      end
+
+      def save
+        File.open("config/diffs/#{@file_name}", "w") do |file|
+          file.write @view_diffs.to_yaml
+        end
+      end
+    end
+  end
+end

data/app/services/flexite/diff/get_service.rb

@@ -0,0 +1,35 @@
+module Flexite
+  class Diff
+    class GetService
+      include Flexite::Engine.routes.url_helpers
+
+      def initialize(stage, endpoint)
+        @stage = stage
+        @token = Flexite.config.migration_token
+        @endpoint = endpoint + api_configs_path(token: @token)
+        @timestamps = Time.now.strftime("%Y%m%d%H%M%S")
+        @file_name = "#{@timestamps}_#{@stage}.yml"
+        @result = ActionService::Result.new
+      end
+
+      def call
+        get_configs
+        calculate_diff
+
+        Flexite::ActionService::Result.new(data: { file_name: @file_name })
+      end
+
+      private
+
+      def get_configs
+        uri = URI(@endpoint)
+        response = Net::HTTP.get(uri)
+        @other_tree = JSON.parse(response)
+      end
+
+      def calculate_diff
+        Delayed::Job.enqueue(ShowDiffJob.new(@other_tree, @file_name))
+      end
+    end
+  end
+end

data/app/services/flexite/diff/show_service.rb

@@ -0,0 +1,18 @@
+module Flexite
+  class Diff
+    class ShowService
+      def initialize(file_name)
+        @file_name = file_name
+      end
+
+      def call
+        @data = { file_name: @file_name}
+        if File.exists?("#{Rails.root}/config/diffs/#{@file_name}")
+          @data = { diffs: YAML.load_file("#{Rails.root}/config/diffs/#{@file_name}") }
+        end
+
+        Flexite::ActionService::Result.new(data: @data)
+      end
+    end
+  end
+end

data/app/views/flexite/application/index.html.haml

@@ -15,3 +15,4 @@
     #section-2.pos-fixed
   .col-md-4
     #section-3.pos-fixed
+#diff-timer

data/app/views/flexite/diffs/_diff.html.haml

@@ -1,5 +1,5 @@
 .diffs
-  - @data.each do |type, diffs|
+  - data&.each do |type, diffs|
     %button.btn.btn-default{ type: :button,
     data: { toggle: :collapse, target: "##{t("css.#{type}-diff")}" },
     aria: { expanded: 'false', controls: t("css.#{type}-diff") },

data/app/views/flexite/diffs/_timer.js.haml

@@ -0,0 +1,7 @@
+:javascript
+  setTimeout(function() {
+      $flexite.ajax({
+          url: "#{diff_path}",
+          data: { name: "#{@result.data[:file_name]}" }
+      })
+  }, 2000);

data/app/views/flexite/diffs/show.js.haml

@@ -0,0 +1,9 @@
+- data = @result.data.try(:[], :diffs)
+-if data.blank?
+  $flexite('#diff-timer').html("#{j render 'timer'}");
+-else
+  $flexite("#modal-body").html("#{j render 'diff', data: data}");
+  // $flexite("#submit-btn").html("#{j link_to 'Push', push_diff_path(stage: @stage, url: @url), remote: true, class: 'btn btn-success' }");
+  $flexite("#modal").modal("show");
+
+

data/config/routes.rb

@@ -22,8 +22,13 @@ Flexite::Engine.routes.draw do
     post :check
     post :apply
     post :save_diff
+    get :get
     get :push
   end
 
+  namespace :api, defaults: { format: :json } do
+    get :configs
+  end
+
   root to: 'application#index'
 end

data/db/migrate/20180829112429_create_flexite_job_reports.rb

@@ -0,0 +1,9 @@
+class CreateFlexiteJobReports < ActiveRecord::Migration
+  def change
+    create_table :flexite_job_reports do |t|
+      t.string  :file_name
+      t.integer :status
+      t.timestamps
+    end
+  end
+end

data/lib/flexite/version.rb

@@ -1,3 +1,3 @@
 module Flexite
-  VERSION = '0.0.23'
+  VERSION = '0.0.24'
 end

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

@@ -0,0 +1,5 @@
+require 'delayed_job_active_record'
+
+Delayed::Worker.delay_jobs          = true
+Delayed::Worker.destroy_failed_jobs = false
+Delayed::Worker.logger              = Logger.new(File.join(Rails.root, 'log', 'delayed_job.log'))

data/test/dummy/db/schema.rb

@@ -11,7 +11,23 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20180629110934) do
+ActiveRecord::Schema.define(:version => 20180829112429) do
+
+  create_table "delayed_jobs", :force => true do |t|
+    t.integer  "priority",   :default => 0, :null => false
+    t.integer  "attempts",   :default => 0, :null => false
+    t.text     "handler",                   :null => false
+    t.text     "last_error"
+    t.datetime "run_at"
+    t.datetime "locked_at"
+    t.datetime "failed_at"
+    t.string   "locked_by"
+    t.string   "queue"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
   create_table "flexite_configs", :force => true do |t|
     t.string   "name"
@@ -56,4 +72,11 @@ ActiveRecord::Schema.define(:version => 20180629110934) do
 
   add_index "flexite_history_attributes", ["history_id"], :name => "index_flexite_history_attributes_on_history_id"
 
+  create_table "flexite_job_reports", :force => true do |t|
+    t.string   "file_name"
+    t.integer  "status"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
 end

data/test/dummy/script/delayed_job

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+require 'delayed/command'
+Delayed::Command.new(ARGV).daemonize

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: flexite
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Maksim Rusakovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: delayed_job_active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.3
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +204,7 @@ files:
 - app/assets/stylesheets/flexite/entries.css
 - app/assets/stylesheets/flexite/tree.css
 - app/assets/stylesheets/scaffold.css
+- app/controllers/flexite/api_controller.rb
 - app/controllers/flexite/application_controller.rb
 - app/controllers/flexite/configs_controller.rb
 - app/controllers/flexite/diffs_controller.rb
@@ -190,6 +219,7 @@ files:
 - app/helpers/flexite/application_helper.rb
 - app/helpers/flexite/configs_helper.rb
 - app/helpers/flexite/entries_helper.rb
+- app/jobs/show_diff_job.rb
 - app/models/concerns/flexite/with_history.rb
 - app/models/flexite/arr_entry.rb
 - app/models/flexite/bool_entry.rb
@@ -199,6 +229,7 @@ files:
 - app/models/flexite/history.rb
 - app/models/flexite/history_attribute.rb
 - app/models/flexite/int_entry.rb
+- app/models/flexite/job_report.rb
 - app/models/flexite/str_entry.rb
 - app/models/flexite/sym_entry.rb
 - app/presenters/flexite/diff_presenter.rb
@@ -210,12 +241,11 @@ files:
 - app/services/flexite/data/migrators/yaml.rb
 - app/services/flexite/data/new_service.rb
 - app/services/flexite/diff/apply_service.rb
-- app/services/flexite/diff/async_check_service.rb
-- app/services/flexite/diff/async_show_service.rb
+- app/services/flexite/diff/check_service.rb
+- app/services/flexite/diff/get_service.rb
 - app/services/flexite/diff/push_service.rb
 - app/services/flexite/diff/save_diff_service.rb
-- app/services/flexite/diff/sync_check_service.rb
-- app/services/flexite/diff/sync_show_service.rb
+- app/services/flexite/diff/show_service.rb
 - app/services/flexite/diff/token.rb
 - app/services/flexite/entry/array_create_service.rb
 - app/services/flexite/entry/array_update_service.rb
@@ -233,7 +263,9 @@ files:
 - app/views/flexite/configs/new.js.haml
 - app/views/flexite/configs/update.js.haml
 - app/views/flexite/diffs/_diff.html.haml
+- app/views/flexite/diffs/_timer.js.haml
 - app/views/flexite/diffs/push.js.haml
+- app/views/flexite/diffs/show.js.haml
 - app/views/flexite/diffs/sync_show.js.haml
 - app/views/flexite/entries/_form.html.haml
 - app/views/flexite/entries/_new_array_entry_form.html.haml
@@ -272,6 +304,7 @@ files:
 - db/migrate/20180618115057_create_flexite_history_attributes.rb
 - db/migrate/20180621134948_add_description_column_to_flexite_configs.rb
 - db/migrate/20180629110934_remove_created_by_column_from_flexite_configs.rb
+- db/migrate/20180829112429_create_flexite_job_reports.rb
 - lib/flexite.rb
 - lib/flexite/cached_node.rb
 - lib/flexite/configuration.rb
@@ -296,6 +329,7 @@ files:
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/delayed_job.rb
 - test/dummy/config/initializers/flexite.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
@@ -314,6 +348,7 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/dummy/script/delayed_job
 - test/dummy/script/rails
 - test/dummy/tmp/cache/assets/C67/060/sprockets%2Ffaf176441f0544dd2b51901280044b40
 - test/dummy/tmp/cache/assets/C9D/530/sprockets%2Fdcd49c063327c12052812f41c20a8e74
@@ -375,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Database driven web-app settings
@@ -438,11 +473,13 @@ test_files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/delayed_job.rb
 - 'test/dummy/elect("#{Config.table_name}.*, #{Entry.table_name}.id AS entry_id")'
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/script/delayed_job
 - test/dummy/script/rails
 - test/dummy/Rakefile
 - test/test_helper.rb

data/app/services/flexite/diff/async_check_service.rb

@@ -1,18 +0,0 @@
-module Flexite
-  class Diff
-    class AsyncCheckService
-      def initialize(*args)
-        @args = args
-        @handler = Flexite.config.async_diff_handler
-      end
-
-      def call
-        unless @handler.is_a?(Proc)
-          raise 'Async handler should be a proc object'
-        end
-
-        @handler.call(*@args)
-      end
-    end
-  end
-end

data/app/services/flexite/diff/async_show_service.rb

@@ -1,21 +0,0 @@
-module Flexite
-  class Diff
-    class AsyncShowService < SyncShowService
-      def call
-        response = Flexite.cache.read("#{Flexite.state_digest}-#{@stage}-show-diff")
-
-        if response.present?
-          return result(response)
-        end
-
-        expire_old
-        nodes = Config.t_nodes
-        checksum = Digest::MD5.hexdigest(nodes.to_json)
-        Flexite.cache.write("#{Flexite.state_digest}-#{@stage}-diff-checksum", checksum)
-        @remote_diff.check({ token: Flexite.config.migration_token, tree: nodes, stage: Flexite.config.stagename, checksum: checksum })
-        ActionService::Result.new(flash: { type: :warning, message: "You will be notified via #{Flexite.config.async_diff_handler&.notifier} when difference check will be completed" },
-                                  endpoint: { partial: 'flexite/shared/show_flash' })
-      end
-    end
-  end
-end

data/app/services/flexite/diff/sync_check_service.rb

@@ -1,42 +0,0 @@
-module Flexite
-  class Diff
-    class SyncCheckService
-      def initialize(other_tree, token, stage, checksum)
-        @other_tree = other_tree
-        @current_tree = Config.t_nodes
-        @token = Token.new(token)
-        @stage = stage
-        @checksum = checksum
-      end
-
-      def call
-        check
-      end
-
-      protected
-
-      def check
-        if @token.invalid?
-          return { error: 'Invalid token', code: 401 }
-        end
-
-        diffs = HashDiff.diff(@current_tree, @other_tree, array_path: true)
-
-        if diffs.blank?
-          return {}
-        end
-
-        view_diffs = { '+': [], '-': [], '~': [] }
-
-        diffs.each do |type, depth, *changes|
-          view_diffs[type.to_sym] << [depth, *changes]
-        end
-
-        Flexite.cache.write("#{Flexite.state_digest}-#{@checksum}-#{@stage}-diffs", diffs)
-        { diffs: view_diffs }
-      rescue => exc
-        { error: exc.message, code: 500 }
-      end
-    end
-  end
-end

data/app/services/flexite/diff/sync_show_service.rb

@@ -1,42 +0,0 @@
-module Flexite
-  class Diff
-    class SyncShowService
-      def initialize(stage, url)
-        @stage = stage
-        @remote_diff = Diff.new(url)
-        @state_digest = Flexite.state_digest
-      end
-
-      def call
-        response = Flexite.cache.read("#{@state_digest}-#{@stage}-show-diff")
-
-        if response.nil?
-          expire_old
-          nodes = Config.t_nodes
-          checksum = Digest::MD5.hexdigest(nodes.to_json)
-          Flexite.cache.write("#{@state_digest}-#{@stage}-diff-checksum", checksum)
-          response = @remote_diff.check({ token: Flexite.config.migration_token, tree: nodes, stage: Flexite.config.stagename, checksum: checksum })
-          Flexite.cache.write("#{@state_digest}-#{@stage}-show-diff", response)
-        end
-
-        result(response)
-      end
-
-      protected
-
-      def expire_old
-        Flexite.cache.delete_matched(Flexite.match_key("-#{@stage}-show-diff"))
-        Flexite.cache.delete_matched(Flexite.match_key("-#{@stage}-diff-checksum"))
-      end
-
-      def result(response)
-        if response[:error].present?
-          expire_old
-          ActionService::Result.new(success: false, flash: { type: :danger, message: response[:error] }, endpoint: { partial: 'flexite/shared/show_flash' })
-        else
-          ActionService::Result.new(data: response[:diffs], endpoint: { action: :sync_show })
-        end
-      end
-    end
-  end
-end