pretty_feed 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9092c93db2f35d0d54b1194e6044e7183b37af1faca2a10eab4b2b5ba81c38e8
-  data.tar.gz: 74d467066d0c10d78ad82f10dc1a74d7e90a4da6b716541aed106d60304d9d48
+  metadata.gz: 17c30588dd58871f5a984e967e4e808d52da0acabebdf584a26c2dae1b347949
+  data.tar.gz: a1f8d1b0a9a535c479db007b81df251a480f231a7b8748cf565a57b31f36cbb0
 SHA512:
-  metadata.gz: 4a828968a0a4525a47c631c73fa10c18be3a4f912f47089d0b66e4aa136909e74bc80cf777bffa3ed5de0330a37ba2481e9856218eef5764dae866f0546c30b1
-  data.tar.gz: 223a4bcfc83f2ee7b39fd31b8504770bea3fc34db2f908121884ec805645831a05ab6a5b4222b58827ced389f36286ea6438568e776499ed70f05b3afc4685f6
+  metadata.gz: 15ed9ff39b39eec2cd158cdd4812e771b125ed07cb2c380b92063db59bc37f9600c7e85598b85a54c22478afa843574744020997647242fac4685753013eea7c
+  data.tar.gz: d399c722f2e9c964e7214e3cb519be946ca14625e23c6098bb73e2d51f56e27ac8cc25317286a0f3d7cdbdd7c53e84b1d4fcd2bc317f939015d4a6b7f5f4bf2d

data/README.md

@@ -22,9 +22,9 @@ If bundler is not being used to manage dependencies, install the gem by executin
 namespace :scrub do
     task :blurb => :environment do |_t, _args|
         include PrettyFeed::PfTf.new(truthy: 'green', falsey: 'blue')
-        pf("this will be green", true)
+        pftf("this will be green", true)
         # => "this will be green" # in the console
-        pf("this will be blue", false)
+        pftf("this will be blue", false)
         # => "this will be blue" # in the console
     end
 end
@@ -36,7 +36,7 @@ Instead of passing truthy or falsey values, you can pass a proc that will be eva
 namespace :scrub do
     task :blurb => :environment do |_t, someth|
         include PrettyFeed::PfTf.new(truthy: 'green', falsey: 'blue')
-        pf("might be green or blue", someth, ->(a) { a })
+        pftf("might be green or blue", someth, ->(a) { a })
         # => the color will depend on what someth is and how the proc evaluates it.
     end
 end

data/lib/pretty_feed/compat.rb

@@ -3,24 +3,26 @@
 module PrettyFeed
   # Provide compatibility with Polluted and Unpolluted Strings
   module Compat
-    module_function
-
     define_method(:[]) do |str, color|
-      if defined?(ColorizedString)
-        ColorizedString[str]
-      elsif str.respond_to?(color.to_sym)
-        str
-      else
-        mod = Module.new do
-          define_method(color.to_sym) do
-            warn "String '#{self}' doesn't respond to #{color}"
-            self
-          end
-        end
+      return ColorizedString[str] if defined?(ColorizedString)
+      return str if str.respond_to?(color.to_sym)
+
+      dstr = str.dup
+      dstr.singleton_class.send(:include, color_stub(str, color))
+      dstr
+    end
+    module_function :[]
+
+    private
 
-        str.singleton_class.send(:include, mod)
-        str
+    def color_stub(str, color)
+      Module.new do
+        define_method(color.to_sym) do
+          warn "Adding stub for missing '#{str}'.#{color}"
+          self
+        end
       end
     end
+    module_function :color_stub
   end
 end

data/lib/pretty_feed/pf_tf.rb

@@ -8,9 +8,9 @@ module PrettyFeed
   #   namespace :scrub do
   #     task :blurb => :environment do |_t, args|
   #       include PrettyFeed::PfTf.new(truthy: 'green', falsey: 'blue')
-  #       pf("this will be green", true)
+  #       pftf("this will be green", true)
   #       # => "this will be green" # but in green
-  #       pf("this will be blue", false)
+  #       pftf("this will be blue", false)
   #       # => "this will be blue" # but in blue
   #     end
   #   end

data/lib/pretty_feed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PrettyFeed
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/pretty_feed/pf_tf_spec.rb

@@ -2,77 +2,80 @@
 
 RSpec.describe PrettyFeed::PfTf do
   subject(:pftfer) { ExamplePfff.new }
+  let(:caught) { COMPAT_LIB.nil? ? :stderr : :stdout }
+  let(:str) { "pear: " }
+  let(:truthy_value) { :cake }
+  let(:falsey_value) { false }
+  let(:color_open) { Regexp.escape("\e[") }
+  let(:color_close) { Regexp.escape("\e[0m\n") }
+  let(:falsey_out) { capture(caught) { pftfer.pftf(str, falsey_value) } }
+  let(:truthy_out) { capture(caught) { pftfer.pftf(str, truthy_value) } }
+  let(:falsey_out_proc) { capture(caught) { pftfer.pftf(str, falsey_value, ->(a) { a }) } }
+  let(:truthy_out_proc) { capture(caught) { pftfer.pftf(str, truthy_value, ->(a) { !a.nil? }) } }
+  let(:truthy_color) { :green }
+  let(:falsey_color) { :red }
+
   shared_examples_for "ptft call" do
     it "#pftf returns nil when truthy" do
-      expect(pftfer.pftf("hi: ", true)).to be_nil
+      expect(pftfer.pftf(str, truthy_value)).to be_nil
+    end
+    it "#pftf returns nil when proc is truthy" do
+      expect(pftfer.pftf(str, truthy_value, ->(a) { !a.nil? })).to be_nil
     end
     it "#pftf returns nil when falsey" do
-      expect(pftfer.pftf("hi: ", false)).to be_nil
+      expect(pftfer.pftf(str, falsey_value)).to be_nil
+    end
+    it "#pftf returns nil when proc is falsey" do
+      expect(pftfer.pftf(str, falsey_value, ->(a) { !a })).to be_nil
     end
     it "#pftf includes prefix when truthy" do
-      str = "hi: "
-      output = capture(:stdout) { pftfer.pftf(str, true) }
-      expect(output).to match(str)
+      expect(truthy_out).to match("#{str}#{truthy_value}")
+    end
+    it "#pftf includes prefix when proc is truthy" do
+      expect(truthy_out_proc).to match("#{str}#{truthy_value}")
     end
     it "#pftf includes prefix when falsey" do
-      str = "hi: "
-      output = capture(:stdout) { pftfer.pftf(str, false) }
-      expect(output).to match(str)
+      expect(falsey_out).to match("#{str}#{falsey_value}")
     end
-  end
-
-  it_behaves_like "ptft call"
-  it "#pftf has output when falsey" do
-    if COMPAT_LIB.nil?
-      output = capture(:stderr) { pftfer.pftf("hi: ", false) }
-      expect(output).to eq("String 'hi: false' doesn't respond to red\n")
-    elsif COMPAT_LIB == :cs
-      output = capture(:stdout) { pftfer.pftf("hi: ", false) }
-      expect(output).to eq("\e[0;31;49mhi: false\e[0m\n")
-    else
-      output = capture(:stdout) { pftfer.pftf("hi: ", false) }
-      expect(output).to eq("\e[1;31mhi: false\e[0m\n")
+    it "#pftf includes prefix when proc is falsey" do
+      expect(falsey_out_proc).to match("#{str}#{falsey_value}")
     end
-  end
-  it "#pftf has output when truthy" do
-    if COMPAT_LIB.nil?
-      output = capture(:stderr) { pftfer.pftf("hi: ", true) }
-      expect(output).to eq("String 'hi: true' doesn't respond to green\n")
-    elsif COMPAT_LIB == :cs
-      output = capture(:stdout) { pftfer.pftf("hi: ", true) }
-      expect(output).to eq("\e[0;32;49mhi: true\e[0m\n")
-    else
-      output = capture(:stdout) { pftfer.pftf("hi: ", true) }
-      expect(output).to eq("\e[1;32mhi: true\e[0m\n")
-    end
-  end
-
-  context "when custom color" do
-    subject(:pftfer) { ExamplePfffColors.new }
-    it_behaves_like "ptft call"
     it "#pftf has output when falsey" do
       if COMPAT_LIB.nil?
-        output = capture(:stderr) { pftfer.pftf("hi: ", false) }
-        expect(output).to eq("String 'hi: false' doesn't respond to yellow\n")
-      elsif COMPAT_LIB == :cs
-        output = capture(:stdout) { pftfer.pftf("hi: ", false) }
-        expect(output).to eq("\e[0;33;49mhi: false\e[0m\n")
+        expect(falsey_out).to eq("Adding stub for missing '#{str}#{falsey_value}'.#{falsey_color}\n")
       else
-        output = capture(:stdout) { pftfer.pftf("hi: ", false) }
-        expect(output).to eq("\e[1;33mhi: false\e[0m\n")
+        expect(falsey_out).to match(/#{color_open}.*\d{2}m#{Regexp.escape(str.to_s)}#{Regexp.escape(falsey_value.to_s)}#{color_close}/)
+      end
+    end
+    it "#pftf has output when falsey proc" do
+      if COMPAT_LIB.nil?
+        expect(falsey_out_proc).to eq("Adding stub for missing '#{str}#{falsey_value}'.#{falsey_color}\n")
+      else
+        expect(falsey_out_proc).to match(/#{color_open}.*\d{2}m#{Regexp.escape(str.to_s)}#{Regexp.escape(falsey_value.to_s)}#{color_close}/)
       end
     end
     it "#pftf has output when truthy" do
       if COMPAT_LIB.nil?
-        output = capture(:stderr) { pftfer.pftf("hi: ", true) }
-        expect(output).to eq("String 'hi: true' doesn't respond to cyan\n")
-      elsif COMPAT_LIB == :cs
-        output = capture(:stdout) { pftfer.pftf("hi: ", true) }
-        expect(output).to eq("\e[0;36;49mhi: true\e[0m\n")
+        expect(truthy_out).to eq("Adding stub for missing '#{str}#{truthy_value}'.#{truthy_color}\n")
+      else
+        expect(truthy_out).to match(/#{color_open}.*\d{2}m#{Regexp.escape(str.to_s)}#{Regexp.escape(truthy_value.to_s)}#{color_close}/)
+      end
+    end
+    it "#pftf has output when truthy proc" do
+      if COMPAT_LIB.nil?
+        expect(truthy_out_proc).to eq("Adding stub for missing '#{str}#{truthy_value}'.#{truthy_color}\n")
       else
-        output = capture(:stdout) { pftfer.pftf("hi: ", true) }
-        expect(output).to eq("\e[1;35mhi: true\e[0m\n")
+        expect(truthy_out_proc).to match(/#{color_open}.*\d{2}m#{Regexp.escape(str.to_s)}#{Regexp.escape(truthy_value.to_s)}#{color_close}/)
       end
     end
   end
+
+  it_behaves_like "ptft call"
+
+  context "when custom color" do
+    subject(:pftfer) { ExamplePfffColors.new }
+    let(:truthy_color) { :cyan }
+    let(:falsey_color) { :yellow }
+    it_behaves_like "ptft call"
+  end
 end

data/spec/spec_helper.rb

@@ -20,12 +20,16 @@ end
 
 COMPAT_LIB = compat_lib
 DEBUG = ENV["DEBUG"] == "true"
-RUN_COVERAGE = ENV["CI_CODECOV"] || ENV["CI"].nil?
 
 ruby_version = Gem::Version.new(RUBY_VERSION)
 minimum_version = ->(version, engine = "ruby") { ruby_version >= Gem::Version.new(version) && RUBY_ENGINE == engine }
-coverage = minimum_version.call("2.7") && RUN_COVERAGE
+actual_version = lambda do |major, minor|
+  actual = Gem::Version.new(ruby_version)
+  major == actual.segments[0] && minor == actual.segments[1] && RUBY_ENGINE == "ruby"
+end
 debugging = minimum_version.call("2.7") && DEBUG
+RUN_COVERAGE = minimum_version.call("2.6") && (ENV["COVER_ALL"] || ENV["CI_CODECOV"] || ENV["CI"].nil?)
+ALL_FORMATTERS = actual_version.call(2, 7) && (ENV["COVER_ALL"] || ENV["CI_CODECOV"] || ENV["CI"])
 
 if DEBUG
   if debugging
@@ -35,7 +39,7 @@ if DEBUG
   end
 end
 
-require "simplecov" if coverage
+require "simplecov" if RUN_COVERAGE
 
 # This gem
 require "pretty_feed"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pretty_feed
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Peter Boling
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,10 +126,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/pboling/pretty_feed
-  source_code_uri: https://github.com/pboling/pretty_feed/tree/v0.1.0
-  changelog_uri: https://github.com/pboling/pretty_feed/blob/v0.1.0/CHANGELOG.md
+  source_code_uri: https://github.com/pboling/pretty_feed/tree/v0.1.1
+  changelog_uri: https://github.com/pboling/pretty_feed/blob/v0.1.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/pboling/pretty_feed/issues
-  documentation_uri: https://www.rubydoc.info/gems/pretty_feed/0.1.0
+  documentation_uri: https://www.rubydoc.info/gems/pretty_feed/0.1.1
   wiki_uri: https://github.com/pboling/pretty_feed/wiki
   rubygems_mfa_required: 'true'
 post_install_message: