piano 0.7.2 → 0.7.3

data/README.rdoc

@@ -10,9 +10,9 @@ The magic triplet, one command away!
 
 == Standalone Usage
 
-  server/folder$ piano [<port-number>]
+  server/folder$ piano [<port-number> <environment>]
 
-Piano will start a Sinatra server based in the same folder where you run the command, in the port given. If no port is given, piano will start in the default Sinatra port, 4567. 
+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 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.
 
@@ -68,6 +68,17 @@ When receiving a request for <tt>"/users"</tt>, Piano will look up for a YAML fi
   
 Note: You can find this sample in the repository within the <tt>/sample</tt> folder.
 
+== Going :production!
+
+Piano goes production in command line just adding <tt>production</tt> to its arguments. When it goes, it goes this way:
+
+* Now any unmatched route will give a zero-information-disclosure nice old 404 error page
+* And the default behaviour for 500 errors in Sinatra.
+
+For nicety sake, you can personalize 404 pages simply by creating a <tt>server/folder/404.haml</tt> template. Beware when you do: out there be dragons.
+
+Note: you can also add a <tt>server/folder/data/404.yaml</tt> file to keep layer separation even in your error pages.
+
 == Library Usage
 
 If you want, you can include Piano as a library in your own server. Kind of defeats the point of using Piano, but useful if you want to extend its functionality.
@@ -146,12 +157,14 @@ Etags cause client side caching. This should not be a problem since the hash cha
 * Custom error when there's no data
 * More helpers for semantic data handling.
 * Deploy of sample with command line <tt>--sample</tt> argument.
-* Setup to production enviroment option (why not?!)
 * Online source files edition.
 
+DONE &gt; Setup to production enviroment option (why not?!)
+* Now it would be nice to give Piano personalized templates not only to 404 but for all error pages, specially 500
+
 == Tips
 
-As for v0.7, not really suitable for production use, since any empty URL will return a full path disclosure of the file that Piano intended to load.
+As for v0.7.3, Piano has now the ability to go <tt>:production</tt> mode both in command line and library modes.
 
 Piano is in intensive development, you might want to keep track of small updates with Bundler pointing to the github repository. Here is the line to put in your Gemfile
 

data/bin/piano

@@ -2,8 +2,16 @@
 
 require "piano"
 
-if port = ARGV.shift
-  Piano.port = port
+unless ARGV.empty?
+  
+  ARGV.each do |arg|
+    if arg =~ /^\d+$/
+      Piano.port = arg
+    elsif arg =~ /^[a-z]+$/
+      Piano.environment = arg.to_sym
+    end
+  end
+
 end
 
 Piano.run!

data/lib/piano.rb

@@ -73,7 +73,16 @@ class Piano < Sinatra::Base
     end
     
     def bad_luck(path)
-      halt 404, "<h1>You have still to put something here.</h1><p>This is <em>#{path}</em></p><blockquote>Good luck!</blockquote>"
+      if settings.environment == :production
+        if File.exists? "#{pwd}/404.haml"
+          @data = data_for "404"
+          halt 404, haml(:"404")
+        else
+          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
     
     def hash_for(name, type)

data/lib/piano/version.rb

@@ -1,3 +1,3 @@
 module Piano
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piano
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &20782944 !ruby/object:Gem::Requirement
+  requirement: &21772596 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *20782944
+  version_requirements: *21772596
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &20782644 !ruby/object:Gem::Requirement
+  requirement: &21772296 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *20782644
+  version_requirements: *21772296
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &20782368 !ruby/object:Gem::Requirement
+  requirement: &21772020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *20782368
+  version_requirements: *21772020
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &20782092 !ruby/object:Gem::Requirement
+  requirement: &21771744 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *20782092
+  version_requirements: *21771744
 description: Out-of-the-box sinatra server for web site sketching using haml + sass
   + coffee-script
 email: