camping 2.1.523 → 2.1.531

data/lib/camping-unabridged.rb

@@ -50,6 +50,7 @@ module Camping
   U = Rack::Utils
   O = {}
   Apps = []
+  SK = :camping #Key for r.session
   # An object-like Hash.
   # All Camping query string and cookie variables are loaded as this.
   # 
@@ -389,8 +390,9 @@ module Camping
     end
 
     # Serves the string +c+ with the MIME type of the filename +p+.
+    # Default text/html
     def serve(p, c)
-      t = Rack::Mime.mime_type(p[/\..*$/], nil) and @headers['Content-Type'] = t
+      t = Rack::Mime.mime_type(p[/\..*$/], "text/html") and @headers['Content-Type'] = t
       c
     end
     
@@ -406,7 +408,7 @@ module Camping
     #     end
     #   end
     def to_a
-      @env['rack.session'] = Hash[@state]
+      @env['rack.session'][SK] = Hash[@state]
       r = Rack::Response.new(@body, @status, @headers)
       @cookies._n.each do |k, v|
         r.set_cookie(k, v)
@@ -419,8 +421,8 @@ module Camping
       @root, @input, @cookies, @state,
       @headers, @status, @method =
       r.script_name.sub(/\/$/,''), n(r.params),
-      Cookies[r.cookies], H[r.session.to_hash],
-      {}, m =~ /r(\d+)/ ? $1.to_i : 200, m
+      Cookies[r.cookies], H[r.session[SK]||{}],
+      {'Content-Type'=>'text/html'}, m =~ /r(\d+)/ ? $1.to_i : 200, m
       @cookies._p = self/"/"
     end
     
@@ -615,11 +617,26 @@ module Camping
     #
     #   module Nuts::Controllers; ... end
     #   module Nuts::Models;      ... end
-    #   module Nuts::Views;       ... end 
+    #   module Nuts::Views;       ... end
+    #
+    # Additionally, you can pass a Binding as the second parameter,
+    # which enables you to create a Camping-based application within
+    # another module, for example to namespace your web interface and
+    # code for a worker process together:
+    # 
+    #   module YourApplication
+    #     Camping.goes :Web, binding()
+    #     module Web
+    #       ...
+    #     end
+    #     module Worker
+    #       ...
+    #     end
+    #   end
     #
     # All the applications will be available in Camping::Apps.
-    def goes(m)
-      Apps << a = eval(S.gsub(/Camping/,m.to_s), TOPLEVEL_BINDING)
+    def goes(m, g=TOPLEVEL_BINDING)
+      Apps << a = eval(S.gsub(/Camping/,m.to_s), g)
       caller[0]=~/:/
       IO.read(a.set:__FILE__,$`)=~/^__END__/ &&
       (b=$'.split(/^@@\s*(.+?)\s*\r?\n/m)).shift rescue nil

data/lib/camping.rb

@@ -1,7 +1,7 @@
 require "uri";require "rack";class Object;def meta_def m,&b;(class<<self;self
 end).send:define_method,m,&b end end;module Camping;C=self;S=IO.read(__FILE__
-)rescue nil;P="<h1>Cam\ping Problem!</h1><h2>%s</h2>";U=Rack::Utils;O={};Apps=[]
-class H<Hash;def method_missing m,*a;m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m.
+)rescue nil;P="<h1>Cam\ping Problem!</h1><h2>%s</h2>";U=Rack::Utils;O={};Apps=[];
+SK=:camping;class H<Hash;def method_missing m,*a;m.to_s=~/=$/?self[$`]=a[0]:a==[]?self[m.
 to_s]:super end;undef id,type if ??==63 end;class Cookies<H;attr_accessor :_p;
 def _n;@n||={}end;alias :_s :[]=;def set k,v,o={};_s(j=k.to_s,v);_n[j]=
 {:value=>v,:path=>_p}.update o;end;def []=(k,v)set(k,v,v.is_a?(Hash)?v:{})end
@@ -23,12 +23,12 @@ end;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;def r500 k,m,e
 raise e end;def r501 m;P%"#{m.upcase} not implemented"end;def serve(p,c)
-(t=Rack::Mime.mime_type p[/\..*$/],nil)&&@headers["Content-Type"]=t;c;end;def to_a;@env[
-'rack.session']=Hash[@state];r=Rack::Response.new(@body,@status,@headers)
+(t=Rack::Mime.mime_type p[/\..*$/],"text/html")&&@headers["Content-Type"]=t;c;end;def to_a;@env[
+'rack.session'][SK]=Hash[@state];r=Rack::Response.new(@body,@status,@headers)
 @cookies._n.each{|k,v|r.set_cookie k,v};r.to_a end;def initialize env,m
 r=@request=Rack:: Request.new(@env=env);@root,@input,@cookies,@state,@headers,
 @status,@method=r.script_name.sub(/\/$/,''),n(r.params),Cookies[r.cookies],
-H[r.session.to_hash],{},m=~/r(\d+)/?$1.to_i: 200,m;@cookies._p=self/"/" end
+H[r.session[SK]||{}],{'Content-Type'=>'text/html'},m=~/r(\d+)/?$1.to_i: 200,m;@cookies._p=self/"/" end
 def n h;Hash===h ?h.inject(H[]){|m,(k,v)|m[k]=
 n(v);m}: h end;def service *a;r=catch(:halt){send(@method,*a)};@body||=r;self
 end end;module Controllers;@r=[];class<<self;def R *u;r=@r;Class.
@@ -41,7 +41,7 @@ map{|c|k=const_get(c);k.send:include,C,X,Base,Helpers,Models
 @r=[k]+@r if @r-[k]==@r;k.meta_def(:urls){["/#{c.to_s.scan(/.[^A-Z]*/).map(&
 N.method(:[]))*'/'}"]}if !k.respond_to?:urls}end end;I=R()end;X=
 Controllers;class<<self;def
-goes m;Apps<<a=eval(S.gsub(/Camping/,m.to_s),TOPLEVEL_BINDING);caller[0]=~/:/
+goes m,g=TOPLEVEL_BINDING;Apps<<a=eval(S.gsub(/Camping/,m.to_s),g);caller[0]=~/:/
 IO.read(a.set:__FILE__,$`)=~/^__END__/&&(b=$'.split /^@@\s*(.+?)\s*\r?\n/m).shift rescue nil
 a.set :_t,H[*b||[]];end;def call e;X.M
 k,m,*a=X.D e["PATH_INFO"],e['REQUEST_METHOD'].

data/test/app_simple.rb

@@ -59,6 +59,7 @@ class Simple::Test < TestCase
   def test_index
     get '/'
     assert_body "Hello World!"
+    assert_equal "text/html", last_response.headers['Content-Type']
     
     post '/'
     assert_body "Hello Post!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: camping
 version: !ruby/object:Gem::Version
-  version: 2.1.523
+  version: 2.1.531
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70274142153900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274142153900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: mab
-  requirement: &70274142153120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70274142153120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70274142152460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274142152460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70274150145520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70274150145520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: why@ruby-lang.org
 executables:
@@ -156,9 +176,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: camping
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: minature rails for stay-at-home moms
 test_files: []
-has_rdoc: true