nimbu 0.2 → 0.2.4

data/lib/nimbu/client.rb

@@ -69,10 +69,14 @@ class Nimbu::Client
     post("/engine/template",params)
   end
 
-  def get_page(params)
+  def get_request(params)
     post("/engine/render",params)
   end
 
+  def post_request(params)
+    post("/engine/process",params)
+  end
+
   def list_themes
     get("/themes")
   end
@@ -93,6 +97,17 @@ class Nimbu::Client
     get("/themes/#{theme}/assets/#{id}")
   end
 
+  def upload_layout(theme,name,content)
+    post("/themes/#{theme}/layouts", {:name => name, :content => content})
+  end
+
+  def upload_template(theme,name,content)
+    post("/themes/#{theme}/templates", {:name => name, :content => content})
+  end
+
+  def upload_asset(theme,name,file)
+    post("/themes/#{theme}/assets", {:name => name, :file => file})
+  end
 
   ##################
 
@@ -100,7 +115,7 @@ class Nimbu::Client
     if http_proxy
       RestClient.proxy = http_proxy
     end
-    resource = RestClient::Resource.new(realize_full_uri(uri), options.merge(:user => password))
+    resource = RestClient::Resource.new(realize_full_uri(uri), options)
     resource
   end
 
@@ -154,7 +169,8 @@ class Nimbu::Client
 
   def nimbu_headers   # :nodoc:
     {
-      'X-Nimbu-API-Version' => '1',
+      'X-Nimbu-API-Version'  => '1',
+      'X-Nimbu-Token'       => password,
       'User-Agent'           => self.class.gem_version_string,
       'X-Ruby-Version'       => RUBY_VERSION,
       'X-Ruby-Platform'      => RUBY_PLATFORM

data/lib/nimbu/command/themes.rb

@@ -83,4 +83,105 @@ class Nimbu::Command::Themes < Nimbu::Command::Base
       print " (ok)\n"
     end
   end
+
+  # download
+  #
+  # download all layouts, templates and assets
+  #
+  def push
+    simulate = args.include?("--dry-run") || args.include?("-d")
+    liquid_only = args.include?("--liquid-only") || args.include?("--liquid")
+    css_only = args.include?("--css-only") || args.include?("--css")
+    js_only = args.include?("--js-only") || args.include?("-js")
+
+    # if !input.to_s.strip.empty?
+    #   theme = input.to_s.strip
+    # else
+    # end
+    theme = Nimbu::Auth.theme
+    display "Pushing layouts, templates and assets for '#{theme}' to the server:"
+    
+    layouts_glob = Dir.glob("#{Dir.pwd}/layouts/**/*.liquid")
+    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/","")}
+
+    if !(css_only || js_only)
+      print "\nLayouts:\n"
+      layouts_files.each do |layout|
+        file = "#{Dir.pwd}/layouts/#{layout}"
+        next if File.directory?(file)
+        print " - layouts/#{layout}"
+        nimbu.upload_layout(theme, layout, IO.read(file))
+        print " (ok)\n"
+      end      
+
+      print "\nTemplates:\n"
+      templates_files.each do |template|
+        file = "#{Dir.pwd}/templates/#{template}"
+        next if File.directory?(file)
+        print " - templates/#{template}"
+        nimbu.upload_template(theme, template, IO.read(file))
+        print " (ok)\n"
+      end
+    end
+
+    if !liquid_only
+      css_glob = Dir.glob("#{Dir.pwd}/stylesheets/**/*.css")
+      css_files = css_glob.map {|dir| dir.gsub("#{Dir.pwd}/stylesheets/","")}
+      if !js_only
+        print "\nStylesheet:\n"
+        css_files.each do |css|
+          file = "#{Dir.pwd}/stylesheets/#{css}"
+          next if File.directory?(file) || (!anyFileWithWord?(layouts_glob,css) && !anyFileWithWord?(templates_glob,css))
+          nimbu.upload_asset(theme, "stylesheets/#{css}", File.open(file))
+          print " - stylesheets/#{css}"
+          print " (ok)\n"
+        end
+      end
+
+      js_glob = Dir.glob("#{Dir.pwd}/javascripts/**/*.js")
+      js_files = js_glob.map {|dir| dir.gsub("#{Dir.pwd}/javascripts/","")}
+      if !css_only
+        print "\nJavascripts:\n"
+        js_files.each do |js|
+          file = "#{Dir.pwd}/javascripts/#{js}"
+          next if File.directory?(file) || (!anyFileWithWord?(layouts_glob,js) && !anyFileWithWord?(templates_glob,js))
+          nimbu.upload_asset(theme, "javascripts/#{js}", File.open(file))
+          print " - javascripts/#{js}"
+          print " (ok)\n"
+        end
+      end
+
+      image_files = Dir.glob("#{Dir.pwd}/images/**/*").map {|dir| dir.gsub("#{Dir.pwd}/images/","")}
+      if !(css_only || js_only)
+        print "\nImages:\n"
+        image_files.each do |image|
+          file = "#{Dir.pwd}/images/#{image}"
+          next if File.directory?(file) || (!anyFileWithWord?(css_glob,image) && !anyFileWithWord?(js_glob,image) && !anyFileWithWord?(layouts_glob,image) && !anyFileWithWord?(templates_glob,image))
+          nimbu.upload_asset(theme, "images/#{image}", File.open(file))
+          print " - images/#{image}"
+          print " (ok)\n"
+        end
+      end
+    end
+  end
+
+  private 
+
+  def anyFileWithWord?(glob,word)
+    found = false
+    glob.each do |file|
+      found = true if fileHasWord?(file,word)
+    end
+    return found
+  end
+
+  def fileHasWord?(file,word)
+    File.open(file) do |f|
+      f.any? do |line|
+        line.include?(word)
+      end
+    end
+  end
 end

data/lib/nimbu/server/base.rb

@@ -1,9 +1,18 @@
 require 'sinatra'
+require "sinatra/reloader"
 require "vendor/nimbu/okjson"
+require 'term/ansicolor'
 
 module Nimbu
   module Server
     class Base < Sinatra::Base
+      include Term::ANSIColor
+      enable :sessions
+
+      configure :development do
+        register Sinatra::Reloader
+      end
+
       set :static, true                             # set up static file routing
       set :public_folder, Dir.pwd # set up the static dir (with images/js/css inside)
       
@@ -17,15 +26,32 @@ module Nimbu
         return ""
       end
 
+      get '/favicon.ico' do
+        return ""
+      end
+
+      post '*' do
+        path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
+        result = json_decode(nimbu.post_request({:path => path, :extra => params, :session => session}))
+
+        session[:logged_in] = true if result["logged_in"]
+        session[:flash] = result["flash"] if result["flash"]
+        redirect result["redirect_to"] if result["redirect_to"]
+      end
+
       get '*' do
-        puts "Getting template for #{request.path}"
+        puts green("Getting template for #{request.fullpath}")
         path = request.path == "/" ? request.path : request.path.gsub(/\/$/,'')
-        template = json_decode(nimbu.get_template({:path => path}))["template"]
-        if template.nil?
+        result = json_decode(nimbu.get_template({:path => path, :extra => params}))
+
+        session[:logged_in] = result["logged_in"] if result.has_key?("logged_in")
+        redirect result["redirect_to"] if result["redirect_to"]
+        
+        if result["template"].nil?
           raise Sinatra::NotFound
         end
-        template = template.gsub(/buddha$/,'liquid')
-        puts "Uploading assets for template '#{template}'"
+        template = result["template"].gsub(/buddha$/,'liquid')
+        puts green("Uploading assets for template '#{template}'")
         # Read the template file
         template_file = File.join(Dir.pwd,'templates',template)
         if File.exists?(template_file)
@@ -48,11 +74,14 @@ module Nimbu
         if File.exists?(layout_file)
           layout_code = IO.read(layout_file)
         else
+          puts red("Layout file '#{layout_file}' is missing...") 
           return "Layout file '#{layout_file}' is missing..."
         end
 
+        puts red("logged_in") if session[:logged_in]
+
         # Send the templates to the browser
-        results = json_decode(nimbu.get_page({:path => path, :template => template_code, :layout => layout_code}))
+        results = json_decode(nimbu.get_request({:path => path, :template => template_code, :layout => layout_code, :extra => params, :logged_in => session[:logged_in]}))
 
         return "#{results["result"]}"
       end

data/lib/nimbu/version.rb

@@ -1,3 +1,3 @@
 module Nimbu
-  VERSION = "0.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nimbu
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70143971766620 !ruby/object:Gem::Requirement
+  requirement: &70348632583180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70143971766620
+  version_requirements: *70348632583180
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70143971766080 !ruby/object:Gem::Requirement
+  requirement: &70348632597260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70143971766080
+  version_requirements: *70348632597260
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70143971765600 !ruby/object:Gem::Requirement
+  requirement: &70348632596100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *70143971765600
+  version_requirements: *70348632596100
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70143971765140 !ruby/object:Gem::Requirement
+  requirement: &70348632593760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143971765140
+  version_requirements: *70348632593760
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70143971764540 !ruby/object:Gem::Requirement
+  requirement: &70348632605460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143971764540
+  version_requirements: *70348632605460
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: &70348632604380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70348632604380
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70143971763980 !ruby/object:Gem::Requirement
+  requirement: &70348632603440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143971763980
+  version_requirements: *70348632603440
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70143971762860 !ruby/object:Gem::Requirement
+  requirement: &70348632601780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143971762860
+  version_requirements: *70348632601780
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70143971762380 !ruby/object:Gem::Requirement
+  requirement: &70348632600000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70143971762380
+  version_requirements: *70348632600000
 description: Client library and command-line tool to design and manage websites on
   the Nimbu platform.
 email: