nimbu 0.2.13 → 0.2.14

data/lib/nimbu/command/server.rb

@@ -20,6 +20,7 @@ class Nimbu::Command::Server < Nimbu::Command::Base
     else
       no_haml = args.include?("--no-haml")
       no_compass = args.include?("--no-compass")
+      Nimbu.debug = args.include?("--debug")
 
       if !(File.exists?(File.join(Dir.pwd,'haml')) && File.directory?(File.join(Dir.pwd,'haml')))
           no_haml = true

data/lib/nimbu/server/base.rb

@@ -3,6 +3,7 @@ require "sinatra/reloader"
 require "sinatra/multi_route"
 require "vendor/nimbu/okjson"
 require 'term/ansicolor'
+require "base64"
 
 module Nimbu
   module Server
@@ -43,39 +44,45 @@ module Nimbu
       # end
 
       route :get, :post, :put, :delete, '*' do
-        verb = (
-          if request.get? then "GET"
-          elsif request.post? then "POST"
-          elsif request.put? then "PUT"
-          elsif request.delete? then "DELETE"  
+
+        method = (
+          if request.get? then "get"
+          elsif request.post? then "post"
+          elsif request.put? then "put"
+          elsif request.delete? then "delete"  
           end
         )
-        puts green("#{verb} #{request.fullpath}")
+        puts green("#{method.upcase} #{request.fullpath}")
+
         if request.post? || request.put? || request.delete?
           path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
           begin
-            method = "post" if request.post?
-            method = "put" if request.put?
-            method = "delete" if request.delete?
-
-            result = json_decode(nimbu.post_request({:path => path, :extra => params, :session => session, :method => method, :logged_in => session[:logged_in]})) 
+            response = nimbu.post_request({:path => path, :extra => params, :method => method, :client_session => session })
+            puts "RESPONSE: #{response}" if Nimbu.debug
+            result = json_decode(response)
+            puts result if Nimbu.debug
+            parse_session(result)
           rescue Exception => e
-            return e.http_body
+            if e.respond_to?(:http_body)
+              return e.http_body
+            else
+              raise e
+            end
           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"]
         else
           # First get the template name and necessary subtemplates
           path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
           begin
-            result = json_decode(nimbu.get_template({:path => path, :extra => params, :method => "get", :extra => params, :logged_in => session[:logged_in]}))
+            result = json_decode(nimbu.get_template({:path => path, :extra => params, :method => "get", :extra => params, :client_session => session }))
+            puts result if Nimbu.debug
+            parse_session(result)            
           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"]
         end
         
@@ -117,8 +124,9 @@ 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], :method => request.post? ? "post" : "get"})
-          results = json_decode(response)
+          results = json_decode(nimbu.get_request({:path => path, :template => template_code, :layout => layout_code, :extra => params, :method => method, :client_session => session }))
+          puts result if Nimbu.debug
+          parse_session(results)
           return "#{results["result"]}"
         rescue RestClient::Exception => error
           return error.http_body
@@ -176,6 +184,20 @@ module Nimbu
         Nimbu::Auth.client
       end
 
+      def parse_session(response)
+        if !response["client_session"].nil?
+          response["client_session"].each do |key,value|
+            session[key.to_sym] = value
+            puts "Session: :#{key} => #{value}" if Nimbu.debug
+          end
+          session.each do |key,value|
+            if !response["client_session"].has_key?(key.to_s)
+              session.delete(key)
+            end
+          end
+        end
+      end
+
     end
   end
 end

data/lib/nimbu/version.rb

@@ -1,3 +1,3 @@
 module Nimbu
-  VERSION = "0.2.13"
+  VERSION = "0.2.14"
 end

data/lib/nimbu.rb

@@ -2,5 +2,11 @@ require "nimbu/version"
 require "nimbu/client"
 
 module Nimbu
-  # Your code goes here...
+  def self.debug=(value)
+    @@debug = value
+  end
+
+  def self.debug
+    @@debug
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70164889209320 !ruby/object:Gem::Requirement
+  requirement: &70351799835960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70164889209320
+  version_requirements: *70351799835960
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70164889208820 !ruby/object:Gem::Requirement
+  requirement: &70351799835460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70164889208820
+  version_requirements: *70351799835460
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70164889208360 !ruby/object:Gem::Requirement
+  requirement: &70351799835000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70164889208360
+  version_requirements: *70351799835000
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70164889207980 !ruby/object:Gem::Requirement
+  requirement: &70351799834620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164889207980
+  version_requirements: *70351799834620
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70164889207520 !ruby/object:Gem::Requirement
+  requirement: &70351799834160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164889207520
+  version_requirements: *70351799834160
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &70164889207100 !ruby/object:Gem::Requirement
+  requirement: &70351799833740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164889207100
+  version_requirements: *70351799833740
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70164889206680 !ruby/object:Gem::Requirement
+  requirement: &70351799833320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164889206680
+  version_requirements: *70351799833320
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70164889206260 !ruby/object:Gem::Requirement
+  requirement: &70351799832900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164889206260
+  version_requirements: *70351799832900
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70164889205840 !ruby/object:Gem::Requirement
+  requirement: &70351799832480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164889205840
+  version_requirements: *70351799832480
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70164889205420 !ruby/object:Gem::Requirement
+  requirement: &70351799832060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70164889205420
+  version_requirements: *70351799832060
 description: Client library and command-line tool to design and manage websites on
   the Nimbu platform.
 email: