deface 1.8.2 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f95e0d9ff0d9928f8791253e4ce8a96e8c3dfda75505f1f6f9d96d5b50ee20cc
-  data.tar.gz: 5db5672c1fc4c8e43a591674a6d60950a6b70e48f54adbcb9d3f0a380ad2e039
+  metadata.gz: 26589c63a50265b4e04831dcb67dc38a16e7a00d21c2e6158d64b7443928aa48
+  data.tar.gz: fed8af2ec7577935cc784e5fe91cb7166e7d383f5be281a4f3934cd0e078d8ee
 SHA512:
-  metadata.gz: 5b36c2c608cc51a7975a97da0931e351be90dc4a19d4c51bc37d3f5fe6a0023ed31a6b67ed01d6b17105ded32edf6b1d6cfd1a1bd538471a52790fbb526f1cf6
-  data.tar.gz: 8cf7a37e8af2c13cfcbdeaf039434fd8736e777ec7fb2a2ceeb7186b0a49e4d931c14459e882d71d5d10b527ab523f9f1d6500f452c6acb2b5746b6c015aa99b
+  metadata.gz: f830667a04b8a024430b1e32a4c8f209e0c0fbfcec3d468d2eaa1bf6ec53a95d1e1388c204a29ccdae5417c6c462a0f267b5828ec0e4807d5693426721a6790e
+  data.tar.gz: 768515c2072167c2f06bbce63c3d9197590da1377711cc2c09315166639411c05cee8f5abf8c4650f50c79d8136e296c28ca0d98e50c576a351e95d626f66640

data/.github/workflows/main.yml

@@ -15,19 +15,19 @@ jobs:
           # - ruby: "2.7"
           #   gemfile: "rails_6_1"
           - ruby: "2.6"
-            gemfile: "rails_6_1"
+            gemfile: "rails_6.1"
           - ruby: "2.5"
-            gemfile: "rails_6_1"
+            gemfile: "rails_6.1"
 
           # - ruby: "2.7"
           #   gemfile: "rails_6_0"
           - ruby: "2.6"
-            gemfile: "rails_6_0"
+            gemfile: "rails_6.0"
           - ruby: "2.5"
-            gemfile: "rails_6_0"
+            gemfile: "rails_6.0"
 
           - ruby: "2.5"
-            gemfile: "rails_5_2"
+            gemfile: "rails_5.2"
 
     runs-on: ubuntu-latest
 

data/Appraisals

@@ -24,3 +24,12 @@ appraise 'rails-6.1' do
     gem rails_gem, '~> 6.1.0'
   end
 end
+
+appraise 'rails-7.0' do
+  %w[
+    actionview
+    railties
+  ].each do |rails_gem|
+    gem rails_gem, '~> 7.0.0'
+  end
+end

data/gemfiles/{rails_6_1.gemfile → rails_7.0.gemfile}

@@ -2,12 +2,8 @@
 
 source "https://rubygems.org"
 
-%w[
-  actionview
-  railties
-].each do |rails_gem|
-  gem rails_gem, "~> 6.1.0"
-end
+gem "actionview", "~> 7.0.0"
+gem "railties", "~> 7.0.0"
 
 group :test do
   gem "test-unit"

data/lib/deface/override.rb

@@ -70,8 +70,8 @@ module Deface
         raise(ArgumentError, ":action is invalid") if self.action.nil?
       end
 
-      #set loaded time (if not already present) for hash invalidation
-      @args[:updated_at] ||= Time.zone.now.to_f
+      # Set loaded time (if not already present) for hash invalidation
+      @args[:updated_at] ||= Time.current.to_f
       @args[:railtie_class] = self.class.current_railtie
 
       self.class.all[virtual_key][name_key] = self

data/lib/deface/search.rb

@@ -7,7 +7,7 @@ module Deface
       def find(details)
         return [] if self.all.empty? || details.empty?
 
-        virtual_path = details[:virtual_path]
+        virtual_path = details[:virtual_path].dup
         return [] if virtual_path.nil?
 
         [/^\//, /\.\w+\z/].each { |regex| virtual_path.gsub!(regex, '') }

data/lib/deface/template_helper.rb

@@ -11,14 +11,14 @@ module Deface
       parts = virtual_path.split("/")
 
       if parts.size == 2
-        prefix = ""
+        prefix = nil
         name = virtual_path
       else
-        prefix = parts.shift
+        prefix = [parts.shift]
         name = parts.join("/")
       end
 
-      view = lookup_context.disable_cache { lookup_context.find(name, [prefix], partial) }
+      view = lookup_context.disable_cache { lookup_context.find(name, prefix, partial) }
 
       source =
         if view.handler.to_s == "Haml::Plugin"

data/lib/deface/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Deface
-  VERSION = '1.8.2'
+  VERSION = '1.9.0'
 
   def gem_version
     Gem::Version.new(VERSION)

data/spec/deface/search_spec.rb

@@ -20,6 +20,12 @@ module Deface
       it "should return empty array when no details hash passed" do
         expect(Deface::Override.find({})).to eq([])
       end
+
+      context 'with a frozen string as virtual_path' do
+        it 'works' do
+          expect(Deface::Override.find({:virtual_path => "posts/index".freeze}).size).to eq(1)
+        end
+      end
     end
 
     describe "#find_using" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deface
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.9.0
 platform: ruby
 authors:
 - Brian D Quinn
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -241,7 +241,7 @@ files:
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
-- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/deface.rb
 - lib/deface/action_view_extensions.rb
 - lib/deface/actions/action.rb