piano 0.10.2 → 0.10.4

data/bin/piano

@@ -77,11 +77,11 @@ if File.exists?(File.expand_path(Dir.pwd) + "/Pianofile")
   load File.expand_path(Dir.pwd) + "/Pianofile"
 end
 
-if Dir.exist? "controllers"
+if File.exist?("controllers") && File.directory?("controllers")
   puts "'controllers' directory found, loading '.controller' files"
   Piano::ControllerLoader.folder "controllers" 
 end
 
 require "piano/routes"
 
-Piano::Base.play!
+Piano::Base.play!

data/lib/piano.rb

@@ -57,7 +57,7 @@ module Sinatra
     
     # Loads and parses the YAML data from the data directory
     def data_for(template)
-      file_name = "#{pwd}/data/#{template}.yaml"
+      file_name = "#{settings.data}/#{template}.yaml"
       YAML.load_file(file_name) if File.exists?(file_name)
     end
     
@@ -112,10 +112,10 @@ module Sinatra
     # 
     #   => "Hello World!..."
     #
-    def extract(text, length = 80)
-      words = text.gsub(/<.+?>/, "").split
-      return text if words.length <= length
-      words[0..(length-1)].join(" ") + "..."
+    def extract(text, length = 80)
+      words = text.gsub(/<.+?>/, "").split
+      return text if words.length <= length
+      words[0..(length-1)].join(" ") + "..."
     end
     
     # Returns a url-friendly version of the given link, with a
@@ -132,12 +132,7 @@ 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 = text.gsub(/<.+?>/, "").gsub(" ", "-").downcase.gsub(/[^a-z0-9\-]/, "").split("-")
       words[0..(length-1)].join("-")
     end
     
@@ -166,6 +161,7 @@ module Piano
     
     set :root, File.expand_path(Dir.pwd)
     set :views, File.expand_path(Dir.pwd)
+    set :data, File.expand_path(Dir.pwd + "/data")
     set :etags, :on
     set :i18n_path, File.expand_path(Dir.pwd) + "/config/locale"
     
@@ -187,4 +183,4 @@ module Piano
   end
 end
 
-require "piano/controllerloader"
+require "piano/controllerloader"

data/lib/piano/controllerloader.rb

@@ -1,7 +1,4 @@
 require "polyglot"
-require "rspec"
-
-include RSpec::Matchers
 
 module Piano
   # Controller loader especifically for polyglot
@@ -39,4 +36,4 @@ module Piano
   end
 end
 
-Polyglot.register "controller", Piano::PolyglotControllerLoader
+Polyglot.register "controller", Piano::PolyglotControllerLoader

data/lib/piano/version.rb

@@ -1,3 +1,3 @@
 module Piano
-  VERSION = "0.10.2"
+  VERSION = "0.10.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piano
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.10.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-14 00:00:00.000000000 -03:00
-default_executable: 
+date: 2011-11-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &22855200 !ruby/object:Gem::Requirement
+  requirement: &18672096 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *22855200
+  version_requirements: *18672096
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &22854900 !ruby/object:Gem::Requirement
+  requirement: &18671700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *22854900
+  version_requirements: *18671700
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &22854624 !ruby/object:Gem::Requirement
+  requirement: &18671004 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +43,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *22854624
+  version_requirements: *18671004
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &22854348 !ruby/object:Gem::Requirement
+  requirement: &18670704 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *22854348
+  version_requirements: *18670704
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &22854072 !ruby/object:Gem::Requirement
+  requirement: &18670428 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +65,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *22854072
+  version_requirements: *18670428
 - !ruby/object:Gem::Dependency
   name: polyglot
-  requirement: &22853796 !ruby/object:Gem::Requirement
+  requirement: &18670044 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +76,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *22853796
+  version_requirements: *18670044
 - !ruby/object:Gem::Dependency
   name: metafun
-  requirement: &22853568 !ruby/object:Gem::Requirement
+  requirement: &18669720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22853568
+  version_requirements: *18669720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22853292 !ruby/object:Gem::Requirement
+  requirement: &18669312 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22853292
+  version_requirements: *18669312
 description: Out-of-the-box sinatra server for web site sketching using haml + sass
   + coffee-script
 email:
@@ -124,7 +123,6 @@ files:
 - sample/index.haml
 - sample/style.sass
 - spec/controller_spec.rb
-has_rdoc: true
 homepage: http://github.com/xaviervia/piano
 licenses: []
 post_install_message: 
@@ -145,9 +143,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: piano
-rubygems_version: 1.5.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Out-of-the-box sinatra server for web site sketching using haml + sass +
   coffee-script
 test_files: []
+has_rdoc: