piano 0.11.0 → 0.12.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = Piano
 
-Out-of-the-box Sinatra server for fast website sketching using Haml and Sass and CoffeeScript (and YAML!).
+Out-of-the-box Sinatra server for fast website sketching using Haml (or Slim) and Sass and CoffeeScript (and YAML!).
 
 The magic triplet, one command away!
 
@@ -14,7 +14,7 @@ The magic triplet, one command away!
 
 Piano will start a Sinatra server based in the same folder where you run the command, in the port and environment given. If no port or environment is given, Piano will start in the default Sinatra port <tt>4567</tt> and the default environment <tt>:development</tt>. 
 
-Haml (http://haml-lang.com) <tt>.haml</tt> files and Sass (http://sass-lang.com) <tt>.sass</tt> and CoffeeScript (http://github.com/josh/ruby-coffee-script) <tt>.coffee</tt> files in the base folder will automatically be mapped to urls.
+Haml (http://haml-lang.com) <tt>.haml</tt> (or Slim (http://slim-lang.com) <tt>.slim</tt>) files and Sass (http://sass-lang.com) <tt>.sass</tt> and CoffeeScript (http://github.com/josh/ruby-coffee-script) <tt>.coffee</tt> files in the base folder will automatically be mapped to urls.
 
   yoursite.com/users      => server/folder/users.haml
   yoursite.com/style.css  => server/folder/style.sass
@@ -32,25 +32,25 @@ Any route added to the <tt>Pianofile</tt> will be parsed before the default rout
 
 This file, for example, will bring back the email masking functionality that was deprecated in version 0.7.6
 
-  get "/" do
-    "Hi! Just testing"
+  get '/' do
+    'Hi! Just testing'
   end
 
-  get "/email" do
+  get '/email' do
     "Here is my email: #{unicode_entities('xavier@example.com')}"
   end
 
-  post "/" do  # The "/" route, is considered "index" for the haml and yaml files
+  post '/' do  # The '/' route, is considered "index" for the haml and yaml files
     require "psych"
-    
-    File.open "data/index.yaml", "w" do |file|
+
+    File.open 'data/index.yaml', 'w' do |file|
       file.write params.to_yaml
     end
   end
 
   helpers do
     def unicode_entities(string)
-      encodings = ""
+      encodings = ''
       string.codepoints do |c|
         encodings += "&##{c};"
       end
@@ -71,8 +71,8 @@ When receiving a request for <tt>"/users"</tt>, Piano will look up for a YAML fi
   !!! 5
   %head
     %title= @data['title']
-    = style "style.css"
-    = script "app.js"
+    = style 'style.css'
+    = script 'app.js'
   %body
     %h1= @data['title']
     %p= @data['description']
@@ -80,6 +80,22 @@ When receiving a request for <tt>"/users"</tt>, Piano will look up for a YAML fi
       - @data['list'].each do |item|
         %li= item
 
+Or if slim:
+
+==== folder/index.slim
+
+  doctype html
+  head
+    title= @data['title']
+    == style 'style.css'
+    == script 'app.js'
+  body
+    h1= @data['title']
+    p= @data['description']
+    ul
+      - @data['list'].each do |item|
+        li= item
+
 ==== folder/style.sass
 
   body
@@ -92,7 +108,7 @@ When receiving a request for <tt>"/users"</tt>, Piano will look up for a YAML fi
 ==== folder/app.coffee
 
   alert "This is too simple to be true"
-  
+
 ==== folder/data/index.yaml
 
   title: 5 minutes site!
@@ -101,7 +117,7 @@ When receiving a request for <tt>"/users"</tt>, Piano will look up for a YAML fi
     - and I can have
     - a list
     - also.
-  
+
 Note: You can find this sample in the repository within the <tt>/sample</tt> folder.
 
 == Going :production!
@@ -129,43 +145,43 @@ Piano is fully usable as a Sinatra Extension. Provide the helpers, <tt>sass("tem
 Note: Prior to version 0.8.2, Piano was intended to be used as a subclass of Sinatra::Base, but now it works both as a Sinatra Extension and as a subclass.
 Further moves to keep most functionality as a Sinatra Extension will be done in the future, except in the <tt>piano/routes</tt>.
 
-  require "piano"
-    
-  class MyPiano < Sinatra::Base   
+  require 'piano'
+
+  class MyPiano < Sinatra::Base
     helpers Sinatra::Piano
-    
-    get "/" do
+
+    get '/' do
       "Let's change the default behaviour"
     end
-  end  
-  
-  MyPiano.run! 
+  end
+
+  MyPiano.run!
 
 === Routes
 
 To load the routes (the ones that match your requests with your haml, sass and coffee templates) you have to require also <tt>"piano/routes"</tt>. Usually you'll want to load them after you define your own ones, otherwise you won't be able to override them.
 
-  require "piano"
-  
-  class Piano
-    get "/special" do
+  require 'piano/base'
+
+  class Piano::Base
+    get '/special' do
       "A special route, overriding the default 'special.haml'"
     end
   end
-  
-  require "piano/routes"
-  
-  Piano.play! # .play! added 4 the lulz; Piano.run! will do the trick aswell
+
+  require 'piano/routes'
+
+  Piano::Base.play! # .play! added 4 the lulz; Piano.run! will do the trick aswell
 
 <tt>Piano</tt> inherits <tt>Sinatra::Base</tt>, so all of <tt>Sinatra::Base</tt> own methods are available. Read the Sinatra documentation (http://www.sinatrarb.com/intro) for further information. 
 
 Tip: put
-  
-  Piano.environment = :production
+
+  Piano::Base.environment = :production
 
 just before letting it play for play in production environment!
 
-By setting <tt>Piano.etags = :off</tt>, etags will be disabled.
+By setting <tt>Piano::Base.etags = :off</tt>, etags will be disabled.
 
 == Candies for the kidz
 
@@ -181,9 +197,18 @@ You can use them in your haml templates like this:
   %html
     %head
       %title Out-of-the-box is pretty awesome!
-      = style "style.css"
-      = script "app.js"
-      
+      = style 'style.css'
+      = script 'app.js'
+
+Or in slim:
+
+  doctype html
+  html
+    head
+      title Out-of-the-box is pretty awesome!
+      == style 'style.css'
+      == script 'app.js'
+
 ==== <tt>extract</tt>
 
 Another helper you may find useful is <tt>extract("source_text/html", word_count = 80)</tt>. Returns an extract of the first <tt>word_count</tt> words (default is 80), html tags stripped, and closed by <tt>"..."</tt> . It does nothing is the text is less than <tt>word_count</tt> words in length.
@@ -197,11 +222,11 @@ No, it does not print an anchor: it strips all strange characters from a string
 Really useful when generating uri's for articles, or html id attributes.
 
   %a(href="/articles/#{article.id}-#{link(article.title)}")= article.title
-  
+
 or
-  
+
   %h2(id="#{link(subtitle,4)}")= subtitle
-  
+
 In this example, the second argument (4) ensures that the link is done with no more than four of the subtitle's words.
 
 === <tt>flash</tt>
@@ -240,6 +265,8 @@ As for v0.7.3, Piano has now the ability to go <tt>:production</tt> mode both in
 
 == Deprecated functions
 
+From version 0.11.0 on, <tt>flash?</tt> has been deprecated and the <tt>flash</tt> helpers has been replaced with the <tt>sinatra-flash</tt> gem.
+
 From version 0.7.6 on, <tt>unicode_entities</tt> has been deprecated for better Ruby version backwards compatibility.
 
 = License
@@ -248,7 +275,7 @@ From version 0.7.6 on, <tt>unicode_entities</tt> has been deprecated for better
 
 Copyright © 2011:
 
-* Xavier Via (http://germino.com.ar)
+* Xavier Via (http://xaviervia.com.ar)
 
 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:
 

data/bin/piano

@@ -1,17 +1,17 @@
 #!/usr/bin/env ruby
-require "piano"
-require "metafun/delegator"
+require 'piano'
+require 'metafun/delegator'
 
 unless ARGV.empty?
-  
+
   args = {}
-  
+
   ARGV.each do |arg|
     if arg =~ /^\d+$/
       args[:port] = arg
     elsif arg =~ /^noetags$/
       args[:etags] = :off
-    elsif arg == "-v"
+    elsif arg == '-v'
       puts Piano::VERSION
       Process.exit!
     elsif arg =~ /^views:/
@@ -36,28 +36,28 @@ if args
 end
 
 self.extend Metafun::Delegator
-self.delegate Piano::Base,  :get, :patch, :put, :post, :delete, 
+self.delegate Piano::Base, :get, :patch, :put, :post, :delete,
                       :head, :options, :template, :fetch, :layout,
-                      :before, :after, :error, :not_found, 
-                      :configure, :set, :mime_type, :enable, 
-                      :disable, :use, :development?, :test?, 
+                      :before, :after, :error, :not_found,
+                      :configure, :set, :mime_type, :enable,
+                      :disable, :use, :development?, :test?,
                       :production?, :helpers, :settings, :play!
 
 self.helpers Sinatra::Piano
 
-$LOAD_PATH << Dir.pwd + "/lib"
+$LOAD_PATH << Dir.pwd + '/lib'
 
-if File.exists?("Pianofile")
-  puts "Pianofile found, loading..."
-  load "Pianofile"
+if File.exists?('Pianofile')
+  puts 'Pianofile found, loading...'
+  load 'Pianofile'
 end
 
-if File.directory?("controllers")
+if File.directory?('controllers')
   puts "'controllers' directory found, loading '.controller' files"
-  Piano::ControllerLoader.folder "controllers" 
+  Piano::ControllerLoader.folder 'controllers'
 end
 
-require "piano/routes"
+require 'piano/routes'
 
 puts "Starting Sinatra from Piano #{Piano::VERSION}"
 Piano::Base.play!

data/lib/piano.rb

@@ -1,22 +1,23 @@
-require "sinatra/base"
-require "sinatra/flash"
+require 'sinatra/base'
+require 'sinatra/flash'
 
-require "haml"
-require "sass"
-require "compass"
-require "yaml"
-require "i18n"
+require 'haml'
+require 'slim'
+require 'sass'
+require 'compass'
+require 'yaml'
+require 'i18n'
 
 begin
-  require "coffee-script"
+  require 'coffee-script'
 rescue Exception => error
-  puts "No JavaScript environment was found. Please install therubyracer gem"
-  puts "  gem install therubyracer"
+  puts 'No JavaScript environment was found. Please install therubyracer gem'
+  puts '  gem install therubyracer'
   Process.exit!
 end
 
-require "sinatra/piano"
+require 'sinatra/piano'
 
-require "piano/base"
-require "piano/controllerloader"
-require "piano/version"
+require 'piano/base'
+require 'piano/controller_loader'
+require 'piano/version'

data/lib/piano/base.rb

@@ -1,8 +1,8 @@
 module Piano
-  class Base < Sinatra::Base      
+  class Base < Sinatra::Base
     register Sinatra::Piano
     register Sinatra::Flash
-    
+
     Compass.configuration do |config|
       config.project_path = File.expand_path(Dir.pwd)
       config.sass_dir = File.expand_path(Dir.pwd)
@@ -12,12 +12,12 @@ module Piano
     set :root, File.expand_path(Dir.pwd)
     set :views, File.expand_path(Dir.pwd)
     set :sass, Compass.sass_engine_options
-    set :data, File.expand_path(Dir.pwd + "/data")
+    set :data, File.expand_path("#{Dir.pwd}/data")
     set :etags, :on
     set :multidomain, :off
-    
+
     def self.play!
       self.run!
-    end    
+    end
   end
 end

data/lib/piano/{controllerloader.rb → controller_loader.rb}

@@ -6,17 +6,19 @@ module Piano
         load item
       end
     end
-    
+
     # Iterates recursively over the path and calls the block
     # with each newfound file
     def self.recursive path, &block
       files = []
       Dir.new(File.expand_path(path)).each do |file|
         if File.directory? "#{path}/#{file}"
-          recursive "#{path}/#{file}" do |item|
-            files << "#{item}"
-          end unless file == ".." or file == "."
-        elsif file.end_with? ".controller"
+          unless file == '..' or file == '.'
+            recursive "#{path}/#{file}" do |item|
+              files << "#{item}"
+            end
+          end
+        elsif file.end_with? '.controller'
           files << "#{path}/#{file}"
         end
       end

data/lib/piano/routes.rb

@@ -1,21 +1,21 @@
 module Piano
   class Base
-    get "/" do
-      @data = data_for "index"
+    get '/' do
+      @data = data_for 'index'
       fetch :index
     end
-    
+
     get %r{/(.+?).css$} do |something|
       content_type :css
       fetch something, :sass
     end
-    
+
     get %r{/(.+?).js$} do |something|
       content_type :js
       fetch something, :coffee
     end
-    
-    get "/*" do 
+
+    get '/*' do
       something = request.path[1..(request.path.length-1)]
       @data = data_for something
       fetch something

data/lib/piano/version.rb

@@ -1,3 +1,3 @@
 module Piano
-  VERSION = "0.11.0"
+  VERSION = '0.12.0'
 end

data/lib/sinatra/piano.rb

@@ -1,96 +1,102 @@
 module Sinatra
-  
+
   # Piano was originally though as a Sinatra extension
   # That's why the code was defined here
-  module Piano    
-    
-    # Replacemente for :try_haml, :sass & :coffee. Agnostic
+  module Piano
+
+    # Replacemente for :try_haml, :try_slim, :sass & :coffee. Agnostic
     # Work in progress
-    def fetch *args
+    def fetch(*args)
       resource = args.shift
-      unless args.empty?
-        type = args.shift
-      else 
-        type = :haml
+
+      unless type = args.shift
+        [:haml, :slim].each do |t|
+          file_name = "#{settings.views}/#{resource}.#{t}"
+          if File.exists?(file_name)
+            type = t and break
+          end
+        end
       end
-      
-      file_name = "#{settings.views}/#{resource}.#{type}"
-      return bad_luck file_name unless File.exists? file_name
+
+      return bad_luck("#{settings.views}/#{resource}.haml/slim") unless type
 
       if etags?
-        if type == :haml
-          hash = hash_for resource, :haml
+        if [:haml, :slim].include? type
+          hash = hash_for resource, type
           if File.exists? "#{settings.views}/#{settings.data}/#{resource}.yaml"
             hash += hash_for "#{settings.data}/#{resource}", :yaml
           end
-          
+
           etag hash
         else
           etag hash_for(resource, type)
-        end      
+        end
       end
-      
+
       send type, resource.to_sym, *args # Send the template to Sinatra to take care of it
     end
-    
+
     # Loads and parses the YAML data from the data directory
     def data_for(template)
       file_name = "#{settings.data}/#{template}.yaml"
       YAML.load_file(file_name) if File.exists?(file_name)
     end
-    
+
     # Sugar: formats a css stylesheet <link /> tag with the input
-    def style path, more = ""
+    def style(path, more = '')
       "<link rel='stylesheet' type='text/css' href='#{path}' #{more} />"
     end
-    
+
     # Sugar: formats a javascript <script> tag with the input
-    def script path, more = ""
+    def script(path, more = '')
       "<script type='text/javascript' src='#{path}' #{more} ></script>"
     end
-    
+
     # Fails. Shouts a 404 response and prints hints
     #
     # If Piano is running in production mode, prints a plain 404 html
-    # or, if a 404.haml exists in the :views directory, returns it
+    # or, if a 404.haml or 404.slim exists in the :views directory, returns it
     def bad_luck(path)
       content_type :html
       if settings.environment == :production
         if File.exists? "#{settings.views}/404.haml"
           @data = data_for "404"
           halt 404, haml(:"404")
+        elsif File.exists? "#{settings.views}/404.slim"
+          @data = data_for "404"
+          halt 404, slim(:"404")
         else
-          halt 404, "<h1>404 - Not Found</h1><p>Piano has found nothing in this address</p>"
+          halt 404, '<h1>404 - Not Found</h1><p>Piano has found nothing in this address</p>'
         end
       else
         halt 404, "<h1>You have still to put something here.</h1><p>This is <em>#{path}</em></p><blockquote>Good luck!</blockquote>"
       end
     end
-    
+
     # Builds a hash for a file within the :views directory
     # Note: I feel like this functionality should be private
     def hash_for(name, type)
-      "#{name}.#{type} - " + File.mtime("#{settings.views}/#{name}.#{type}").to_s
+      "#{name}.#{type} - #{File.mtime("#{settings.views}/#{name}.#{type}")}"
     end
-    
+
     # Makes an extract out of the given text with the default length
     # of 80 words
-    # 
+    #
     # If an integer is passed as the second argument, the length 
     # of the result is adjusted properly:
-    #   
+    #
     #   extract "Hello World! Too much text is inconvenient", 2
     #
     # returns
-    # 
+    #
     #   => "Hello World!..."
     #
     def extract(text, length = 80)
-      words = text.gsub(/<.+?>/, "").split
+      words = text.gsub(/<.+?>/, '').split
       return text if words.length <= length
-      words[0..(length-1)].join(" ") + "..."
+      words[0..(length-1)].join(' ') + '...'
     end
-    
+
     # Returns a url-friendly version of the given link, with a
     # default maximum of 5 words. 
     # `link` strips any non-letter or special character, downcases the
@@ -105,20 +111,20 @@ module Sinatra
     #
     # You can specify a word length in the second argument.
     def link(text, length = 5)
-      words = text.gsub(/<.+?>/, "").gsub(" ", "-").downcase.gsub(/[^a-z0-9\-]/, "").split("-")
-      words[0..(length-1)].join("-")
+      words = text.gsub(/<.+?>/, '').gsub(' ', '-').downcase.gsub(/[^a-z0-9\-]/, '').split('-')
+      words[0..(length-1)].join('-')
     end
-    
+
     # Shorthand to settings.etags == :on
     def etags?
       if settings.respond_to? :etags
         settings.etags == :on
-      else 
+      else
         true
       end
     end
-  
+
   end
-  
+
   register Piano
 end

data/piano.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sinatra", ">= 1.2.6"
   s.add_dependency "sinatra-flash", ">= 0.3.0"
   s.add_dependency "haml", ">= 3.1.1"
+  s.add_dependency "slim"
   s.add_dependency "sass", ">= 3.1.1"
   s.add_dependency "compass", ">= 0.12.2"
   s.add_dependency "coffee-script", ">= 2.2.0"

metadata

@@ -1,159 +1,170 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: piano
-version: !ruby/object:Gem::Version 
-  hash: 51
+version: !ruby/object:Gem::Version
+  version: 0.12.0
   prerelease: 
-  segments: 
-  - 0
-  - 11
-  - 0
-  version: 0.11.0
 platform: ruby
-authors: 
+authors:
 - Xavier Via
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 2
-        - 6
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sinatra-flash
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.6
+- !ruby/object:Gem::Dependency
+  name: sinatra-flash
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
   name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 1
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.1
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sass
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 1
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !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: 3.1.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: compass
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 12
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.1
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.2
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: coffee-script
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: metafun
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: metafun
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-description: Out-of-the-box sinatra server for web site sketching using haml + sass + coffee-script
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Out-of-the-box sinatra server for web site sketching using haml + sass
+  + coffee-script
+email:
 - xavierviacanel@gmail.com
-executables: 
+executables:
 - piano
 - piano~
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -162,7 +173,7 @@ files:
 - bin/piano~
 - lib/piano.rb
 - lib/piano/base.rb
-- lib/piano/controllerloader.rb
+- lib/piano/controller_loader.rb
 - lib/piano/routes.rb
 - lib/piano/version.rb
 - lib/sinatra/piano.rb
@@ -173,36 +184,27 @@ files:
 - sample/style.sass
 homepage: http://github.com/xaviervia/piano
 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: piano
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Out-of-the-box sinatra server for web site sketching using haml + sass + coffee-script
+summary: Out-of-the-box sinatra server for web site sketching using haml + sass +
+  coffee-script
 test_files: []
-