Add support for Phlex 2, drop support for Phlex 1

Author: benpickles

.github/workflows/main.yml

@@ -9,9 +9,6 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.7'
-          - '3.0'
-          - '3.1'
           - '3.2'
           - '3.3'
           - '3.4'
@@ -31,5 +28,5 @@ jobs:
     - uses: ruby/setup-ruby@v1
       with:
         bundler-cache: true
-        ruby-version: '3.2'
+        ruby-version: '3.4'
     - run: bundle exec rubocop

.rubocop.yml

@@ -1,7 +1,7 @@
 AllCops:
   NewCops: enable
   SuggestExtensions: false
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.2
 
 Layout:
   Enabled: false

lib/phlex-sinatra.rb

@@ -21,11 +21,11 @@ def initialize(obj)
 
     module SGMLOverrides
       def helpers
-        @_view_context
+        context
       end
 
       def url(...)
-        helpers.url(...)
+        context.url(...)
       end
     end
 
@@ -51,10 +51,10 @@ def phlex(
 
       if stream
         self.stream do |out|
-          obj.call(out, view_context: self)
+          obj.call(out, context: self)
         end
       else
-        output = obj.call(view_context: self)
+        output = obj.call(context: self)
 
         if layout
           render(layout_engine, layout, { layout: false }) { output }

phlex-sinatra.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = 'A Phlex adapter for Sinatra'
   spec.homepage = 'https://github.com/benpickles/phlex-sinatra'
   spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.7' # Match Phlex.
+  spec.required_ruby_version = '>= 3.2' # Match Phlex.
 
   spec.metadata['changelog_uri'] = 'https://github.com/benpickles/phlex-sinatra/blob/main/CHANGELOG.md'
   spec.metadata['homepage_uri'] = spec.homepage
@@ -30,6 +30,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'phlex', '>= 1.7.0'
+  spec.add_dependency 'phlex', '>= 2'
   spec.add_dependency 'sinatra'
 end