middleman-core 3.0.0.beta.1 → 3.0.0.beta.2

data/lib/middleman-core/vendor/{padrino-helpers-0.10.5 → padrino-helpers-0.10.6}/lib/padrino-helpers.rb

@@ -1,6 +1,7 @@
-require 'padrino-core/support_lite' unless defined?(SupportLite)
+require 'middleman-core/vendor/padrino-core-0.10.6/lib/padrino-core/support_lite' unless defined?(SupportLite) ### !!! FIXME middleman ###
+### require 'padrino-core/support_lite' unless defined?(SupportLite) ### !!! FIXME middleman ###
 require 'cgi'
-# require 'i18n'
+### require 'i18n' ### !!! FIXME middleman ###
 require 'enumerator'
 require 'active_support/core_ext/string/conversions'  # to_date
 require 'active_support/core_ext/float/rounding'      # round
@@ -11,7 +12,7 @@ require 'active_support/inflector'                    # humanize
 FileSet.glob_require('padrino-helpers/**/*.rb', __FILE__)
 
 # Load our locales
-# I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-helpers/locale/*.yml"]
+### I18n.load_path += Dir["#{File.dirname(__FILE__)}/padrino-helpers/locale/*.yml"] ### !!! FIXME middleman ###
 
 module Padrino
   ##

data/lib/middleman-core/vendor/{padrino-helpers-0.10.5 → padrino-helpers-0.10.6}/test/fixtures/markup_app/views/form_for.erb

@@ -5,14 +5,30 @@
     <%= f.label :username, :caption => "Login: ", :class => 'user-label' %>
     <%= f.text_field :username, :class => 'user-text', :value => "John" %>
   </p>
-  <p>
-    <%= f.label :email, :caption => "Email", :class => 'user-email' %>
-    <%= f.text_field :email %>
-  </p>
   <p>
     <%= f.label :password %>
     <%= f.password_field :password, :class => 'user-password', :value => "secret" %>
   </p>
+  <p>
+    <%= f.label :age %>
+    <%= f.number_field :age, :class => 'numeric '%>
+  </p>
+  <p>
+    <%= f.label :telephone %>
+    <%= f.telephone_field :telephone, :class => 'numeric' %>
+  </p>
+  <p>
+    <%= f.label :email, :caption => 'Email Address: ' %>
+    <%= f.email_field :email, :class => 'string' %>
+  </p>
+  <p>
+    <%= f.label :webpage, :caption => 'Your Web Page: ' %>
+    <%= f.url_field :webpage, :class => 'string' %>
+  </p>
+  <p>
+    <%= f.label :search %>
+    <%= f.search_field :search, :class => 'string' %>
+  </p>
   <p>
     <%= f.label :photo %>
     <%= f.file_field :photo, :class => 'user-photo' %>

data/lib/middleman-core/vendor/{padrino-helpers-0.10.5 → padrino-helpers-0.10.6}/test/fixtures/markup_app/views/form_for.haml

@@ -4,12 +4,24 @@
   %p
     = f.label :username, :caption => "Login: ", :class => 'user-label'
     = f.text_field :username, :class => 'user-text', :value => "John"
-  %p
-    = f.label :email, :caption => "Email", :class => 'user-email'
-    = f.text_field :email
   %p
     = f.label :password
     = f.password_field :password, :class => 'user-password', :value => "secret"
+  %p
+    = f.label :age
+    = f.number_field :age, :class => 'numeric'
+  %p
+    = f.label :telephone
+    = f.telephone_field :telephone, :class => 'numeric'
+  %p
+    = f.label :email, :caption => 'Email Address: '
+    = f.email_field :email, :class => 'string'
+  %p
+    = f.label :webpage, :caption => 'Your Web Page: '
+    = f.url_field :webpage, :class => 'string'
+  %p
+    = f.label :search
+    = f.search_field :search, :class => 'string'
   %p
     = f.label :photo
     = f.file_field :photo, :class => 'user-photo'

data/lib/middleman-core/vendor/{padrino-helpers-0.10.5 → padrino-helpers-0.10.6}/test/fixtures/markup_app/views/form_for.slim

@@ -4,12 +4,24 @@
   p
     == f.label :username, :caption => "Login: ", :class => 'user-label'
     == f.text_field :username, :class => 'user-text', :value => "John"
-  p
-    == f.label :email, :caption => "Email", :class => 'user-email'
-    == f.text_field :email
   p
     == f.label :password
     == f.password_field :password, :class => 'user-password', :value => "secret"
+  p
+    == f.label :age
+    == f.number_field :age, :class => 'numeric'
+  p
+    == f.label :telephone
+    == f.telephone_field :telephone, :class => 'numeric'
+  p
+    == f.label :email, :caption => 'Email Address: '
+    == f.email_field :email, :class => 'string'
+  p
+    == f.label :webpage, :caption => 'Your Web Page: '
+    == f.url_field :webpage, :class => 'string'
+  p
+    == f.label :search
+    == f.search_field :search, :class => 'string'
   p
     == f.label :photo
     == f.file_field :photo, :class => 'user-photo'

data/lib/middleman-core/vendor/{padrino-helpers-0.10.5 → padrino-helpers-0.10.6}/test/fixtures/markup_app/views/form_tag.erb

@@ -5,6 +5,16 @@
     <%= text_field_tag :username %>
     <%= label_tag :password %>
     <%= password_field_tag :password %>
+    <%= label_tag :email %>
+    <%= email_field_tag :email %>
+    <%= label_tag :age %>
+    <%= number_field_tag :age %>
+    <%= label_tag :telephone %>
+    <%= telephone_field_tag :telephone %>
+    <%= label_tag :webpage %>
+    <%= url_field_tag :webpage %>
+    <%= label_tag :search %>
+    <%= search_field_tag :search %>
     <%= check_box_tag :remember_me %>
     <%= label_tag :gender %>
     <%= label_tag :color %>
@@ -27,6 +37,26 @@
       <%= label_tag :password, :class => 'first' %>
       <%= password_field_tag :password, :value => params[:password] %>
     </p>
+    <p>
+      <%= label_tag :email, :caption => 'Email Address' %>
+      <%= email_field_tag :email, :class => 'string' %>
+    </p>
+    <p>
+      <%= label_tag :age, :class => 'age' %>
+      <%= number_field_tag :age, :class => 'numeric' %>
+    </p>
+    <p>
+      <%= label_tag :telephone, :class => 'telephone' %>
+      <%= telephone_field_tag :telephone, :class => 'numeric' %>
+    </p>
+    <p>
+      <%= label_tag :webpage, :caption => 'Your Home Page' %>
+      <%= url_field_tag :webpage, :class => 'string' %>
+    </p>
+    <p>
+      <%= label_tag :search %>
+      <%= search_field_tag :search, :class => 'string' %>
+    </p>
     <p>
       <%= label_tag :about, :class => 'about', :caption => "About Me" %>
       <%= text_area_tag :about, :class => 'large' %>

data/lib/middleman-core/vendor/{padrino-helpers-0.10.5 → padrino-helpers-0.10.6}/test/fixtures/markup_app/views/form_tag.haml

@@ -6,6 +6,16 @@
     = text_field_tag :username
     = label_tag :password
     = password_field_tag :password
+    = label_tag :email
+    = email_field_tag :email
+    = label_tag :age
+    = number_field_tag :age
+    = label_tag :telephone
+    = telephone_field_tag :telephone
+    = label_tag :webpage
+    = url_field_tag :webpage
+    = label_tag :search
+    = search_field_tag :search
     = label_tag  :color
     = select_tag :color, :options => ['green', 'orange', 'purple']
     = label_tag  :gender
@@ -24,6 +34,21 @@
     %p
       = label_tag :password, :class => 'first'
       = password_field_tag :password, :value => params[:password]
+    %p
+      = label_tag :email, :caption => 'Email Address'
+      = email_field_tag :email, :class => 'string'
+    %p
+      = label_tag :age, :class => 'age'
+      = number_field_tag :age, :class => 'numeric'
+    %p
+      = label_tag :telephone, :class => 'telephone'
+      = telephone_field_tag :telephone, :class => 'numeric'
+    %p
+      = label_tag :webpage, :caption => 'Your Home Page'
+      = url_field_tag :webpage, :class => 'string'
+    %p
+      = label_tag :search
+      = search_field_tag :search, :class => 'string'
     %p
       = label_tag :about, :class => 'about', :caption => "About Me"
       = text_area_tag :about, :class => 'large'

data/lib/middleman-core/vendor/{padrino-helpers-0.10.5 → padrino-helpers-0.10.6}/test/fixtures/markup_app/views/form_tag.slim

@@ -6,6 +6,16 @@
     == text_field_tag :username
     == label_tag :password
     == password_field_tag :password
+    == label_tag :email
+    == email_field_tag :email
+    == label_tag :age
+    == number_field_tag :age
+    == label_tag :telephone
+    == telephone_field_tag :telephone
+    == label_tag :webpage
+    == url_field_tag :webpage
+    == label_tag :search
+    == search_field_tag :search
     == label_tag  :color
     == select_tag :color, :options => ['green', 'orange', 'purple']
     == label_tag  :gender
@@ -24,6 +34,21 @@
     p
       == label_tag :password, :class => 'first'
       == password_field_tag :password, :value => params[:password]
+    p
+      == label_tag :email, :caption => 'Email Address'
+      == email_field_tag :email, :class => 'string'
+    p
+      == label_tag :age, :class => 'age'
+      == number_field_tag :age, :class => 'numeric'
+    p
+      == label_tag :telephone, :class => 'telephone'
+      == telephone_field_tag :telephone, :class => 'numeric'
+    p
+      == label_tag :webpage, :caption => 'Your Home Page'
+      == url_field_tag :webpage, :class => 'string'
+    p
+      == label_tag :search
+      == search_field_tag :search, :class => 'string'
     p
       == label_tag :about, :class => 'about', :caption => "About Me"
       == text_area_tag :about, :class => 'large'

data/lib/middleman-core/vendor/{padrino-helpers-0.10.5 → padrino-helpers-0.10.6}/test/test_asset_tag_helpers.rb

@@ -9,7 +9,7 @@ describe "AssetTagHelpers" do
   end
 
   def flash
-    { :notice => "Demo notice" }
+    @_flash ||= { :notice => "Demo notice" }
   end
 
   context 'for #flash_tag method' do
@@ -20,6 +20,14 @@ describe "AssetTagHelpers" do
       actual_html = flash_tag(:notice, :class => 'notice', :id => 'notice-area')
       assert_has_tag('div.notice#notice-area', :content => "Demo notice") { actual_html }
     end
+    should "display multiple flash tags with given attributes" do
+      flash[:error] = 'wrong'
+      flash[:success] = 'okey'
+      actual_html = flash_tag(:success, :error, :id => 'area')
+      assert_has_tag('div.success#area', :content => flash[:success]) { actual_html }
+      assert_has_tag('div.error#area', :content => flash[:error]) { actual_html }
+      assert_has_no_tag('div.notice') { actual_html }
+    end
   end
 
   context 'for #link_to method' do
@@ -39,7 +47,7 @@ describe "AssetTagHelpers" do
 
     should "display link element with void url and options" do
       actual_link = link_to('Sign up', :class => "test")
-      assert_has_tag('a', :content => "Sign up", :href => 'javascript:void(0);', :class => 'test') { actual_link }
+      assert_has_tag('a', :content => "Sign up", :href => '#', :class => 'test') { actual_link }
     end
 
     should "display link element with remote option" do
@@ -146,10 +154,10 @@ describe "AssetTagHelpers" do
   context 'for #image_tag method' do
     should "display image tag absolute link with no options" do
       time = stop_time_for_test
-      assert_has_tag('img', :src => "/absolute/pic.gif?#{time.to_i}") { image_tag('/absolute/pic.gif') }
+      assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
     end
 
-    should "display image tag absolute link with specified uri root" do
+    should "display image tag relative link with specified uri root" do
       time = stop_time_for_test
       self.class.stubs(:uri_root).returns("/blog")
       assert_has_tag('img', :src => "/blog/images/relative/pic.gif?#{time.to_i}") { image_tag('relative/pic.gif') }
@@ -201,7 +209,7 @@ describe "AssetTagHelpers" do
       time = stop_time_for_test
       expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
       actual_html = stylesheet_link_tag('/css/style')
-      assert_has_tag('link', expected_options.merge(:href => "/css/style.css?#{time.to_i}")) { actual_html }
+      assert_has_tag('link', expected_options.merge(:href => "/css/style.css")) { actual_html }
     end
 
     should "display stylesheet link item with uri root" do
@@ -257,7 +265,7 @@ describe "AssetTagHelpers" do
     should "display javascript item with absolute path" do
       time = stop_time_for_test
       actual_html = javascript_include_tag('/js/application')
-      assert_has_tag('script', :src => "/js/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+      assert_has_tag('script', :src => "/js/application.js", :type => "text/javascript") { actual_html }
     end
 
     should "display javascript item with uri root" do

data/lib/middleman-core/vendor/{padrino-helpers-0.10.5 → padrino-helpers-0.10.6}/test/test_form_builder.rb

@@ -63,7 +63,7 @@ describe "FormBuilder" do
 
     should "display correct form html with remote option and method put" do
       actual_html = form_for(@user, '/update', :"accept-charset" => "UTF-8", :remote => true, :method => 'put') { "Demo" }
-      assert_has_tag('form', :"accept-charset" => "UTF-8", :method => 'post', "data-method" => 'put', "data-remote" => 'true') { actual_html }
+      assert_has_tag('form', :"accept-charset" => "UTF-8", :method => 'post', "data-remote" => 'true') { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
     end
 
@@ -199,7 +199,7 @@ describe "FormBuilder" do
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Fake must be valid"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Second must be present"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
-      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
     end
 
     should "display correct form in erb" do
@@ -212,7 +212,7 @@ describe "FormBuilder" do
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Fake must be valid"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Second must be present"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
-      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
     end
 
     should "display correct form in slim" do
@@ -225,7 +225,7 @@ describe "FormBuilder" do
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Fake must be valid"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Second must be present"
       assert_have_selector '#demo2 div.field-errors ul li', :content => "Third must be a number"
-      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'invalid'
+      assert_have_selector '#demo input', :name => 'markup_user[email]', :class => 'string invalid'
     end
   end
 
@@ -325,6 +325,116 @@ describe "FormBuilder" do
     end
   end
 
+  context 'for #number_field method' do
+    should "display correct number field html" do
+      actual_html = standard_builder.number_field(:age, :class => 'numeric')
+      assert_has_tag('input.numeric[type=number]', :id => 'user_age', :name => 'user[age]') { actual_html }
+    end
+
+    should "display correct number field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.numeric[type=number]', :id => 'markup_user_age'
+    end
+
+    should "display correct number field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.numeric[type=number]', :id => 'markup_user_age'
+    end
+
+    should "display correct number field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.numeric[type=number]', :id => 'markup_user_age'
+    end
+  end
+
+  context 'for #telephone_field method' do
+    should "display correct telephone field html" do
+      actual_html = standard_builder.telephone_field(:telephone, :class => 'numeric')
+      assert_has_tag('input.numeric[type=tel]', :id => 'user_telephone', :name => 'user[telephone]') { actual_html }
+    end
+
+    should "display correct telephone field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
+    end
+
+    should "display correct telephone field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
+    end
+
+    should "display correct telephone field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.numeric[type=tel]', :id => 'markup_user_telephone'
+    end
+  end
+
+  context 'for #search_field method' do
+    should "display correct search field html" do
+      actual_html = standard_builder.search_field(:search, :class => 'string')
+      assert_has_tag('input.string[type=search]', :id => 'user_search', :name => 'user[search]') { actual_html }
+    end
+
+    should "display correct search field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.string[type=search]', :id => 'markup_user_search'
+    end
+
+    should "display correct search field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.string[type=search]', :id => 'markup_user_search'
+    end
+
+    should "display correct search field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.string[type=search]', :id => 'markup_user_search'
+    end
+  end
+
+  context 'for #email_field method' do
+    should "display correct email field html" do
+      actual_html = standard_builder.email_field(:email, :class => 'string')
+      assert_has_tag('input.string[type=email]', :id => 'user_email', :name => 'user[email]') { actual_html }
+    end
+
+    should "display correct email field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.string[type=email]', :id => 'markup_user_email'
+    end
+
+    should "display correct email field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.string[type=email]', :id => 'markup_user_email'
+    end
+
+    should "display correct email field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.string[type=email]', :id => 'markup_user_email'
+    end
+  end
+
+  context 'for #url_field method' do
+    should "display correct url field html" do
+      actual_html = standard_builder.url_field(:webpage, :class => 'string')
+      assert_has_tag('input.string[type=url]', :id => 'user_webpage', :name => 'user[webpage]') { actual_html }
+    end
+
+    should "display correct url field in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input.string[type=url]', :id => 'markup_user_webpage'
+    end
+
+    should "display correct url field in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input.string[type=url]', :id => 'markup_user_webpage'
+    end
+
+    should "display correct url field in slim" do
+      visit '/slim/form_for'
+      assert_have_selector '#demo input.string[type=url]', :id => 'markup_user_webpage'
+    end
+  end
+
   context 'for #check_box method' do
     should "display correct checkbox html" do
       actual_html = standard_builder.check_box(:confirm_destroy, :class => 'large')
@@ -430,7 +540,7 @@ describe "FormBuilder" do
   context 'for #text_area method' do
     should "display correct text_area html" do
       actual_html = standard_builder.text_area(:about, :class => 'large')
-      assert_has_tag('textarea.large', :id => 'user_about', :name => 'user[about]', :rows => '', :cols => '') { actual_html }
+      assert_has_tag('textarea.large', :id => 'user_about', :name => 'user[about]') { actual_html }
     end
 
     should "display correct text_area html and content" do
@@ -628,7 +738,7 @@ describe "FormBuilder" do
 
     should "display correct image submit button html" do
       actual_html = standard_builder.image_submit('/system/ok.png', :class => 'large')
-      assert_has_tag('input.large[type=image]', :src => "/system/ok.png?#{@stamp}") { actual_html }
+      assert_has_tag('input.large[type=image]', :src => "/system/ok.png") { actual_html }
     end
 
     should "display correct image submit button in haml" do