deface 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf234b6836f2b2d5bee1e3ae0d73632c048c0fa5
-  data.tar.gz: 1cdc7e44036fb3bf0fc9b5bcfe6ee485d4b8d6fe
+  metadata.gz: 1abef419e3fa75dc8e8f82e92f9fdd019d1adb83
+  data.tar.gz: 4ca2e8f9f48cd397428398f7315bfc93634ca6a8
 SHA512:
-  metadata.gz: 893ca0bc578ad92b43c6758583e37c1a712e63737dc0c7d7a0a06efcbe2c107c100fe52a973d65ce6251378f0774384159e1eccf842036618f5157992b8f93a5
-  data.tar.gz: 1b476d0268efbf0d74b6af40a34b1fc1a6cf1be2f8c72eb58d542adf02706c5d86ddb68551139a80aae3051ce857e9bf042e53d763100b220d79a878af7a4eb8
+  metadata.gz: 3bdc37fec62caed46381652d1a3da9f6cb20e6b366876aaea9e18f33862994122808a7c6d66e7bde35f094ed27d30c06627a05627b4d183fce697bd0b5e6f296
+  data.tar.gz: 6511b13a014b50fd9049314b8e6191ad99698bc571b2e564099e6de86da37840f092d1e911a1e1f60e0c4d4e9f32ebb4ea0d9b0f966f4af71539270963e28ed0

data/deface.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "deface"
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.authors = ["Brian D Quinn"]
   s.description = "Deface is a library that allows you to customize ERB, Haml and Slim views in a Rails application without editing the underlying view."
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = "Deface is a library that allows you to customize ERB, Haml and Slim views in Rails"
 
-  s.add_dependency('nokogiri', '~> 1.6')
+  s.add_dependency('nokogiri', '>= 1.6')
   s.add_dependency('rails', '>= 4.1')
   s.add_dependency('rainbow', '>= 2.1.0')
   s.add_dependency('polyglot')

data/lib/deface.rb

@@ -4,6 +4,7 @@ require "deface/template_helper"
 require "deface/original_validator"
 require "deface/applicator"
 require "deface/search"
+require "deface/digest"
 require "deface/override"
 require "deface/parser"
 require "deface/dsl/loader"
@@ -42,6 +43,10 @@ module Deface
     require "deface/railtie"
   end
 
+  if defined?(ActiveSupport::Digest)
+    Deface::Digest.digest_class = ActiveSupport::Digest
+  end
+
   # Exceptions
   class DefaceError < StandardError; end
 

data/lib/deface/action_view_extensions.rb

@@ -52,7 +52,7 @@ ActionView::Template.class_eval do
       deface_hash = Deface::Override.digest(:virtual_path => @virtual_path)
 
       #we digest the whole method name as if it gets too long there's problems
-      "_#{Digest::MD5.new.update("#{deface_hash}_#{method_name_without_deface}").hexdigest}"
+      "_#{Deface::Digest.hexdigest("#{deface_hash}_#{method_name_without_deface}")}"
     end
 
   private

data/lib/deface/digest.rb

@@ -0,0 +1,25 @@
+module Deface
+  class Digest
+    class <<self
+      def digest_class
+        @digest_class || ::Digest::MD5
+      end
+
+      def digest_class=(klass)
+        @digest_class = klass
+      end
+
+      def hexdigest(arg)
+        new.hexdigest(arg)
+      end
+    end
+
+    def initialize(klass = nil)
+      @digest_class = klass || self.class.digest_class
+    end
+
+    def hexdigest(arg)
+      @digest_class.hexdigest(arg).truncate(32)
+    end
+  end
+end

data/lib/deface/original_validator.rb

@@ -11,7 +11,7 @@ module Deface
     def validate_original(match)
       match = match.map(&:to_s).join if match.is_a? Array
 
-      hashed_original = Digest::SHA1.hexdigest(match.to_s.gsub(/\s/, ''))
+      hashed_original = ::Digest::SHA1.hexdigest(match.to_s.gsub(/\s/, ''))
 
       if @args[:original].present?
         valid = @args[:original] == hashed_original

data/lib/deface/override.rb

@@ -185,7 +185,8 @@ module Deface
     # used to determine if an override has changed
     #
     def digest
-      Digest::MD5.new.update(@args.keys.map(&:to_s).sort.concat(@args.values.map(&:to_s).sort).join).hexdigest
+      to_hash = @args.keys.map(&:to_s).sort.concat(@args.values.map(&:to_s).sort).join
+      Deface::Digest.hexdigest(to_hash)
     end
 
     # Creates MD5 of all overrides that apply to a particular
@@ -195,8 +196,8 @@ module Deface
     #
     def self.digest(details)
       overrides = self.find(details)
-
-      Digest::MD5.new.update(overrides.inject('') { |digest, override| digest << override.digest }).hexdigest
+      to_hash = overrides.inject('') { |digest, override| digest << override.digest }
+      Deface::Digest.hexdigest(to_hash)
     end
 
     def self.all

data/spec/deface/digest_spec.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+
+require 'spec_helper'
+
+module Deface
+  describe Digest do
+    it "should use MD5 by default" do
+      expect(Digest.new.hexdigest("123")).to eq "202cb962ac59075b964b07152d234b70"
+    end
+
+    it "should use user-provided digest" do
+      digest = double("digest")
+      expect(digest).to receive(:hexdigest).with("to_digest").and_return("digested")
+      expect(Digest.new(digest).hexdigest("to_digest")).to eq "digested"
+    end
+
+    it "should truncate digest to 32 characters" do
+      digest = double("digest")
+      expect(digest).to receive(:hexdigest).with("to_digest").and_return("a" * 50)
+      expect(Digest.new(digest).hexdigest("to_digest").size).to eq 32
+    end
+  end
+end
+

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: deface
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Brian D Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
@@ -212,6 +212,7 @@ files:
 - lib/deface/actions/surround_action.rb
 - lib/deface/actions/surround_contents.rb
 - lib/deface/applicator.rb
+- lib/deface/digest.rb
 - lib/deface/dsl/context.rb
 - lib/deface/dsl/loader.rb
 - lib/deface/environment.rb
@@ -267,6 +268,7 @@ files:
 - spec/deface/actions/surround_contents_spec.rb
 - spec/deface/actions/surround_spec.rb
 - spec/deface/applicator_spec.rb
+- spec/deface/digest_spec.rb
 - spec/deface/dsl/context_spec.rb
 - spec/deface/dsl/loader_spec.rb
 - spec/deface/environment_spec.rb
@@ -302,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Deface is a library that allows you to customize ERB, Haml and Slim views
@@ -333,6 +335,7 @@ test_files:
 - spec/deface/actions/surround_contents_spec.rb
 - spec/deface/actions/surround_spec.rb
 - spec/deface/applicator_spec.rb
+- spec/deface/digest_spec.rb
 - spec/deface/dsl/context_spec.rb
 - spec/deface/dsl/loader_spec.rb
 - spec/deface/environment_spec.rb