camping 3.2.3 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f5615f332dcf7362345f6d628b4d9d90adf93862cecddce4168b6609e684b87
-  data.tar.gz: 0d6454ca641d2a2ff03d097c0c6b62df9971517ddde4b72fea2b18b108ca3f9a
+  metadata.gz: 6eb683f17e8a1026e536396b517135abfeae0597453b99202662a7ad92e055d5
+  data.tar.gz: 4f38e1736732750ff070e988863dd7de1410ec18e5f81a3176469ace840016d3
 SHA512:
-  metadata.gz: 57eeda38ff38008fe71e9437bbd0484582c06bacd2d75cadc77134ec5e7cbd216cbd2ac25723a493c6a06268e5739e9942fdfef084055960241bc4b9f0db908e
-  data.tar.gz: 19563aba78678ed871ee40cd004dbdfeff4039d30b515304dbeefc8bd33a070c0a982f8828ef4102f2fda8b441809b5457410a1ebf1241042e2164759db8812e
+  metadata.gz: d11e1328dd9c227b030bc5bf5594f5ce59b370ea850a2439d10c128cf472f7afc2b7f75bd8e49305b3944b2a28f128f6d719d936e3125249fb05376cdd60e70f
+  data.tar.gz: 6197f2e9a11a19a3f85a4b71c254ae055c85d61c98717d85aec5efb1d8005498750b68dd2291d284f454352ee10fa3b343dc05885232b6141996eab4cd4a851d

data/README.md

@@ -1,4 +1,4 @@
-![Build Status](https://github.com/camping/camping/actions/workflows/ruby.yml/badge.svg)
+![Build Status](https://github.com/camping/camping/actions/workflows/camping.yml/badge.svg) ![Build Status](https://github.com/camping/camping/actions/workflows/integration.yml/badge.svg)
 
 # Camping, a Microframework
 

data/Rakefile

@@ -86,22 +86,12 @@ Rake::TestTask.new(:reloader) do |t|
   t.test_files = FileList['test/reload_*.rb']
 end
 
-## Reloader Tests
+## Config Reloader Tests
 Rake::TestTask.new(:configreloader) do |t|
   t.libs << "test"
   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`
-  `gem install ../../#{gem}`
-  t.libs << "/"
-  t.test_files = FileList['test/test_*.rb']
-end
-
 ## Diff
 desc "Compare camping and camping-unabridged"
 task :diff do

data/lib/camping/version.rb

@@ -1,5 +1,5 @@
 module Camping
-  VERSION = "3.2"
+  VERSION = "3.2.4"
   def self.version
     VERSION
   end

data/lib/camping-unabridged.rb

@@ -945,7 +945,8 @@ module Camping
       # setup parental data
       a.set :_meta, H[file: fl, line_number: ln, parent: self, root: (name != "Cam\ping" ? '/' + CampTools.to_snake(name) : '/')]
 
-      # configure the app?
+      # configures the app, using the kuddly options and
+      # settings provided.
       C.configure(a)
     end
   end
@@ -1024,6 +1025,7 @@ module Camping
   pack Gear::Filters
   pack Gear::Nancy
   pack Gear::Kuddly
+  pack Gear::Firewatch
 
   C
 end

data/lib/camping.rb

@@ -74,8 +74,8 @@ k.send"#{i}=",v};k.service(*a)end
 def use*a,&b;m=a.shift.new(method(:call),*a,&b);meta_def(:call){|e|m.call(e)};m;end
 def pack*a,&b;G<< g=a.shift;include g;g.setup(self,*a,&b)end
 def gear;G end;def options;O;end;def set k,v;O[k]=v end
-def goes m,g=TOPLEVEL_BINDING;sp=caller[0].split('`')[0].split(":");fl,ln,pr=
-sp[0]+' <Cam\ping App> ',sp[1].to_i,nil;Apps<< a=eval(S.gsub(/Camping/,m.to_s),g,fl,1);caller[0]=~/:/
+def goes m,g=TOPLEVEL_BINDING;sp=caller[0].split('`')[0].split(":");fl,ln=
+sp[0]+' <Cam\ping App> ',sp[1].to_i;Apps<< a=eval(S.gsub(/Camping/,m.to_s),g,fl,1);caller[0]=~/:/
 IO.read(a.set:__FILE__,$`)=~/^__END__/&&(b=$'.split(/^@@\s*(.+?)\s*\r?\n/m)
 ).shift rescue nil;a.set :_t,H[*b||[]]
 a.set :_meta, H[file: fl, line_number: ln, parent: self,
@@ -83,4 +83,4 @@ root: (name != "Cam\ping" ? '/' + CampTools.to_snake(name) : '/')];C.configure(a
 module Views;include X,Helpers end;module Models
 Helpers.include(X,self) end;autoload:Mab,'camping/mab'
 autoload:Template,'camping/template';pack Gear::Inspection;pack Gear::Filters
-pack Gear::Nancy;pack Gear::Kuddly;C end
+pack Gear::Nancy;pack Gear::Kuddly;pack Gear::Firewatch;C end

data/test/app_camping_gear.rb

@@ -83,7 +83,7 @@ class Packing::Test < TestCase
 
   def test_gear_packed
     list = Packing::G
-    assert (list.length == 5), "Proper number of Gear was not packed! Gear: #{list.length}"
+    assert (list.length == 6), "Proper number of Gear was not packed! Gear: #{list.length}"
   end
 
   def test_right_gear_packed

data/test/integration/Gemfile

@@ -1,21 +1,18 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-gem 'camping'
-gem 'puma'
+gem 'bundler'
 gem 'rake'
+gem 'puma'
+gem "camping", :path => "../../"
 
 group :production do
   gem 'rack-ssl-enforcer'
 end
 
-group :development do
-end
-
 group :test do
   gem 'minitest', '~> 5.0'
   gem 'minitest-reporters'
   gem 'rack-test'
   gem 'minitest-hooks'
 end
-

data/test/integration/Rakefile

@@ -14,3 +14,31 @@ namespace 'test' do
     t.test_files = FileList['test/test_*.rb']
   end
 end
+
+# def delete_file(filename="")
+#   return if !File.exist? filename
+#   begin
+#     f = File.open(filename, 'r')
+#   ensure
+#     f.close unless f.nil? or f.closed?
+#     File.delete(filename) if File.exist? filename
+#   end
+# end
+
+## Integration Test
+# desc "Perform an integration test"
+# task :integration do
+  # `bundle install` # remove gems
+  # `bundle clean --force` # remove gems
+  # puts Dir.pwd
+  # # `gem install` # add bundler.
+  # `bundle install` # rewrites Gemfile.lock
+  # `bundle add camping --path=../../`
+  # # `bundle add camping puma`
+  # # `bundle add minitest -g=test`
+  # # `bundle add minitest-reporters -g=test`
+  # # `bundle add rack-test -g=test`
+  # # `bundle add minitest-hooks -g=test`
+  # # t.libs << "/"
+  # # t.test_files = FileList['test/test_*.rb']
+# end

data/test/integration/test/test_helper.rb

@@ -13,7 +13,7 @@ require 'rack/test'
 require "minitest/reporters"
 Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]
 
-class TestCase < MiniTest::Test
+class TestCase < Minitest::Test
   include Rack::Test::Methods
 
   def self.inherited(mod)
@@ -53,4 +53,3 @@ class TestCase < MiniTest::Test
   def test_silly; end
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camping
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.2.4
 platform: ruby
 authors:
 - why the lucky stiff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-10 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -287,12 +287,10 @@ files:
 - test/config_reloader.rb
 - test/gear/gear_nancy.rb
 - test/integration/Gemfile
-- test/integration/Gemfile.lock
 - test/integration/README.md
 - test/integration/Rakefile
 - test/integration/camp.rb
 - test/integration/config.kdl
-- test/integration/test/test_helper.r
 - test/integration/test/test_helper.rb
 - test/reload_reloader.rb
 - test/test_helper.rb
@@ -323,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: miniature rails for anyone

data/test/integration/Gemfile.lock

@@ -1,95 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ansi (1.5.0)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
-    builder (3.3.0)
-    camping (3.2.2)
-      dry-logger (~> 1.0.4)
-      kdl (~> 1.0, >= 1.0.5)
-      listen (~> 3.9.0, >= 3.9.0)
-      mab (~> 0.0, >= 0.0.3)
-      rack (~> 3.0, >= 3.0.4.1)
-      rack-session (~> 2.0, >= 2.0.0)
-      rackup (~> 2.1.0)
-      rake (~> 13.2.1)
-      tilt (~> 2.3.0)
-      zeitwerk (~> 2.6.15, >= 2.6.15)
-    dry-logger (1.0.4)
-    ffi (1.17.0)
-    ffi (1.17.0-aarch64-linux-gnu)
-    ffi (1.17.0-aarch64-linux-musl)
-    ffi (1.17.0-arm-linux-gnu)
-    ffi (1.17.0-arm-linux-musl)
-    ffi (1.17.0-arm64-darwin)
-    ffi (1.17.0-x86-linux-gnu)
-    ffi (1.17.0-x86-linux-musl)
-    ffi (1.17.0-x86_64-darwin)
-    ffi (1.17.0-x86_64-linux-gnu)
-    ffi (1.17.0-x86_64-linux-musl)
-    kdl (1.0.5)
-      base64 (~> 0.2.0)
-      bigdecimal (~> 3.1.6)
-      racc (~> 1.5)
-      simpleidn (~> 0.2.1)
-    listen (3.9.0)
-      rb-fsevent (~> 0.10, >= 0.10.3)
-      rb-inotify (~> 0.9, >= 0.9.10)
-    mab (0.0.3)
-    minitest (5.23.1)
-    minitest-hooks (1.5.1)
-      minitest (> 5.3)
-    minitest-reporters (1.6.1)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    nio4r (2.7.3)
-    puma (6.4.2)
-      nio4r (~> 2.0)
-    racc (1.8.0)
-    rack (3.0.11)
-    rack-session (2.0.0)
-      rack (>= 3.0.0)
-    rack-ssl-enforcer (0.2.9)
-    rack-test (2.1.0)
-      rack (>= 1.3)
-    rackup (2.1.0)
-      rack (>= 3)
-      webrick (~> 1.8)
-    rake (13.2.1)
-    rb-fsevent (0.11.2)
-    rb-inotify (0.11.1)
-      ffi (~> 1.0)
-    ruby-progressbar (1.13.0)
-    simpleidn (0.2.3)
-    tilt (2.3.0)
-    webrick (1.8.1)
-    zeitwerk (2.6.15)
-
-PLATFORMS
-  aarch64-linux-gnu
-  aarch64-linux-musl
-  arm-linux-gnu
-  arm-linux-musl
-  arm64-darwin
-  ruby
-  x86-linux-gnu
-  x86-linux-musl
-  x86_64-darwin
-  x86_64-linux-gnu
-  x86_64-linux-musl
-
-DEPENDENCIES
-  camping
-  minitest (~> 5.0)
-  minitest-hooks
-  minitest-reporters
-  puma
-  rack-ssl-enforcer
-  rack-test
-  rake
-
-BUNDLED WITH
-   2.5.11

data/test/integration/test/test_helper.r

@@ -1,64 +0,0 @@
-# Test Helper
-$:.unshift File.dirname(__FILE__) + '/../'
-
-begin
-  require 'rubygems'
-rescue LoadError
-end
-
-require 'minitest/autorun'
-require 'rack/test'
-require 'minitest/reporters'
-require 'minitest/hooks'
-Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]
-
-# Default TestCase with some helpers.
-# The same stuff we use for Camping itself.
-class TestCase < MiniTest::Test
-  include Rack::Test::Methods
-  include Minitest::Hooks
-
-  def self.inherited(mod)
-    mod.app = Object.const_get(mod.to_s[/w+/])
-    super
-  end
-
-  class << self
-    attr_accessor :app
-  end
-
-  def setup
-    super
-    Camping.make_camp
-  end
-
-  def body() last_response.body end
-  def app()  self.class.app     end
-
-  def response_body() last_response.to_a end
-
-  def assert_reverse
-    begin
-      yield
-    rescue Exception
-    else
-      assert false, "Block didn't fail"
-    end
-  end
-
-  def assert_body(str, message="")
-    case str
-    when Regexp
-      assert_match(str, last_response.body.strip, message)
-    else
-      assert_equal(str.to_s, last_response.body.strip, message)
-    end
-  end
-
-  def assert_status(code, message="")
-    assert_equal(code, last_response.status, message)
-  end
-
-  def test_silly; end
-end
-