nimbu 0.2.14 → 0.3

data/lib/nimbu/client.rb

@@ -105,6 +105,10 @@ class Nimbu::Client
     post("/themes/#{theme}/templates", {:name => name, :content => content})
   end
 
+  def upload_snippet(theme,name,content)
+    post("/themes/#{theme}/snippets", {:name => name, :content => content})
+  end
+
   def upload_asset(theme,name,file)
     post("/themes/#{theme}/assets", {:name => name, :file => file})
   end

data/lib/nimbu/command/themes.rb

@@ -41,6 +41,9 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
     contents["templates"].each do |t|
       display " - templates/#{t["name"]}"
     end unless contents["templates"].nil?
+    contents["snippets"].each do |s|
+      display " - snippets/#{s["name"]}"
+    end unless contents["templates"].nil?
     contents["assets"].each do |a|
       display " - #{a["folder"]}/#{a["name"]}"
     end unless contents["assets"].nil?
@@ -105,6 +108,8 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
     layouts_files = layouts_glob.map {|dir| dir.gsub("#{Dir.pwd}/layouts/","")}
     templates_glob = Dir.glob("#{Dir.pwd}/templates/**/*.liquid")
     templates_files = templates_glob.map {|dir| dir.gsub("#{Dir.pwd}/templates/","")}
+    snippets_glob = Dir.glob("#{Dir.pwd}/snippets/**/*.liquid")
+    snippets_files = snippets_glob.map {|dir| dir.gsub("#{Dir.pwd}/snippets/","")}
 
     if !(css_only || js_only)
       print "\nLayouts:\n"
@@ -124,6 +129,15 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
         nimbu.upload_template(theme, template, IO.read(file))
         print " (ok)\n"
       end
+
+      print "\nSnippets:\n"
+      snippets_files.each do |snippet|
+        file = "#{Dir.pwd}/snippets/#{snippet}"
+        next if File.directory?(file)
+        print " - snippets/#{snippet}"
+        nimbu.upload_snippet(theme, snippet, IO.read(file))
+        print " (ok)\n"
+      end
     end
 
     if !liquid_only

data/lib/nimbu/server/base.rb

@@ -4,10 +4,13 @@ require "sinatra/multi_route"
 require "vendor/nimbu/okjson"
 require 'term/ansicolor'
 require "base64"
+require "sinatra/json"
+require 'json'
 
 module Nimbu
   module Server
     class Base < Sinatra::Base
+      helpers Sinatra::JSON
       include Term::ANSIColor
       register Sinatra::MultiRoute
 
@@ -55,12 +58,12 @@ 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(/\/$/,'')
           begin
-            response = nimbu.post_request({:path => path, :extra => params, :method => method, :client_session => session })
+            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)
-            puts result if Nimbu.debug
             parse_session(result)
           rescue Exception => e
             if e.respond_to?(:http_body)
@@ -71,12 +74,21 @@ module Nimbu
           end
 
           session[:flash] = result["flash"] if result["flash"]
-          redirect result["redirect_to"] and return if result["redirect_to"]
+          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 }))
+            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
@@ -89,6 +101,7 @@ module Nimbu
         if result["template"].nil?
           raise Sinatra::NotFound
         end
+
         template = result["template"].gsub(/buddha$/,'liquid')
         # Then render everything
         puts green(" => using template '#{template}'")
@@ -97,7 +110,8 @@ module Nimbu
         if File.exists?(template_file)
           template_code = IO.read(template_file)
         else
-          return render_missing_template(File.join('templates',template))
+          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/
@@ -119,18 +133,39 @@ module Nimbu
           layout_code = IO.read(layout_file)
         else
           puts red("Layout file '#{layout_file}' is missing...") 
-          return "Layout file '#{layout_file}' is missing..."
+          return render_missing(File.join('layouts',layout),'layout')
+        end
+
+        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
+
+        if snippets.any?
+          puts green("    using snippets '#{snippets.keys.join('\', \'')}'")
         end
 
         # Send the templates to the browser
         begin
-          results = json_decode(nimbu.get_request({:path => path, :template => template_code, :layout => layout_code, :extra => params, :method => method, :client_session => session }))
+          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)
-          return "#{results["result"]}"
+          html = results["result"]
         rescue RestClient::Exception => error
-          return error.http_body
-        end       
+          html = error.http_body
+        end   
+
+        if request.xhr?
+          return results["json"]
+        else
+          return "#{html}"    
+        end
       end
 
       error 404 do
@@ -146,6 +181,13 @@ module Nimbu
         return render_error(@messag)
       end
 
+      def render_missing(file, type)
+        @messag = ""
+        @messag += "<h1>A #{type} file is missing!</h1>"
+        @messag += "<p>Expected #{type} location: <strong>#{file}</strong></p>"
+        return render_error(@messag)
+      end
+
       def render_404(path)
         @messag = ""
         @messag += "<h1>This page does not exist!</h1>"
@@ -188,7 +230,7 @@ module Nimbu
         if !response["client_session"].nil?
           response["client_session"].each do |key,value|
             session[key.to_sym] = value
-            puts "Session: :#{key} => #{value}" if Nimbu.debug
+            #puts "Session: :#{key} => #{value}" if Nimbu.debug
           end
           session.each do |key,value|
             if !response["client_session"].has_key?(key.to_s)
@@ -198,6 +240,31 @@ module Nimbu
         end
       end
 
+      def parse_snippets(code, snippets = {})
+        # Parse template file for snippets
+        search = Regexp.new("\{\% include (.*) \%\}")
+        matches = code.scan(search)
+        if !matches.empty?
+          matches.each do |snippet|
+            # There seems to be a special layout?
+            snippet_name = snippet[0].gsub(/,$/, '').gsub(/^'/, '').gsub(/'$/, '').gsub(/^"/, '').gsub(/"$/, '')
+            if !(snippet_name =~ /\.liquid$/)
+              snippet_name = "#{snippet_name}.liquid"
+            end
+            # Read the snippet file
+            snippet_file = File.join(Dir.pwd,'snippets',snippet_name)
+            if File.exists?(snippet_file)
+              snippet_code = IO.read(snippet_file)
+              snippets[snippet_name.to_sym] = snippet_code
+              self.parse_snippets(snippet_code, snippets)
+            else
+              raise "#{snippet_file}"
+            end
+          end
+        end
+        return snippets
+      end
+
     end
   end
 end

data/lib/nimbu/version.rb

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

metadata

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