staticmatic 0.11.0.alpha.8 → 0.11.0.alpha.9

data/Rakefile

@@ -1,7 +1,7 @@
 require "rubygems"
 require 'spec/rake/spectask'
 
-require File.dirname(__FILE__) + '/lib/staticmatic'
+require File.expand_path("../lib/staticmatic", __FILE__)
 
 begin
   require 'jeweler'

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 11
 :patch: 0
-:build: alpha.8
+:build: alpha.9

data/lib/staticmatic/helpers.rb

@@ -1,211 +1,3 @@
-module StaticMatic
-  module Helpers
-    self.extend self
-    
-    # Generates links to all stylesheets in the source directory
-    # = stylesheets
-    # or specific stylesheets in a specific order
-    # = stylesheets :reset, :application
-    # Can also pass options hash in at the end so you can specify :media => :print
-    def stylesheets(*params)
-      options = {}
-      if params.last.is_a?(Hash)
-        options = params.last
-        params.slice!(-1, 1)
-      end
-      options[:media] = 'all' unless options.has_key?(:media)
-      options[:rel] = 'stylesheet'; options[:type] = 'text/css'
-
-      relative_path = current_page_relative_path
-
-      output = ""
-      if params.length == 0
-        # no specific files requested so include all in no particular order
-        stylesheet_dir = File.join(@staticmatic.src_dir, 'stylesheets')
-        stylesheet_directories = Dir[File.join(stylesheet_dir, '**','*.{sass,scss}')]
-        
-        # Bit of a hack here - adds any stylesheets that exist in the site/ dir that haven't been generated from source sass
-        Dir[File.join(@staticmatic.site_dir, 'stylesheets', '*.css')].each do |filename|
-          search_filename = File.basename(filename).chomp(File.extname(filename))
-          puts search_filename
-          already_included = false
-          stylesheet_directories.each do |path|
-            if File.basename(path).include?(search_filename)
-              already_included = true
-              break
-            end
-          end
-          
-          stylesheet_directories << filename unless already_included
-        end
-
-        stylesheet_directories.each do |path|
-          
-          filename_without_extension = File.basename(path).chomp(File.extname(path))
-          
-          if !filename_without_extension.match(/^\_/)
-            
-            path = path.gsub(/#{@staticmatic.src_dir}/, "").
-                        gsub(/#{@staticmatic.site_dir}/, "").
-                        gsub(/#{filename_without_extension}\.(sass|scss|css)/, "")
-                        
-            options[:href] = "#{relative_path}#{path}#{filename_without_extension}.css"
-            output << tag(:link, options)
-          end
-        end
-      else
-        #specific files requested and in a specific order
-        params.each do |file|
-          if File.exist?(File.join(@staticmatic.src_dir, 'stylesheets', "#{file}.sass")) ||
-             File.exist?(File.join(@staticmatic.site_dir, 'stylesheets', "#{file}.css"))
-            options[:href] = "#{relative_path}stylesheets/#{file}.css"
-            output << tag(:link, options)
-          end
-        end
-      end
-      
-      output
-    end
-    
-    # Generate javascript source tags for the specified files
-    #
-    # javascripts('test')   ->   <script language="javascript" src="javascripts/test.js"></script>
-    #    
-    def javascripts(*files)
-      relative_path = current_page_relative_path
-
-      output = ""
-      files.each do |file|
-        file_str = file.to_s
-        src = file_str.match(%r{^((\.\.?)?/|https?://)}) ? file_str : "#{relative_path}javascripts/#{file_str}.js"
-        output << tag(:script, :language => 'javascript', :src => src, :type => "text/javascript") { "" }
-      end
-      output
-    end
-
-    # Generates a form text field
-    #
-    def text_field(name, value, options = {})
-      options.merge!(:type => "text", :name => name, :value => value)
-      tag(:input, options)
-    end
-    
-    # Generate a form textarea
-    #
-    def text_area(name, value, options = {})
-      options.merge!(:name => name)
-      tag(:textarea, options) { value }
-    end
-    
-    # Generate an HTML link
-    #
-    # If only the title is passed, it will automatically
-    # create a link from this value:
-    #
-    # link('Test')  ->  <a href="test.html">Test</a>
-    #
-    def link(title, href = "", options = {})
-      if href.is_a?(Hash)
-        options = href
-        href = ""
-      end
-
-      if href.nil? || href.strip.length < 1
-        path_prefix = ''
-        if title.match(/^(\.\.?)?\//)
-          # starts with relative path so strip it off and prepend it to the urlified title
-          path_prefix_match = title.match(/^[^\s]*\//)
-          path_prefix = path_prefix_match[0] if path_prefix_match
-          title = title[path_prefix.length, title.length]
-        end
-        href = path_prefix + urlify(title) + ".html"
-      end
-
-      options[:href] = "#{current_page_relative_path(href)}#{href}"
-      
-      local_page = (options[:href].match(/^(\#|.+?\:)/) == nil)
-      unless @staticmatic.configuration.use_extensions_for_page_links || !local_page
-        options[:href].chomp!(".html")
-        options[:href].chomp!("index") if options[:href][-5, 5] == 'index'
-      end
-
-      tag(:a, options) { title }
-    end
-    alias link_to link
-
-    # Generates an image tag always relative to the current page unless absolute path or http url specified.
-    # 
-    # img('test_image.gif')   ->   <img src="/images/test_image.gif" alt="Test image"/>
-    # img('contact/test_image.gif')   ->   <img src="/images/contact/test_image.gif" alt="Test image"/>
-    # img('http://localhost/test_image.gif')   ->   <img src="http://localhost/test_image.gif" alt="Test image"/>
-    def img(name, options = {})
-      options[:src] = name.match(%r{^((\.\.?)?/|https?://)}) ? name : "#{current_page_relative_path}images/#{name}"
-      options[:alt] ||= name.split('/').last.split('.').first.capitalize.gsub(/_|-/, ' ')
-      tag :img, options
-    end
-  
-    # Generates HTML tags:
-    #
-    # tag(:br)   ->   <br/>
-    # tag(:a, :href => 'test.html') { "Test" }    ->    <a href="test.html">Test</a>
-    #
-    def tag(name, options = {}, &block)
-      options[:id] ||= options[:name] if options[:name]
-      output = "<#{name}"
-      options.keys.sort { |a, b| a.to_s <=> b.to_s }.each do |key|
-        output << " #{key}=\"#{options[key]}\"" if options[key]
-      end
-      
-      if block_given?
-        output << ">"
-        output << yield
-        output << "</#{name}>"
-      else
-        format = @staticmatic.configuration.haml_options[:format]
-        
-        if format.nil? || format == :xhtml
-          output << "/>"
-        else
-          output << ">"
-        end
-      end
-      output
-    end
-    
-    # Generates a URL friendly string from the value passed:
-    #
-    # "We love Haml"  ->  "we_love_haml"
-    # "Elf & Ham"     ->  "elf_and_ham"
-    # "Stephen's gem" ->  "stephens_gem"
-    #
-    def urlify(string)
-      string.tr(" ", "_").
-             sub("&", "and").
-             sub("@", "at").
-             tr("^A-Za-z0-9_", "").
-             sub(/_{2,}/, "_").
-             downcase
-    end
-    
-    # Include a partial template
-    def partial(name, options = {})
-      @staticmatic.generate_partial(name, options)
-    end
-
-    def current_page
-      @staticmatic.current_page
-    end
-
-    private
-
-    def current_page_relative_path(current_path = nil)
-      if current_path.nil? || current_path.match(/^((\.\.?)?\/|\#|.+?\:)/) == nil
-        current_page_depth = current_page.split('/').length - 2;
-        (current_page_depth > 0) ? ([ '..' ] * current_page_depth).join('/') + '/' : ''
-      else
-        ''
-      end
-    end
-
-  end
+["assets", "form", "current_path", "render", "tag", "url"].each do |helper|
+  require File.join(File.dirname(__FILE__), "helpers", "#{helper}_helper")
 end

data/lib/staticmatic/helpers/assets_helper.rb

@@ -0,0 +1,100 @@
+
+module StaticMatic
+  module Helpers
+    module AssetTagHelper
+      self.extend self
+      
+      # Generates links to all stylesheets in the source directory
+      # = stylesheets
+      # or specific stylesheets in a specific order
+      # = stylesheets :reset, :application
+      # Can also pass options hash in at the end so you can specify :media => :print
+      def stylesheets(*params)
+        options = {}
+        if params.last.is_a?(Hash)
+          options = params.last
+          params.slice!(-1, 1)
+        end
+        options[:media] = 'all' unless options.has_key?(:media)
+        options[:rel] = 'stylesheet'; options[:type] = 'text/css'
+
+        relative_path = current_page_relative_path
+
+        output = ""
+        if params.length == 0
+          # no specific files requested so include all in no particular order
+          stylesheet_dir = File.join(@staticmatic.src_dir, 'stylesheets')
+          stylesheet_directories = Dir[File.join(stylesheet_dir, '**','*.{sass,scss}')]
+          
+          # Bit of a hack here - adds any stylesheets that exist in the site/ dir that haven't been generated from source sass
+          Dir[File.join(@staticmatic.site_dir, 'stylesheets', '*.css')].each do |filename|
+            search_filename = File.basename(filename).chomp(File.extname(filename))
+            puts search_filename
+            already_included = false
+            stylesheet_directories.each do |path|
+              if File.basename(path).include?(search_filename)
+                already_included = true
+                break
+              end
+            end
+            
+            stylesheet_directories << filename unless already_included
+          end
+
+          stylesheet_directories.each do |path|
+            
+            filename_without_extension = File.basename(path).chomp(File.extname(path))
+            
+            if !filename_without_extension.match(/^\_/)
+              
+              path = path.gsub(/#{@staticmatic.src_dir}/, "").
+                          gsub(/#{@staticmatic.site_dir}/, "").
+                          gsub(/#{filename_without_extension}\.(sass|scss|css)/, "")
+                          
+              options[:href] = File.join(relative_path, path, "#{filename_without_extension}.css")
+              output << tag(:link, options)
+            end
+          end
+        else
+          #specific files requested and in a specific order
+          params.each do |file|
+            if File.exist?(File.join(@staticmatic.src_dir, 'stylesheets', "#{file}.sass")) ||
+               File.exist?(File.join(@staticmatic.site_dir, 'stylesheets', "#{file}.css"))
+              options[:href] = File.join(relative_path, "stylesheets", "#{file}.css")
+              output << tag(:link, options)
+            end
+          end
+        end
+        
+        output
+      end
+      
+      # Generate javascript source tags for the specified files
+      #
+      # javascripts('test')   ->   <script language="javascript" src="javascripts/test.js"></script>
+      #    
+      def javascripts(*files)
+        relative_path = current_page_relative_path
+
+        output = ""
+        files.each do |file|
+          file_str = file.to_s
+          src = file_str.match(%r{^((\.\.?)?/|https?://)}) ? file_str : "#{relative_path}javascripts/#{file_str}.js"
+          output << tag(:script, :language => 'javascript', :src => src, :type => "text/javascript") { "" }
+        end
+        output
+      end
+
+      # Generates an image tag always relative to the current page unless absolute path or http url specified.
+      # 
+      # img('test_image.gif')   ->   <img src="/images/test_image.gif" alt="Test image"/>
+      # img('contact/test_image.gif')   ->   <img src="/images/contact/test_image.gif" alt="Test image"/>
+      # img('http://localhost/test_image.gif')   ->   <img src="http://localhost/test_image.gif" alt="Test image"/>
+      def img(name, options = {})
+        options[:src] = name.match(%r{^((\.\.?)?/|https?://)}) ? name : "#{current_page_relative_path}images/#{name}"
+        options[:alt] ||= name.split('/').last.split('.').first.capitalize.gsub(/_|-/, ' ')
+        tag :img, options
+      end
+    end
+  end
+end

data/lib/staticmatic/helpers/current_path_helper.rb

@@ -0,0 +1,22 @@
+module StaticMatic
+  module Helpers
+    module CurrentPathHelper
+      self.extend self
+      
+      def current_page
+        @staticmatic.current_page
+      end
+
+      private
+
+      def current_page_relative_path(current_path = nil)
+        if current_path.nil? || current_path.match(/^((\.\.?)?\/|\#|.+?\:)/) == nil
+          current_page_depth = current_page.split('/').length - 2;
+          (current_page_depth > 0) ? ([ '..' ] * current_page_depth).join('/') + '/' : ''
+        else
+          ''
+        end
+      end
+    end
+  end
+end

data/lib/staticmatic/helpers/form_helper.rb

@@ -0,0 +1,23 @@
+
+module StaticMatic
+  module Helpers
+    module FormHelper
+      self.extend self
+
+      # Generates a form text field
+      #
+      def text_field(name, value, options = {})
+        options.merge!(:type => "text", :name => name, :value => value)
+        tag(:input, options)
+      end
+        
+        
+      # Generate a form textarea
+      #
+      def text_area(name, value, options = {})
+        options.merge!(:name => name)
+        tag(:textarea, options) { value }
+      end
+    end
+  end
+end

data/lib/staticmatic/helpers/render_helper.rb

@@ -0,0 +1,13 @@
+
+module StaticMatic
+  module Helpers
+    module RenderHelper
+      self.extend self
+      
+      # Include a partial template
+      def partial(name, options = {})
+        @staticmatic.generate_partial(name, options)
+      end
+    end
+  end
+end

data/lib/staticmatic/helpers/tag_helper.rb

@@ -0,0 +1,35 @@
+module StaticMatic
+  module Helpers
+    module TagHelper
+      self.extend self
+      
+      # Generates HTML tags:
+      #
+      # tag(:br)   ->   <br/>
+      # tag(:a, :href => 'test.html') { "Test" }    ->    <a href="test.html">Test</a>
+      #
+      def tag(name, options = {}, &block)
+        options[:id] ||= options[:name] if options[:name]
+        output = "<#{name}"
+        options.keys.sort { |a, b| a.to_s <=> b.to_s }.each do |key|
+          output << " #{key}=\"#{options[key]}\"" if options[key]
+        end
+        
+        if block_given?
+          output << ">"
+          output << yield
+          output << "</#{name}>"
+        else
+          format = @staticmatic.configuration.haml_options[:format]
+          
+          if format.nil? || format == :xhtml
+            output << "/>"
+          else
+            output << ">"
+          end
+        end
+        output
+      end
+    end
+  end
+end

data/lib/staticmatic/helpers/url_helper.rb

@@ -0,0 +1,59 @@
+module StaticMatic
+  module Helpers
+    module UrlHelper
+      self.extend self
+      
+      # Generate an HTML link
+      #
+      # If only the title is passed, it will automatically
+      # create a link from this value:
+      #
+      # link('Test')  ->  <a href="test.html">Test</a>
+      #
+      def link(title, href = "", options = {})
+        if href.is_a?(Hash)
+          options = href
+          href = ""
+        end
+
+        if href.nil? || href.strip.length < 1
+          path_prefix = ''
+          if title.match(/^(\.\.?)?\//)
+            # starts with relative path so strip it off and prepend it to the urlified title
+            path_prefix_match = title.match(/^[^\s]*\//)
+            path_prefix = path_prefix_match[0] if path_prefix_match
+            title = title[path_prefix.length, title.length]
+          end
+          href = path_prefix + urlify(title) + ".html"
+        end
+
+        options[:href] = "#{current_page_relative_path(href)}#{href}"
+        
+        local_page = (options[:href].match(/^(\#|.+?\:)/) == nil)
+        unless @staticmatic.configuration.use_extensions_for_page_links || !local_page
+          options[:href].chomp!(".html")
+          options[:href].chomp!("index") if options[:href][-5, 5] == 'index'
+        end
+
+        tag(:a, options) { title }
+      end
+      alias link_to link
+
+      # Generates a URL friendly string from the value passed:
+      #
+      # "We love Haml"  ->  "we_love_haml"
+      # "Elf & Ham"     ->  "elf_and_ham"
+      # "Stephen's gem" ->  "stephens_gem"
+      #
+      def urlify(string)
+        string.tr(" ", "_").
+               sub("&", "and").
+               sub("@", "at").
+               tr("^A-Za-z0-9_", "").
+               sub(/_{2,}/, "_").
+               downcase
+      end
+    end
+  end
+
+end

data/lib/staticmatic/mixins/server.rb

@@ -1,6 +1,7 @@
 module StaticMatic::ServerMixin
   def preview
-    puts "StaticMatic Preview Server Starting..."
+    puts "StaticMatic Preview Server"
+    puts "Ctrl+C to exit"
     StaticMatic::Server.start(self)
   end
 end

data/lib/staticmatic/server.rb

@@ -3,6 +3,8 @@ module StaticMatic
     def initialize(staticmatic, default = nil)
       @files = default || Rack::File.new(staticmatic.site_dir)
       @staticmatic = staticmatic
+      
+
     end
 
     def call(env)
@@ -41,6 +43,13 @@ module StaticMatic
 
     # Starts the StaticMatic preview server
     def self.start(staticmatic)
+      [ 'INT', 'TERM' ].each do |signal|
+        Signal.trap(signal) do
+          puts 
+          puts "Exiting"
+          exit!(0)
+        end
+      end
       port = staticmatic.configuration.preview_server_port || 3000
 
       host = staticmatic.configuration.preview_server_host || ""
@@ -48,7 +57,8 @@ module StaticMatic
       app = Rack::Builder.new do
         use Rack::ShowExceptions
         run StaticMatic::Server.new(staticmatic)
-      end
+      end 
+      
       Rack::Handler::WEBrick.run(app, :Port => port, :Host => host)
     end
 

data/spec/{helpers_spec.rb → helpers/asset_helper_spec.rb}

@@ -1,17 +1,15 @@
-require File.dirname(__FILE__) + "/spec_helper"
+
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe "Helpers:" do
-  include StaticMatic::Helpers
+  include StaticMatic::Helpers::AssetTagHelper
+  include StaticMatic::Helpers::CurrentPathHelper
+  include StaticMatic::Helpers::TagHelper
   before do
     setup_staticmatic
     @staticmatic.instance_variable_set("@current_page", "")
   end
   
-  it "should include custom helper" do
-    content = @staticmatic.generate_html_with_layout("index")
-    content.should match(/Hello, Steve!/)
-  end
-  
   context "When using the stylesheet helper" do
     before do
       @links = stylesheets
@@ -38,4 +36,4 @@ describe "Helpers:" do
       @links.should match(/\.\.\/stylesheets/)
     end
   end
-end
+end

data/spec/helpers/custom_helper_spec.rb

@@ -0,0 +1,18 @@
+
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe "Helpers:" do
+  include StaticMatic::Helpers::AssetTagHelper
+  include StaticMatic::Helpers::CurrentPathHelper
+  include StaticMatic::Helpers::TagHelper
+  before do
+    setup_staticmatic
+    @staticmatic.instance_variable_set("@current_page", "")
+  end
+  
+  it "should include custom helper" do
+    content = @staticmatic.generate_html_with_layout("index")
+    content.should match(/Hello, Steve!/)
+  end
+  
+end

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'stringio'
 require 'spec'
 
-require File.dirname(__FILE__) + '/../lib/staticmatic'
+require 'lib/staticmatic'
 
 TEST_SITE_PATH = File.expand_path(File.join(File.dirname(__FILE__), "sandbox", "test_site"))
 
@@ -11,4 +11,4 @@ end
 
 def setup_staticmatic
   @staticmatic = StaticMatic::Base.new(TEST_SITE_PATH)
-end
+end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 11
   - 0
   - alpha
-  - 8
-  version: 0.11.0.alpha.8
+  - 9
+  version: 0.11.0.alpha.9
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-05 00:00:00 +01:00
+date: 2010-09-16 00:00:00 +01:00
 default_executable: staticmatic
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -84,6 +84,12 @@ files:
 - lib/staticmatic/configuration.rb
 - lib/staticmatic/error.rb
 - lib/staticmatic/helpers.rb
+- lib/staticmatic/helpers/assets_helper.rb
+- lib/staticmatic/helpers/current_path_helper.rb
+- lib/staticmatic/helpers/form_helper.rb
+- lib/staticmatic/helpers/render_helper.rb
+- lib/staticmatic/helpers/tag_helper.rb
+- lib/staticmatic/helpers/url_helper.rb
 - lib/staticmatic/mixins/build.rb
 - lib/staticmatic/mixins/helpers.rb
 - lib/staticmatic/mixins/render.rb
@@ -101,7 +107,8 @@ files:
 - lib/staticmatic/templates/rescues/template.haml
 - spec/base_spec.rb
 - spec/compass_integration_spec.rb
-- spec/helpers_spec.rb
+- spec/helpers/asset_helper_spec.rb
+- spec/helpers/custom_helper_spec.rb
 - spec/render_spec.rb
 - spec/rescue_spec.rb
 - spec/sandbox/test_site/config/compass.rb
@@ -175,7 +182,8 @@ summary: Lightweight Static Site Framework
 test_files: 
 - spec/base_spec.rb
 - spec/compass_integration_spec.rb
-- spec/helpers_spec.rb
+- spec/helpers/asset_helper_spec.rb
+- spec/helpers/custom_helper_spec.rb
 - spec/render_spec.rb
 - spec/rescue_spec.rb
 - spec/sandbox/test_site/config/compass.rb