RubyGems - camping - Versions diffs - 2.1.467 → 2.1.523 - Mend

camping 2.1.467 → 2.1.523

Files changed (20) hide show

data/{README → README.md} +45 -43
data/Rakefile +20 -1
data/book/{01_introduction → 01_introduction.md} +4 -4
data/book/{02_getting_started → 02_getting_started.md} +196 -196
data/book/{51_upgrading → 51_upgrading.md} +54 -54
data/lib/camping-unabridged.rb +7 -7
data/lib/camping.rb +4 -4
data/lib/camping/mab.rb +24 -13
data/lib/camping/reloader.rb +98 -128
data/lib/camping/server.rb +22 -89
data/test/app_helpers.rb +12 -1
data/test/app_markup.rb +54 -0
data/test/app_reloader.rb +70 -0
data/test/app_simple.rb +12 -0
data/test/apps/reloader.rb +7 -0
data/test/apps/reloader/config.ru +5 -0
data/test/apps/reloader/reload_me.rb +2 -0
data/test/apps/reloader_indirect.rb +3 -0
data/test/test_helper.rb +4 -5
metadata +67 -55

@@ -44,7 +44,7 @@ module Camping
         options = {}
         opt_parser = OptionParser.new("", 24, '  ') do |opts|
-          opts.banner = "Usage: camping app1.rb app2.rb..."
+          opts.banner = "Usage: camping my-camping-app.rb"
           opts.define_head "#{File.basename($0)}, the microframework ON-button for ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
           opts.separator ""
           opts.separator "Specific options:"
@@ -62,7 +62,7 @@ module Camping
           opts.on("-C", "--console",
           "Run in console mode with IRB") { options[:server] = "console" }
-          server_list = ["mongrel", "webrick", "console"]
+          server_list = ["thin", "webrick", "console"]
           opts.on("-s", "--server NAME",
           "Server to force (#{server_list.join(', ')})") { |v| options[:server] = v }
@@ -90,15 +90,14 @@ module Camping
           exit
         end
-        options[:scripts] = args
+        options[:script] = args.shift
         options
       end
     end
     def initialize(*)
       super
-      @reloader = Camping::Reloader.new
-      @reloader.on_reload do |app|
+      @reloader = Camping::Reloader.new(options[:script]) do |app|
         if !app.options.has_key?(:dynamic_templates)
 		      app.options[:dynamic_templates] = true
 	      end
@@ -125,16 +124,16 @@ module Camping
     def middleware
       h = super
-      h["development"].unshift [XSendfile]
+      h["development"] << [XSendfile]
       h
     end
     def start
       if options[:server] == "console"
         puts "** Starting console"
-        reload!
-        this = self
-        eval("self", TOPLEVEL_BINDING).meta_def(:reload!) { this.reload!; nil }
+        @reloader.reload!
+        r = @reloader
+        eval("self", TOPLEVEL_BINDING).meta_def(:reload!) { r.reload!; nil }
         ARGV.clear
         IRB.start
         exit
@@ -144,95 +143,29 @@ module Camping
         super
       end
     end
-    def find_scripts
-      scripts = options[:scripts].map do |path|
-        if File.file?(path)
-          path
-        elsif File.directory?(path)
-          Dir[File.join(path, '*.rb')]
-        end
-      end.flatten.compact
-      @reloader.update(*scripts)
-    end
-    def reload!
-      find_scripts
+    def public_dir
+      File.expand_path('../public', @reloader.file)
     end
     def app
-      self
+      Rack::Cascade.new([Rack::File.new(public_dir), self], [405, 404, 403])
     end
-    def call(env)
-      reload!
+    def current_app
+      @reloader.reload
       apps = @reloader.apps
-      case apps.length
-      when 0
-        index_page(apps)
-      when 1
-        apps.values.first.call(env)
-      else
-        apps.each do |name, app|
-          mount = name.to_s.downcase
-          case env["PATH_INFO"]
-          when %r{^/#{mount}}
-            env["SCRIPT_NAME"] = env["SCRIPT_NAME"] + $&
-            env["PATH_INFO"] = $'
-            return app.call(env)
-          when %r{^/code/#{mount}}
-            return [200, {'Content-Type' => 'text/plain', 'X-Sendfile' => @reloader.script(app).file}, []]
-          end
-        end
-        index_page(apps)
+      return apps.values.first if apps.size == 1
+      if key = apps.keys.grep(/^#{@reloader.name}$/i)[0]
+        apps[key]
       end
     end
-    def index_page(apps)
-      [200, {'Content-Type' => 'text/html'}, [TEMPLATE.result(binding)]]
+    def call(env)
+      app = current_app || raise("Could not find an app called `#{@reloader.name}`")
+      app.call(env)
     end
-    SOURCE = <<-HTML
-<html>
-  <head>
-    <title>You are Camping</title>
-    <style type="text/css">
-      body {
-        font-family: verdana, arial, sans-serif;
-        padding: 10px 40px;
-        margin: 0;
-      }
-      h1, h2, h3, h4, h5, h6 {
-        font-family: utopia, georgia, serif;
-      }
-      h3 { display: inline; }
-    </style>
-  </head>
-  <body>
-    <% if apps.empty? %>
-      <p>Good day.  I'm sorry, but I could not find any Camping apps.
-      You might want to take a look at the console to see if any errors
-      have been raised.</p>
-    <% else %>
-      <p>Good day.  These are the Camping apps you've mounted.</p>
-      <ul>
-      <% apps.each do |name, app| %>
-        <li>
-          <h3><a href="/<%= name.to_s.downcase %>"><%= app %></a></h3>
-          <small> / <a href="/code/<%= name.to_s.downcase %>">View source</a></small>
-        </li>
-      <% end %>
-      </ul>
-    <% end %>
-  </body>
-</html>
-    HTML
-    TEMPLATE = ERB.new(SOURCE)
     class XSendfile
       def initialize(app)
         @app = app
@@ -262,4 +195,4 @@ module Camping
       end
     end
   end
-end
+end

data/test/app_helpers.rb CHANGED

@@ -23,6 +23,12 @@ end
 module Helpers::Controllers
   class Index
+    def get
+      URL('/').to_s
+    end
+  end
+  class Model
     def get
       current_user.name
     end
@@ -37,7 +43,7 @@ end
 class Helpers::Test < TestCase
   def test_models
-    get '/'
+    get '/model'
     assert_body "Bob"
   end
@@ -45,5 +51,10 @@ class Helpers::Test < TestCase
     get '/users'
     assert_body "/"
   end
+  def test_url
+    get '/', {}, 'PATH_INFO' => ''
+    assert_body "http://example.org/"
+  end
 end

data/test/app_markup.rb CHANGED

@@ -15,6 +15,32 @@ module Markup::Controllers
       render :index, :layout => false
     end
   end
+  class AutoPrepend
+    def get
+      mab do
+        img :src => '/hello.png'
+      end
+    end
+  end
+  class Compat < R '/compat/(.*?)'
+    def get(type)
+      mab do
+        send(type) do
+          body { h1 'Nice' }
+        end
+      end
+    end
+  end
+  class CompatHelpers
+    def get
+      mab do
+        helpers.R CompatHelpers
+      end
+    end
+  end
 end
 module Markup::Views
@@ -23,6 +49,7 @@ module Markup::Views
   end
   def layout
+    self << '<!DOCTYPE html>'
     html do
       head do
         title "Web Page"
@@ -36,6 +63,7 @@ end
 class Markup::Test < TestCase
   def test_render
     get '/'
+    assert_body %r{\A<!DOCTYPE html>}
     assert_body %r{<h1>Welcome!</h1>}
     assert_body %r{<title>Web Page</title>}
   end
@@ -48,4 +76,30 @@ class Markup::Test < TestCase
       assert_body %r{<title>Web Page</title>}
     end
   end
+  def test_auto_prepend
+    get '/auto/prepend', {}, 'SCRIPT_NAME' => '/mount'
+    assert_body '<img src="/mount/hello.png">'
+  end
+  def test_compat
+    warning = "xhtml_strict is no longer supported (or an active standard); using HTML5 instead\n"
+    assert_output '', warning * 3 do
+      get '/compat/xhtml_strict'
+      assert_body '<!DOCTYPE html><html><body><h1>Nice</h1></body></html>'
+      get '/compat/xhtml_transitional'
+      assert_body '<!DOCTYPE html><html><body><h1>Nice</h1></body></html>'
+      get '/compat/xhtml_frameset'
+      assert_body '<!DOCTYPE html><html><body><h1>Nice</h1></body></html>'
+    end
+  end
+  def test_compat_helpers
+    get '/compat/helpers'
+    assert_body '/compat/helpers'
+  end
 end

data/test/app_reloader.rb ADDED

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

data/test/app_simple.rb CHANGED

@@ -47,6 +47,12 @@ module Simple::Controllers
       "Optional: #{value}"
     end
   end
+  class Weird
+    def get
+      redirect MultipleComplexX, 'hello%#/world'
+    end
+  end
 end
 class Simple::Test < TestCase
@@ -94,4 +100,10 @@ class Simple::Test < TestCase
     get '/optional/override'
     assert_body "Optional: override"
   end
+  def test_weird
+    get '/weird'
+    follow_redirect!
+    assert_body 'Complex: hello%#/world'
+  end
 end

data/test/apps/reloader.rb ADDED

@@ -0,0 +1,7 @@
+require 'camping'
+Camping.goes :Reloader
+$LOAD_PATH << File.dirname(__FILE__)
+require 'reloader/reload_me'

data/test/apps/reloader/config.ru ADDED

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

data/test/apps/reloader/reload_me.rb ADDED

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

data/test/apps/reloader_indirect.rb ADDED

@@ -0,0 +1,3 @@
+$LOAD_PATH << File.dirname(__FILE__)
+require 'reloader'

data/test/test_helper.rb CHANGED

@@ -11,10 +11,10 @@ else
   require 'camping-unabridged'
 end
-require 'test/unit'
+require 'minitest/autorun'
 require 'rack/test'
-class TestCase < Test::Unit::TestCase
+class TestCase < MiniTest::Unit::TestCase
   include Rack::Test::Methods
   def self.inherited(mod)
@@ -50,7 +50,6 @@ class TestCase < Test::Unit::TestCase
   def assert_status(code)
     assert_equal(code, last_response.status)
   end
-  def test_noop
-  end
+  def test_silly; end
 end

metadata CHANGED

@@ -1,66 +1,75 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: camping
-version: !ruby/object:Gem::Version
-  version: 2.1.467
+version: !ruby/object:Gem::Version
+  version: 2.1.523
   prerelease:
 platform: ruby
-authors:
+authors:
 - why the lucky stiff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2012-09-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  requirement: &id001 !ruby/object:Gem::Requirement
+  requirement: &70274142153900 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency
+  version_requirements: *70274142153900
+- !ruby/object:Gem::Dependency
+  name: mab
+  requirement: &70274142153120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70274142153120
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id002 !ruby/object:Gem::Requirement
+  requirement: &70274142152460 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - "="
-      - !ruby/object:Gem::Version
-        version: 0.8.7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency
+  version_requirements: *70274142152460
+- !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &id003 !ruby/object:Gem::Requirement
+  requirement: &70274150145520 !ruby/object:Gem::Requirement
     none: false
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *70274150145520
 description:
 email: why@ruby-lang.org
-executables:
+executables:
 - camping
 extensions: []
-extra_rdoc_files:
-- README
+extra_rdoc_files:
+- README.md
 - CHANGELOG
 - COPYING
-- book/01_introduction
-- book/02_getting_started
-- book/51_upgrading
-files:
+- book/01_introduction.md
+- book/02_getting_started.md
+- book/51_upgrading.md
+files:
 - COPYING
-- README
+- README.md
 - Rakefile
 - bin/camping
 - test/app_cookies.rb
@@ -69,6 +78,7 @@ files:
 - test/app_inline_templates.rb
 - test/app_markup.rb
 - test/app_partials.rb
+- test/app_reloader.rb
 - test/app_route_generating.rb
 - test/app_sessions.rb
 - test/app_simple.rb
@@ -77,6 +87,10 @@ files:
 - test/apps/forward_to_other_controller.rb
 - test/apps/migrations.rb
 - test/apps/misc.rb
+- test/apps/reloader/config.ru
+- test/apps/reloader/reload_me.rb
+- test/apps/reloader.rb
+- test/apps/reloader_indirect.rb
 - test/apps/sessions.rb
 - test/test_helper.rb
 - lib/camping/ar.rb
@@ -109,16 +123,15 @@ files:
 - extras/rdoc/generator/template/flipbook/readme.rhtml
 - extras/rdoc/generator/template/flipbook/reference.rhtml
 - extras/rdoc/generator/template/flipbook/toc.rhtml
-- book/01_introduction
-- book/02_getting_started
-- book/51_upgrading
+- book/01_introduction.md
+- book/02_getting_started.md
+- book/51_upgrading.md
 - examples/blog.rb
 - CHANGELOG
 homepage: http://camping.rubyforge.org/
 licenses: []
 post_install_message:
-rdoc_options:
+rdoc_options:
 - --line-numbers
 - --quiet
 - --main
@@ -127,26 +140,25 @@ rdoc_options:
 - ^(examples|extras)\/
 - --exclude
 - lib/camping.rb
-require_paths:
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.2
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project: camping
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key:
 specification_version: 3
 summary: minature rails for stay-at-home moms
 test_files: []
+has_rdoc: true