meddleware 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0197bd468d02ee66541d9ae7b369afc2ad0632cb6058cc3d8856a2b87f8ff897'
-  data.tar.gz: 4dab2733ff8907db8abbe3b3b11d45ba536d2bc76831d7128b68a4db5847900e
+  metadata.gz: 0c9a407cd470f194fda6286e743513706d094408be53bd75a31ebd14eef97fa2
+  data.tar.gz: 57243177c0047d94f58ca39eb3f9ceb6b9cdcb37aa204be3f2c511a934905e68
 SHA512:
-  metadata.gz: 305a9da953ca540f424296aca10836829cff777c39698b1938f998f7f425045cd3fb69fef9563a34579858e87b8fd38d02971a7fc72b1ef34df3b242f80d18f2
-  data.tar.gz: '08023838c15da52c5339ad7efeb6124eea151aa8d4ea334dd15b01f64c191ae8f4d4eaf01e7f9171a10606c368aa70a87c30ac297792d7c2e443dec575820b81'
+  metadata.gz: 52816fdea29cea1af9a32ce346079686fe75ced2ac34d4bf972afe174e7d74a7bd62cd1e0bac6aab6433eb3373c66772d373ed17778ee251857625e1d7368fde
+  data.tar.gz: e4eb77b1748be5c025b3be3bf3c049ed167e7cd7624deb1ef980542667b4eb556a60c40ee911ac805f2aaa7de01a0c199129f45edc3b6701dd589bb23130434f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+###  v0.4.0  (2024-04-05)
+- drop ruby 2.7
+- gem constraints
+- simplify codecov
+- drop rake
+- test coverage
+
 ###  v0.3.0  (2022-10-11)
 - extendable
 - drop ruby 2.5 (#4)

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gemspec
+

data/Gemfile.lock

@@ -0,0 +1,42 @@
+PATH
+  remote: .
+  specs:
+    meddleware (0.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    byebug (11.1.3)
+    diff-lcs (1.5.1)
+    docile (1.4.0)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug (>= 11)
+  meddleware!
+  rspec (>= 3.13)
+  simplecov (>= 0.22)
+
+BUNDLED WITH
+   2.5.7

data/README.md

@@ -1,5 +1,9 @@
 Meddleware
 ======
+![Gem](https://img.shields.io/gem/dt/meddleware?style=plastic)
+[![codecov](https://codecov.io/gh/dpep/meddleware_rb/branch/main/graph/badge.svg)](https://codecov.io/gh/dpep/meddleware_rb)
+
+
 A middleware framework to make meddling easy.  Middleware is a popular pattern from Rack and Rails, which provides callers a way to execute code before and after yours.  This gives callers the ability to modify parameters or results, conditionally skip execution, and log activity without the need to monkey patch or subclass.
 
 
@@ -139,8 +143,3 @@ Yes please  :)
 [@mperham](https://github.com/mperham) + [Sidekiq](https://github.com/mperham/sidekiq/blob/master/lib/sidekiq/middleware/chain.rb)
 
 [Rails](https://github.com/rails/rails/blob/main/actionpack/lib/action_dispatch/middleware/stack.rb)
-
-
-----
-![Gem](https://img.shields.io/gem/dt/meddleware?style=plastic)
-[![codecov](https://codecov.io/gh/dpep/meddleware_rb/branch/main/graph/badge.svg)](https://codecov.io/gh/dpep/meddleware_rb)

data/lib/meddleware/stack.rb

@@ -183,10 +183,5 @@ module Meddleware
         end
       end
     end
-
-    if RUBY_VERSION < '3'
-      require 'meddleware/v2_7'
-      prepend Meddleware::V2_7
-    end
   end
 end

data/lib/meddleware/version.rb

@@ -1,3 +1,3 @@
 module Meddleware
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/meddleware.gemspec

@@ -1,29 +1,19 @@
-package_name = File.basename(__FILE__).split(".")[0]
-load Dir.glob("lib/**/version.rb")[0]
-
+require_relative "lib/meddleware/version"
 package = Meddleware
 
-
 Gem::Specification.new do |s|
-  s.name        = package_name
+  s.name        = File.basename(__FILE__).split(".")[0]
   s.version     = package.const_get 'VERSION'
   s.authors     = ['Daniel Pepper']
   s.summary     = package.to_s
   s.description = 'A middleware framework to make meddling easy.'
-  s.homepage    = "https://github.com/dpep/#{package_name}_rb"
+  s.homepage    = "https://github.com/dpep/meddleware_rb"
   s.license     = 'MIT'
-  s.required_ruby_version = '>= 2.7'
+  s.files       = `git ls-files * ':!:spec'`.split("\n")
 
-  s.files       = Dir[
-    __FILE__,
-    'lib/**/*',
-    'CHANGELOG*',
-    'LICENSE*',
-    'README*',
-  ]
+  s.required_ruby_version = '>= 3'
 
-  s.add_development_dependency 'byebug'
-  s.add_development_dependency 'codecov'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'byebug', '>= 11'
+  s.add_development_dependency 'rspec', '>= 3.13'
+  s.add_development_dependency 'simplecov', '>= 0.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: meddleware
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Pepper
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -16,75 +16,62 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: codecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.22'
 description: A middleware framework to make meddling easy.
-email:
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - lib/meddleware.rb
 - lib/meddleware/stack.rb
-- lib/meddleware/v2_7.rb
 - lib/meddleware/version.rb
 - meddleware.gemspec
 homepage: https://github.com/dpep/meddleware_rb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -92,15 +79,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
-summary: Gem::Specification::Meddleware
+summary: Meddleware
 test_files: []

data/lib/meddleware/v2_7.rb

@@ -1,143 +0,0 @@
-# backwards compatible functionality for Ruby 2.7
-
-module Meddleware
-  module V2_7
-    def use(*klass_and_args, &block)
-      entry = create_entry(klass_and_args, block)
-      remove(entry[0])
-      stack << entry
-      self
-    end
-    alias append use
-
-    def prepend(*klass_and_args, &block)
-      entry = create_entry(klass_and_args, block)
-      remove(entry[0])
-      stack.insert(0, entry)
-      self
-    end
-
-    def after(after_klass, *klass_and_args, &block)
-      entry = create_entry(klass_and_args, block)
-      remove(entry[0])
-
-      i = if after_klass.is_a? Array
-        after_klass.map {|x| index(x) }.compact.max
-      else
-        index(after_klass)
-      end
-      i ||= count - 1 # last element
-
-      stack.insert(i + 1, entry)
-      self
-    end
-
-    def before(before_klass, *klass_and_args, &block)
-      entry = create_entry(klass_and_args, block)
-      remove(entry[0])
-
-      i = if before_klass.is_a? Array
-        before_klass.map {|x| index(x) }.compact.min
-      else
-        index(before_klass)
-      end
-      i ||= 0 # first element
-
-      stack.insert(i, entry)
-      self
-    end
-
-    def replace(old_klass, *klass_and_args, &block)
-      entry = create_entry(klass_and_args, block)
-      remove(entry[0])
-
-      i = index(old_klass)
-
-      unless i
-        raise RuntimeError, "middleware not present: #{old_klass}"
-      end
-
-      stack[i] = entry
-      self
-    end
-
-    def call(*args)
-      chain = build_chain
-      default_args = args
-
-      traverse = proc do |*args|
-        if args.empty?
-          args = default_args
-        else
-          default_args = args
-        end
-
-        if chain.empty?
-          yield(*args) if block_given?
-        else
-          middleware = chain.shift
-
-          if middleware.is_a?(Proc) && !middleware.lambda?
-            middleware.call(*args)
-
-            # implicit yield
-            traverse.call(*args)
-          else
-            middleware.call(*args, &traverse)
-          end
-        end
-      end
-      traverse.call(*args)
-    end
-
-
-    private
-
-    def create_entry(klass_and_args, block)
-      klass, *args = klass_and_args
-
-      if [ klass, block ].compact.count == 0
-        raise ArgumentError, 'either a middleware or block must be provided'
-      end
-
-      if klass
-        # validate
-        if klass.is_a? Class
-          unless klass.method_defined?(:call)
-            raise ArgumentError, "middleware must implement `.call`: #{klass}"
-          end
-        else
-          unless klass.respond_to?(:call)
-            raise ArgumentError, "middleware must respond to `.call`: #{klass}"
-          end
-
-          unless block.nil?
-            raise ArgumentError, 'can not supply middleware instance and block'
-          end
-        end
-
-        [ klass, args, block ].compact
-      else
-        [ block ]
-      end
-    end
-
-    def build_chain
-      # build the middleware stack
-      stack.map do |klass, args, block|
-        if klass.is_a? Class
-          klass.new(*args, &block)
-        else
-          if args.nil? || args.empty?
-            klass
-          else
-            # curry args
-            ->(*more_args, &block) do
-              klass.call(*args, *more_args, &block)
-            end
-          end
-        end
-      end
-    end
-  end
-end