piano 0.8.5 → 0.9.0

data/bin/piano

@@ -70,6 +70,8 @@ self.delegate Piano,  :get, :patch, :put, :post, :delete,
 
 self.helpers Sinatra::Piano
 
+$LOAD_PATH << Dir.pwd
+
 if File.exists?(File.expand_path(Dir.pwd) + "/Pianofile")
   piano_file = File.expand_path(Dir.pwd) + "/Pianofile"
   puts "Pianofile found, loading..."

data/lib/piano.rb

@@ -134,4 +134,6 @@ class Piano < Sinatra::Base
   def self.play!
     self.run! 
   end
-end
+end
+
+require "piano/controllerloader"

data/lib/piano/controllerloader.rb

@@ -0,0 +1,11 @@
+require "polyglot"
+
+class Piano
+  class ControllerLoader
+    def self.load filename, options = nil, &block
+      Kernel.eval File.read filename
+    end
+  end
+end
+
+Polyglot.register "controller", Piano::ControllerLoader

data/lib/piano/routes.rb

@@ -4,12 +4,12 @@ class Piano
     try_haml "index"
   end
   
-  get %r{/(.+?).css} do |something|
+  get %r{/(.+?).css$} do |something|
     content_type :css
     sass something
   end
   
-  get %r{/(.+?).js} do |something|
+  get %r{/(.+?).js$} do |something|
     content_type :js
     coffee something
   end

data/lib/piano/version.rb

@@ -1,3 +1,3 @@
 module Piano
-  VERSION = "0.8.5"
+  VERSION = "0.9.0"
 end

data/piano.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sass", ">= 3.1.1"
   s.add_dependency "coffee-script", ">= 2.2.0"
   s.add_dependency "i18n", ">= 0.6.0"
+  s.add_dependency "polyglot", ">= 0.3.1"
   s.add_dependency "metafun"
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piano
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000 -03:00
+date: 2011-10-12 00:00:00.000000000 -03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &23082864 !ruby/object:Gem::Requirement
+  requirement: &22896720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *23082864
+  version_requirements: *22896720
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &23082444 !ruby/object:Gem::Requirement
+  requirement: &22896420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *23082444
+  version_requirements: *22896420
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &23081964 !ruby/object:Gem::Requirement
+  requirement: &22896108 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *23081964
+  version_requirements: *22896108
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &23081544 !ruby/object:Gem::Requirement
+  requirement: &22895832 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *23081544
+  version_requirements: *22895832
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &23081148 !ruby/object:Gem::Requirement
+  requirement: &22895556 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,21 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *23081148
+  version_requirements: *22895556
+- !ruby/object:Gem::Dependency
+  name: polyglot
+  requirement: &22895268 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *22895268
 - !ruby/object:Gem::Dependency
   name: metafun
-  requirement: &23080884 !ruby/object:Gem::Requirement
+  requirement: &22895016 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +88,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23080884
+  version_requirements: *22895016
 description: Out-of-the-box sinatra server for web site sketching using haml + sass
   + coffee-script
 email:
@@ -96,6 +107,7 @@ files:
 - features/step_definitions/i18n_steps.rb
 - features/support/env.rb
 - lib/piano.rb
+- lib/piano/controllerloader.rb
 - lib/piano/routes.rb
 - lib/piano/version.rb
 - piano.gemspec