piano 0.8.3 → 0.8.4

data/.gitignore

@@ -3,4 +3,5 @@
 Gemfile.lock
 pkg/*
 views/*
-test/*
+test/*
+config/*

data/README.rdoc

@@ -32,15 +32,15 @@ Any route added to the <tt>Pianofile</tt> will be parsed before the default rout
 
 This file, for example, will bring back the email masking functionality that was deprecated in version 0.7.6
 
-  class Piano
-    helpers do
-      def unicode_entities(string)
-        encodings = ""
-        string.codepoints do |c|
-          encodings += "&##{c};"
-        end
-        encodings
+Note: as version 0.8.4, direct DSL usage, Sinatra-style, is available. This documentation will be updated as soon as is stable.
+
+  helpers do
+    def unicode_entities(string)
+      encodings = ""
+      string.codepoints do |c|
+        encodings += "&##{c};"
       end
+      encodings
     end
   end
 

data/bin/piano

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require "metafun/delegator"
 
 unless ARGV.empty?
   
@@ -59,6 +60,16 @@ def make_sample
   FileUtils.cp_r "#{source_dir}/sample", this_dir
 end
 
+self.extend Metafun::Delegator
+self.delegate Piano,  :get, :patch, :put, :post, :delete, 
+                      :head, :options, :template, :layout,
+                      :before, :after, :error, :not_found, 
+                      :configure, :set, :mime_type, :enable, 
+                      :disable, :use, :development?, :test?, 
+                      :production?, :helpers, :settings
+
+self.helpers Sinatra::Piano
+
 if File.exists?(File.expand_path(Dir.pwd) + "/Pianofile")
   piano_file = File.expand_path(Dir.pwd) + "/Pianofile"
   puts "Pianofile found, loading..."

data/features/piano_i18n.feature

@@ -0,0 +1,28 @@
+Feature: i18n
+  In order to have internationalization in Piano
+  As a Piano user
+  I want to get it loaded and ready
+  
+  Scenario: Load the i18n
+    Given I have installed the i18n gem
+    When I require the i18n
+    Then I have the I18n module in scope
+    
+  Scenario: Get an english translation
+    Given I have the file "config/locale/en.yml"
+    And I have the file "config/locale/es.yml"
+    And the file "config/locale/en.yml" includes:
+      """
+      en: 
+        hello:
+          world: 'Hello World!'
+      """
+    When I load the i18ns within "config/locale"
+    And I set the locale as :en
+    And I run the translation with "hello.world"
+    Then I should get the translated "Hello World!"
+    
+  Scenario: Provide a helper
+    Given everything is ok
+    When execute instance.t "some.text"
+    Then translation should match "translation missing"

data/features/step_definitions/i18n_steps.rb

@@ -0,0 +1,52 @@
+Given /I have installed the (.*?) gem$/ do |gem|
+  Gem.available? gem
+end
+
+When /I require the (.*?)$/ do |file|
+  Piano.should be_a(Class)
+end
+
+Then /I have the (.*?) module in scope/ do |class_name|
+  klass = Module.const_get class_name
+  klass.should be_a(Module)
+end
+
+Given /I have the file "([^"]*)"$/ do |file_path|
+  @base_path = File.expand_path("../../../", __FILE__)
+  file_name = "#{@base_path}/#{file_path}"
+  File.should exist(file_name)
+end
+
+Given /the file "([^"]*)" includes:$/ do |file_path, content|
+  file_content = File.read "#{@base_path}/#{file_path}"
+  file_content.should == content
+end
+
+When /I load the i18ns within "([^"]*)"/ do |folder|
+  Piano.i18n_path = folder
+  Piano.i18n!
+end
+
+When /I set the locale as :(.*)/ do |locale_string|
+  I18n.locale = locale_string.to_sym
+end
+
+When /I run the translation with "([^"]*)"/ do |key|
+  @translation = I18n.translate key
+end
+
+Then /I should get the translated "([^"]*)"/ do |translated|
+  @translation.should == translated
+end
+
+Given /everything is ok/ do; end
+
+When /execute instance.t "([^"]*)"/ do |text|
+  obj = Object.new
+  obj.extend Sinatra::Piano::Helpers
+  @translation = obj.t text
+end
+
+Then /translation should match "([^"]*)"/ do |text|
+  @translation.should match(Regexp.new(text))
+end

data/features/support/env.rb

@@ -0,0 +1,3 @@
+$LOAD_PATH << File.expand_path("../../../lib", __FILE__)
+
+require "piano"

data/lib/piano.rb

@@ -2,6 +2,7 @@ require "sinatra/base"
 require "haml"
 require "sass"
 require "yaml"
+require "i18n"
 
 begin
   require "coffee-script"
@@ -13,6 +14,107 @@ 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
@@ -99,21 +201,31 @@ module Sinatra
         true
       end
     end
+    
+    def t(key)
+      I18n.translate key
+    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
+  set :i18n_path, File.expand_path(Dir.pwd) + "/config/locale"
+  
+  def self.i18n!
+    return unless Dir.exists? self.i18n_path
+    dir = Dir.new self.i18n_path
+    i18n_files = []
+    dir.each do |file|
+      if file.end_with?(".yml") or file.end_with?(".yaml")
+        i18n_files << "#{dir.path}/#{file}"
+      end
+    end
+    I18n.load_path = i18n_files
+  end
   
   def self.play!
-    self.run!
+    self.run! 
   end
 end

data/lib/piano/version.rb

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

data/piano.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.add_dependency "haml", ">= 3.1.1"
   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 "metafun"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piano
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-03 00:00:00.000000000 -03:00
+date: 2011-09-05 00:00:00.000000000 -03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &21731508 !ruby/object:Gem::Requirement
+  requirement: &22118244 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *21731508
+  version_requirements: *22118244
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &21731208 !ruby/object:Gem::Requirement
+  requirement: &22117824 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *21731208
+  version_requirements: *22117824
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &21730932 !ruby/object:Gem::Requirement
+  requirement: &22117368 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *21730932
+  version_requirements: *22117368
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &21730656 !ruby/object:Gem::Requirement
+  requirement: &22116924 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,29 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *21730656
+  version_requirements: *22116924
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &22116528 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *22116528
+- !ruby/object:Gem::Dependency
+  name: metafun
+  requirement: &22116264 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *22116264
 description: Out-of-the-box sinatra server for web site sketching using haml + sass
   + coffee-script
 email:
@@ -70,6 +92,9 @@ files:
 - README.rdoc
 - Rakefile
 - bin/piano
+- features/piano_i18n.feature
+- features/step_definitions/i18n_steps.rb
+- features/support/env.rb
 - lib/piano.rb
 - lib/piano/routes.rb
 - lib/piano/version.rb