piano 0.8.1 → 0.8.3

data/README.rdoc

@@ -24,11 +24,11 @@ Other files (images, plain text files, etc) will be loaded from the <tt>server/f
 
 == Extending functionality
 
-Piano will try to load a file named <tt>server/folder/.piano</tt>. There you can add functionality, like custom helpers and routes.
+Piano will try to load a file named <tt>server/folder/Pianofile</tt>. There you can add functionality, like custom helpers and routes.
 
-Any route added to the <tt>.piano</tt> file will be parsed before the default routes from Piano, overriding them. 
+Any route added to the <tt>Pianofile</tt> will be parsed before the default routes from Piano, overriding them. 
 
-==== Sample <tt>.piano</tt> file
+==== Sample <tt>Pianofile</tt>
 
 This file, for example, will bring back the email masking functionality that was deprecated in version 0.7.6
 
@@ -106,30 +106,26 @@ Note: you can also add a <tt>server/folder/data/404.yaml</tt> file to keep layer
 * Port number: Any number passed as an argument to the <tt>piano</tt> command will be used as the port number.
 * Environment: Any string that does not matches any other argument will be setted as the environment. 
 * <tt>noetags</tt>: Adding <tt>noetags</tt> to the shell command will cause Piano to run without etags.
+* <tt>views:<views_path></tt> Sets the views folder, within server/folder
+* <tt>public:<public_path></tt> Sets the public folder, within server/folder
+== Library Usage as Sinatra Extension
 
-== Library Usage
+Piano is fully usable as a Sinatra Extension. Provide the helpers, <tt>sass("template")</tt>, <tt>coffee("template")</tt>, <tt>try_haml("template")</tt>.
 
-Piano is fully usable as a library. Its main utility is provide the helpers, <tt>sass("template")</tt>, <tt>coffee("template")</tt>, <tt>try_haml("template")</tt>.
+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 Piano   
+  class MyPiano < Sinatra::Base   
+    helpers Sinatra::Piano
+    
     get "/" do
       "Let's change the default behaviour"
     end
   end  
   
-  Piano.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
-
-just before letting it play for play in production environment!
-
-By setting <tt>Piano.etags = :off</tt>, etags will be disabled.
+  MyPiano.run! 
 
 === Routes
 
@@ -144,6 +140,18 @@ To load the routes (the ones that match your requests with your haml, sass and c
   end
   
   require "piano/routes"
+  
+  Piano.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
+
+just before letting it play for play in production environment!
+
+By setting <tt>Piano.etags = :off</tt>, etags will be disabled.
 
 == Candies for the kidz
 

data/bin/piano

@@ -59,7 +59,12 @@ def make_sample
   FileUtils.cp_r "#{source_dir}/sample", this_dir
 end
 
-if File.exists?(File.expand_path(Dir.pwd) + "/.piano")
+if File.exists?(File.expand_path(Dir.pwd) + "/Pianofile")
+  piano_file = File.expand_path(Dir.pwd) + "/Pianofile"
+  puts "Pianofile found, loading..."
+  load piano_file
+end
+if File.exists?(File.expand_path(Dir.pwd) + "/.piano") # Deprecate soon
   load File.expand_path(Dir.pwd) + "/.piano"
 end
 

data/lib/piano.rb

@@ -11,36 +11,13 @@ rescue Exception => error
   Process.exit!
 end
 
-class Piano < Sinatra::Base
-
-  class AllButPattern
-    Match = Struct.new(:captures)
-
-    def initialize(except)
-      @except   = except
-      @captures = Match.new([])
-    end
-
-    def match(str)
-      @captures unless @except === str
-    end
-  end
-
-  def self.all_but(pattern)
-    AllButPattern.new(pattern)
-  end
-  
-  set :root, File.expand_path(Dir.pwd)
-  set :views, File.expand_path(Dir.pwd)
-  set :etags, :on
-  set :etags?, Proc.new { settings.etags == :on }
-    
-  helpers do
+module Sinatra
+  module Piano
     def try_haml(template)
       file_name = "#{pwd}/#{template}.haml"
       bad_luck file_name unless File.exists? file_name
      
-      if settings.etags?
+      if etags?
         hash = hash_for template, :haml
         hash += hash_for "data/#{template}", :yaml if File.exists? "#{pwd}/data/#{template}.yaml"
         etag hash
@@ -52,7 +29,7 @@ class Piano < Sinatra::Base
       file_name = "#{pwd}/#{template}.sass"
       bad_luck file_name unless File.exists? file_name
 
-      etag hash_for(template, :sass) if settings.etags?
+      etag hash_for(template, :sass) if etags?
       Sass.compile File.read(file_name), :syntax => :sass
     end
   
@@ -60,7 +37,7 @@ class Piano < Sinatra::Base
       file_name = "#{pwd}/#{template}.coffee"
       bad_luck file_name unless File.exists? file_name
       
-      etag hash_for(template, :coffee) if settings.etags?
+      etag hash_for(template, :coffee) if etags?
       CoffeeScript.compile(File.read(file_name))
     end
     
@@ -104,8 +81,38 @@ class Piano < Sinatra::Base
       return text if words.length <= length
       words[0..(length-1)].join(" ") + "..."
     end
+    
+    def link(text, length = 5)
+      words = text
+                .gsub(/<.+?>/, "")
+                .gsub(" ", "-")
+                .downcase
+                .gsub(/[^a-z0-9\-]/, "")
+                .split("-")
+      words[0..(length-1)].join("-")
+    end
+    
+    def etags?
+      if settings.respond_to? :etags
+        settings.etags == :on
+      else 
+        true
+      end
+    end
   end
   
+  helpers Piano
+end
+
+
+
+class Piano < Sinatra::Base
+  helpers Sinatra::Piano
+  
+  set :root, File.expand_path(Dir.pwd)
+  set :views, File.expand_path(Dir.pwd)
+  set :etags, :on
+  
   def self.play!
     self.run!
   end

data/lib/piano/routes.rb

@@ -14,7 +14,7 @@ class Piano
     coffee something
   end
   
-  get all_but(%r{/finetuner(:.+)$}) do 
+  get "/*" do 
     something = request.path[1..(request.path.length-1)]
     @data = data_for something
     try_haml something

data/lib/piano/version.rb

@@ -1,3 +1,3 @@
 module Piano
-  VERSION = "0.8.1"
+  VERSION = "0.8.3"
 end

data/sample/index.haml

@@ -8,4 +8,4 @@
   %p= @data['description']
   %ul
     - @data['list'].each do |item|
-      %li= unicode_entities item
+      %li= item

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piano
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-29 00:00:00.000000000 -03:00
+date: 2011-06-03 00:00:00.000000000 -03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &16340412 !ruby/object:Gem::Requirement
+  requirement: &21731508 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *16340412
+  version_requirements: *21731508
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &16340112 !ruby/object:Gem::Requirement
+  requirement: &21731208 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *16340112
+  version_requirements: *21731208
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &16339836 !ruby/object:Gem::Requirement
+  requirement: &21730932 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *16339836
+  version_requirements: *21730932
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &16339560 !ruby/object:Gem::Requirement
+  requirement: &21730656 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *16339560
+  version_requirements: *21730656
 description: Out-of-the-box sinatra server for web site sketching using haml + sass
   + coffee-script
 email: