camping 3.2.2 → 3.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f510e735548917a248d02aec9a7a36f21c3c527919799c23dc32c2c717396d
-  data.tar.gz: 2535878776ceb1093fd24b621db216ae5917addd76a9bc0f7f8fff33abc6f4e6
+  metadata.gz: 3f5615f332dcf7362345f6d628b4d9d90adf93862cecddce4168b6609e684b87
+  data.tar.gz: 0d6454ca641d2a2ff03d097c0c6b62df9971517ddde4b72fea2b18b108ca3f9a
 SHA512:
-  metadata.gz: 99b49c530feed07ee899e83d1e442b708cb44e383d8e23437896cbeea0ed945b0500edd794bd887b2d59a9be957b13556d61600d6c2d38a0389625dd1b2c6222
-  data.tar.gz: 1eb83d984b72e38e5a475555dd80503fbf9dcd2ca43ca6770e1b744f4f41b360698432f08c35162bc4ff422f249813a705f93e0b00a471181ba7e73b9fb74905
+  metadata.gz: 57eeda38ff38008fe71e9437bbd0484582c06bacd2d75cadc77134ec5e7cbd216cbd2ac25723a493c6a06268e5739e9942fdfef084055960241bc4b9f0db908e
+  data.tar.gz: 19563aba78678ed871ee40cd004dbdfeff4039d30b515304dbeefc8bd33a070c0a982f8828ef4102f2fda8b441809b5457410a1ebf1241042e2164759db8812e

data/Rakefile

@@ -97,6 +97,7 @@ Rake::TestTask.new(:integration) do |t|
   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

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-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)

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

data/test/integration/Gemfile

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+source 'https://rubygems.org'
+
+gem 'camping'
+gem 'puma'
+gem 'rake'
+
+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/Gemfile.lock

@@ -0,0 +1,95 @@
+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/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,16 @@
+# 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

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.r

@@ -0,0 +1,64 @@
+# 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
+

data/test/integration/test/test_helper.rb

@@ -0,0 +1,56 @@
+$:.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camping
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - why the lucky stiff
@@ -286,10 +286,19 @@ files:
 - test/apps/sessions.rb
 - 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
 homepage: http://rubycamping.org/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: