camping 3.2.0 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be886915ade584cc08bca9944defc3985ff28fb9c67ea4bff803f4f5ad5c3b6a
-  data.tar.gz: 1d0919e7257a74b7c84cb38253fbfdcee3db82f2af4c9c525db735c93cc817ff
+  metadata.gz: e8f510e735548917a248d02aec9a7a36f21c3c527919799c23dc32c2c717396d
+  data.tar.gz: 2535878776ceb1093fd24b621db216ae5917addd76a9bc0f7f8fff33abc6f4e6
 SHA512:
-  metadata.gz: 6f59a0936824edc6d51bbb6063e839d747bba292a58f022fe539fdc9c66de660065bc84050c26829fbc3497b50394c66a34db67f96025eeb4213c624c1de6bca
-  data.tar.gz: 143a53c658cefb5f6cc5d6195aa9096c4c26a1a5581725474bc20a3945179021fb8d817f4194391060860c033d1146476d550a52512a45a47df7824006c3f879
+  metadata.gz: 99b49c530feed07ee899e83d1e442b708cb44e383d8e23437896cbeea0ed945b0500edd794bd887b2d59a9be957b13556d61600d6c2d38a0389625dd1b2c6222
+  data.tar.gz: 1eb83d984b72e38e5a475555dd80503fbf9dcd2ca43ca6770e1b744f4f41b360698432f08c35162bc4ff422f249813a705f93e0b00a471181ba7e73b9fb74905

data/Rakefile

@@ -92,6 +92,15 @@ Rake::TestTask.new(:configreloader) do |t|
   t.test_files = FileList['test/config_*.rb']
 end
 
+Rake::TestTask.new(:integration) do |t|
+  `gem build`
+  gem = Dir.glob("camping*.gem").first
+  exit if gem == nil
+  `cd test/integration`
+  t.libs << "/"
+  t.test_files = FileList['test/test_*.rb']
+end
+
 ## Diff
 desc "Compare camping and camping-unabridged"
 task :diff do

data/lib/camping/gear/firewatch.rb

@@ -30,7 +30,12 @@ module Camping
     # If +logger+ is nil, Firewatch(CommonLogger) will fall back <tt>env['rack.errors']</tt>.
     def initialize(app, logger = nil)
       @app = app
-      @logger = Camping::Firewatch.logger = logger.nil? ? Camping::Firewatch.default_logger : logger
+      if logger == nil
+        @logger = Camping::Firewatch.default_logger
+      else
+        @logger = logger
+      end
+      # @logger = Camping::Firewatch.logger = logger.nil? ? Camping::Firewatch.default_logger : logger
     end
 
   end

data/lib/camping/server.rb

@@ -3,7 +3,7 @@ require 'erb'
 require 'rack'
 require 'rackup'
 require 'camping/version'
-require 'camping/firewatch'
+require 'camping/gear/firewatch'
 require 'camping/loader'
 require 'camping/commands'
 
@@ -111,13 +111,16 @@ module Camping
     # redefine logging middleware
     class << self
       def logging_middleware
-        @logger ||= Camping::Firewatch.logger
+        lambda { |server|
+          /CGI/.match?(server.server.name) || server.options[:quiet] ?  nil : [Camping::Firewatch, $stderr]
+        }
       end
     end
 
     def middleware
       h = super
       h["development"] << [XSendfile]
+      h["deployment"] << [XSendfile]
       h
     end
 
@@ -125,7 +128,6 @@ module Camping
     # referencing their documentation would be a good idea.
     # @file: String, file location for a camp.rb file.
     def start(file = nil)
-
       commands = ARGV
 
       # Parse commands
@@ -143,8 +145,6 @@ module Camping
       @reloader.reload!
       r = @reloader
 
-      logger = r.apps.first.options[:logger]
-
       if options[:routes] == true
         eval("self", TOPLEVEL_BINDING).meta_def(:reload!) { r.reload!; nil }
         ARGV.clear
@@ -161,7 +161,7 @@ module Camping
       else
         name = server.name[/\w+$/]
         puts "** Starting #{name} on #{options[:Host]}:#{options[:Port]}"
-        super
+        super()
       end
     end
 

data/lib/camping-unabridged.rb

@@ -768,11 +768,11 @@ module Camping
     #   end
     #
     # This piece of code feels a bit confusing, but let's walk through it.
-    # Rack apps all implement a Call method. This is how Rub web servers
-    # pass call the app, or code that you're set up. In our case, our camping
+    # Rack apps all implement a Call method. This is how Ruby web servers
+    # call the app, or code that you've set up. In our case, our camping
     # apps.
     #
-    # The Use method is setting up a new middleware, it first shifts the first
+    # The Use method is setting up a new middleware, it shifts the first
     # argument supplied to Use, which should be the Middleware name, then
     # initializes it. That's your new middleware. Rack based middleware accept
     # a single argument to their initialize methods, which is an app. Optionally
@@ -828,6 +828,22 @@ module Camping
     #     end
     #   end
     #
+    # Camping gear can also provide Helper methods to our controllers:
+    #
+    #   module MyGear
+    #     module HelperMethods
+    #       # Define Helper Methods here
+    #     end
+    #
+    #     # This is plumbing in our Gear to add our Helper methods.
+    #     class << self
+    #       def included(mod)
+    #         mod::Helpers.include(HelperMethods)
+    #       end
+    #     end
+    #   end
+    #
+    # Helper methods are available in our controllers.
     def pack(*a, &b)
       G << g = a.shift
       include g
@@ -868,7 +884,7 @@ module Camping
     # which enables you to create a Camping-based application within
     # another module.
     #
-    # Here's an example of namespacing your web interface and
+    # Here's an example of name spacing your web interface and
     # code for a worker process together:
     #
     #   module YourApplication

data/test/app_logger.rb

@@ -13,6 +13,7 @@ module Loggy::Controllers
       log.debug("Created Logger")
       log.info("Program Started")
       log.warn("Nothing to do!")
+      log "what up"
     end
   end
 end
@@ -50,14 +51,14 @@ class Loggy::Test < TestCase
   end
 
   def test_change_log_location
-    Camping::Firewatch.logger = Dry.Logger(:Camping, template: Camping::Firewatch.default_template).add_backend(stream: "logs/production.log")
+    Camping::Firewatch.logger = Dry.Logger(:Camping, template: Camping::Firewatch::default_template).add_backend(stream: "logs/production.log")
     puts Camping::Firewatch.logger
     get '/'
     lags = File.read Dir["./**/logs/production.log"].first
     assert(/(INFO).*Program Started$/.match?(lags), "Log level of INFO not found.")
 
     # the end of the test means we set it back.
-    Camping::Firewatch.logger = Dry.Logger(:Camping, template: Camping::Firewatch.default_template).add_backend(stream: "logs/development.log")
+    Camping::Firewatch.logger = Dry.Logger(:Camping, template: Camping::Firewatch::default_template).add_backend(stream: "logs/development.log")
   end
 
   # def test_changing_loggging_formatter

data/test/test_helper.rb

@@ -121,7 +121,7 @@ TXT
 
 end
 
-class TestCase < MiniTest::Test
+class TestCase < Minitest::Test
   include Rack::Test::Methods
   include CommandLineCommands
   include Minitest::Hooks

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: camping
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.2
 platform: ruby
 authors:
 - why the lucky stiff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.2.1
 - !ruby/object:Gem::Dependency
   name: mab
   requirement: !ruby/object:Gem::Requirement
@@ -30,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +121,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -103,47 +131,61 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.8
+        version: 2.6.15
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.8
+        version: 2.6.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.8
+        version: 2.6.15
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.8
+        version: 2.6.15
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: dry-logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 description:
 email: why@ruby-lang.org
 executables:
@@ -272,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: miniature rails for anyone