flexite 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e032838d9d874df9e0acc442083e551c8e0d760a
-  data.tar.gz: 9ae676c5872e54b2b9e902221a52b117cc78b77f
+  metadata.gz: 58858de76b1806f20ff56d96b34567d33fed5886
+  data.tar.gz: a11049597ba2d66a41b887539cc705e2ba4f0010
 SHA512:
-  metadata.gz: bc06b67c75a5af494f6878078a4501ea879f2552f710a9b7a9bdd476573d2bcb6a854fa448b5d3ed650bc2df9a75d0d8ee104d92c28286ebcfd54ed95486d763
-  data.tar.gz: 628fba6f9199cfd136972b0ca4266308b574898f7b546e2f3064f55afea3a6ad332f6a8e7885d8b8a27bf22c57d3c91efe28cdbb868decfd24534d798e6784a7
+  metadata.gz: e9e9eae384d8f5e0b01af46c88549dd0c21830f520c42f7488a836f760479ba4c68a9986bd3774c1d4da9103e956bcab7f6fd481329abe5c47164547a3d9b8c3
+  data.tar.gz: 54c7663ffce26aeb29e6d1e434df975b1a1e114039093fb64e44596ba6ad9efdcf567c94fc4d5d9e9c8cf010a073b0db6b5df8b9ecd589ec4488615e41b1fa35

data/app/assets/stylesheets/flexite/application.css

@@ -31,3 +31,8 @@ button.close {
 .flex {
     display: flex;
 }
+
+.progress-loader {
+    position: absolute;
+    top: 50%;
+}

data/app/jobs/show_diff_job.rb

@@ -1,10 +1,10 @@
-ShowDiffJob = Struct.new(:other_tree, :file_name ) do
+ShowDiffJob = Struct.new(:current_tree, :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
+    Flexite::Diff::CheckService.new(current_tree, other_tree, file_name).call
   end
 
   def success

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

@@ -1,9 +1,9 @@
 module Flexite
   class Diff
     class CheckService
-      def initialize(other_tree, file_name)
+      def initialize(current_tree, other_tree, file_name)
         @other_tree = other_tree
-        @current_tree = Config.t_nodes
+        @current_tree = current_tree
         @file_name = file_name
       end
 

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

@@ -7,16 +7,16 @@ module Flexite
         @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 })
+        if File.exists?("#{Rails.root}/config/diffs/#{@file_name}")
+          Diff::ShowService.new(@file_name).call
+        else
+          calculate_diff
+          ActionService::Result.new(data: { file_name: @file_name })
+        end
       end
 
       private
@@ -25,10 +25,18 @@ module Flexite
         uri = URI(@endpoint)
         response = Net::HTTP.get(uri)
         @other_tree = JSON.parse(response)
+        @current_tree = Config.t_nodes
+        @file_name = "#{checksum}_#{@stage}.yml"
       end
 
       def calculate_diff
-        Delayed::Job.enqueue(ShowDiffJob.new(@other_tree, @file_name))
+        Delayed::Job.enqueue(ShowDiffJob.new(@current_tree, @other_tree, @file_name))
+      end
+
+      def checksum
+        @other_checksum = Digest::MD5.hexdigest(@other_tree.to_json)
+        @current_checksum = Digest::MD5.hexdigest(@current_tree.to_json)
+        @checksum = Digest::MD5.hexdigest("#{@other_checksum}#{@current_checksum}")
       end
     end
   end

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

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

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

@@ -1,9 +1,11 @@
 - data = @result.data.try(:[], :diffs)
--if data.blank?
+-if data.nil?
   $flexite('#diff-timer').html("#{j render 'timer'}");
+  $flexite('#progress-loader').modal({ backdrop: 'static', keyboard: false });
 -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");
+  $flexite('#progress-loader').modal('hide');
 
 

data/app/views/flexite/shared/_progress_loader.html.haml

@@ -0,0 +1,7 @@
+.progress-loader.modal.fade#progress-loader{ role: :dialog, backdrop: 'static', keyboard: false }
+  .modal-dialog
+    .modal-content
+      .modal-body
+        .progress
+          .progress-bar.progress-bar-striped.active{ role: 'progressbar', aria: { valuenow: 100, valuemin: 0, valuemax: 100 }, style: 'width: 100%'}
+            Loading diff ...

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

@@ -7,6 +7,7 @@
   %body
     #flash
       = render 'flexite/shared/messages'
+    = render 'flexite/shared/progress_loader'
     = render 'flexite/shared/popup'
     .container-fluid#main-container
       = yield

data/lib/flexite/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexite
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Maksim Rusakovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-30 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
@@ -289,6 +289,7 @@ files:
 - app/views/flexite/histories/restore.js.haml
 - app/views/flexite/shared/_messages.html.haml
 - app/views/flexite/shared/_popup.html.haml
+- app/views/flexite/shared/_progress_loader.html.haml
 - app/views/flexite/shared/_show_flash.js.haml
 - app/views/layouts/flexite/application.html.haml
 - config/initializers/simple_form.rb