web_randomizer 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56a64c25d01f7b0fc4ae959f48ebc77eda2729cc862972df826dfe0992d25255
-  data.tar.gz: da22d32977061ddaa280a713e169cd61b736cd0099106f9b64af4ce5de1fe605
+  metadata.gz: 51754e676ba7c463a714258160488a9d50b63e1aee19c1c388efdc9ef7950219
+  data.tar.gz: 8a9dbc5026a58356c7e2fe3338bd72548acf7b82259a6bab8d114eb0e6cb57b6
 SHA512:
-  metadata.gz: e836dd9a165b10fb12cdd58a105d3c8fbcc9285f4096d49447a361b24a8d8bcc1e8fb524de43e7f3e055ea10daa14949eae32d61baca2c233ea4bf14b59101c7
-  data.tar.gz: 077ef13667b9dc2d5e53015f731e3f96517b15a9dfcff025eeac629003e72bebc3f796bd2275b24ee250e6fa2510f3fba9659ca39bd8a08c55a1c51c3dde333f
+  metadata.gz: 936fc0f6d1c5fda79425d5e856ce895c94fd6d5feb38263777ded73b176f8caf4a464bba61966c92e8fb985d0d22cb7a0125a73668f78ebca1abebfeaac9c262
+  data.tar.gz: cdb0ad0a7d310fad09dae425ed5c039252392c2a0bb57d1886863a135ac6859a12a57a110ebb308eac159674af6dcfffe13398d286a6a0ef6d51785eab7b1ed8

data/lib/web_randomizer.rb

@@ -1,153 +1,253 @@
-# frozen_string_literal: true
-
-require 'yaml'
-
-module WebRandomizer
-  class << self
-    def execute
-      initialize!
-
-      randomize_div!
-
-      @сss_files_array.each do |el|
-        puts "\n\nUpdating #{el[:filename]}\n"
-
-        File.open(el[:filename], 'w') do |file|
-          file.write(color_shift(el[:contents]))
-        end
-      end
-    end
-
-    private
-
-    def initialize!
-      if File.file?('randomize.yml')
-        config = YAML.load_file('randomize.yml')
-
-        @html_dir_list = config['html_dir']
-        @css_dir_list = config['css_dir']
-
-      else
-        @html_dir_list = %w[_layouts _includes]
-        @css_dir_list = %w[assets/css _sass]
-      end
-
-      @сss_files_array = []
-
-      @css_dir_list.each do |dir_item|
-        Dir.foreach(dir_item) do |css_filename|
-          next if css_filename == '.' || css_filename == '..'
-
-          @сss_files_array << ({ filename: "#{dir_item}/#{css_filename}",
-                                 contents: File.open("#{dir_item}/#{css_filename}").read })
-        end
-      end
-    end
-
-    def randomize_div!
-      @html_dir_list.each do |dir_item|
-        Dir.foreach(dir_item) do |filename|
-          next if filename == '.' || filename == '..'
-
-          puts "Processing #{dir_item}/#{filename}"
-
-          output = File.open("#{dir_item}/#{filename}") { |f| f.read }
-
-          #    puts 'DEBUG output:' + output.inspect + "\n\n"
-
-          output.gsub!(/<div>/, "<div class=\"#{rand_string}\">")
-
-          output.scan(/<div.*?class=(.*?)>/).uniq.each do |div|
-            div.first.slice(/\"(.*)\"/, 1).strip.split(/\s+/).each do |el|
-              puts "\n\nHTML Searching non-div classes: " + el + "\n\n"
-
-              if found_in_non_div(el)
-                puts "\n\nFound in non-div tags. Skipping: " + el + "\n\n"
-                next
-              end
-
-              new_value = rand_string.strip
-              @html_dir_list.each do |inner_dir_item|
-                Dir.foreach(inner_dir_item) do |inner_filename|
-                  next if inner_filename == '.' || inner_filename == '..'
-
-                  puts "\n\nHTML Processing inner file: #{inner_dir_item}/" + inner_filename + "\n\n"
-
-                  contents = nil
-
-                  File.open("#{inner_dir_item}/#{inner_filename}", 'r') { |f| contents = f.read }
-
-                  File.open("#{inner_dir_item}/#{inner_filename}", 'w+') do |fw|
-                    fw.write(contents.gsub(el, new_value))
-                  end
-
-                  #    puts 'DEBUG contents:' + contents
-                  #    puts 'DEBUG contents.gsub(el, new_value):' + contents.gsub(el, new_value)
-                  #    raise ">>>>>>>>>>> DEBUG "
-                end
-              end
-
-              css_array_update!(el, new_value)
-            end
-          end
-        end
-      end
-    end
-
-    def found_in_non_div(el)
-      @html_dir_list.each do |dir_item|
-        Dir.foreach(dir_item) do |filename|
-          next if filename == '.' || filename == '..'
-
-          puts "Processing #{dir_item}/#{filename}"
-
-          output = File.open("#{dir_item}/#{filename}") { |f| f.read }
-
-          #    puts 'DEBUG output:' + output.inspect + "\n\n"
-
-          #          puts 'DEBUG output scan: ' + output.scan(/<(?!div).*?class.*?=.*?#{el}.*?>/).inspect
-          #          puts 'DEBUG output scan: ' + output.scan(/<(?!div).*?class.*?=.*?#{el}.*?>/).empty?.inspect
-
-          return true unless output.scan(/<(?!div).*?class.*?=.*?#{el}.*?>/).empty?
-
-          #  raise
-        end
-      end
-
-      false
-    end
-
-    def css_array_update!(old_value, new_value)
-      puts "\n\nCSS Processing div class from #{old_value} to #{new_value}\n\n"
-
-      @сss_files_array.each do |el|
-        puts "CSS Processing file: #{el[:filename]}\n"
-        el[:contents].gsub!(/.\b#{old_value}\b/, '.' + new_value) # .inspect
-      end
-    end
-
-    def rand_string
-      o = [('a'..'z'), ('A'..'Z')].map(&:to_a).flatten
-      (0...16).map { o[rand(o.length)] }.join
-    end
-
-    def color_shift(contents)
-      contents.gsub!(/#[0-9a-fA-F]+/) do |pattern|
-        #    puts "Color processing old_value: #{pattern}\n"
-
-        delta = pattern[1..2].downcase == 'ff' ? -1 : 1
-
-        pattern[1..2] = to_hex(pattern[1..2].hex + delta)
-
-        #    puts "Color processing new value: #{pattern}\n"
-
-        pattern
-      end
-      contents
-    end
-
-    def to_hex(int)
-      int < 16 ? '0' + int.to_s(16) : int.to_s(16)
-    end
-  end
-end
+# frozen_string_literal: true
+
+require 'yaml'
+
+module WebRandomizer
+  class << self
+    def execute
+      initialize!
+
+      randomize_div!
+
+      @сss_files_array.each do |el|
+        puts "\n\nUpdating #{el[:filename]}\n"
+
+        File.open(el[:filename], 'w') do |file|
+          file.write(color_shift(el[:contents]))
+        end
+      end
+    end
+
+    private
+
+    def initialize!
+      if File.file?('randomize.yml')
+        config = YAML.load_file('randomize.yml')
+
+        @html_dir_list = config['html_dir']
+        @css_dir_list = config['css_dir']
+
+      else
+        @html_dir_list = %w[_layouts _includes]
+        @css_dir_list = %w[assets/css _sass]
+      end
+
+      @сss_files_array = []
+
+      @css_dir_list.each do |dir_item|
+        Dir.foreach(dir_item) do |css_filename|
+          next if ['.', '..'].include?(css_filename)
+
+          @сss_files_array << ({ filename: "#{dir_item}/#{css_filename}",
+                                 contents: File.open("#{dir_item}/#{css_filename}").read })
+        end
+      end
+    end
+
+    def randomize_div!
+      @html_dir_list.each do |dir_item|
+        Dir.foreach(dir_item) do |filename|
+          next if ['.', '..'].include?(filename)
+
+          puts "Processing #{dir_item}/#{filename}"
+
+          output = File.open("#{dir_item}/#{filename}", &:read)
+
+          #    puts 'DEBUG output:' + output.inspect + "\n\n"
+
+          output.gsub!(/<div>/, "<div class=\"#{rand_string}\">")
+
+          output.scan(/<div.*?class.*?=(.*?)>/).uniq.each do |div|
+            #    puts "\n\nDEBUG output.scan:" + output.scan(/<div.*?class.*?=(.*?)>/).inspect + "\n\n"
+
+            #       raise
+
+            #        puts 'DEBUG div.first: ' + div.first
+            #        puts 'DEBUG div.first.slice(/\"(.*)\"/, 1):   ' + div.first.tr('"', '').inspect
+
+            #             if compound?(div.first)
+            #               puts "\n\nSkipping compound div: " + div.first
+            #               next
+            #             end
+
+            div.first.tr('"', '').strip.split(/\s+/).each do |el|
+              #             if found_in_compound(div.first)
+              #               puts "\n\nFound in compound class. Skipping: " + div.first + "\n\n"
+              #               next
+              #             end
+
+              if found_in_non_div(el)
+                puts "\n\nFound in non-div tags. Skipping: " + el + "\n\n"
+
+                #      raise
+
+                next
+              end
+
+              new_value = rand_string.strip
+
+              html_files_update(el, new_value)
+
+              css_array_update!(el, new_value)
+            end
+          end
+        end
+      end
+    end
+
+    def html_files_update(old_value, new_value)
+      @html_dir_list.each do |inner_dir_item|
+        Dir.foreach(inner_dir_item) do |inner_filename|
+          next if ['.', '..'].include?(inner_filename)
+
+          puts "\n\nHTML Processing inner file: #{inner_dir_item}/" + inner_filename + "\n\n"
+
+          contents = nil
+
+          File.open("#{inner_dir_item}/#{inner_filename}", 'r') { |f| contents = f.read }
+
+          puts 'DEBUG old_value:' + old_value
+          puts 'DEBUG new_value:' + new_value
+
+          #    raise
+
+          File.open("#{inner_dir_item}/#{inner_filename}", 'w+') do |fw|
+            # TODO: must find old_value with div tag
+
+            puts "\n\nDEBUG new contents.scan:" + contents.scan(/<div.*?[^-]\b#{old_value}\b[^-].*?>/).inspect + "\n\n"
+
+            scan_result = contents.scan(/<div.*?[^-]\b#{old_value}\b[^-].*?>/).each do |el|
+              replaced_el = el.gsub(/\b#{old_value}\b/, new_value)
+
+              puts "\n\nDEBUG replaced_el:" + replaced_el.inspect + "\n\n"
+
+              contents.gsub!(el, replaced_el)
+
+              puts "\n\nDEBUG contents:" + contents.inspect + "\n\n"
+            end
+
+            #       puts "\n\nDEBUG wrong contents.scan:" + contents.scan(/<.?*\b#{old_value}\b.?*>/).inspect + "\n\n"
+            #        raise
+
+            fw.write(contents)
+
+            #               puts "\n\nDEBUG contents.gsub OLD:\n\n" + contents.gsub(old_value, new_value).inspect
+            #               puts "\n\nDEBUG contents.gsub NEW:\n\n" + contents.gsub(/[\"\s]?#{old_value}[\"\s]?/, new_value).inspect
+            #               puts "\n\nDEBUG contents.scan :\n\n" + contents.scan(/[\"\s]?#{old_value}[\"\s]?/).inspect
+            #               puts "\n\nDEBUG contents.scan :\n\n" + contents.scan(/\b#{old_value}\b/).inspect
+            #               puts "\n\nDEBUG contents.scan :\n\n" + contents.scan(old_value).inspect
+          end
+
+          #    puts 'DEBUG contents:' + contents
+          #    puts 'DEBUG contents.gsub(el, new_value):' + contents.gsub(el, new_value)
+          #    raise ">>>>>>>>>>> DEBUG "
+        end
+      end
+    end
+
+    def found_in_non_div(el)
+      @html_dir_list.each do |dir_item|
+        Dir.foreach(dir_item) do |filename|
+          next if ['.', '..'].include?(filename)
+
+          #  puts "Processing #{dir_item}/#{filename}"
+
+          output = File.open("#{dir_item}/#{filename}", &:read)
+
+          #    puts 'DEBUG output:' + output.inspect + "\n\n"
+
+          #          puts 'DEBUG output scan: ' + output.scan(/<(?!div).*?class.*?=.*?#{el}.*?>/).inspect
+          #          puts 'DEBUG output scan: ' + output.scan(/<(?!div).*?class.*?=.*?#{el}.*?>/).empty?.inspect
+
+          #          return true unless output.scan(/<(?!div).*?class.*?=.*?[^-]\b#{el}\b[^-].*?>/).empty?
+          unless output.scan(/<(?!div).*?class.*?=.*?[^-]\b#{el}\b[^-].*?>/).empty?
+
+            puts 'DEBUG el:' + el
+            puts "\n\nDEBUG output scan: " + output.scan(/<(?!div).*?class.*?=.*?[^-]\b#{el}\b[^-].*?>/).inspect + "\n\n"
+
+            return true
+
+            #  raise
+
+          end
+          #      puts 'DEBUG el:' + el
+          #      puts "\n\nDEBUG output scan: " + output.scan(/<(?!div).*?class.*?=.*?[^-]\b#{el}\b[^-].*?>/).inspect+"\n\n"
+
+          #      raise
+        end
+      end
+
+      false
+    end
+
+    def css_array_update!(old_value, new_value)
+      puts "\n\nCSS Processing div class from #{old_value} to #{new_value}\n\n"
+
+      @сss_files_array.each do |el|
+        puts "CSS Processing file: #{el[:filename]}\n"
+
+        el[:contents].gsub!(/\.\b#{old_value}\b/, '.' + new_value) # .inspect
+
+        puts 'DEBUG old_value:' + old_value
+        puts 'DEBUG new_value:' + new_value
+        puts "DEBUG OLD el[:contents].gsub: \n\n" + el[:contents].gsub(/.\b#{old_value}\b/, '.' + new_value) + "\n\n"
+        puts "DEBUG NEW el[:contents].gsub: \n\n" + el[:contents].gsub(/\.\b#{old_value}\b[^-]/, '.' + new_value) + "\n\n"
+
+        #    raise
+
+        #   el[:contents].gsub!(/\.\b#{old_value}\b[^-]/, '.' + new_value+' ') # .inspect
+      end
+    end
+
+    def rand_string
+      o = [('a'..'z'), ('A'..'Z')].map(&:to_a).flatten
+      (0...16).map { o[rand(o.length)] }.join
+    end
+
+    def color_shift(contents)
+      contents.gsub!(/#[0-9a-fA-F]+/) do |pattern|
+        #    puts "Color processing old_value: #{pattern}\n"
+
+        delta = pattern[1..2].downcase == 'ff' ? -1 : 1
+
+        pattern[1..2] = to_hex(pattern[1..2].hex + delta)
+
+        #    puts "Color processing new value: #{pattern}\n"
+
+        pattern
+      end
+      contents
+    end
+
+    def to_hex(int)
+      int < 16 ? '0' + int.to_s(16) : int.to_s(16)
+    end
+
+    #     def compound?(value)
+    #       value.tr('"', '').strip.split(/\s+/).count>1
+    #     end
+    #
+    #     def found_in_compound(el)
+    #       @html_dir_list.each do |dir_item|
+    #         Dir.foreach(dir_item) do |filename|
+    #           next if ['.', '..'].include?(filename)
+    #
+    #           puts "Processing #{dir_item}/#{filename}"
+    #
+    #           output = File.open("#{dir_item}/#{filename}", &:read)
+    #
+    #           #    puts 'DEBUG output:' + output.inspect + "\n\n"
+    #
+    #           #          puts 'DEBUG output scan: ' + output.scan(/<(?!div).*?class.*?=.*?#{el}.*?>/).inspect
+    #           #          puts 'DEBUG output scan: ' + output.scan(/<(?!div).*?class.*?=.*?#{el}.*?>/).empty?.inspect
+    #
+    #           return true unless output.scan(/<(?!div).*?class.*?=.*?#{el}.*?>/).empty?
+    #
+    #           #  raise
+    #         end
+    #       end
+    #
+    #       false
+    #     end
+  end
+end

data/spec/web_randomizer_spec.rb

@@ -21,31 +21,54 @@ RSpec.describe 'WebRandomizer' do
   context 'with valid tags' do
     before do
       html1_str =
-        <<-'_layouts'
+        <<~'_LAYOUTS'
+                  
+          <div class="mh-footer-widget">
+                  
           <div class="div1">
+          
+          <footer class="footer-widget-title">
+          
+          <div class="footer-widget">
+          <div class="dsada  footer-widget">
+          
+          
+          <div class="footer-widget-1">
+          
+          <div class="compound compound2">
+          
+          <div class="footer_class">
+          
           <div class="div2">
-          <footer class="footer_class">
-        _layouts
+          <div id="text-4" class="after_id">
+        _LAYOUTS
 
       html2_str =
-        <<-'_includes'
+        <<~'_INCLUDES'
+          <footer class="footer-widget-title">
+          
+          <div class="compound">
+          
+          <footer class="footer_class">
           <div class="div2">
-          <div class="footer_class">
-        _includes
+        _INCLUDES
 
       css_str =
-        <<-'css'
-            .div1 
-            .div2 
-            cite { color: #9B9b97; }
-        css
+        <<~'CSS'
+          .mh-footer-widget.widget_archive li
+          .comment-edit-link .div1 { margin-right: 15px; }
+          .div1 .comment-edit-link { margin-right: 15px; }
+          
+          .div2 
+           cite { color: #9B9b97; }
+        CSS
 
       sass_str =
-        <<-'sass'
-            .div2 
-            .div3 
-            a:hover { color: #ff805E; }
-        sass
+        <<~'SASS'
+          .div2 
+          .div3 
+          a:hover { color: #ff805E; }
+        SASS
 
       File.open('_layouts/test.html', 'w') { |file| file.write(html1_str) }
       File.open('_includes/test.html', 'w') { |file| file.write(html2_str) }
@@ -55,13 +78,18 @@ RSpec.describe 'WebRandomizer' do
       WebRandomizer.execute
 
       puts  "\n\nSPEC OUTPUT:\n\n"
-      puts  "\n_layouts:\n" + File.open('_layouts/test.html', 'r', &:read)
-      puts  "\n_includes:\n" + File.open('_includes/test.html', 'r', &:read)
-      puts  "\nassets: \n" + File.open('assets/css/test.css', 'r', &:read)
-      puts  "\n_sass:\n" + File.open('_sass/test.sass', 'r', &:read)
+      puts  "\n_layouts:\n\n#{html1_str}\n" + File.open('_layouts/test.html', 'r', &:read)
+      puts  "\n_includes:\n\n#{html2_str}\n" + File.open('_includes/test.html', 'r', &:read)
+      puts  "\nassets: \n\n#{css_str}\n" + File.open('assets/css/test.css', 'r', &:read)
+      puts  "\n_sass:\n\n#{sass_str}\n" + File.open('_sass/test.sass', 'r', &:read)
     end
 
-    it 'should randomize div tags' do
+    it 'shouldn`t match tags with equal substrings' do
+      scan_result = File.open('_layouts/test.html', 'r', &:read).scan(/.*?[^-][\b]footer-widget[\b][^-].*?/)
+      expect(scan_result.empty?).to be true
+    end
+
+    it 'should change div tags' do
       scan_result = File.open('_layouts/test.html', 'r', &:read).scan(/.*?(?=div1|div2).*?/)
       expect(scan_result.empty?).to be true
     end
@@ -83,5 +111,14 @@ RSpec.describe 'WebRandomizer' do
       change_result = File.open('assets/css/test.css', 'r', &:read).scan(/.*?#9B9b97.*?/)
       expect(change_result.empty?).to be true
     end
+
+=begin
+      it 'should keep compound classes' do
+        scan_result = File.open('_layouts/test.html', 'r', &:read).scan(/.*?compound.*?/)
+        expect(scan_result.empty?).to be false
+        scan_result = File.open('_includes/test.html', 'r', &:read).scan(/.*?compound2.*?/)
+        expect(scan_result.empty?).to be false
+      end
+=end
   end
 end

data/web_randomizer.gemspec

@@ -4,8 +4,8 @@ $LOAD_PATH.push File.expand_path('lib', __dir__)
 
 Gem::Specification.new do |s|
   s.name        = 'web_randomizer'
-  s.version     = '0.2.0'
-  s.date        = '2020-10-11'
+  s.version     = '0.3.0'
+  s.date        = '2020-10-13'
   s.summary     = 'WebRandomizer - gem for randomizing div classes and color styles for static sites'
   s.description = 'Gem for randomizing div classes and color styles for static sites.'
   s.author      = 'Timur Sobolev'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web_randomizer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Timur Sobolev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml