deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix Padrino helpers that require an i18n locale to be present

Browse source
This commit is contained in:
Ben Hollis 2012-03-04 17:20:57 -08:00
parent c2f498e26e
commit 617f73c8db
4 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
middleman-core/features/former_padrino_helpers.feature
View file

@ -1,10 +1,12 @@
Feature: Built-in macro view helpers
In order to simplify generating HTML
Scenario: Using the link_to helper
Scenario: Using the padrino helpers
Given the Server is running at "padrino-helpers-app"
When I go to "/former_padrino_test.html"
And I should see 'href="test2.com"'
And I should see 'src="/images/test2.png"'
Then I should see 'src="/javascripts/test1.js"'
Then I should see 'href="/stylesheets/test1.css"'
And I should see 'src="/javascripts/test1.js"'
And I should see 'href="/stylesheets/test1.css"'
And I should see '1 KB'

1
middleman-core/fixtures/padrino-helpers-app/source/former_padrino_test.html.erb
View file

@ -2,3 +2,4 @@
<%= javascript_include_tag "test1" %>
<%= image_tag "test2.png", :alt => "alt" %>
<%= link_to "Has param", "test2.com", :class => "test" %>
<%= number_to_human_size(1024) %>

18
middleman-core/lib/middleman-core/core_extensions/default_helpers.rb
View file

@ -1,13 +1,4 @@
require "middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite"
# require 'i18n'
require 'enumerator'
# require 'active_support/core_ext/string/conversions' # to_date
require 'active_support/core_ext/float/rounding' # round
require 'active_support/option_merger' # with_options
require 'active_support/core_ext/object/with_options' # with_options
# require 'active_support/inflector' # humanize
FileSet.glob_require('../vendor/padrino-helpers-0.10.5/lib/padrino-helpers/**/*.rb', __FILE__)
require 'middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers'
# Built-in helpers
module Middleman::CoreExtensions::DefaultHelpers
@ -27,9 +18,10 @@ module Middleman::CoreExtensions::DefaultHelpers
app.helpers Helpers
# app.ready do
# ::I18n.load_path = Dir["#{File.join(root, 'locales', '*.yml')}"]
# end
app.ready do
::I18n.load_path += Dir["#{File.join(root, 'locales','*.yml')}"]
::I18n.load_path += Dir["#{File.dirname(__FILE__)}/../vendor/padrino-helpers-0.10.5/lib/padrino-helpers/locale/*.yml"]
end
end
alias :included :registered
end

2
middleman-core/lib/middleman-core/vendor/padrino-helpers-0.10.5/lib/padrino-helpers.rb vendored
View file

@ -1,4 +1,4 @@
require 'padrino-core/support_lite' unless defined?(SupportLite)
require 'middleman-core/vendor/padrino-core-0.10.5/lib/padrino-core/support_lite' unless defined?(SupportLite)
require 'cgi'
# require 'i18n'
require 'enumerator'