nimbu 0.6.4 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ea5b7593ec34ac1b9021a9717c648cc990869d
-  data.tar.gz: f4c39215744c4c55fcf49185164b7329a7fcc6c0
+  metadata.gz: 2849d39ff894ad5145ff30a8c440214496519b81
+  data.tar.gz: c46c6fe8fc3ee24688b0877a34907adfca08a365
 SHA512:
-  metadata.gz: a8814292a860e967494b4fc8f45b9aeeb2f39da95adbec81bb3db0bbb751874a55a21beb9e846894730b22ee485794758d8abf8643da4f2809dc957c3d68ea29
-  data.tar.gz: 06224ba232d2dbf588095deeb8d0c507ea3218e2ba43586905cb8a09f277eb2fa8e7825a39973a3ce08fec7de04ff79e29c000ec1c47a20540ca33c588b8fd01
+  metadata.gz: 65d192f03292576b9014adc87b1da3b0e832e9e90874181be424f3ce547d633b0451e3b833c8de760bac7a66818cc6805b9e39d73cce02d3c70e908742305724
+  data.tar.gz: 4e8edae2409f1dee25cedcec5a1b3f7cc44d9c77e69b25e520f16e4b93ed1390a810fe09b0418588c24b4e5a00060ed3f47c48315b16209cf87887d5f2e5873f

data/lib/nimbu/auth.rb

@@ -10,6 +10,13 @@ class Nimbu::Auth
     attr_accessor :credentials
     attr_accessor :configuration
 
+    def simulator_id
+      return @simulator_id if defined? @simulator_id
+
+      ranges = [('a'..'z'),('A'..'Z'),(0..9)].map{|i| i.to_a}.flatten
+      @simulator_id ||= (1..40).map{ ranges[rand(ranges.length)]  }.join
+    end
+
     def client
       @client ||= begin
         Nimbu::Client.new(:oauth_token => token, :endpoint => host, :user_agent => self.user_agent)

data/lib/nimbu/command/server.rb

@@ -78,8 +78,7 @@ class Nimbu::Command::Server < Nimbu::Command::Base
         [:INT, :TERM].each do |sig|
           Signal.trap(sig) do
             puts green("== Stopping HAML watcher\n")
-            haml_listener.stop
-            puts haml_listener
+            Thread.new { haml_listener.stop }
           end
         end
         Process.waitall

data/lib/nimbu/server/base.rb

@@ -2,6 +2,7 @@
 require 'sinatra'
 require "sinatra/reloader"
 require "sinatra/multi_route"
+require "sinatra/cookies"
 require "vendor/nimbu/okjson"
 require 'term/ansicolor'
 require "base64"
@@ -12,209 +13,69 @@ require 'rack/streaming_proxy'
 module Nimbu
   module Server
     class Base < Sinatra::Base
-      helpers Sinatra::JSON
       include Term::ANSIColor
-      register Sinatra::MultiRoute
 
-      configure :development do
-        register Sinatra::Reloader
-      end
+      helpers Sinatra::JSON
+      helpers Sinatra::Cookies
+      register Sinatra::MultiRoute
 
       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)
 
       set :views,  File.expand_path('../views', __FILE__) # set up the views dir
-      set :haml, { :format => :html5 }                    # if you use haml
+      set :haml, { format: :html5 }                    # if you use haml
 
       # Your "actions" go here…
       #
 
-      get '/media/*' do
-        proxy = Rack::StreamingProxy::ProxyRequest.new(request,"http://#{nimbu.host}/media/#{params[:splat].first}")
-        return [proxy.status, proxy.headers, proxy]
-      end
-
       get '/__sinatra__/*' do
         return ""
       end
 
       get '/favicon.ico' do
-        return ""
+        proxy = Rack::StreamingProxy::ProxyRequest.new(request,"http://#{Nimbu::Auth.site}.#{Nimbu::Auth.admin_host}/favicon.ico")
+        return [proxy.status, proxy.headers, proxy]
       end
 
-      # post '*' do
-      #   path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
-      #   result = json_decode(nimbu.post_request({:path => path, :extra => params, :session => session}))
+      route :get, :post, :put, :delete, :patch, '*' do
+        # clear the session after a restart of the browser
 
-      #   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
+        method = detect_http_method(request)
+        @templates = {}
 
-      route :get, :post, :put, :delete, '*' do
-
-        method = (
-          if request.get? then "get"
-          elsif request.post? then "post"
-          elsif request.put? then "put"
-          elsif request.delete? then "delete"
-          end
-        )
-        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, :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(/\/$/,'')
-
-        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
+        if cookies["nimbu_simulator_id"] != Nimbu::Auth.simulator_id
+          puts yellow("Refreshing session for simulation...")
+          cookies.each {|k,v| cookies.delete(k)}
+          response.set_cookie "nimbu_simulator_id", { :value => Nimbu::Auth.simulator_id, :http_only => false, :path => "/" }
+          redirect to(request.path) and return
         end
 
-        if result["template"].nil? && !request.xhr?
-          raise Sinatra::NotFound
-        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 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.strip.gsub(/,$/, '').gsub(/^'/, '').gsub(/'$/, '').gsub(/^"/, '').gsub(/"$/, '')
-            if !(layout =~ /\.liquid$/)
-              layout = "#{layout}.liquid"
-            end
-          else
-            layout = 'default.liquid'
-          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("#{method.upcase} #{request.fullpath}")
 
-          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
-        else
-          template_file = ""
-        end
+        ### GET THE RECIPE FOR RENDERING THIS PAGE ###
+        path = extract_path(request)
+        templates = pack_templates!
+
+        params = request.params || {}
+        params.merge!({
+          simulator: {
+            version: "v2",
+            path:    path,
+            code:    templates,
+            request: {
+              host:    request.host,
+              port:    request.port,
+              method:  method,
+              session: session,
+              headers: request.env.to_json
+            }
+          }
+        })
 
         # Send the templates to the browser
         begin
-          params = ({} || params).merge({:simulator => {
-                          :path => path,
-                          :code => {
-                            :template_name => template,
-                            :template => template_code,
-                            :layout_name => layout,
-                            :layout => layout_code,
-                            :snippets => snippets,
-                          },
-                          :request => {
-                            :host => request.host,
-                            :port => request.port,
-                            :method => method,
-                            :session => session,
-                            :headers => request.env.to_json
-                          }
-                        }})
-          results = nimbu.simulator(:subdomain => Nimbu::Auth.site).render(params)
+          results = nimbu.simulator(subdomain: Nimbu::Auth.site).render(params)
           puts results["status"] if Nimbu.debug
           puts results["headers"] if Nimbu.debug
           puts Base64.decode64(results["body"]).gsub(/\n/,'') if Nimbu.debug
@@ -223,9 +84,8 @@ module Nimbu
           headers results["headers"] unless results["headers"] == ""
           body Base64.decode64(results["body"])
         rescue Exception => error
-          puts "Error!"
           puts "Error! #{error.http_body}"
-          html = error.http_body
+          error.http_body
         end
       end
 
@@ -235,6 +95,23 @@ module Nimbu
 
       protected
 
+      def detect_http_method(request)
+        if request.get?       then "get"
+        elsif request.post?   then "post"
+        elsif request.patch?  then "patch"
+        elsif request.put?    then "put"
+        elsif request.delete? then "delete"
+        end
+      end
+
+      def extract_path(request)
+        if request.path == "/"
+          request.path
+        else
+          request.path.gsub(/\/$/,'')
+        end
+      end
+
       def render_missing_template(template)
         @messag = ""
         @messag += "<h1>A template file is missing!</h1>"
@@ -287,35 +164,25 @@ module Nimbu
         Nimbu::Auth.client
       end
 
-      def parse_snippets(code, snippets = {})
-        # Parse template file for snippets
-        search = /\{\% include ([^\s]*).*\%\}/
-        matches = code.scan(search)
-        if !matches.empty?
-          matches.each do |snippet|
-            # There seems to be a special layout?
-            snippet_name = snippet[0].strip.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)
-            snippet_file_haml = File.join(Dir.pwd,'snippets',"#{snippet_name}.haml")
+      def debug(message)
+        puts message if Nimbu.debug
+      end
+
+      def pack_templates!
+        ["layouts","templates","snippets"].each do |type|
+          load_files(type)
+        end
+        Base64.encode64(Zlib::Deflate.deflate(json_encode(@templates), Zlib::DEFAULT_COMPRESSION))
+      end
 
-            if File.exists?(snippet_file)
-              snippet_code = IO.read(snippet_file).force_encoding('UTF-8')
-              snippets[snippet_name.to_sym] = snippet_code
-              self.parse_snippets(snippet_code, snippets)
-            elsif File.exists?(snippet_file_haml)
-              snippet_code = IO.read(snippet_file_haml).force_encoding('UTF-8')
-              snippets["#{snippet_name}.haml".to_sym] = snippet_code
-              self.parse_snippets(snippet_code, snippets)
-            else
-              raise "#{snippet_file}"
-            end
-          end
+      def load_files(directory)
+        glob = Dir["#{Dir.pwd}/#{directory}/**/*.liquid","#{Dir.pwd}/#{directory}/**/*.liquid.haml"]
+        glob.each do |file|
+          name = file.gsub("#{Dir.pwd}/#{directory}/","")
+          code = IO.read(file).force_encoding('UTF-8')
+          @templates[directory] ||= {}
+          @templates[directory][name.to_s] = code
         end
-        return snippets
       end
 
     end

data/lib/nimbu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: '0.7'
 platform: ruby
 authors:
 - Zenjoy BVBA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor