pakyow-support 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9e987aa91d0a15f1c799ed5b41e37c6757f82f9920a5eee68b553a33c577eaa
-  data.tar.gz: d7691434abb486da61c6e65d7dee545e85195ed42dc1bcf7a6c9cd73e33c90d8
+  metadata.gz: 769e1cff2257abd2c9df32717dc5df46207bbb7e88a05daed9fb6a92e8ac7e42
+  data.tar.gz: 1df9a64688f38a9a8630797aea6a14cf81f0e89b3bcf0e00f900aae225055d63
 SHA512:
-  metadata.gz: 5e8da7fe59c931536d82635347db3ce54d05477f85ef03e8fbe48229222769a81c61be7337dcafdfa5691479ebec95f39f842d69b8e422fa4dd7081b50233a72
-  data.tar.gz: 7960b63c41ce6ecfd8f4b48465857d2ef9b8523ef41af356bfe353c8aa1d778582f537ac42ab70ab81f6c0e0d8b038af998d651684d9adda6d4372a0edaeda72
+  metadata.gz: d72b3bee48f8ae13b4534469352643e9e2aafe93ac3050d5e3a0639a1ea1fe228e0f0effd86698648b3a5ac798b612ec7d9316025ff38de8f66965099e070fc7
+  data.tar.gz: 2beac1964e1bf996902b9cf57b7293ea3203b2dcab8f352056d85305d77c7a56fb48cd619fd8ed490a55d89211d3fc1b6ee149a1d629aa5b9e5223eec2fcb15f

data/CHANGELOG.md

@@ -1,5 +1,34 @@
-# UNRELEASED
+# v1.0.2 (unreleased)
 
-# 1.0
+  * `fix` **Message verification no longer fails when the digest contains `--`.**
+
+    *Related links:*
+    - [Pull Request #316][pr-316]
+
+  * `fix` **Avoid including the initializer for configurable modules.**
+
+    *Related links:*
+    - [Pull Request #312][pr-312]
+
+  * `fix` **Methods defined an an app block are now defined in the correct context.**
+
+    *Related links:*
+    - [Commit 62112dc][62112dc]
+    - [Commit f7591d4][f7591d4]
+
+  * `fix` **Named actions can now share a name with a method on the pipelined object.**
+
+    *Related links:*
+    - [Pull Request #297][pr-297]
+    - [Commit fe1f554][fe1f554]
+
+[pr-316]: https://github.com/pakyow/pakyow/pull/316/commits
+[pr-312]: https://github.com/pakyow/pakyow/pull/312/commits
+[pr-297]: https://github.com/pakyow/pakyow/pull/297/commits
+[f7591d4]: https://github.com/pakyow/pakyow/commit/f7591d406fd87c04eee3ee036da6a780188971b6
+[62112dc]: https://github.com/pakyow/pakyow/commit/62112dc1396e397fda73e92df780c4358e28a3fa
+[fe1f554]: https://github.com/pakyow/pakyow/commit/fe1f554b56a4c22298f8c2b7809519a9b8eb220b
+
+# v1.0.0
 
   * Hello, Web

data/lib/pakyow/support/configurable.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "forwardable"
+
 require "concurrent/hash"
 
 require "pakyow/support/class_state"
@@ -46,7 +48,10 @@ module Pakyow
         base.class_state :__config, default: Config.new(base), inheritable: true
         base.class_state :__config_environments, default: Concurrent::Hash.new, inheritable: true
 
-        base.prepend Initializer
+        unless base.instance_of?(Module)
+          base.prepend Initializer
+        end
+
         base.include CommonMethods
         base.extend  ClassMethods, CommonMethods
       end

data/lib/pakyow/support/definable.rb

@@ -138,7 +138,7 @@ module Pakyow
         # Define state for the object.
         #
         def define(&block)
-          instance_eval(&block)
+          class_exec(&block)
         end
       end
 

data/lib/pakyow/support/dependencies.rb

@@ -6,21 +6,55 @@ module Pakyow
     module Dependencies
       extend self
 
-      LOCAL_FRAMEWORK_PATH = File.expand_path("../../../../../", __FILE__)
+      def self.bundler_gem_path
+        @bundler_gem_path ||= Bundler.bundle_path.to_s + "/bundler/gems"
+      end
+
+      def self.local_framework_path
+        @local_framework_path ||= File.expand_path("../../../../../", __FILE__)
+      end
+
+      def self.ruby_gem_path
+        @ruby_gem_path ||= File.join(Gem.dir, "/gems")
+      end
+
+      def self.regex_bundler
+        @regex_bundler ||= /^#{Dependencies.bundler_gem_path}\//
+      end
+
+      def self.regex_local_framework
+        @regex_local_framework ||= /^#{Dependencies.local_framework_path}\//
+      end
+
+      def self.regex_pakyow_lib
+        @regex_pakyow_lib ||= /^#{Pakyow.config.lib}\//
+      end
+
+      def self.regex_pakyow_root
+        @regex_pakyow_root ||= /^#{Pakyow.config.root}\//
+      end
+
+      def self.regex_ruby_gem
+        @regex_ruby_gem ||= /^#{Dependencies.ruby_gem_path}\//
+      end
+
+      def self.regex_ruby
+        @regex_ruby ||= /^#{RbConfig::CONFIG["libdir"]}\//
+      end
 
       def strip_path_prefix(line)
         if line.start_with?(Pakyow.config.root)
-          line.gsub(/^#{Pakyow.config.root}\//, "")
+          line.gsub(Dependencies.regex_pakyow_root, "")
         elsif line.start_with?(Pakyow.config.lib)
-          line.gsub(/^#{Pakyow.config.lib}\//, "")
-        elsif line.start_with?(Gem.default_dir)
-          line.gsub(/^#{Gem.default_dir}\/gems\//, "")
-        elsif line.start_with?(Bundler.bundle_path.to_s)
-          line.gsub(/^#{Bundler.bundle_path.to_s}\/gems\//, "")
+          line.gsub(Dependencies.regex_pakyow_lib, "")
+        elsif line.start_with?(Dependencies.ruby_gem_path)
+          line.gsub(Dependencies.regex_ruby_gem, "")
+        elsif line.start_with?(Dependencies.bundler_gem_path)
+          line.gsub(Dependencies.regex_bundler, "")
         elsif line.start_with?(RbConfig::CONFIG["libdir"])
-          line.gsub(/^#{RbConfig::CONFIG["libdir"]}\//, "")
-        elsif line.start_with?(LOCAL_FRAMEWORK_PATH)
-          line.gsub(/^#{LOCAL_FRAMEWORK_PATH}\//, "")
+          line.gsub(Dependencies.regex_ruby, "")
+        elsif line.start_with?(Dependencies.local_framework_path)
+          line.gsub(Dependencies.regex_local_framework, "")
         else
           line
         end
@@ -28,8 +62,10 @@ module Pakyow
 
       def library_name(line)
         case library_type(line)
-        when :gem, :bundler
+        when :gem
           strip_path_prefix(line).split("/")[0].split("-")[0..-2].join("-")
+        when :bundler
+          strip_path_prefix(line).split("/")[1]
         when :ruby
           "ruby"
         when :pakyow
@@ -42,13 +78,13 @@ module Pakyow
       end
 
       def library_type(line)
-        if line.start_with?(Gem.default_dir)
+        if line.start_with?(Dependencies.ruby_gem_path)
           :gem
-        elsif line.start_with?(Bundler.bundle_path.to_s)
+        elsif line.start_with?(Dependencies.bundler_gem_path)
           :bundler
         elsif line.start_with?(RbConfig::CONFIG["libdir"])
           :ruby
-        elsif line.start_with?(LOCAL_FRAMEWORK_PATH)
+        elsif line.start_with?(Dependencies.local_framework_path)
           :pakyow
         elsif line.start_with?(Pakyow.config.lib)
           :lib

data/lib/pakyow/support/message_verifier.rb

@@ -11,7 +11,7 @@ module Pakyow
     class MessageVerifier
       attr_reader :key
 
-      JOIN_CHARACTER = "--"
+      JOIN_CHARACTER = "~"
 
       # TODO: support configuring the digest
       # TODO: support rotations by calling `rotate` with options

data/lib/pakyow/support/pipeline.rb

@@ -307,7 +307,7 @@ module Pakyow
             else
               @block
             end
-          elsif @target.is_a?(Symbol) && context.respond_to?(@target, true)
+          elsif @target.is_a?(Symbol) && context.respond_to?(@target, true) && (options[0].nil? || !options[0].instance_methods(false).include?(:call))
             if context
               context.method(@target)
             else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-support
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,56 +30,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: pastel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: tty-command
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.1
 description: Supporting code for Pakyow
 email: bryan@bryanp.org
 executables: []