stasis 0.2.0.pre → 0.2.0

data/bin/stasis

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require File.expand_path(File.dirname(__FILE__) + "/../lib/stasis")
-
 gem "slop", "3.3.2"
 require 'slop'
 
@@ -9,10 +8,18 @@ slop = Slop.parse :help => true, :optional_arguments => true do
   on :d, :development, "Development mode", :as => Integer
   on :o, :only, "Only generate specific files (comma-separated)", :as => Array
   on :p, :public, "Public directory path"
+  on :m, :mime_types, "Additional Mime Types", :as => Array
 end
 
 exit if slop.help?
 options = slop.to_hash
+options[:mime_types] = Hash[*options[:mime_types]]
+
+# Autoload Gemfile if present in pwd
+begin
+  require "bundler/setup"
+  Bundler.require
+rescue; end
 
 if slop.development?
   require 'stasis/dev_mode'

data/lib/stasis.rb

@@ -61,6 +61,9 @@ class Stasis
   # `String` -- changes with each iteration of the main loop within `Stasis#render`.
   attr_accessor :path
 
+  # `String` -- changes with each iteration of the main loop within `Stasis#render`.
+  attr_accessor :dest
+
   # `Array` -- all paths in the project that Stasis will act upon.
   attr_accessor :paths
 
@@ -233,26 +236,26 @@ class Stasis
 
       # Add `destination` (as specified from `Stasis.new`) to front of relative
       # destination.
-      dest = "#{destination}#{relative}"
+      @dest = "#{destination}#{relative}"
 
       # Cut off the extension if the extension is supported by [Tilt][ti].
-      dest =
-        if ext && File.extname(dest) == ".#{ext}"
-          dest[0..-1*ext.length-2]
+      @dest =
+        if ext && File.extname(@dest) == ".#{ext}"
+          @dest[0..-1*ext.length-2]
         else
-          dest
+          @dest
         end
 
       # Create the directories leading up to the destination.
       if render_options[:write] != false
-        FileUtils.mkdir_p(File.dirname(dest))
+        FileUtils.mkdir_p(File.dirname(@dest))
       end
 
       # If markup was rendered...
       if @output
         # Write the rendered markup to the destination.
         if render_options[:write] != false
-          File.open(dest, 'w') do |f|
+          File.open(@dest, 'w') do |f|
             f.write(@output)
           end
         end
@@ -264,10 +267,10 @@ class Stasis
       elsif File.exists?(@path)
         # Copy the file located at the path to the destination path.
         if render_options[:write] != false
-          FileUtils.cp(@path, dest)
+          FileUtils.cp(@path, @dest)
         end
       end
-      
+
       # Trigger all plugin `after_write` events. Only fires if view was created.
       trigger(:after_write)
     end
@@ -276,7 +279,7 @@ class Stasis
     trigger(:after_all)
 
     # Unset class-level instance variables.
-    @action, @path, @output = nil, nil, nil
+    @action, @path, @dest, @output = nil, nil, nil, nil
 
     # Respond with collected render output if `collect` option given.
     collect if render_options[:collect]

data/lib/stasis/dev_mode.rb

@@ -42,8 +42,16 @@ class Stasis
 
       if @options[:development].is_a?(::Integer)
         mime_types = WEBrick::HTTPUtils::DefaultMimeTypes
-        mime_types.store 'js', 'application/javascript'
+
+        additional_mime_types = @options[:mime_types]
         
+        additional_mime_types.each do |extension, mimetype|
+          mime_types.store extension, mimetype
+          puts "add mime type #{mimetype} with extension .#{extension}"
+        end
+
+        mime_types.store 'js', 'application/javascript'
+
         server  = WEBrick::HTTPServer.new(
           :AccessLog => [ nil, nil ],
           :DocumentRoot => @stasis.destination,

data/lib/stasis/plugins/render.rb

@@ -20,9 +20,10 @@ class Stasis
       callback = options[:callback]
       locals = options[:locals]
       path = options[:path]
+      ext = File.extname(path.to_s)[1..-1]
       scope = options[:scope]
       text = options[:text]
-      template_options = options[:template]
+      template_options = Options.get_template_option(ext).merge( options[:template] || {} )
 
       if @stasis.controller
         path = @stasis.controller._resolve(path)
@@ -40,7 +41,7 @@ class Stasis
           end
 
           output =
-            if Tilt.mappings.keys.include?(File.extname(path)[1..-1])
+            if Tilt.mappings.keys.include?(ext)
               scope = options[:scope] ||= @stasis.action
               tilt = Tilt.new(path, nil, template_options)
               if block_given?

data/spec/fixtures/mixins/template_options.scss

@@ -0,0 +1,3 @@
+@mixin template-options($val){
+  pass: $val
+}

data/spec/fixtures/project/controller.rb

@@ -3,12 +3,18 @@
 
 require "#{File.dirname(__FILE__)}/plugin"
 
+Stasis::Options.set_template_option 'scss', { :load_paths => ["#{File.dirname(__FILE__)}/../mixins"] }
+
 # Before
 
 before 'index.html.haml' do
   @before_index_literal = :root
 end
 
+before 'template_options.html.haml' do
+  @css = render 'template_options.css.scss'
+end
+
 before 'no_controller/index.html.haml' do
   @before_index_literal = :no_controller
 end

data/spec/fixtures/project/template_options.css.scss

@@ -0,0 +1,4 @@
+@import "template_options";
+div {
+  @include template-options(true);
+}

data/spec/fixtures/project/template_options.html.haml

@@ -0,0 +1 @@
+%style= @css

data/spec/stasis/plugins/render_spec.rb

@@ -36,4 +36,12 @@ describe Stasis::Render do
   it "should render locals into subdirectory/render_locals.html" do
     $files['subdirectory/render_locals.html'].should =~ /true/
   end
+
+  it "should respect Stasis::Options.set_template_option settings in template_options.css" do
+    $files['template_options.css'].should =~ /pass: true/
+  end
+
+  it "should respect Stasis::Options.set_template_option settings in before blocks template_options.html" do
+    $files['template_options.css'].should =~ /pass: true/
+  end
 end

data/stasis.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "stasis"
-  s.version     = '0.2.0.pre'
+  s.version     = '0.2.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

metadata

@@ -1,184 +1,179 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: stasis
-version: !ruby/object:Gem::Version
-  version: 0.2.0.pre
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  hash: 23
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Winton Welsh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: albino
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  requirement: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: coffee-script
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  requirement: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: haml
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  requirement: *id003
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  requirement: *id004
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  requirement: *id005
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: rocco
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  requirement: *id006
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
+  requirement: *id007
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: directory_watcher
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 4
+        - 1
         version: 1.4.1
   type: :runtime
+  requirement: *id008
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.4.1
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: slop
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 3
+        - 2
         version: 3.3.2
   type: :runtime
+  requirement: *id009
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.3.2
-- !ruby/object:Gem::Dependency
+- !ruby/object:Gem::Dependency 
   name: tilt
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
   type: :runtime
+  requirement: *id010
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.3
 description: Stasis is a dynamic framework for static sites.
-email:
+email: 
 - mail@wintoni.us
-executables:
+executables: 
 - stasis
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -209,6 +204,7 @@ files:
 - site/stasis.css.scss
 - site/stasis.js.coffee
 - site/stasis.png
+- spec/fixtures/mixins/template_options.scss
 - spec/fixtures/project/.dotfile
 - spec/fixtures/project/_locals.html.haml
 - spec/fixtures/project/_partial.html.haml
@@ -244,6 +240,8 @@ files:
 - spec/fixtures/project/subdirectory/layout_controller.html.haml
 - spec/fixtures/project/subdirectory/layout_controller_from_root.html.haml
 - spec/fixtures/project/subdirectory/render_locals.html.haml
+- spec/fixtures/project/template_options.css.scss
+- spec/fixtures/project/template_options.html.haml
 - spec/fixtures/project/time.html.haml
 - spec/spec_helper.rb
 - spec/stasis/plugins/before_spec.rb
@@ -256,32 +254,39 @@ files:
 - stasis.gemspec
 homepage: http://stasis.me
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -658786105732867218
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
-      version: 1.3.1
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Static sites made powerful
-test_files:
+test_files: 
+- spec/fixtures/mixins/template_options.scss
 - spec/fixtures/project/.dotfile
 - spec/fixtures/project/_locals.html.haml
 - spec/fixtures/project/_partial.html.haml
@@ -317,6 +322,8 @@ test_files:
 - spec/fixtures/project/subdirectory/layout_controller.html.haml
 - spec/fixtures/project/subdirectory/layout_controller_from_root.html.haml
 - spec/fixtures/project/subdirectory/render_locals.html.haml
+- spec/fixtures/project/template_options.css.scss
+- spec/fixtures/project/template_options.html.haml
 - spec/fixtures/project/time.html.haml
 - spec/spec_helper.rb
 - spec/stasis/plugins/before_spec.rb