nimbu 0.2.9 → 0.2.10

data/lib/nimbu/server/base.rb

@@ -1,5 +1,6 @@
 require 'sinatra'
 require "sinatra/reloader"
+require "sinatra/multi_route"
 require "vendor/nimbu/okjson"
 require 'term/ansicolor'
 
@@ -7,6 +8,8 @@ module Nimbu
   module Server
     class Base < Sinatra::Base
       include Term::ANSIColor
+      register Sinatra::MultiRoute
+
       enable :sessions
 
       configure :development do
@@ -30,23 +33,32 @@ module Nimbu
         return ""
       end
 
-      post '*' do
-        path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
-        result = json_decode(nimbu.post_request({:path => path, :extra => params, :session => session}))
+      # post '*' do
+      #   path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
+      #   result = json_decode(nimbu.post_request({:path => path, :extra => params, :session => session}))
 
-        session[:logged_in] = true if result["logged_in"]
-        session[:flash] = result["flash"] if result["flash"]
-        redirect result["redirect_to"] if result["redirect_to"]
-      end
+      #   session[:logged_in] = true if result["logged_in"]
+      #   session[:flash] = result["flash"] if result["flash"]
+      #   redirect result["redirect_to"] and return if result["redirect_to"]
+      # end
 
-      get '*' do
-        # 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}))
+      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"}))
+
+          session[:logged_in] = true if result["logged_in"]
+          session[:flash] = result["flash"] if result["flash"]
+          redirect result["redirect_to"] and return if result["redirect_to"]
+        else
+          # 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"}))
 
-        session[:logged_in] = result["logged_in"] if result.has_key?("logged_in")
-        redirect result["redirect_to"] if result["redirect_to"]
+          session[:logged_in] = result["logged_in"] if result.has_key?("logged_in")
+          redirect result["redirect_to"] and return if result["redirect_to"]
+        end
         
         if result["template"].nil?
           raise Sinatra::NotFound
@@ -86,14 +98,12 @@ module Nimbu
 
         # Send the templates to the browser
         begin
-          response = nimbu.get_request({:path => path, :template => template_code, :layout => layout_code, :extra => params, :logged_in => session[:logged_in]})
+          response = nimbu.get_request({:path => path, :template => template_code, :layout => layout_code, :extra => params, :logged_in => session[:logged_in], :method => request.post? ? "post" : "get"})
           results = json_decode(response)
           return "#{results["result"]}"
         rescue RestClient::Exception => error
           return error.http_body
-        end
-
-        
+        end       
       end
 
       error 404 do

data/lib/nimbu/version.rb

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

metadata

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