middleman 1.1.0.beta.8 → 1.1.0.1

data/bin/mm-init

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'middleman')
-require "thor"
-require "thor/group"
+require "middleman/templates"
 
 module Middleman
   class Generator < ::Thor::Group
@@ -9,29 +8,18 @@ module Middleman
     
     argument :location, :type => :string, :desc => "New project location"
     
-    class_option :template, :aliases => "-T", :default => "default", :desc => 'Optionally use a pre-defined project template: html5, default'
-    
-    def self.source_root
-      File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'templates')
-    end
+    available_templates = Middleman::Templates.registered_names.join(", ")
+    class_option :template, :aliases => "-T", :default => "default", :desc => "Optionally use a pre-defined project template: #{available_templates}"
     
     class_option :css_dir, :default => "stylesheets", :desc => 'The path to the css files'
     class_option :js_dir, :default => "javascripts", :desc => 'The path to the javascript files'
     class_option :images_dir, :default => "images", :desc => 'The path to the image files'
     
     def create_project
-      if options[:template] == "html5"
-        template "html5boilerplate/config.tt", File.join(location, "config.rb")
-        directory "html5boilerplate/public", File.join(location, "public")
-        empty_directory File.join(location, "views")
-      else
-        template "default/config.tt", File.join(location, "config.rb")
-        template "default/config.ru", File.join(location, "config.ru")
-        directory "default/views", File.join(location, "views")
-        empty_directory File.join(location, "public", options[:css_dir])
-        empty_directory File.join(location, "public", options[:js_dir])
-        empty_directory File.join(location, "public", options[:images_dir])
-      end
+      key = options[:template].to_sym
+      key = :default unless Middleman::Templates.registered_templates.has_key?(key)
+      
+      Middleman::Templates.registered_templates[key].start
     end
   end
 end

data/features/step_definitions/generator_steps.rb

@@ -8,7 +8,7 @@ end
 
 Then /^template files should exist at "([^\"]*)"$/ do |dirname|
   target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
-  template_glob = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "lib", "middleman", "template", "*/**/*")
+  template_glob = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "lib", "middleman", "templates", "default", "*/**/*")
   
   Dir[template_glob].each do |f|
     next if File.directory?(f)

data/lib/middleman/builder.rb

@@ -96,7 +96,7 @@ module Middleman
       
         handled_by_tilt = ::Tilt.mappings.keys.include?(file_extension.gsub(/^\./, ""))
         if handled_by_tilt || (file_extension == ".js")
-          new_file_extension = ""
+          new_file_extension = (file_extension == ".js") ? ".js" : ""
           next if file_source.split('/').last.split('.').length < 3
         
           file_destination.gsub!(file_extension, new_file_extension)

data/lib/middleman/features.rb

@@ -75,6 +75,10 @@ module Middleman::Features
   # paragraphs, fake images, names and email addresses.
   autoload :Lorem,               "middleman/features/lorem"
 
+  # Data looks at the data/ folder for YAML files and makes them available
+  # to dynamic requests.
+  autoload :Data,                "middleman/features/data"
+
   # LiveReload will auto-reload browsers with the live reload extension installed after changes
   # Currently disabled and untested.
   #autoload :LiveReload,          "middleman/features/live_reload"

data/lib/middleman/features/data.rb

@@ -0,0 +1,30 @@
+require "yaml"
+
+module Middleman::Features::Data
+  class << self
+    def registered(app)
+      app.helpers Middleman::Features::Data::Helpers
+    end
+    alias :included :registered
+  end
+  
+  module Helpers
+    def data
+      @@data ||= Middleman::Features::Data::DataObject.new(self)
+    end
+  end
+  
+  class DataObject
+    def initialize(app)
+      @app = app
+    end
+    
+    def method_missing(path)
+      file_path = File.join(@app.class.root, "data", "#{path}.yml")      
+      if File.exists? file_path
+        return YAML.load_file(file_path)
+      end
+    end
+  end
+  
+end

data/lib/middleman/features/lorem.rb

@@ -14,6 +14,28 @@ module Middleman::Features::Lorem
 
   # Adapted from Frank:
   # https://github.com/blahed/frank/
+  # Copyright (c) 2010 Travis Dunn
+  # 
+  #   Permission is hereby granted, free of charge, to any person
+  #   obtaining a copy of this software and associated documentation
+  #   files (the "Software"), to deal in the Software without
+  #   restriction, including without limitation the rights to use,
+  #   copy, modify, merge, publish, distribute, sublicense, and/or sell
+  #   copies of the Software, and to permit persons to whom the
+  #   Software is furnished to do so, subject to the following
+  #   conditions:
+  # 
+  #   The above copyright notice and this permission notice shall be
+  #   included in all copies or substantial portions of the Software.
+  # 
+  #   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  #   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+  #   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  #   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+  #   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+  #   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  #   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  #   OTHER DEALINGS IN THE SOFTWARE.
   class LoremObject
     WORDS = %w(alias consequatur aut perferendis sit voluptatem accusantium doloremque aperiam eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo aspernatur aut odit aut fugit sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt neque dolorem ipsum quia dolor sit amet consectetur adipisci velit sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem ut enim ad minima veniam quis nostrum exercitationem ullam corporis nemo enim ipsam voluptatem quia voluptas sit suscipit laboriosam nisi ut aliquid ex ea commodi consequatur quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae et iusto odio dignissimos ducimus qui blanditiis praesentium laudantium totam rem voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident sed ut perspiciatis unde omnis iste natus error similique sunt in culpa qui officia deserunt mollitia animi id est laborum et dolorum fuga et harum quidem rerum facilis est et expedita distinctio nam libero tempore cum soluta nobis est eligendi optio cumque nihil impedit quo porro quisquam est qui minus id quod maxime placeat facere possimus omnis voluptas assumenda est omnis dolor repellendus temporibus autem quibusdam et aut consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur at vero eos et accusamus officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae itaque earum rerum hic tenetur a sapiente delectus ut aut reiciendis voluptatibus maiores doloribus asperiores repellat)
 

data/lib/middleman/server.rb

@@ -9,7 +9,7 @@ module Middleman
   class Server < Sinatra::Base
     # Basic Sinatra config
     set :app_file,    __FILE__
-    #set :root,        ENV["MM_DIR"] || Dir.pwd
+    set :root,        ENV["MM_DIR"] || Dir.pwd
     set :reload,      false
     set :sessions,    false
     set :logging,     false
@@ -40,6 +40,9 @@ module Middleman
     # Activate built-in helpers
     register Middleman::Features::DefaultHelpers
     
+    # Activate Yaml Data package
+    register Middleman::Features::Data
+    
     # Activate Lorem helpers
     register Middleman::Features::Lorem
     
@@ -154,7 +157,7 @@ require "middleman/assets"
 
 # The Rack App
 class Middleman::Server
-  def self.new(*args, &block)    
+  def self.new(*args, &block)  
     # Check for and evaluate local configuration
     local_config = File.join(self.root, "config.rb")
     if File.exists? local_config
@@ -162,7 +165,7 @@ class Middleman::Server
       Middleman::Server.class_eval File.read(local_config)
       set :app_file, File.expand_path(local_config)
     end
-    
+      
     use ::Rack::ConditionalGet
     use ::Rack::Static, :urls => ["/#{self.images_dir}"], :root => "public"
     

data/lib/middleman/templates.rb

@@ -0,0 +1,31 @@
+require "thor"
+require "thor/group"
+
+module Middleman::Templates
+  @@template_mappings = {}
+  def self.register(name, klass)
+    @@template_mappings[name] = klass
+  end
+  
+  def self.registered_names
+    @@template_mappings.keys
+  end
+  
+  def self.registered_templates
+    @@template_mappings
+  end
+  
+  class Base < ::Thor::Group
+    include Thor::Actions
+    
+    argument :location, :type => :string
+    class_option :css_dir, :default => "stylesheets", :desc => 'The path to the css files'
+    class_option :js_dir, :default => "javascripts", :desc => 'The path to the javascript files'
+    class_option :images_dir, :default => "images", :desc => 'The path to the image files'
+  end
+end
+
+# Default template
+require "middleman/templates/default"
+# HTML5 template
+require "middleman/templates/html5"

data/lib/middleman/templates/default.rb

@@ -0,0 +1,16 @@
+class Middleman::Templates::Default < Middleman::Templates::Base
+  def self.source_root
+    File.join(File.dirname(__FILE__), 'default')
+  end
+  
+  def build_scaffold
+    template "config.tt", File.join(location, "config.rb")
+    template "config.ru", File.join(location, "config.ru")
+    directory "views", File.join(location, "views")
+    empty_directory File.join(location, "public", options[:css_dir])
+    empty_directory File.join(location, "public", options[:js_dir])
+    empty_directory File.join(location, "public", options[:images_dir])
+  end  
+end
+
+Middleman::Templates.register(:default, Middleman::Templates::Default)

data/lib/middleman/templates/html5.rb

@@ -0,0 +1,13 @@
+class Middleman::Templates::Html5 < Middleman::Templates::Base
+  def self.source_root
+    File.join(File.dirname(__FILE__), 'html5')
+  end
+  
+  def build_scaffold
+    template "config.tt", File.join(location, "config.rb")
+    directory "public", File.join(location, "public")
+    empty_directory File.join(location, "views")
+  end
+end
+
+Middleman::Templates.register(:html5, Middleman::Templates::Html5)

data/lib/middleman/templates/html5/config.ru

@@ -0,0 +1,4 @@
+require 'rubygems'
+require 'middleman'
+
+run Middleman::Server

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.1.0.beta.8"
+  VERSION = "1.1.0.1"
 end

data/middleman.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("compass-slickmap", ["~> 0.4.0"])
   s.add_runtime_dependency("coffee-script", ["~> 2.1.0"])
   s.add_runtime_dependency("less", ["~> 1.2.0"])
+  # s.add_runtime_dependency("fssm", ["~> 0.2.0"])
   s.add_development_dependency("cucumber", ["~> 0.10.0"])
   s.add_development_dependency("rspec", [">= 0"])
   s.add_development_dependency("rocco", [">= 0"]) unless defined?(JRUBY_VERSION)

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 62196355
-  prerelease: 6
+  hash: 85
+  prerelease: 
   segments: 
   - 1
   - 1
   - 0
-  - beta
-  - 8
-  version: 1.1.0.beta.8
+  - 1
+  version: 1.1.0.1
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -07:00
+date: 2011-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -468,6 +467,7 @@ files:
 - lib/middleman/features/automatic_image_sizes/fastimage.rb
 - lib/middleman/features/cache_buster.rb
 - lib/middleman/features/code_ray.rb
+- lib/middleman/features/data.rb
 - lib/middleman/features/default_helpers.rb
 - lib/middleman/features/live_reload.rb
 - lib/middleman/features/lorem.rb
@@ -482,29 +482,33 @@ files:
 - lib/middleman/renderers/haml.rb
 - lib/middleman/renderers/sass.rb
 - lib/middleman/server.rb
+- lib/middleman/templates.rb
+- lib/middleman/templates/default.rb
 - lib/middleman/templates/default/config.ru
 - lib/middleman/templates/default/config.tt
 - lib/middleman/templates/default/views/index.html.haml
 - lib/middleman/templates/default/views/layout.haml
 - lib/middleman/templates/default/views/stylesheets/site.css.sass
-- lib/middleman/templates/html5boilerplate/config.tt
-- lib/middleman/templates/html5boilerplate/public/404.html
-- lib/middleman/templates/html5boilerplate/public/apple-touch-icon.png
-- lib/middleman/templates/html5boilerplate/public/crossdomain.xml
-- lib/middleman/templates/html5boilerplate/public/css/handheld.css
-- lib/middleman/templates/html5boilerplate/public/css/style.css
-- lib/middleman/templates/html5boilerplate/public/favicon.ico
-- lib/middleman/templates/html5boilerplate/public/humans.txt
-- lib/middleman/templates/html5boilerplate/public/images/.gitignore
-- lib/middleman/templates/html5boilerplate/public/index.html
-- lib/middleman/templates/html5boilerplate/public/js/libs/dd_belatedpng.js
-- lib/middleman/templates/html5boilerplate/public/js/libs/jquery-1.5.0.js
-- lib/middleman/templates/html5boilerplate/public/js/libs/jquery-1.5.0.min.js
-- lib/middleman/templates/html5boilerplate/public/js/libs/modernizr-1.6.min.js
-- lib/middleman/templates/html5boilerplate/public/js/mylibs/.gitignore
-- lib/middleman/templates/html5boilerplate/public/js/plugins.js
-- lib/middleman/templates/html5boilerplate/public/js/script.js
-- lib/middleman/templates/html5boilerplate/public/robots.txt
+- lib/middleman/templates/html5.rb
+- lib/middleman/templates/html5/config.ru
+- lib/middleman/templates/html5/config.tt
+- lib/middleman/templates/html5/public/404.html
+- lib/middleman/templates/html5/public/apple-touch-icon.png
+- lib/middleman/templates/html5/public/crossdomain.xml
+- lib/middleman/templates/html5/public/css/handheld.css
+- lib/middleman/templates/html5/public/css/style.css
+- lib/middleman/templates/html5/public/favicon.ico
+- lib/middleman/templates/html5/public/humans.txt
+- lib/middleman/templates/html5/public/images/.gitignore
+- lib/middleman/templates/html5/public/index.html
+- lib/middleman/templates/html5/public/js/libs/dd_belatedpng.js
+- lib/middleman/templates/html5/public/js/libs/jquery-1.5.0.js
+- lib/middleman/templates/html5/public/js/libs/jquery-1.5.0.min.js
+- lib/middleman/templates/html5/public/js/libs/modernizr-1.6.min.js
+- lib/middleman/templates/html5/public/js/mylibs/.gitignore
+- lib/middleman/templates/html5/public/js/plugins.js
+- lib/middleman/templates/html5/public/js/script.js
+- lib/middleman/templates/html5/public/robots.txt
 - lib/middleman/version.rb
 - middleman.gemspec
 has_rdoc: true
@@ -528,14 +532,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: middleman