staticise 0.5.8 → 0.5.9

data/Gemfile

@@ -1,8 +1,10 @@
 source 'https://rubygems.org'
 
 gem 'haml'
+gem 'sass'
 gem 'coffee-script'
 gem 'commander'
+gem 'listen'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -12,6 +12,7 @@ GEM
       highline (~> 1.6.11)
     execjs (1.4.0)
       multi_json (~> 1.0)
+    ffi (1.8.1)
     git (1.2.5)
     haml (4.0.2)
       tilt
@@ -23,10 +24,20 @@ GEM
       rake
       rdoc
     json (1.7.7)
+    listen (1.1.3)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
     multi_json (1.7.3)
     rake (10.0.4)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
     rdoc (4.0.1)
       json (~> 1.4)
+    sass (3.2.9)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
@@ -44,5 +55,7 @@ DEPENDENCIES
   commander
   haml
   jeweler
+  listen
   rdoc
+  sass
   shoulda

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

data/app/css/test.sass

@@ -0,0 +1,3 @@
+.test
+  font-size: 3px
+

data/app/pages/_footer.haml

@@ -1 +1,2 @@
 %h1 this is a footer
+%p tst

data/app/pages/_footer.html

@@ -0,0 +1,3 @@
+<h1>
+  I am a Footer with pure html
+</h1>

data/app/pages/help.html

@@ -0,0 +1,4 @@
+<h1>
+	I am a help page
+</h1>
+<p>Hello world . com</p>

data/app/pages/index.haml

@@ -2,4 +2,7 @@
 %p
   Hello world, hello world...
 
-= partial "footer"
+%h5 Footer with haml partial
+= partial "footer.haml"
+%h5 Footer with Html partial
+= partial "footer.html"

data/app/pages/t.haml

@@ -0,0 +1 @@
+melvin

data/bin/staticise

@@ -32,4 +32,20 @@ command :init do |c|
   end
 end
 
+command :watch do |c|
+  c.syntax = 'staticise watch [options]'
+  c.summary = 'Start staticise watcher'
+  c.option '--no-sass', 'do not include sass files'
+  c.option '--no-less', 'do not include less files'
+  c.option '--no-haml', 'do not include haml files'
+  c.option '--no-coffee', 'do not include coffee files'
+
+  c.action do |args, options|
+    Staticise::Renderer.all
+
+    watcher = Staticise::Watcher.new(options)
+    watcher.start
+  end
+end
+
 

data/lib/staticise/renderer.rb

@@ -10,18 +10,18 @@ module Staticise
     end
 
     def render_page
-      Haml::Engine.new(File.read(@layout)).render(self) do
-        Haml::Engine.new(File.read(@file)).render(self)
+      Haml::Engine.new(read_template(@layout)).render(self) do
+        Haml::Engine.new(read_template(@file)).render(self)
       end
     end
 
     def partial(file, locals = {})
       if file.split("/").length > 1
-        path = File.join(APP_ROOT, 'app', 'pages', "_#{ file.to_s }.haml")
+        path = File.join(APP_ROOT, 'app', 'pages', "_#{ file.to_s }")
       else
-        path = File.join(File.dirname(@file), "_#{ file.to_s }.haml")
+        path = File.join(File.dirname(@file), "_#{ file.to_s }")
       end
-      Haml::Engine.new(File.read(path)).render(self, locals)
+      Haml::Engine.new(read_template(path)).render(self, locals)
     end
 
     def export
@@ -56,7 +56,8 @@ module Staticise
     def self.pages
       puts "Compiling pages.."
       files = Dir.glob(File.join(APP_ROOT, 'app/pages/**/*.haml'))
-      files.each do |f|
+      files << Dir.glob(File.join(APP_ROOT, 'app/pages/**/*.html'))
+      files.flatten.each do |f|
         self.new(f).export unless File.basename(f).start_with?("_")
       end
       return
@@ -87,6 +88,18 @@ module Staticise
 
     private
 
+    def read_template(file)
+      if File.extname(file).eql?(".html")
+        s = [":preserve\n"]
+        s << File.readlines(file).map {|l| "  #{ l }"}
+        res = s.flatten.join
+      else
+        res = File.read(file)
+      end
+      # puts res
+      res
+    end
+
     def extract(file)
       @layout = File.join(APP_ROOT, "app", "layouts", "app.haml")
       @file = file

data/lib/staticise/watcher.rb

@@ -0,0 +1,63 @@
+require 'fileutils'
+require 'listen'
+
+module Staticise
+
+  class Watcher
+    attr_accessor :no_sass, :no_less, :no_haml, :no_coffee
+
+    def initialize(options)
+      @no_sass = !options.no_sass.nil?
+      @no_less = !options.no_less.nil?
+      @no_haml = !options.no_haml.nil?
+      @no_coffee = !options.no_coffee.nil?
+
+      puts "listening now with #{ self.inspect }"
+
+      @listener = Listen.to!(File.join(APP_ROOT, 'app')) do |modified, added, removed|
+        process(modified)
+      end
+    end
+
+    def process(file)
+      if file.class.eql?(Array)
+        file.each {|f| process(f)}
+        return
+      end
+
+      ext = File.extname(file.to_s).downcase
+
+      case ext
+        when ".sass"
+          sass(file) unless @no_sass
+        when ".less"
+          less(file) unless @no_less
+        when ".haml"
+          haml(file) unless @no_haml
+        when ".coffee"
+          coffee(file) unless @no_coffee
+        else
+
+      end
+    end
+
+    def haml(file)
+      Staticise::Renderer.pages
+    end
+
+    def less(file)
+      Staticise::Renderer.styles
+    end
+
+    def sass(file)
+      puts "processing #{ file }"
+      ext = '.sass'
+      FileUtils.mkdir_p(File.join(APP_ROOT, "public", "css")) unless File.exist?(File.join(APP_ROOT, "public", "css"))
+      `sass #{ File.join(APP_ROOT, 'app', file) }:#{ File.join(APP_ROOT, 'public', File.dirname(file), "#{ File.basename(file, ext) }.css") }`
+    end
+
+    def coffee(file)
+      Staticise::Renderer.scripts
+    end
+  end
+end

data/lib/staticise.rb

@@ -7,4 +7,5 @@ require 'haml'
 APP_ROOT = "." #File.expand_path(File.dirname(__FILE__) + "../../")
 
 require 'staticise/renderer'
+require 'staticise/watcher'
 

data/public/help.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang='en'>
+  <head>
+    <meta charset='utf-8'>
+    <meta content='IE=Edge,chrome=1' http-equiv='X-UA-Compatible'>
+    <meta content='width=device-width, initial-scale=1.0' name='viewport'>
+    <title></title>
+    
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      
+    <![endif]-->
+    
+    <link href='images/apple-touch-icon-144x144.png' rel='apple-touch-icon-precomposed' sizes='144x144'>
+    <link href='images/apple-touch-icon-114x114.png' rel='apple-touch-icon-precomposed' sizes='114x114'>
+    <link href='images/apple-touch-icon-72x72.png' rel='apple-touch-icon-precomposed' sizes='72x72'>
+    <link href='images/apple-touch-icon.png' rel='apple-touch-icon-precomposed'>
+    <link href='favicon.ico' rel='shortcut icon'>
+  </head>
+  <body>
+    <div class='navbar navbar-fixed-top'>
+      <div class='navbar-inner'>
+        <div class='container'>
+          <a class='btn btn-navbar' data-target='.nav-collapse' data-toggle='collapse'>
+            <span class='icon-bar'></span>
+            <span class='icon-bar'></span>
+            <span class='icon-bar'></span>
+          </a>
+          <a class='brand' href='/' title='Im sick of damn excel sheet'>isodes</a>
+          <div class='container nav-collapse'>
+            <ul class='nav'>
+              <li></li>
+              <li></li>
+              <li></li>
+              <li></li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class='container content-panel'>
+      <div class='row'>
+        <div class='span12'>
+          
+          <h1>&#x000A;	I am a help page&#x000A;</h1>&#x000A;<p>Hello world . com</p>
+        </div>
+      </div>
+      <footer>
+        <p>&copy; melvinsembrano@gmail.com 2013</p>
+      </footer>
+    </div>
+    <!--
+      Javascripts
+      ==================================================
+    -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    
+  </body>
+</html>

data/public/index.html

@@ -46,7 +46,11 @@
           <p>
             Hello world, hello world...
           </p>
+          <h5>Footer with haml partial</h5>
           <h1>this is a footer</h1>
+          <p>tst</p>
+          <h5>Footer with Html partial</h5>
+          <h1>&#x000A;  I am a Footer with pure html&#x000A;</h1>
         </div>
       </div>
       <footer>

data/public/t.html

@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang='en'>
+  <head>
+    <meta charset='utf-8'>
+    <meta content='IE=Edge,chrome=1' http-equiv='X-UA-Compatible'>
+    <meta content='width=device-width, initial-scale=1.0' name='viewport'>
+    <title></title>
+    
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      
+    <![endif]-->
+    
+    <link href='images/apple-touch-icon-144x144.png' rel='apple-touch-icon-precomposed' sizes='144x144'>
+    <link href='images/apple-touch-icon-114x114.png' rel='apple-touch-icon-precomposed' sizes='114x114'>
+    <link href='images/apple-touch-icon-72x72.png' rel='apple-touch-icon-precomposed' sizes='72x72'>
+    <link href='images/apple-touch-icon.png' rel='apple-touch-icon-precomposed'>
+    <link href='favicon.ico' rel='shortcut icon'>
+  </head>
+  <body>
+    <div class='navbar navbar-fixed-top'>
+      <div class='navbar-inner'>
+        <div class='container'>
+          <a class='btn btn-navbar' data-target='.nav-collapse' data-toggle='collapse'>
+            <span class='icon-bar'></span>
+            <span class='icon-bar'></span>
+            <span class='icon-bar'></span>
+          </a>
+          <a class='brand' href='/' title='Im sick of damn excel sheet'>isodes</a>
+          <div class='container nav-collapse'>
+            <ul class='nav'>
+              <li></li>
+              <li></li>
+              <li></li>
+              <li></li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class='container content-panel'>
+      <div class='row'>
+        <div class='span12'>
+          
+          melvin
+        </div>
+      </div>
+      <footer>
+        <p>&copy; melvinsembrano@gmail.com 2013</p>
+      </footer>
+    </div>
+    <!--
+      Javascripts
+      ==================================================
+    -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    
+  </body>
+</html>

data/staticise.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "staticise"
-  s.version = "0.5.8"
+  s.version = "0.5.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Melvin Sembrano"]
-  s.date = "2013-05-16"
+  s.date = "2013-05-22"
   s.description = "Static site generator using Haml and Coffescript"
   s.email = "melvinsembrano@gmail.com"
   s.executables = ["staticise"]
@@ -26,26 +26,34 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/css/st.sass",
     "app/css/test.less",
+    "app/css/test.sass",
     "app/js/main.coffee",
     "app/js/plugins/a.coffee",
     "app/layouts/app.haml",
     "app/pages/_footer.haml",
+    "app/pages/_footer.html",
     "app/pages/cat/index.haml",
     "app/pages/dog/index.haml",
+    "app/pages/help.html",
     "app/pages/index.haml",
     "app/pages/lion/index.haml",
+    "app/pages/t.haml",
     "bin/staticise",
     "lib/staticise.rb",
     "lib/staticise/renderer.rb",
+    "lib/staticise/watcher.rb",
     "public/cat/index.html",
     "public/css/test.css",
     "public/dog/index.html",
+    "public/help.html",
     "public/index.html",
     "public/js/app.js",
     "public/js/main.js",
     "public/js/plugins/a.js",
     "public/lion/index.html",
+    "public/t.html",
     "staticise.gemspec",
     "test/helper.rb",
     "test/test_staticise.rb"
@@ -61,16 +69,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<haml>, [">= 0"])
+      s.add_runtime_dependency(%q<sass>, [">= 0"])
       s.add_runtime_dependency(%q<coffee-script>, [">= 0"])
       s.add_runtime_dependency(%q<commander>, [">= 0"])
+      s.add_runtime_dependency(%q<listen>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<haml>, [">= 0"])
+      s.add_dependency(%q<sass>, [">= 0"])
       s.add_dependency(%q<coffee-script>, [">= 0"])
       s.add_dependency(%q<commander>, [">= 0"])
+      s.add_dependency(%q<listen>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -78,8 +90,10 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<haml>, [">= 0"])
+    s.add_dependency(%q<sass>, [">= 0"])
     s.add_dependency(%q<coffee-script>, [">= 0"])
     s.add_dependency(%q<commander>, [">= 0"])
+    s.add_dependency(%q<listen>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staticise
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -140,26 +172,34 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/css/st.sass
 - app/css/test.less
+- app/css/test.sass
 - app/js/main.coffee
 - app/js/plugins/a.coffee
 - app/layouts/app.haml
 - app/pages/_footer.haml
+- app/pages/_footer.html
 - app/pages/cat/index.haml
 - app/pages/dog/index.haml
+- app/pages/help.html
 - app/pages/index.haml
 - app/pages/lion/index.haml
+- app/pages/t.haml
 - bin/staticise
 - lib/staticise.rb
 - lib/staticise/renderer.rb
+- lib/staticise/watcher.rb
 - public/cat/index.html
 - public/css/test.css
 - public/dog/index.html
+- public/help.html
 - public/index.html
 - public/js/app.js
 - public/js/main.js
 - public/js/plugins/a.js
 - public/lion/index.html
+- public/t.html
 - staticise.gemspec
 - test/helper.rb
 - test/test_staticise.rb
@@ -178,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2632539740084124357
+      hash: 3417070075809130016
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: