nimbu 0.2.10 → 0.2.11

data/lib/nimbu/server/base.rb

@@ -45,7 +45,11 @@ module Nimbu
       route :get, :post, '*' do
         if request.post?
           path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
-          result = json_decode(nimbu.post_request({:path => path, :extra => params, :session => session, :method => "post"}))
+          begin
+            result = json_decode(nimbu.post_request({:path => path, :extra => params, :session => session, :method => "post", :logged_in => session[:logged_in]})) 
+          rescue Exception => e
+            return e.http_body
+          end
 
           session[:logged_in] = true if result["logged_in"]
           session[:flash] = result["flash"] if result["flash"]
@@ -54,7 +58,11 @@ module Nimbu
           # First get the template name and necessary subtemplates
           puts green("Getting template for #{request.fullpath}")
           path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
-          result = json_decode(nimbu.get_template({:path => path, :extra => params, :method => "get"}))
+          begin
+            result = json_decode(nimbu.get_template({:path => path, :extra => params, :method => "get", :extra => params, :logged_in => session[:logged_in]}))
+          rescue Exception => e
+            return e.http_body
+          end
 
           session[:logged_in] = result["logged_in"] if result.has_key?("logged_in")
           redirect result["redirect_to"] and return if result["redirect_to"]

data/lib/nimbu/version.rb

@@ -1,3 +1,3 @@
 module Nimbu
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70211995749860 !ruby/object:Gem::Requirement
+  requirement: &70289111764520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70211995749860
+  version_requirements: *70289111764520
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70211995749340 !ruby/object:Gem::Requirement
+  requirement: &70289111764020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70211995749340
+  version_requirements: *70289111764020
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70211995748780 !ruby/object:Gem::Requirement
+  requirement: &70289115335520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70211995748780
+  version_requirements: *70289115335520
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70211995748300 !ruby/object:Gem::Requirement
+  requirement: &70289115333700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211995748300
+  version_requirements: *70289115333700
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70211995747680 !ruby/object:Gem::Requirement
+  requirement: &70289115332140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211995747680
+  version_requirements: *70289115332140
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &70211995747120 !ruby/object:Gem::Requirement
+  requirement: &70289115330240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211995747120
+  version_requirements: *70289115330240
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70211995741560 !ruby/object:Gem::Requirement
+  requirement: &70289111793440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211995741560
+  version_requirements: *70289111793440
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70211995741120 !ruby/object:Gem::Requirement
+  requirement: &70289111793020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211995741120
+  version_requirements: *70289111793020
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70211995740700 !ruby/object:Gem::Requirement
+  requirement: &70289111792600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211995740700
+  version_requirements: *70289111792600
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70211995740280 !ruby/object:Gem::Requirement
+  requirement: &70289111792180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70211995740280
+  version_requirements: *70289111792180
 description: Client library and command-line tool to design and manage websites on
   the Nimbu platform.
 email: