piano 0.8.4 → 0.8.5

data/README.rdoc

@@ -194,6 +194,7 @@ Etags cause client side caching. This should not be a problem since the hash cha
 == Desired (future) features
 
 * Folder paths configurable.
+* <tt>style</tt> and <tt>script</tt> helpers working with symbols.
 * Further documentation of Piano helpers
 * More helpers for semantic data handling.
 * Deploy of sample with command line <tt>--sample</tt> argument.
@@ -214,10 +215,6 @@ Etags cause client side caching. This should not be a problem since the hash cha
 
 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
-
-  gem "piano", :git => "git://github.com/xaviervia/piano.git"
-
 == Deprecated functions
 
 From version 0.7.6 on, <tt>unicode_entities</tt> has been deprecated for better Ruby version backwards compatibility.

data/lib/piano.rb

@@ -14,107 +14,6 @@ end
 
 module Sinatra
   module Piano
-    module Helpers
-      def try_haml(template)
-        file_name = "#{pwd}/#{template}.haml"
-        bad_luck file_name unless File.exists? file_name
-       
-        if etags?
-          hash = hash_for template, :haml
-          hash += hash_for "data/#{template}", :yaml if File.exists? "#{pwd}/data/#{template}.yaml"
-          etag hash
-        end
-        haml template.to_sym
-      end
-      
-      def sass(template)
-        file_name = "#{pwd}/#{template}.sass"
-        bad_luck file_name unless File.exists? file_name
-  
-        etag hash_for(template, :sass) if etags?
-        Sass.compile File.read(file_name), :syntax => :sass
-      end
-    
-      def coffee(template)
-        file_name = "#{pwd}/#{template}.coffee"
-        bad_luck file_name unless File.exists? file_name
-        
-        etag hash_for(template, :coffee) if etags?
-        CoffeeScript.compile(File.read(file_name))
-      end
-      
-      def data_for(template)
-        file_name = "#{pwd}/data/#{template}.yaml"
-        YAML.load_file(file_name) if File.exists?(file_name)
-      end
-      
-      def style(path)
-        "<link rel='stylesheet' type='text/css' href='#{path}' />"
-      end
-      
-      def script(path)
-        "<script type='text/javascript' src='#{path}'></script>"
-      end
-      
-      def pwd
-        settings.views
-      end
-      
-      def bad_luck(path)
-        content_type :html
-        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)
-        "#{name}.#{type} - " + File.mtime("#{pwd}/#{name}.#{type}").to_s
-      end
-      
-      def extract(text, length = 80)
-        words = text.gsub(/<.+?>/, "").split
-        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
-      
-      def t(key)
-        I18n.translate key
-      end
-    end
-  end
-  
-  helpers Piano::Helpers
-end
-
-
-
-class Piano < Sinatra::Base      
-  helpers do
     def try_haml(template)
       file_name = "#{pwd}/#{template}.haml"
       bad_luck file_name unless File.exists? file_name
@@ -206,7 +105,14 @@ class Piano < Sinatra::Base
       I18n.translate key
     end
   end
+  
+  register Piano
+end
+
 
+
+class Piano < Sinatra::Base      
+  register Sinatra::Piano
   
   set :root, File.expand_path(Dir.pwd)
   set :views, File.expand_path(Dir.pwd)

data/lib/piano/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piano
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &22118244 !ruby/object:Gem::Requirement
+  requirement: &23082864 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *22118244
+  version_requirements: *23082864
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &22117824 !ruby/object:Gem::Requirement
+  requirement: &23082444 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *22117824
+  version_requirements: *23082444
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &22117368 !ruby/object:Gem::Requirement
+  requirement: &23081964 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *22117368
+  version_requirements: *23081964
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &22116924 !ruby/object:Gem::Requirement
+  requirement: &23081544 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *22116924
+  version_requirements: *23081544
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &22116528 !ruby/object:Gem::Requirement
+  requirement: &23081148 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *22116528
+  version_requirements: *23081148
 - !ruby/object:Gem::Dependency
   name: metafun
-  requirement: &22116264 !ruby/object:Gem::Requirement
+  requirement: &23080884 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22116264
+  version_requirements: *23080884
 description: Out-of-the-box sinatra server for web site sketching using haml + sass
   + coffee-script
 email: