spec_views 3.2.1 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54310e0011e60f8a5484b9a8450101e0ae7ba804ccc2194f719cbf974b9eb500
-  data.tar.gz: 6451285b6a799ce30614e9c36d16e3bc633a8bdebdb5938a94549dad906378ea
+  metadata.gz: ffc864c05ff98f751abe8d28920fb4dcddcf8da527299327a42f1565bc545718
+  data.tar.gz: dbb69ec88cdbaa8157875ff907f1d1b0a31475029454e5d0d23993b6c5a5e9d2
 SHA512:
-  metadata.gz: 98f12c25bc8cde3f8f6a9aa21a3712b764dc55531299e4e7b883cb71593a19457922f8d84b30852a097bf22687fd1da1aaf9da0dcf1bf0b86b8073fa72e94350
-  data.tar.gz: e513e67cbed82c90b6acfab920ef547b17a7f7da92409f801f5658d2b0dd283fc66c5e3d708f32a7f783c77f9909b1027e7afcb0cee8cce274b4ad07dafcd066
+  metadata.gz: cf0d8f5c736f7736eede534183b70d52ff1782545d2086542126dfaba9c66af03bbd46e70a073bdd4b7adcb8b4012d9e2016c789c99739308a57f53872ab1ca9
+  data.tar.gz: '0387e85f37e57af40325a7282dff27ac5687e13d2e7f156894dc77c8abc27fc91b2003e0aa21fadd6b51cbc9dc6c0e943ebae9bd127070a84bea03c54b723da1'

data/app/controllers/spec_views/views_controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'diff/lcs'
+
 module SpecViews
   class ViewsController < ApplicationController
     skip_authorization_check if respond_to?(:skip_authorization_check)
@@ -18,6 +20,21 @@ module SpecViews
       end
     end
 
+    def batch
+      @change = BatchDiff.new(directories).biggest_change
+      redirect_to(url_for(action: :index), notice: 'No identical changes found') unless @change
+    end
+
+    def batch_accept
+      batch_diff = BatchDiff.new(directories)
+      batch_diff.accept_by_hash!(params[:hash])
+      if batch_diff.changes.size > 1
+        redirect_to(action: :batch)
+      else
+        redirect_to(action: :index)
+      end
+    end
+
     def show
       path = directory.champion_path
       path = directory.challenger_path if params[:view] == 'challenger'
@@ -84,6 +101,7 @@ module SpecViews
     def directories
       @directories ||= Pathname.new(directory_path).children.select(&:directory?).map do |path|
         next unless File.file?("#{path}/meta.txt")
+
         SpecViews::Directory.new(path)
       end.compact
       latest_run = @directories.map(&:last_run).max
@@ -114,7 +132,7 @@ module SpecViews
 
     def accept_directory(dir)
       FileUtils.copy_file(dir.challenger_path, dir.champion_path)
-      FileUtils.remove_file(dir.challenger_path)
+      dir.remove_challenger
     end
   end
 end

data/app/models/spec_views/batch_diff.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module SpecViews
+  class BatchDiff
+    attr_reader :directories
+
+    Change = Struct.new(:hash, :count) do
+      def patched_champion
+        Diff::LCS.patch!(champion, diff)
+      end
+
+      def champion
+        directory.champion_html
+      end
+
+      def add(directory, diff)
+        @pairs ||= []
+        @pairs.push([directory, diff])
+        self.count += 1
+      end
+
+      def directory
+        @pairs&.first&.first
+      end
+
+      def diff
+        @pairs&.first&.second
+      end
+
+      def accept!
+        @pairs.each do |directory, diff|
+          patched_champion = Diff::LCS.patch!(directory.champion_html, diff)
+          directory.write_champion(patched_champion)
+          directory.remove_challenger if patched_champion == directory.challenger_html
+        end
+      end
+    end
+
+    def initialize(directories)
+      @directories = directories.select(&:challenger?).select(&:champion?).reject(&:binary?)
+    end
+
+    def changes
+      @changes ||= begin
+        map = {}
+        @directories.each do |directory|
+          diffs = Diff::LCS.diff(directory.champion_html, directory.challenger_html)
+          diffs.each do |diff|
+            raw_diff = diff.map do |change|
+              element = change.element
+              element = '\r' if element == "\r"
+              element = '\n' if element == "\n"
+              [change.action, element]
+            end
+            diff_hash = raw_diff.map(&:join).join
+            map[diff_hash] ||= Change.new(diff_hash, 0)
+            map[diff_hash].add(directory, diff)
+          end
+        end
+        map.values.filter { |change| change.count > 1 }
+      end
+    end
+
+    def biggest_change
+      changes.max_by(&:count)
+    end
+
+    def accept_by_hash!(hash)
+      changes.select { |change| change.hash == hash }.map(&:accept!)
+    end
+
+    private
+
+    def get_view(path, html_safe: true)
+      content = File.read(path)
+      content = content.html_safe if html_safe
+      content
+    rescue Errno::ENOENT
+      ''
+    end
+  end
+end

data/app/models/spec_views/directory.rb

@@ -5,7 +5,7 @@ module SpecViews
     attr_reader :path
 
     def self.for_description(description, content_type: :html)
-      dir_name = description.strip.gsub(/[^0-9A-Za-z.\-]/, '_').gsub('__', '_')
+      dir_name = description.strip.gsub(/[^0-9A-Za-z.-]/, '_').gsub('__', '_')
       new(Rails.root.join(Rails.configuration.spec_views.directory, dir_name), content_type)
     end
 
@@ -46,12 +46,21 @@ module SpecViews
       path.join("view.#{file_extension}")
     end
 
+    def champion?
+      File.file?(champion_path)
+    end
+
     def champion_html
       File.read(champion_path)
     rescue Errno::ENOENT
       nil
     end
 
+    def write_champion(content)
+      FileUtils.mkdir_p(path)
+      File.open(champion_path, binary? ? 'wb' : 'w') { |f| f.write(content) }
+    end
+
     def challenger_path
       path.join("challenger.#{file_extension}")
     end
@@ -60,11 +69,21 @@ module SpecViews
       File.file?(challenger_path)
     end
 
+    def challenger_html
+      File.read(challenger_path)
+    rescue Errno::ENOENT
+      nil
+    end
+
     def write_challenger(content)
       FileUtils.mkdir_p(path)
       File.open(challenger_path, binary? ? 'wb' : 'w') { |f| f.write(content) }
     end
 
+    def remove_challenger
+      FileUtils.remove_file(challenger_path)
+    end
+
     def meta_path
       path.join('meta.txt')
     end

data/app/models/spec_views/http_response_extractor.rb

@@ -23,9 +23,8 @@ module SpecViews
     private
 
     def response_status_match?(response, expected_status)
-      # Use "#{response.message}" to ensure local encoding
       response.status == expected_status ||
-        "#{response.message}".parameterize.underscore == expected_status.to_s
+        response.message.to_s.dup.force_encoding('UTF-8').parameterize.underscore == expected_status.to_s
     end
   end
 end

data/app/models/spec_views/view_sanitizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SpecViews
   class ViewSanitizer
     delegate :each, to: :@sanitizers
@@ -17,4 +19,4 @@ module SpecViews
       string
     end
   end
-end
+end

data/app/views/layouts/spec_views.html.erb

@@ -39,6 +39,38 @@
         padding: 0;
       }
 
+      .flash {
+        position: absolute;
+        z-index: 10;
+        top: 1.5rem;
+        left: 0;
+        right: 0;
+        display: flex;
+        justify-content: center;
+        font-size: 0.9rem;
+        pointer-events: none;
+        animation: fade-out 1s 1;
+        animation-fill-mode: forwards;
+        animation-delay: 5s;
+      }
+      .flash > div {
+        padding: 0.5rem 1rem;
+        background-color: var(--dark-bg-lighter);
+        box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.65);
+        border: 0px solid transparent;
+        border-width: 0 6px;
+        border-color: var(--challenger);
+        pointer-events: all;
+        transition: opacity 0.25s ease-in-out;
+      }
+      .flash > div:hover {
+        opacity: 0;
+      }
+      @keyframes fade-out {
+        from { opacity :1; }
+        to { opacity :0; }
+      }
+
       .iframes {
         position: relative;
         z-index: 5;
@@ -256,6 +288,9 @@
     </style>
   </head>
   <body>
+    <% flash.each do |type, msg| %>
+      <div class="flash flash-<%= type %>"><div onclick="console.log(this.parent)"><%= msg %></div></div>
+    <% end %>
     <%= yield %>
   </body>
 </html>

data/app/views/spec_views/views/batch.html.erb

@@ -0,0 +1,27 @@
+<div class="iframes">
+  <div class="w-100">
+    <div id="diff-settings">
+      <span>Batch Diff</span>
+      <label><input type="radio" name="diff_type" value="diffChars" checked> Characters</label>
+      <label><input type="radio" name="diff_type" value="diffWords"> Words</label>
+      <label><input type="radio" name="diff_type" value="diffLines"> Lines</label>
+    </div>
+    <div id="diff-champion"><%= @change.champion %></div>
+    <div id="diff-challenger"><%= @change.patched_champion %></div>
+    <pre id="diff-result"></pre>
+  </div>
+</div>
+<div class="footer">
+  <div class="info">
+    <div>
+      <%= @change.count %> Views with this Changes
+    </div>
+  </div>
+  <div class="actions">
+    <%= link_to 'Index', url_for(action: :index), class: 'index btn' %>
+    <%= button_to "Accept Change for #{@change.count} Views", url_for(action: :batch_accept), { class: 'accept', params: { hash: @change.hash } } %>
+  </div>
+</div>
+
+
+<%= javascript_include_tag 'spec_views/diff' %>

data/app/views/spec_views/views/index.html.erb

@@ -38,6 +38,9 @@
 <div class="footer">
   <div class="info"></div>
   <div class="actions">
+    <% if @directories.any?(&:challenger?) %>
+      <%= link_to 'Batch Diff', url_for(action: :batch), class: 'diff btn' %>
+    <% end %>
     <% if @directories.any?{ |dir| dir.last_run < @latest_run } %>
       <%= button_to 'Remove Outdated', url_for(action: :destroy_outdated), method: :delete, class: 'reject' %>
     <% end %>

data/config/routes.rb

@@ -6,8 +6,10 @@ Rails.application.routes.draw do
 
     resources :views, only: %i[index show] do
       collection do
+        get :batch
         delete :destroy_outdated
         post :accept_all
+        post :batch_accept
       end
       member do
         get :compare

data/lib/spec_views/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SpecViews
-  VERSION = '3.2.1'
+  VERSION = '3.3.1'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spec_views
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.1
 platform: ruby
 authors:
 - Sebastian Gaul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +107,7 @@ files:
 - app/assets/javascripts/spec_views/jsdiff.js
 - app/controllers/spec_views/views_controller.rb
 - app/models/spec_views/base_matcher.rb
+- app/models/spec_views/batch_diff.rb
 - app/models/spec_views/capybara_session_extractor.rb
 - app/models/spec_views/directory.rb
 - app/models/spec_views/html_matcher.rb
@@ -103,6 +118,7 @@ files:
 - app/views/layouts/spec_views.html.erb
 - app/views/spec_views/views/_actions.html.erb
 - app/views/spec_views/views/_directory_footer.html.erb
+- app/views/spec_views/views/batch.html.erb
 - app/views/spec_views/views/compare.html.erb
 - app/views/spec_views/views/diff.html.erb
 - app/views/spec_views/views/index.html.erb
@@ -133,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Render views from controller specs for comparision