redis_snippets 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1157b175b0ce0c3c72be376383f9da2d522999f69304c093cd3ddbc22eb0d25d
-  data.tar.gz: 7673c2ffe8fd7b0134847e1de912dd94aadf900a267c937625e3ace993f106ee
+  metadata.gz: a6e23e82090d87175ad955c952631f69c82c81f8a44bb31425e0d8fd23cd3efb
+  data.tar.gz: 7a10f98d066f22d13fc396738f5caacf784864f0ecd27bc64768c7b3e5c31592
 SHA512:
-  metadata.gz: fc847d478f9c40aef9fe2ecb067eee24c700d23b1053bcb09280db46c5025b09a94e6363ecdb2f0d70e567a606b75cb53d0771e16844b3a934b6eb815c4bb44f
-  data.tar.gz: fbfc1e84fc0c9794221880574abde61e7d3e2c11720c0c92062be5592c0f15d599f428b556abe777156fc2662790b4386c60cd553720d9567a3664337761602d
+  metadata.gz: e07f026b183cad598364729618af9fe667e3edadbf3797897d2f19adf05738f3e74373c342085230ec28fa549d892d0a54010779ff86e2c8a8861fadc84444d7
+  data.tar.gz: 90c0e1f7b2245e79afdb0acf63e7937455651177c547805eec6f578bec1c8791958f6f3d61a96ff806798074148c349ee622016285283925a1bb8bdf9eca38b4

data/Gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 gemspec
 
 group :test, :development do
-  gem "rails", ">= 6.0"
+  gem "rails", "~> 6"
   gem "rspec-rails", ">= 3.9.0"
 end
 

data/app/helpers/redis_snippets/snippets_helper.rb

@@ -8,7 +8,9 @@ module RedisSnippets
     end
 
     def snippet(key, classes = nil)
-      SnippetPresenter.new(view: self, key: key, classes: classes).call
+      snippet = SnippetFinderService.new(key: key).call
+      return unless snippet
+      SnippetPresenter.new(view: self, key: key, snippet: snippet, classes: classes).call
     end
   end
 end

data/app/presenters/snippet_presenter.rb

@@ -1,14 +1,10 @@
-
 class SnippetPresenter
   include RedisSnippets::Util
 
-  SECTION_DELIMITER = "[section]"
-
-  delegate :random_snippet, to: "self.class"
-
-  def initialize(view:, key:, classes: nil)
+  def initialize(view:, key:, snippet:, classes: nil)
     @view = view
     @key = key
+    @snippet = snippet
     @classes = classes
   end
 
@@ -20,16 +16,9 @@ class SnippetPresenter
   protected
 
   def prepare_snippet
-    @snippet = ""
-
-    return unless content = SnippetStoreService.send(snippet_key(@key))
+    return unless transform_class&.transforms?(key: @key)
 
-    snippets = content.split("#{SECTION_DELIMITER}")
-    @snippet = random_snippet(content)
-
-    if transform_class && transform_class.transforms?(key: @key)
-      @snippet = transform_class.new(content: @snippet, key: @key).transform
-    end
+    @snippet = transform_class.new(content: @snippet, key: @key).transform
   end
 
   def snippet_class_list
@@ -42,11 +31,9 @@ class SnippetPresenter
 
   def render
     # If snippet is empty we avoid wrapping it in the div.
-    if @snippet.blank?
-      ""
-    else
-      @view.content_tag(:div, @snippet.html_safe, class: snippet_class_list)
-    end
+    return "" if @snippet.blank?
+
+    @view.content_tag(:div, @snippet.html_safe, class: snippet_class_list)
   end
 
   def transform_class
@@ -57,11 +44,4 @@ class SnippetPresenter
         RedisSnippets::Engine.config.redis_snippets[:transform] and RedisSnippets::Engine.config.redis_snippets[:transform].constantize
       end
   end
-
-  class << self
-    def random_snippet(content)
-      snippets = content.split("#{SECTION_DELIMITER}").map { |section| section.gsub(/^\n/, "") }
-      snippets[rand(snippets.length)]
-    end
-  end
 end

data/app/services/snippet_finder_service.rb

@@ -0,0 +1,22 @@
+class SnippetFinderService
+  include RedisSnippets::Util
+
+  SECTION_DELIMITER = "[section]"
+
+  def initialize(key:)
+    @key = key
+  end
+
+  def call
+    self.class.random_snippet(SnippetStoreService.send(snippet_key(@key)))
+  end
+
+  protected
+
+  class << self
+    def random_snippet(content)
+      snippets = content.split("#{SECTION_DELIMITER}").map { |section| section.gsub(/^\n/, "") }
+      snippets[rand(snippets.length)]
+    end
+  end
+end

data/lib/redis_snippets/version.rb

@@ -1,3 +1,3 @@
 module RedisSnippets
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

data/spec/dummy/.ruby-version

@@ -1 +1 @@
-2.6.5
+3.1.2

data/spec/dummy/config/environments/test.rb

@@ -1,7 +1,4 @@
-# The test environment is used exclusively to run your application's
-# test suite. You never need to work with it otherwise. Remember that
-# your test database is "scratch space" for the test suite and is wiped
-# and recreated between test runs. Don't rely on the data there!
+require "active_support/core_ext/integer/time"
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.

data/spec/helpers/redis_snippets/snippets_helper_spec.rb

@@ -0,0 +1,57 @@
+require 'rails_helper'
+
+describe RedisSnippets::SnippetsHelper, type: :helper do
+  let(:code) { "<p>Buy this from Amazon.</p>" }
+  let(:multiple_adverts) { <<-HEREDOC
+<p>Buy this from Amazon.</p>
+[section]
+<p>Buy this from Apple.</p>
+HEREDOC
+  }
+  let(:view) { ActionController::Base.new.view_context }
+
+  describe "#snippet_has_content?" do
+    before do
+      SnippetStoreService.update(snippet_key(:advert_header), code)
+    end
+
+    it "returns true if there's content in the snippet" do
+      expect(snippet_has_content?(:advert_header)).to be true
+    end
+
+    it "returns false if there's no content in the snippet" do
+      expect(snippet_has_content?(:advert_footer)).to be false
+    end
+  end
+
+  describe "#snippet" do
+    context "with a single snippet" do
+      before do
+        SnippetStoreService.update(snippet_key(:advert_header), code)
+      end
+
+      it "adds the snippet key as the class" do
+        expect(snippet(:advert_header)).to eq("<div class=\"snippet advert_header\"><p>Buy this from Amazon.</p></div>")
+      end
+
+      it "adds more classes from a string" do
+        expect(snippet(:advert_header, "advert-responsive")).to eq("<div class=\"snippet advert_header advert-responsive\"><p>Buy this from Amazon.</p></div>")
+      end
+
+      it "adds more classes from an array" do
+        expect(snippet(:advert_header, ["advert-responsive", "p-4"])).to eq("<div class=\"snippet advert_header advert-responsive p-4\"><p>Buy this from Amazon.</p></div>")
+      end
+    end
+
+    context "with multiple snippets" do
+      before do
+        SnippetStoreService.update(snippet_key(:advert_header), multiple_adverts)
+      end
+
+      it "adds the snippet key as the class" do
+        expect(SnippetFinderService).to receive(:rand).and_return(1)
+        expect(snippet(:advert_header)).to eq("<div class=\"snippet advert_header\"><p>Buy this from Apple.</p>\n</div>")
+      end
+    end
+  end
+end

data/spec/{app/presenters → presenters}/snippet_presenter_spec.rb

@@ -10,9 +10,9 @@ HEREDOC
   }
   let(:view) { ActionController::Base.new.view_context }
 
-  subject(:presenter) { described_class.new(view: view, key: :advert_header) }
-  subject(:presenter_with_string_class) { described_class.new(view: view, key: :advert_header, classes: "advert-responsive") }
-  subject(:presenter_with_array_classes) { described_class.new(view: view, key: :advert_header, classes: ["advert-responsive", "p-4"]) }
+  subject(:presenter) { described_class.new(view: view, key: :advert_header, snippet: code) }
+  subject(:presenter_with_string_class) { described_class.new(view: view, key: :advert_header, snippet: code, classes: "advert-responsive") }
+  subject(:presenter_with_array_classes) { described_class.new(view: view, key: :advert_header, snippet: code, classes: ["advert-responsive", "p-4"]) }
 
   describe "#call" do
     before do
@@ -37,17 +37,4 @@ HEREDOC
       end
     end
   end
-
-  describe ".random_snippet" do
-    before do
-      SnippetStoreService.update(snippet_key(:advert_header), multiple_adverts)
-    end
-
-    it "returns one of the sections" do
-      allow(SnippetPresenter).to receive(:rand).and_return(0)
-      expect(described_class.random_snippet(multiple_adverts)).to eq("<p>Buy this from Amazon.</p>\n")
-      allow(SnippetPresenter).to receive(:rand).and_return(1)
-      expect(described_class.random_snippet(multiple_adverts)).to eq("<p>Buy this from Apple.</p>\n")
-    end
-  end
 end

data/spec/{app/presenters → presenters}/snippet_presenter_transform_spec.rb

@@ -23,8 +23,8 @@ describe SnippetPresenter do
     let(:code) { "<p>Buy this from Amazon.</p>" }
     let(:view) { ActionController::Base.new.view_context }
 
-    subject(:header_presenter) { described_class.new(view: view, key: :advert_header) }
-    subject(:footer_presenter) { described_class.new(view: view, key: :advert_footer) }
+    subject(:header_finder) { described_class.new(view: view, key: :advert_header, snippet: code) }
+    subject(:footer_finder) { described_class.new(view: view, key: :advert_footer, snippet: code) }
 
     describe "#call" do
       before do
@@ -34,11 +34,11 @@ describe SnippetPresenter do
       end
 
       it "transforms the content" do
-        expect(header_presenter.call).to eq("<div class=\"snippet advert_header\"><p>Buy this from Etsy.</p></div>")
+        expect(header_finder.call).to eq("<div class=\"snippet advert_header\"><p>Buy this from Etsy.</p></div>")
       end
 
       it "does not transform the content if key is not allowed" do
-        expect(footer_presenter.call).to eq("<div class=\"snippet advert_footer\"><p>Buy this from Amazon.</p></div>")
+        expect(footer_finder.call).to eq("<div class=\"snippet advert_footer\"><p>Buy this from Amazon.</p></div>")
       end
     end
   end

data/spec/services/snippet_finder_service_spec.rb

@@ -0,0 +1,35 @@
+require 'rails_helper'
+
+describe SnippetFinderService do
+  let(:code) { "<p>Buy this from Amazon.</p>" }
+  let(:multiple_adverts) { <<-HEREDOC
+<p>Buy this from Amazon.</p>
+[section]
+<p>Buy this from Apple.</p>
+HEREDOC
+  }
+  let(:view) { ActionController::Base.new.view_context }
+
+  subject { described_class.new(key: :advert_header).call }
+
+  describe "#call" do
+    before do
+      SnippetStoreService.update(snippet_key(:advert_header), code)
+    end
+
+    it "finds the content" do
+      expect(subject).to eq(code)
+    end
+  end
+
+  describe ".random_snippet" do
+    before do
+      SnippetStoreService.update(snippet_key(:advert_header), multiple_adverts)
+    end
+
+    it "returns one of the sections" do
+      expect(described_class).to receive(:rand).and_return(0)
+      expect(described_class.random_snippet(multiple_adverts)).to eq("<p>Buy this from Amazon.</p>\n")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_snippets
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Martin Moen Wulffeld
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - app/controllers/redis_snippets/snippets_controller.rb
 - app/helpers/redis_snippets/snippets_helper.rb
 - app/presenters/snippet_presenter.rb
+- app/services/snippet_finder_service.rb
 - app/services/snippet_store_service.rb
 - app/views/redis_snippets/snippets/show.html.erb
 - config/routes.rb
@@ -106,10 +107,6 @@ files:
 - lib/redis_snippets/util.rb
 - lib/redis_snippets/version.rb
 - redis_snippets.gemspec
-- spec/app/helpers/redis_snippets/snippets_helper_spec.rb
-- spec/app/presenters/snippet_presenter_spec.rb
-- spec/app/presenters/snippet_presenter_transform_spec.rb
-- spec/app/services/snippet_store_service_spec.rb
 - spec/dummy/.ruby-version
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
@@ -141,14 +138,19 @@ files:
 - spec/dummy/log/.keep
 - spec/dummy/tmp/.keep
 - spec/dummy/tmp/development_secret.txt
+- spec/helpers/redis_snippets/snippets_helper_spec.rb
+- spec/presenters/snippet_presenter_spec.rb
+- spec/presenters/snippet_presenter_transform_spec.rb
 - spec/rails_helper.rb
+- spec/services/snippet_finder_service_spec.rb
+- spec/services/snippet_store_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/simplecov_setup.rb
 homepage: https://github.com/wulffeld/redis_snippets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -163,15 +165,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Storing snippets of HTML, text, etc. in Redis for use in views.
 test_files:
-- spec/app/helpers/redis_snippets/snippets_helper_spec.rb
-- spec/app/presenters/snippet_presenter_spec.rb
-- spec/app/presenters/snippet_presenter_transform_spec.rb
-- spec/app/services/snippet_store_service_spec.rb
 - spec/dummy/.ruby-version
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
@@ -203,6 +201,11 @@ test_files:
 - spec/dummy/log/.keep
 - spec/dummy/tmp/.keep
 - spec/dummy/tmp/development_secret.txt
+- spec/helpers/redis_snippets/snippets_helper_spec.rb
+- spec/presenters/snippet_presenter_spec.rb
+- spec/presenters/snippet_presenter_transform_spec.rb
 - spec/rails_helper.rb
+- spec/services/snippet_finder_service_spec.rb
+- spec/services/snippet_store_service_spec.rb
 - spec/spec_helper.rb
 - spec/support/simplecov_setup.rb

data/spec/app/helpers/redis_snippets/snippets_helper_spec.rb

@@ -1,38 +0,0 @@
-require 'rails_helper'
-
-describe RedisSnippets::SnippetsHelper, type: :helper do
-  let(:code) { "<p>Buy this from Amazon.</p>" }
-  let(:view) { ActionController::Base.new.view_context }
-
-  describe "#snippet_has_content?" do
-    before do
-      SnippetStoreService.update(snippet_key(:advert_header), code)
-    end
-
-    it "returns true if there's content in the snippet" do
-      expect(snippet_has_content?(:advert_header)).to be true
-    end
-
-    it "returns false if there's no content in the snippet" do
-      expect(snippet_has_content?(:advert_footer)).to be false
-    end
-  end
-
-  describe "#snippet" do
-    before do
-      SnippetStoreService.update(snippet_key(:advert_header), code)
-    end
-
-    it "adds the snippet key as the class" do
-      expect(snippet(:advert_header)).to eq("<div class=\"snippet advert_header\"><p>Buy this from Amazon.</p></div>")
-    end
-
-    it "adds more classes from a string" do
-      expect(snippet(:advert_header, "advert-responsive")).to eq("<div class=\"snippet advert_header advert-responsive\"><p>Buy this from Amazon.</p></div>")
-    end
-
-    it "adds more classes from an array" do
-      expect(snippet(:advert_header, ["advert-responsive", "p-4"])).to eq("<div class=\"snippet advert_header advert-responsive p-4\"><p>Buy this from Amazon.</p></div>")
-    end
-  end
-end