nimbu 0.5.8.1 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c4f71c912ce81f8c717792ed4b2f21bdfb6cb39
-  data.tar.gz: d4c2c195155b4647bc3166c8882ad9e42a3f23f7
+  metadata.gz: b3b793979f2d9f9e9c660aa4d3e174fb1c09726d
+  data.tar.gz: a42ee27c1fd151a73c6345f9e49f50c0d2172ab3
 SHA512:
-  metadata.gz: 5e33503a27e4f505c556b02fb65ba0cf054fe806027466386a4e39aaf81bfdff91d0543775ccb97ba0ec70f2013e9affd71498583c5caab7cba6c3a9df228e91
-  data.tar.gz: 79b883e4fd94d43ff9731935a28d7586057e09a2375abb8c63f72c3f0377679a58eef04d52558b424a5f139332e8a1791a44defba669e1dcc1ec17e51cb0546a
+  metadata.gz: 91155767ca0d7c66253b8e8773a9bce89185adb86e05755160a14dce417f3c182aaef329ff934235af4be4af681e028d5f4a8073ee3c6f3b6e023af7b422b420
+  data.tar.gz: 5394c86eebfd7eac95e0c9c8fd3a0676cb3b0bd5f9a9f3279d4dd46141287e9ef5280963e6e5b8bae7ec1e91fe416696a838c623bc641c1ea3fd4ed3d365143e

data/lib/nimbu/server/base.rb

@@ -105,89 +105,88 @@ module Nimbu
         # end
         ### GET THE TEMPLATES ###
         path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
-        if !request.xhr?
-          begin
-            params = ({} || params).merge({:simulator => {
-                            :host => request.host,
-                            :port => request.port,
-                            :path => path,
-                            :method => method,
-                            :session => session,
-                            :headers => request.env.to_json,
-                          }})
-            result = nimbu.simulator(:subdomain => Nimbu::Auth.site).recipe(params)
-            puts result if Nimbu.debug
-          rescue Exception => e
-            if e.respond_to?(:http_body)
-              return e.http_body
-            else
-              raise e
-            end
-          end
 
-          if result["template"].nil?
-            raise Sinatra::NotFound
+        begin
+          params = ({} || params).merge({:simulator => {
+                          :host => request.host,
+                          :port => request.port,
+                          :path => path,
+                          :method => method,
+                          :session => session,
+                          :headers => request.env.to_json,
+                        }})
+          result = nimbu.simulator(:subdomain => Nimbu::Auth.site).recipe(params)
+          puts result if Nimbu.debug
+        rescue Exception => e
+          if e.respond_to?(:http_body)
+            return e.http_body
+          else
+            raise e
           end
+        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)
-            template_file_haml = File.join(Dir.pwd,'templates',"#{template}.haml")
-
-            if File.exists?(template_file)
-              template_code = IO.read(template_file).force_encoding('UTF-8')
-            elsif File.exists?(template_file_haml)
-              template_code = IO.read(template_file_haml).force_encoding('UTF-8')
-              template = "#{template}.haml"
-            else
-              puts red("Layout file '#{template_file}' is missing...")
-              return render_missing(File.join('templates',template),'template')
-            end
+        if result["template"].nil? && !request.xhr?
+          raise Sinatra::NotFound
+        end
 
-            if template_code=~ /You have an Error in your HAML code/
-              return template_code
-            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)
+          template_file_haml = File.join(Dir.pwd,'templates',"#{template}.haml")
+
+          if File.exists?(template_file)
+            template_code = IO.read(template_file).force_encoding('UTF-8')
+          elsif File.exists?(template_file_haml)
+            template_code = IO.read(template_file_haml).force_encoding('UTF-8')
+            template = "#{template}.haml"
+          else
+            puts red("Layout file '#{template_file}' is missing...")
+            return render_missing(File.join('templates',template),'template')
+          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
+          if template_code=~ /You have an Error in your HAML code/
+            return template_code
+          end
 
-            # Read the layout file
-            layout_file = File.join(Dir.pwd,'layouts',layout)
-            layout_file_haml = File.join(Dir.pwd,'layouts',"#{layout}.haml")
+          # 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
 
-            if File.exists?(layout_file)
-              layout_code = IO.read(layout_file).force_encoding('UTF-8')
-            elsif File.exists?(layout_file_haml)
-              layout = "#{layout}.haml"
-              layout_code = IO.read(layout_file_haml).force_encoding('UTF-8')
-            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)
+          layout_file_haml = File.join(Dir.pwd,'layouts',"#{layout}.haml")
+
+          if File.exists?(layout_file)
+            layout_code = IO.read(layout_file).force_encoding('UTF-8')
+          elsif File.exists?(layout_file_haml)
+            layout = "#{layout}.haml"
+            layout_code = IO.read(layout_file_haml).force_encoding('UTF-8')
+          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('\', \'')}'")
-            end
+          if snippets.any?
+            puts green("    using snippets '#{snippets.keys.join('\', \'')}'")
           end
         else
           template_file = ""

data/lib/nimbu/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Nimbu
-  VERSION = "0.5.8.1"
+  VERSION = "0.5.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.5.8.1
+  version: 0.5.9
 platform: ruby
 authors:
 - Zenjoy BVBA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor