camping 3.2.2 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f510e735548917a248d02aec9a7a36f21c3c527919799c23dc32c2c717396d
-  data.tar.gz: 2535878776ceb1093fd24b621db216ae5917addd76a9bc0f7f8fff33abc6f4e6
+  metadata.gz: 6eb683f17e8a1026e536396b517135abfeae0597453b99202662a7ad92e055d5
+  data.tar.gz: 4f38e1736732750ff070e988863dd7de1410ec18e5f81a3176469ace840016d3
 SHA512:
-  metadata.gz: 99b49c530feed07ee899e83d1e442b708cb44e383d8e23437896cbeea0ed945b0500edd794bd887b2d59a9be957b13556d61600d6c2d38a0389625dd1b2c6222
-  data.tar.gz: 1eb83d984b72e38e5a475555dd80503fbf9dcd2ca43ca6770e1b744f4f41b360698432f08c35162bc4ff422f249813a705f93e0b00a471181ba7e73b9fb74905
+  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,21 +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`
-  t.libs << "/"
-  t.test_files = FileList['test/test_*.rb']
-end
-
 ## Diff
 desc "Compare camping and camping-unabridged"
 task :diff do

data/lib/camping/commands.rb

@@ -240,76 +240,6 @@ namespace 'test' do
     t.test_files = FileList['test/test_*.rb']
   end
 end
-TXT
-      end
-
-      # writes a test_helper
-      def make_test_helper
-        write 'test/test_helper.r', <<-TXT
-# 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
-
 TXT
       end
 
@@ -383,7 +313,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)
@@ -460,7 +390,6 @@ RUBY
         Generators::make_readme()
         Generators::make_public_folder()
         Generators::make_test_folder()
-        Generators::make_test_helper()
 
         # optionally add omnibus support
           # add src/ folder

data/lib/camping/gear/kuddly.rb

@@ -147,7 +147,7 @@ module Gear
       # Then parses it, and merges the data based on the current environment.
       def get_config(provided_config_file = nil)
 
-        config_file, kdl_doc, merged_configs = provided_config_file, nil, {}
+        config_file, merged_configs = provided_config_file, {}
         config_file = get_root_config_file() unless provided_config_file != nil
 
         # If the config file is just nil then we probably don't have one.

data/lib/camping/gear/nancy.rb

@@ -32,7 +32,7 @@ module Gear
 				rs.chop!
 
 				symbol = s.to_sym
-				{s: s, rs: rs, symbol: symbol}
+				{rs: rs, symbol: symbol}
 			end
 
 			# ensures an app exists for the controllers.
@@ -64,7 +64,7 @@ module Gear
 
 				meth = method.to_s
 
-				self.normalize_routes(routes) => {s:, rs:, symbol:}
+				self.normalize_routes(routes) => {rs:, symbol:}
 
 				m = self.ensure_app app
 

data/lib/camping/tools.rb

@@ -39,5 +39,4 @@ module Camping
   end
 end
 
-🏕 = Camping::Tools
-CampTools = Camping::Tools
+CampTools = 🏕 = Camping::Tools

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

@@ -932,7 +932,7 @@ module Camping
 
       # setup caller data
       sp = caller[0].split('`')[0].split(":")
-      fl, ln, pr = sp[0]+' <Cam\ping App> ' , sp[1].to_i, nil
+      fl, ln = sp[0]+' <Cam\ping App> ', sp[1].to_i
 
       # Create the app
       Apps << a = eval(S.gsub(/Camping/,m.to_s), g, fl, 1)
@@ -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

@@ -27,7 +27,7 @@ def render v,*a,&b;if t=lookup(v);r=@_r;@_r=o=Hash===a[-1]?a.pop: {};s=(t==true)
 send v,*a,&b}: t.render(self,o[:locals]||{},&b);s=render(L,o.merge(L=>false)){s
 } if o[L] or o[L].nil?&&lookup(L)&&!r&&v.to_s[0]!=?_;s else raise "no template: #{v}"
 end end
-def mab &b;extend Mab;mab &b;end
+def mab(&b)extend Mab;mab(&b)end
 def r s,b,h={};b,h=h,b if Hash===b;@status=s;@headers.merge!(h);@body=b end
 def redirect *a;r 302,'','Location'=>URL(*a).to_s;end
 def r404 p;P%"#{p} not found"end
@@ -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

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

data/test/integration/README.md

@@ -0,0 +1,7 @@
+# Camping
+Camping is really fun and I hope you enjoy it.
+
+Start camping by running: `camping` in the root directory.
+
+To start Camping in development mode run: `camping -e development
+

data/test/integration/Rakefile

@@ -0,0 +1,44 @@
+# Rakefile
+require 'rake'
+require 'rake/clean'
+require 'rake/testtask'
+require 'tempfile'
+require 'open3'
+
+task :default => :test
+task :test => 'test:all'
+
+namespace 'test' do
+  Rake::TestTask.new('all') do |t|
+    t.libs << 'test'
+    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/camp.rb

@@ -0,0 +1,47 @@
+require 'camping'
+
+Camping.goes :Dummy
+
+module Dummy
+  module Models
+  end
+
+  module Controllers
+    class Index
+      def get
+        @title = "Dummy"
+        render :index
+      end
+    end
+  end
+
+  module Helpers
+  end
+
+  module Views
+
+    def layout
+      html do
+        head do
+          title 'Dummy'
+          link :rel => 'stylesheet', :type => 'text/css',
+          :href => '/styles.css', :media => 'screen'
+        end
+        body do
+          h1 'Dummy'
+
+          div.wrapper! do
+            self << yield
+          end
+        end
+      end
+    end
+
+    def index
+      h2 "Let's go Camping"
+    end
+
+  end
+
+end
+

data/test/integration/config.kdl

@@ -0,0 +1,2 @@
+// config.kdl
+hostname "localhost"

data/test/integration/test/test_helper.rb

@@ -0,0 +1,55 @@
+$:.unshift File.dirname(__FILE__) + '/../'
+# shift to act like we're in the regular degular directory
+
+begin
+  require 'rubygems'
+rescue LoadError
+end
+
+require 'camping'
+require 'minitest/autorun'
+require 'minitest'
+require 'rack/test'
+require "minitest/reporters"
+Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]
+
+class TestCase < Minitest::Test
+  include Rack::Test::Methods
+
+  def self.inherited(mod)
+    mod.app = Object.const_get(mod.to_s[/w+/])
+    super
+  end
+
+  class << self
+    attr_accessor :app
+  end
+
+  def body() last_response.body end
+  def app()  self.class.app     end
+
+  def assert_reverse
+    begin
+      yield
+    rescue Exception
+    else
+      assert false, "Block didn't fail"
+    end
+  end
+
+  def assert_body(str)
+    case str
+    when Regexp
+      assert_match(str, last_response.body.strip)
+    else
+      assert_equal(str.to_s, last_response.body.strip)
+    end
+  end
+
+  def assert_status(code)
+    assert_equal(code, last_response.status)
+  end
+
+  def test_silly; end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camping
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  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
@@ -286,10 +286,17 @@ files:
 - test/apps/sessions.rb
 - test/config_reloader.rb
 - test/gear/gear_nancy.rb
+- test/integration/Gemfile
+- test/integration/README.md
+- test/integration/Rakefile
+- test/integration/camp.rb
+- test/integration/config.kdl
+- test/integration/test/test_helper.rb
 - test/reload_reloader.rb
 - test/test_helper.rb
 homepage: http://rubycamping.org/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options:
@@ -314,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