camping 3.0.2 → 3.1.2

data/lib/camping-unabridged.rb

@@ -724,7 +724,6 @@ module Camping
     #
     # See: https://github.com/rack/rack/blob/main/SPEC.rdoc
     def call(e)
-      make_camp # TODO: Find a better, more consistent place for setting everything up.
       k,m,*a=X.D e["PATH_INFO"],e['REQUEST_METHOD'].downcase,e
       k.new(e,m,prx).service(*a).to_a
     rescue
@@ -752,8 +751,9 @@ module Camping
     def method_missing(m, c, *a)
       h = Hash === a[-1] ? a.pop : {}
       e = H[Rack::MockRequest.env_for('',h.delete(:env)||{})]
-      # puts "method missing failure for controller: #{c}, method: #{m} "
       k = X.const_get(c).new(e,m.to_s,prx)
+   #  rescue => error # : wrong number of arguments
+			# Campguide::make_sense error.message
       h.each { |i, v| k.send("#{i}=", v) }
       k.service(*a)
     end
@@ -914,6 +914,7 @@ module Camping
       # setup caller data
       sp = caller[0].split('`')[0].split(":")
       fl, ln, pr = sp[0], sp[1].to_i, nil
+      # ln = 0
 
       # Create the app
       Apps << a = eval(S.gsub(/Camping/,m.to_s), g, fl, ln)

data/lib/camping.rb

@@ -66,7 +66,7 @@ k.meta_def(:urls){[A.(k,"#{c.to_s.scan(/.[^A-Z]*/).map(&N.method(:[]))*'/'}",p)]
 .respond_to?(:urls) || mu==true)};end end;I=R()end;X=Controllers
 class<<self;def make_camp;X.M prx;Apps.map(&:make_camp) end;def routes;(Apps.map(&:routes)<<X.v).flatten end
 def prx;@_prx||=CampTools.normalize_slashes(O[:url_prefix])end
-def call e;make_camp;k,m,*a=X.D e["PATH_INFO"],e['REQUEST_METHOD'].
+def call e;k,m,*a=X.D e["PATH_INFO"],e['REQUEST_METHOD'].
 downcase,e;k.new(e,m,prx).service(*a).to_a;rescue;r500(:I,k,m,$!,:env=>e).to_a end
 def method_missing m,c,*a;h=Hash===a[-1]?a.pop : {};e=H[Rack::MockRequest.
 env_for('',h.delete(:env)||{})];k=X.const_get(c).new(e,m.to_s,prx);h.each{|i,v|

data/test/app_config.rb

@@ -5,16 +5,14 @@ module Config end
 
 class Config::Test < TestCase
 
-  def setup
+  def before_all
     write_config()
     Camping.goes :Config
     @options = Camping::Apps.select{|a| a.name == "Config" }.first.options
-    super
   end
 
-  def teardown
+  def after_all
     trash_config()
-    super
   end
 
   def test_config

data/test/app_generator.rb

@@ -40,4 +40,43 @@ class Generator::Test < TestCase
 
   end
 
+  # Generates expected directory Structure
+  #
+  # Camping has an expected directory structure:
+  #
+  #   .gitignore
+  #   .ruby-version
+  #   Gemfile
+  #   Rakefile
+  #   camp.rb
+  #   config.kdl
+  #   src/
+  #   lib/
+  #   public/
+  #   test/
+  #   apps/
+  #
+  # This test checks to make certain that the generator command creates this
+  # directory structure.
+  def test_app_generates_directory_structure
+    move_to_tmp
+    Camping::Commands.new_cmd
+
+    res, ignored = [Dir.glob('*').select {|f| !File.directory? f },
+    Dir.glob('*').select {|f| File.directory? f }], Dir.glob(".*")
+
+    assert res[0].include?('Gemfile'), "mising Gemfile"
+    assert res[0].include?('README.md'), "missing README.md"
+    assert res[0].include?('Rakefile'), "missing Rakefile"
+    assert res[0].include?('camp.rb'), "missing camp.rb"
+    assert res[0].include?('config.kdl'), "missing config.kdl"
+    assert res[1].include?('public'), "missing public folder."
+    assert res[1].include?('test'), "missing test folder."
+
+    assert ignored.include?('.gitignore'), ".gitignore is missing."
+    assert ignored.include?('.ruby-version'), ".ruby-version is missing."
+
+    leave_tmp
+  end
+
 end

data/test/app_inception.rb

@@ -2,6 +2,13 @@ require 'test_helper'
 require 'camping'
 require 'camping/commands'
 
+# The idea behind the inception stuff is that you can inherit settings
+# templates, etc... from a Camping app and just... extend it.
+# This is a tabled, but not abandoned idea. It became a little difficult
+# to inherit all of these things, along with views, Models, etc... that's
+# associated with a camping app. Getting this to work would mean a big
+# rewrite of Camping's core, which is a no no.
+
 Camping.goes :Inception
 # Inception.goes :Leonardo
 # Leonardo.goes :Donatello

data/test/app_loader.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+require 'fileutils'
+require 'camping/loader'
+
+module Donuts end
+module Loader end
+
+# for Reloading stuff
+module TestCaseLoaderToo
+  def loader
+    @loader ||= Camping::Loader.new(file)
+  end
+
+  def before_all
+    super
+    move_to_loader
+    loader.reload!
+  end
+
+  def after_all
+    leave_loader
+    super
+  end
+end
+
+class Donuts::Test < TestCase
+  include TestCaseLoaderToo
+  BASE = File.expand_path('../apps/loader/camp', __FILE__)
+  def file; BASE + '.rb' end
+
+  def test_that_our_apps_are_there
+    assert loader.apps.include?(:Donuts), "Donuts not found: #{loader.apps}"
+    assert loader.apps.include?(:Loader), "Loader not found: #{loader.apps}"
+  end
+
+  def test_output
+    # Checks that the view is overwritten successfully more than once.
+    get '/'
+    assert_body "chunky bacon", "Response is wrong in the loader."
+    assert_equal "text/html", last_response.headers['content-type']
+
+    # Checks that the view is not overwritten, because it's not reopened.
+    get '/post'
+    assert_body "_why", "Response is wrong in the loader."
+    assert_equal "text/html", last_response.headers['content-type']
+
+    # Checks that a downstream view is loaded properly.
+    get '/people'
+    assert_body "People are great am I right?", "Response is wrong in the loader."
+    assert_equal "text/html", last_response.headers['content-type']
+  end
+
+end

data/test/app_sessions.rb

@@ -44,8 +44,8 @@ class Sessions::Test < TestCase
     app.set :secret, "whateverloser"
     begin
       app.include Camping::Session
-    rescue InsecureSecret => e
-      message = "You're Session Secret is too short. Minimum length is 64."
+    rescue InsecureSecretError => e
+      message = "Your Session Secret is too short. Minimum length is 64."
       assert_equal(e.message, message, "You're session secret wasn't long enough.")
     end
 
@@ -54,11 +54,11 @@ class Sessions::Test < TestCase
     begin
       app.set :secret, "whateverloserwhateverloserwhateverloserwhateverloserwhateverloser"
       app.include Camping::Session
-    rescue InsecureSecret => e
+    rescue InsecureSecretError => e
       message = e
     end
 
-    assert_equal(e, message, "You're session secret wasn't long enough.")
+    assert_equal(e, message, "Your session secret wasn't long enough.")
   end
 end
 

data/test/apps/loader/apps/donuts/controllers/index.rb

@@ -0,0 +1,18 @@
+module Donuts
+  module Controllers
+    class Index
+      def get
+        render :index
+      end
+    end
+  end
+
+  # how to add a layout to every page
+  module Views
+
+    def index
+      "chunky bacon"
+    end
+
+  end
+end

data/test/apps/loader/apps/donuts.rb

@@ -0,0 +1,15 @@
+module Donuts
+  module Controllers
+    class Index
+      def get
+        "We've got lots of donuts!"
+      end
+    end
+
+    class People
+      def get
+        "People are great am I right?"
+      end
+    end
+  end
+end

data/test/apps/loader/camp.rb

@@ -0,0 +1,35 @@
+require 'camping'
+
+Camping.goes :Loader
+
+$LOAD_PATH << File.dirname(__FILE__)
+
+Camping.goes :Donuts
+
+module Donuts
+  module Controllers
+    class Index
+      def get
+        render :index
+      end
+    end
+    class Post
+      def get
+        render :post
+      end
+    end
+  end
+
+  # how to add a layout to every page
+  module Views
+
+    def index
+      "_why"
+    end
+
+    def post
+      "_why"
+    end
+
+  end
+end

data/test/apps/reloader/config.ru

@@ -1,5 +1,5 @@
 $LOAD_PATH << File.dirname(__FILE__) + '/../'
+$LOAD_PATH << File.dirname(__FILE__) + '/'
 
 require 'reloader'
 run Reloader
-

data/test/apps/reloader/reload_me.rb

@@ -1,2 +1 @@
 $counter += 1
-

data/test/apps/{reloader.rb → reloader/reloader.rb}

@@ -3,5 +3,4 @@ require 'camping'
 Camping.goes :Reloader
 
 $LOAD_PATH << File.dirname(__FILE__)
-require 'reloader/reload_me'
-
+require 'reload_me'

data/test/config_reloader.rb

@@ -0,0 +1,78 @@
+require_relative 'test_helper'
+require 'fileutils'
+require 'camping/loader'
+
+$counter = 0
+
+# for Reloading stuff
+module TestCaseLoader
+
+  def loader
+    @loader ||= Camping::Loader.new(file)
+  end
+
+  def before_all
+    super
+    move_to_reloader
+    loader.reload!
+    assert Object.const_defined?(:Reloader), "Reloader didn't load app"
+    # puts "before_all called"
+  end
+
+  def after_all
+    # puts "after_all called"
+    assert Object.const_defined?(:Reloader), "Test removed app"
+    loader.remove_constants
+    # breaks in CI for some reason.
+    # assert !Object.const_defined?(:Reloader), "Loader didn't remove app"
+    leave_reloader
+    super
+  end
+
+end
+
+class TestConfigRu < TestCase
+  include TestCaseLoader
+
+  BASE = File.expand_path('../apps/reloader', __FILE__)
+  def file; BASE + '/config.ru' end
+
+  def setup
+    super
+    $counter = 0
+    loader.reload!
+    # puts "setup called"
+  end
+
+  def test_counter
+    assert_equal 1, $counter
+  end
+
+  def test_forced_reload
+    loader.reload!
+    assert_equal 2, $counter
+  end
+
+  def test_that_touch_was_touched
+    FileUtils.touch(BASE + '/reloader.rb')
+    assert_equal 1, $counter
+  end
+
+  def test_mtime_reload
+    loader.reload
+    assert_equal 1, $counter
+
+    FileUtils.touch(BASE + '/reloader.rb')
+    loader.reload
+    assert_equal 2, $counter
+
+    FileUtils.touch(BASE + '/reload_me.rb')
+    loader.reload
+    assert_equal 3, $counter
+  end
+
+  def test_name
+    assert_equal Reloader, loader.apps[:reloader]
+  end
+
+end

data/test/reload_reloader.rb

@@ -0,0 +1,81 @@
+require_relative 'test_helper'
+require 'fileutils'
+require 'camping/loader'
+
+$counter = 0
+
+# for Reloading stuff
+module TestCaseLoader
+
+  def loader
+    @loader ||= Camping::Loader.new(file)
+  end
+
+  def before_all
+    super
+    move_to_reloader
+    loader.reload!
+    assert Object.const_defined?(:Reloader), "Reloader didn't load app"
+    # puts "before_all called"
+  end
+
+  def after_all
+    # puts "after_all called"
+    assert Object.const_defined?(:Reloader), "Test removed app"
+    loader.remove_constants
+    assert !Object.const_defined?(:Reloader), "Loader didn't remove app"
+    leave_reloader
+    super
+  end
+
+end
+
+class TestLoader < TestCase
+  include TestCaseLoader
+
+  BASE = File.expand_path('../apps/reloader', __FILE__)
+  def file; BASE + '/reloader.rb' end
+
+  def setup
+    super
+    $counter = 0
+    loader.reload!
+    # puts "setup called"
+  end
+
+  def test_counter
+    assert_equal 1, $counter
+  end
+
+  def test_forced_reload
+    loader.reload!
+    assert_equal 2, $counter
+  end
+
+  def test_that_touch_was_touched
+    FileUtils.touch(BASE + '/reloader.rb')
+    assert_equal 1, $counter
+  end
+
+  def test_mtime_reload
+    loader.reload
+    assert_equal 1, $counter
+
+    FileUtils.touch(BASE + '/reloader.rb')
+    loader.reload
+    assert_equal 2, $counter
+
+    FileUtils.touch(BASE + '/reload_me.rb')
+    loader.reload
+    assert_equal 3, $counter
+  end
+end
+
+# class TestConfigRu < TestLoader
+#   BASE = File.expand_path('../apps/reloader', __FILE__)
+#   def file; BASE + '/config.ru' end
+
+#   def test_name
+#     assert_equal Reloader, loader.apps[:reloader]
+#   end
+# end

data/test/test_helper.rb

@@ -14,7 +14,8 @@ end
 
 require 'minitest/autorun'
 require 'rack/test'
-require "minitest/reporters"
+require 'minitest/reporters'
+require 'minitest/hooks'
 Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]
 
 
@@ -32,6 +33,40 @@ module CommandLineCommands
     `rm -rf test/tmp` if File.exist?('test/tmp')
   end
 
+  # reloader helpers:
+  # move_to_apps
+  # moves to the apps directory in /test
+  def move_to_reloader
+    @original_dir = Dir.pwd
+    Dir.chdir "test"
+    Dir.chdir "apps"
+    Dir.chdir "reloader"
+   	Dir.mkdir("apps") unless Dir.exist?("apps")
+    Dir.mkdir("lib") unless Dir.exist?("lib")
+  end
+
+  # deletes the temporary directories found in the /apps directory for reloader testing.
+  def leave_reloader
+	  Dir.chdir @original_dir
+	  `rm -rf test/apps/reloader/apps` if File.exist?('test/apps/reloader/apps')
+	  `rm -rf test/apps/reloader/lib` if File.exist?('test/apps/reloader/lib')
+  end
+
+  # Moves to the loader directory
+  def move_to_loader
+    @original_dir = Dir.pwd
+    Dir.chdir "test"
+    Dir.chdir "apps"
+    Dir.chdir "loader"
+   	Dir.mkdir("apps") unless Dir.exist?("apps")
+    Dir.mkdir("lib") unless Dir.exist?("lib")
+  end
+
+  # deletes the temporary directories found in the /apps directory for reloader testing.
+  def leave_loader
+	  Dir.chdir @original_dir
+  end
+
   def write(file, content)
     raise "cannot write nil" unless file
     file = tmp_file(file)
@@ -70,6 +105,7 @@ end
 class TestCase < MiniTest::Test
   include Rack::Test::Methods
   include CommandLineCommands
+  include Minitest::Hooks
 
   def self.inherited(mod)
     mod.app = Object.const_get(mod.to_s[/\w+/])
@@ -80,6 +116,11 @@ class TestCase < MiniTest::Test
     attr_accessor :app
   end
 
+  def setup
+    super
+    Camping.make_camp
+  end
+
   def body() last_response.body end
   def app()  self.class.app     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camping
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.2
 platform: ruby
 authors:
 - why the lucky stiff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mab
@@ -104,6 +104,46 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.8
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.6.8
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.6.8
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
 description:
 email: why@ruby-lang.org
 executables:
@@ -153,14 +193,15 @@ files:
 - lib/camping-unabridged.rb
 - lib/camping.rb
 - lib/camping/ar.rb
+- lib/camping/campguide.rb
 - lib/camping/commands.rb
 - lib/camping/gear/filters.rb
 - lib/camping/gear/inspection.rb
 - lib/camping/gear/kuddly.rb
 - lib/camping/gear/nancy.rb
+- lib/camping/loader.rb
 - lib/camping/loads.rb
 - lib/camping/mab.rb
-- lib/camping/reloader.rb
 - lib/camping/server.rb
 - lib/camping/session.rb
 - lib/camping/template.rb
@@ -177,25 +218,30 @@ files:
 - test/app_helpers.rb
 - test/app_inception.rb
 - test/app_inline_templates.rb
+- test/app_loader.rb
 - test/app_markup.rb
 - test/app_migrations.rb
 - test/app_partials.rb
 - test/app_prefixed.rb
-- test/app_reloader.rb
 - test/app_route_generating.rb
 - test/app_sessions.rb
 - test/app_simple.rb
 - test/apps/env_debug.rb
 - test/apps/forms.rb
 - test/apps/forward_to_other_controller.rb
+- test/apps/loader/apps/donuts.rb
+- test/apps/loader/apps/donuts/controllers/index.rb
+- test/apps/loader/camp.rb
 - test/apps/migrations.rb
 - test/apps/misc.rb
-- test/apps/reloader.rb
 - test/apps/reloader/config.ru
 - test/apps/reloader/reload_me.rb
+- test/apps/reloader/reloader.rb
 - test/apps/reloader_indirect.rb
 - test/apps/sessions.rb
+- test/config_reloader.rb
 - test/gear/gear_nancy.rb
+- test/reload_reloader.rb
 - test/test_helper.rb
 homepage: http://camping.rubyforge.org/
 licenses: []

data/test/app_reloader.rb

@@ -1,69 +0,0 @@
-require 'test_helper'
-require 'fileutils'
-require 'camping/reloader'
-
-$counter = 0
-
-module TestCaseReloader
-  def reloader
-    @reloader ||= Camping::Reloader.new(file)
-  end
-
-  def setup
-    super
-    reloader.reload!
-    assert Object.const_defined?(:Reloader), "Reloader didn't load app"
-  end
-
-  def teardown
-    super
-    assert Object.const_defined?(:Reloader), "Test removed app"
-    reloader.remove_apps
-    assert !Object.const_defined?(:Reloader), "Reloader didn't remove app"
-  end
-end
-
-class TestReloader < TestCase
-  include TestCaseReloader
-  BASE = File.expand_path('../apps/reloader', __FILE__)
-
-  def file; BASE + '.rb' end
-
-  def setup
-    $counter = 0
-    super
-  end
-
-  def test_counter
-    assert_equal 1, $counter
-  end
-
-  def test_forced_reload
-    reloader.reload!
-    assert_equal 2, $counter
-  end
-
-  def test_mtime_reload
-    reloader.reload
-    assert_equal 1, $counter
-
-    FileUtils.touch(BASE + '.rb')
-    sleep 1
-    reloader.reload
-    assert_equal 2, $counter
-
-    FileUtils.touch(BASE + '/reload_me.rb')
-    sleep 1
-    reloader.reload
-    assert_equal 3, $counter
-  end
-end
-
-class TestConfigRu < TestReloader
-  BASE = File.expand_path('../apps/reloader', __FILE__)
-  def file; BASE + '/config.ru' end
-
-  def test_name
-    assert_equal Reloader, reloader.apps[:reloader]
-  end
-end