nimbu 0.3 → 0.4

data/lib/nimbu/auth.rb

@@ -45,11 +45,15 @@ class Nimbu::Auth
     end
 
     def get_nimbu_host
-      get_configuration[:hostname]
+      if Nimbu.development
+        get_configuration[:development]
+      else
+        get_configuration[:hostname]
+      end
     end
 
     def get_nimbu_theme
-      get_configuration[:theme]
+      get_configuration[:theme] || "default-theme"
     end
 
     def get_configuration    # :nodoc:

data/lib/nimbu/client.rb

@@ -233,7 +233,7 @@ class Nimbu::Client
     uri = URI.parse(given)
     uri.host ||= host.host
     uri.scheme ||= host.scheme || "http"
-    uri.path = "/api/v1" + ((uri.path[0..0] == "/") ? uri.path : "/#{uri.path}")
+    uri.path = "/api/v2" + ((uri.path[0..0] == "/") ? uri.path : "/#{uri.path}")
     uri.port = host.port if full_host =~ /\:\d+/
     uri.to_s
   end

data/lib/nimbu/command/base.rb

@@ -16,6 +16,10 @@ class Nimbu::Command::Base
   def initialize(args=[], options={})
     @args = args
     @options = options
+
+    Nimbu.debug = args.include?("--debug")
+    Nimbu.development = args.include?("--development") || args.include?("--dev")
+    Nimbu.v2 = args.include?("--v2")
   end
 
   def app

data/lib/nimbu/command/server.rb

@@ -20,7 +20,6 @@ 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
@@ -29,12 +28,14 @@ class Nimbu::Command::Server < Nimbu::Command::Base
 
       puts white("\nStarting up Nimbu Server" + (no_compass ? "" : " + Compass Watcher") + (no_haml ? "" : " + HAML Compiler") + "...")
       puts green(
-            "             _   ___            __         \n" +
+            "\n             _   ___            __         \n" +
             "            / | / (_)____ ___  / /_  __  __\n" +
             "           /  |/ / // __ `__ \\/ __ \\/ / / /\n" +
             "          / /|  / // / / / / / /_/ / /_/ / \n" +
             "         /_/ |_/_//_/ /_/ /_/_.___/\\__,_/  \n")
 
+      puts green("\nConnnected to '#{Nimbu::Auth.host}', using '#{Nimbu::Auth.theme}' theme.\n")
+
       rd1, wr1 = IO::pipe
       rd2, wr2 = IO::pipe
       rd3, wr3 = IO::pipe

data/lib/nimbu/server/base.rb

@@ -14,12 +14,11 @@ module Nimbu
       include Term::ANSIColor
       register Sinatra::MultiRoute
 
-      enable :sessions
-
       configure :development do
         register Sinatra::Reloader
       end
 
+      set :method_override, true
       set :static, true                             # set up static file routing
       set :public_folder, Dir.pwd # set up the static dir (with images/js/css inside)
       
@@ -57,14 +56,60 @@ module Nimbu
         )
         puts green("#{method.upcase} #{request.fullpath}")
 
-        if request.post? || request.put? || request.delete?
-          ##### POST / PUT / DELET #####
-          path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
+        # if request.post? || request.put? || request.delete?
+        #   ##### POST / PUT / DELET #####
+        #   path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
+        #   begin
+        #     response = nimbu.post_request({:path => path, :extra => params, :method => method, :client_session => session, :ajax => request.xhr? })
+        #     puts "RESPONSE: #{response}" if Nimbu.debug
+        #     result = json_decode(response)
+        #     parse_session(result)
+        #   rescue Exception => e
+        #     if e.respond_to?(:http_body)
+        #       return e.http_body
+        #     else
+        #       raise e
+        #     end
+        #   end
+
+        #   session[:flash] = result["flash"] if result["flash"]
+        #   if request.xhr?
+        #     if !result["json"].nil?
+        #       puts "JSON: #{result["json"]["data"]}" if Nimbu.debug
+        #       status result["json"]["status"].to_i
+        #       return json(result["json"]["data"], :encoder => :to_json, :content_type => :js)
+        #     end
+        #   else
+        #     redirect result["redirect_to"] and return if result["redirect_to"]
+        #   end
+        # else
+        #   # First get the template name and necessary subtemplates
+        #   ##### GET #####
+        #   path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
+        #   begin
+        #     result = json_decode(nimbu.get_template({:path => path, :extra => params, :method => "get", :extra => params, :client_session => session, :ajax => request.xhr? }))
+        #     puts result if Nimbu.debug
+        #     parse_session(result)            
+        #   rescue Exception => e
+        #     return e.http_body
+        #   end
+
+        #   redirect result["redirect_to"] and return if result["redirect_to"]
+        # end
+        ### GET THE TEMPLATES ###
+        path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
+        if !request.xhr?
           begin
-            response = nimbu.post_request({:path => path, :extra => params, :method => method, :client_session => session, :ajax => request.xhr? })
-            puts "RESPONSE: #{response}" if Nimbu.debug
-            result = json_decode(response)
-            parse_session(result)
+            params = ({} || params).merge({:simulator => {
+                            :host => request.host,
+                            :port => request.port,
+                            :path => path,  
+                            :method => method, 
+                            :session => session, 
+                            :headers => request.env.to_json,
+                          }})
+            result = json_decode(nimbu.get_template(params))
+            puts result if Nimbu.debug
           rescue Exception => e
             if e.respond_to?(:http_body)
               return e.http_body
@@ -72,100 +117,90 @@ module Nimbu
               raise e
             end
           end
-
-          session[:flash] = result["flash"] if result["flash"]
-          if request.xhr?
-            if !result["json"].nil?
-              puts "JSON: #{result["json"]["data"]}" if Nimbu.debug
-              status result["json"]["status"].to_i
-              return json(result["json"]["data"], :encoder => :to_json, :content_type => :js)
-            end
-          else
-            redirect result["redirect_to"] and return if result["redirect_to"]
-          end
-        else
-          # First get the template name and necessary subtemplates
-          ##### GET #####
-          path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
-          begin
-            result = json_decode(nimbu.get_template({:path => path, :extra => params, :method => "get", :extra => params, :client_session => session, :ajax => request.xhr? }))
-            puts result if Nimbu.debug
-            parse_session(result)            
-          rescue Exception => e
-            return e.http_body
+      
+          if result["template"].nil?
+            raise Sinatra::NotFound
           end
 
-          redirect result["redirect_to"] and return if result["redirect_to"]
-        end
-        
-        if result["template"].nil?
-          raise Sinatra::NotFound
-        end
-
-        template = result["template"].gsub(/buddha$/,'liquid')
-        # Then render everything
-        puts green(" => using template '#{template}'")
-        # Read the template file
-        template_file = File.join(Dir.pwd,'templates',template)
-        if File.exists?(template_file)
-          template_code = IO.read(template_file)
-        else
-          puts red("Layout file '#{template_file}' is missing...") 
-          return render_missing(File.join('templates',template),'template')
-        end
+          unless result["template"] == "<<<< REDIRECT >>>>"
+            template = result["template"].gsub(/buddha$/,'liquid')
+            # Then render everything
+            puts green(" => using template '#{template}'")
+            # Read the template file
+            template_file = File.join(Dir.pwd,'templates',template)
+            if File.exists?(template_file)
+              template_code = IO.read(template_file)
+            else
+              puts red("Layout file '#{template_file}' is missing...") 
+              return render_missing(File.join('templates',template),'template')
+            end
 
-        if template_code=~ /You have an Error in your HAML code/
-          return template_code
-        end
+            if template_code=~ /You have an Error in your HAML code/
+              return template_code
+            end
 
-        # Parse template file for a special layout
-        search = Regexp.new("\{\% layout \'(.*)\' \%\}")
-        if search =~ template_code
-          # There seems to be a special layout?
-          layout = $1
-        else
-          layout = 'default.liquid'
-        end
+            # Parse template file for a special layout
+            search = Regexp.new("\{\% layout \'(.*)\' \%\}")
+            if search =~ template_code
+              # There seems to be a special layout?
+              layout = $1
+            else
+              layout = 'default.liquid'
+            end
 
-        # Read the layout file
-        layout_file = File.join(Dir.pwd,'layouts',layout)
-        if File.exists?(layout_file)
-          layout_code = IO.read(layout_file)
-        else
-          puts red("Layout file '#{layout_file}' is missing...") 
-          return render_missing(File.join('layouts',layout),'layout')
-        end
+            # Read the layout file
+            layout_file = File.join(Dir.pwd,'layouts',layout)
+            if File.exists?(layout_file)
+              layout_code = IO.read(layout_file)
+            else
+              puts red("Layout file '#{layout_file}' is missing...") 
+              return render_missing(File.join('layouts',layout),'layout')
+            end
 
-        puts green("    using layout '#{layout}'")
+            puts green("    using layout '#{layout}'")
 
-        begin
-          snippets = parse_snippets(template_code)
-          snippets = parse_snippets(layout_code,snippets)
-        rescue Exception => e
-          # If there is a snippet missing, we raise an error
-          puts red("Snippet file '#{e.message}' is missing...") 
-          return render_missing(e.message,'snippet')
-        end
+            begin
+              snippets = parse_snippets(template_code)
+              snippets = parse_snippets(layout_code,snippets)
+            rescue Exception => e
+              # If there is a snippet missing, we raise an error
+              puts red("Snippet file '#{e.message}' is missing...") 
+              return render_missing(e.message,'snippet')
+            end
 
-        if snippets.any?
-          puts green("    using snippets '#{snippets.keys.join('\', \'')}'")
+            if snippets.any?
+              puts green("    using snippets '#{snippets.keys.join('\', \'')}'")
+            end
+          end
+        else
+          template_file = ""
         end
 
         # Send the templates to the browser
         begin
-          results = json_decode(nimbu.get_request({:path => path, :template => template_code, :layout => layout_code, :snippets => snippets, :extra => params, :method => method, :client_session => session, :ajax => request.xhr? }))
-          puts result if Nimbu.debug
-          parse_session(results)
-          html = results["result"]
+          params = ({} || params).merge({:simulator => {
+                          :path => path,  
+                          :template => template_code, 
+                          :host => request.host,
+                          :port => request.port,
+                          :layout => layout_code, 
+                          :snippets => snippets, 
+                          :method => method, 
+                          :session => session, 
+                          :headers => request.env.to_json,
+                        }})
+          results = json_decode(nimbu.get_request(params))
+          puts results["status"] if Nimbu.debug
+          puts results["headers"] if Nimbu.debug
+          puts results["body"].gsub(/\n/,'') if Nimbu.debug
+
+          status results["status"]
+          headers results["headers"] unless results["headers"] == ""
+          body results["body"]
         rescue RestClient::Exception => error
+          puts "Error! #{error.http_body}"
           html = error.http_body
-        end   
-
-        if request.xhr?
-          return results["json"]
-        else
-          return "#{html}"    
-        end
+        end          
       end
 
       error 404 do
@@ -226,19 +261,19 @@ 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
+      # def parse_session(response)
+      #   if !response["session"].nil?
+      #     response["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["session"].has_key?(key.to_s)
+      #         session.delete(key)
+      #       end
+      #     end
+      #   end
+      # end
 
       def parse_snippets(code, snippets = {})
         # Parse template file for snippets

data/lib/nimbu/version.rb

@@ -1,3 +1,3 @@
 module Nimbu
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/lib/nimbu.rb

@@ -9,4 +9,20 @@ module Nimbu
   def self.debug
     @@debug
   end
+
+  def self.development=(value)
+    @@development = value
+  end
+
+  def self.development
+    @@development
+  end
+
+  def self.v2=(value)
+    @@v2 = value
+  end
+
+  def self.v2
+    @@v2
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70218127116440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70218127116440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70218127130520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70218127130520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70218127128180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70218127128180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70218127126060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218127126060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70218127123980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218127123980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra-contrib
-  requirement: &70218127137420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218127137420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70218127148300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218127148300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70218127147000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218127147000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70218127146340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218127146340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70218127145540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +165,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70218127145540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Client library and command-line tool to design and manage websites on
   the Nimbu platform.
 email:
@@ -169,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Client library and CLI to design websites on the Nimbu platform.