middleman-core 3.1.0.rc.2 → 3.1.0.rc.3

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/test/fixtures/markup_app/views/content_for.slim

@@ -1,12 +1,12 @@
 - content_for :demo do
   h1 This is content yielded from a content_for
 
-.demo== yield_content :demo
+.demo= yield_content :demo
 
 - content_for :demo2 do |fname, lname|
   h1 This is content yielded with name #{fname + " " + lname}
 
-.demo2== yield_content :demo2, "Johnny", "Smith"
+.demo2= yield_content :demo2, "Johnny", "Smith"
 
-.demo_has_content== content_for?(:demo)
-.fake_has_content== content_for?(:fake)
+.demo_has_content= content_for?(:demo)
+.fake_has_content= content_for?(:fake)

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/markup_app/views/content_tag.slim

@@ -0,0 +1,9 @@
+=content_tag :p, "Test 1", :class => 'test', :id => "test1"
+
+=content_tag :p, "Test 2"
+
+=content_tag(:p, :class => 'test', :id => 'test3') do
+  span Test 3
+
+=content_tag(:p) do
+  span Test 4

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/test/fixtures/markup_app/views/current_engine.haml

@@ -1,5 +1,5 @@
 %p.start= current_engine
 %p.haml= haml :'partials/_haml'
-%p.erb= erb  :'partials/_erb'
+%p.erb= erb :'partials/_erb'
 %p.slim= slim :'partials/_slim'
 %p.end= current_engine

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/markup_app/views/fields_for.slim

@@ -0,0 +1,15 @@
+- @user = MarkupUser.new
+= form_for @user , '/demo1', :id => 'demo-fields-for' do |f|
+  = f.text_field :gender
+  = fields_for @user.permission do |permission|
+    = permission.check_box :can_edit
+    = permission.check_box :can_delete
+  = f.fields_for :telephone do |child_form|
+    = child_form.label :number
+    = child_form.text_field :number
+  = f.fields_for :addresses do |child_form|
+    = child_form.label :name
+    = child_form.text_field :name
+    - unless child_form.object.new_record?
+      = child_form.check_box '_destroy'
+      = child_form.label '_destroy', :caption => 'Remove'

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/markup_app/views/form_for.slim

@@ -0,0 +1,59 @@
+= form_for MarkupUser.new, '/demo', :id => 'demo' do |f|
+  = f.error_messages(:header_message => "custom MarkupUser cannot be saved!")
+  = f.hidden_field :session_id
+  p
+    = f.label :username, :caption => "Login: ", :class => 'user-label'
+    = f.text_field :username, :class => 'user-text', :value => "John"
+  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'
+  p
+    = f.label :about, :caption => "About Me: "
+    = f.text_area :about, :class => 'user-about'
+  p
+    = f.label :gender, :caption => "Your gender: "
+    = f.radio_button :gender, :value => 'male'
+    = f.radio_button :gender, :value => 'female'
+  p
+    = f.label :country, :caption => "Your country"
+    = f.select :country, :options => ['USA', 'Canada', 'Mexico'], :selected => 'USA', :class => 'selector'
+  p
+    = f.label :remember_me
+    = f.check_box :remember_me, :value => "1"
+  p
+    = f.submit "Create", :class => 'success', :id => 'demo-button'
+  p
+    = f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button'
+
+= form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f|
+  = f.error_messages :header_message => "custom MarkupUser cannot be saved!"
+  = f.hidden_field :session_id
+  = f.text_field_block :username, { :class => 'input' }, { :caption => 'Nickname: ', :class => 'label' }
+  = f.password_field_block :code, { :class => 'input' }
+  = f.text_area_block :about, { :class => 'textarea' }
+  = f.file_field_block :photo, { :class => 'upload' }
+  = f.check_box_block :remember_me, { :class => 'checker' }
+  = f.select_block :state, :options => ['California', 'Texas'], :class => 'selector'
+  = f.submit_block "Create", { :class => 'button' }
+  = f.image_submit_block "buttons/ok.png", { :class => 'image' }
+
+= form_for :markup_user, '/third_demo', :id => 'demo3', :method => 'get' do |f|
+  = f.text_field_block :username

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/markup_app/views/form_tag.slim

@@ -0,0 +1,70 @@
+= form_tag '/simple', :class => 'simple-form' do
+  = error_messages_for nil
+  = field_set_tag do
+    = hidden_field_tag :session_id, :value => "__secret__"
+    = label_tag :username
+    = 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
+    = radio_button_tag :gender, :value => 'male'
+    = radio_button_tag :gender, :value => 'female'
+    = check_box_tag :remember_me
+    = submit_tag
+
+= form_tag '/advanced', :id => 'advanced', :class => 'advanced-form', :method => 'get' do
+  = error_messages_for MarkupUser.new, :header_message => "There are problems with saving user!"
+  = hidden_field_tag :session_id, :value => "__secret__"
+  = field_set_tag "Advanced", :class => 'advanced-field-set' do
+    p
+      = label_tag :username, :class => 'first', :caption => "Nickname"
+      = text_field_tag :username, :value => params[:username], :id => 'the_username'
+    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'
+    p
+      = label_tag :gender, :class => 'gender'
+      = radio_button_tag :gender, :value => 'male', :checked => true
+      = radio_button_tag :gender, :value => 'female'
+    p
+      = label_tag :photo, :class => 'photo'
+      = file_field_tag :photo, :class => 'upload'
+    p
+      = label_tag :fav_color
+      = select_tag :fav_color, :options => [ ['green', '1'], ['orange', '2'], ['purple', '3'] ], :selected => '2'
+    p
+      = check_box_tag :remember_me, :value => "1", :checked => true
+  = field_set_tag(:class => 'buttons') do
+    = submit_tag "Login"
+    = button_tag "Cancel"
+    = image_submit_tag "buttons/submit.png"

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/markup_app/views/link_to.slim

@@ -0,0 +1,4 @@
+= link_to "Test 1 No Block", '/test1', :class => 'test', :id => 'test1'
+
+= link_to("/test2", :class => 'test', :id => 'test2') do
+  span Test 2 With Block

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/markup_app/views/mail_to.slim

@@ -0,0 +1,3 @@
+p.simple= mail_to 'test@demo.com'
+
+p.captioned= mail_to 'test@demo.com', "Click my Email"

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/markup_app/views/meta_tag.slim

@@ -0,0 +1,3 @@
+= meta_tag "weblog,news", :name => "keywords"
+
+= meta_tag "text/html; charset=UTF-8", :"http-equiv" => "Content-Type"

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/markup_app/views/partials/_slim.slim

@@ -0,0 +1 @@
+= current_engine

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/markup_app/views/simple_partial.slim

@@ -0,0 +1 @@
+p.slim= partial 'partials/slim', :engine => "slim"

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/test/fixtures/render_app/app.rb

@@ -16,6 +16,9 @@ class RenderDemo < Padrino::Application
   configure do
     set :logging, false
     set :padrino_logging, false
+    set :erb, :engine_class => Padrino::Erubis::SafeBufferTemplate
+    set :haml, :escape_html => true
+    set :slim, :generator => Temple::Generators::RailsOutputBuffer
   end
 
   # get current engines from partials
@@ -28,6 +31,10 @@ class RenderDemo < Padrino::Application
     render :explicit_engine
   end
 
+  get '/double_capture_:ext' do
+    render "double_capture_#{params[:ext]}"
+  end
+
   # partial with object
   get '/partial/object' do
     partial 'template/user', :object => RenderUser.new('John'), :locals => { :extra => "bar" }

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/render_app/views/double_capture_erb.erb

@@ -0,0 +1,3 @@
+<% form_for( :object, '/' ) do |f| %>
+  <%= $number_of_captures += 1 %>
+<% end %>

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/render_app/views/double_capture_haml.haml

@@ -0,0 +1,2 @@
+- form_for :object, '/' do |f|
+  = $number_of_captures += 1

data/lib/vendored-middleman-deps/padrino-helpers-0.11.2/test/fixtures/render_app/views/double_capture_slim.slim

@@ -0,0 +1,2 @@
+- form_for :object, '/' do |f|
+  = $number_of_captures += 1

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/test/helper.rb

@@ -27,6 +27,7 @@ class MiniTest::Spec
   # In this case, block is the html to evaluate
   def assert_has_tag(name, attributes = {}, &block)
     html = block && block.call
+    assert html.html_safe?, 'html_safe? failed'
     matcher = HaveSelector.new(name, attributes)
     raise "Please specify a block!" if html.blank?
     assert matcher.matches?(html), matcher.failure_message

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/test/test_asset_tag_helpers.rb

@@ -23,7 +23,7 @@ describe "AssetTagHelpers" do
     should "display multiple flash tags with given attributes" do
       flash[:error] = 'wrong'
       flash[:success] = 'okey'
-      actual_html = flash_tag(:success, :error, :id => 'area')
+      actual_html = flash_tag(:success, :warning, :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 }
@@ -70,6 +70,17 @@ describe "AssetTagHelpers" do
       assert_has_tag('a#binky.first', :content => "Sign up", :href => '/register') { actual_link }
     end
 
+    should "escape the link text" do
+      actual_link = link_to('/register', :class => 'first', :id => 'binky') { "<>" }
+      assert_has_tag('a#binky.first', :href => '/register') { actual_link }
+      assert_match "&lt;&gt;", actual_link
+    end
+
+    should "not escape image_tag" do
+      actual_link = link_to(image_tag("/my/fancy/image.png"), :class => 'first', :id => 'binky')
+      assert_has_tag('img', :src => "/my/fancy/image.png") { actual_link }
+    end
+
     should "display link block element in haml" do
       visit '/haml/link_to'
       assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
@@ -183,16 +194,15 @@ describe "AssetTagHelpers" do
     should "display image tag relative link with incorrect spacing" do
       time = stop_time_for_test
       assert_has_tag('img.photo', :src => "/images/%20relative/%20pic.gif%20%20?#{time.to_i}") {
-        image_tag(' relative/ pic.gif  ', :class => 'photo') }
+        image_tag(' relative/ pic.gif  ', :class => 'photo')
+      }
     end
 
     should "not use a timestamp if stamp setting is false" do
-      self.class.expects(:asset_stamp).returns(false)
       assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }
     end
 
     should "have xhtml convention tag" do
-      self.class.expects(:asset_stamp).returns(false)
       assert_equal image_tag('/absolute/pic.gif'), '<img src="/absolute/pic.gif" />'
     end
   end
@@ -200,8 +210,10 @@ describe "AssetTagHelpers" do
   context 'for #stylesheet_link_tag method' do
     should "display stylesheet link item" do
       time = stop_time_for_test
+      actual_html = stylesheet_link_tag('style')
       expected_options = { :media => "screen", :rel => "stylesheet", :type => "text/css" }
-      assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}")) { stylesheet_link_tag('style') }
+      assert_has_tag('link', expected_options.merge(:href => "/stylesheets/style.css?#{time.to_i}")) { actual_html }
+      assert actual_html.html_safe?
     end
 
     should "display stylesheet link item for long relative path" do
@@ -248,6 +260,7 @@ describe "AssetTagHelpers" do
       time = stop_time_for_test
       actual_html = javascript_include_tag('application')
       assert_has_tag('script', :src => "/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+      assert actual_html.html_safe?
     end
 
     should "display javascript item for long relative path" do
@@ -281,6 +294,12 @@ describe "AssetTagHelpers" do
       assert_has_tag('script', :src => "/blog/javascripts/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
 
+    should "not append extension to absolute paths" do
+      time = stop_time_for_test
+      actual_html = javascript_include_tag('https://maps.googleapis.com/maps/api/js?key=value&sensor=false')
+      assert_has_tag('script', :src => "https://maps.googleapis.com/maps/api/js?key=value&sensor=false") { actual_html }
+    end
+
     should "display javascript items" do
       time = stop_time_for_test
       actual_html = javascript_include_tag('application', 'base.js', 'http://google.com/lib.js')

data/lib/vendored-middleman-deps/{padrino-helpers-0.10.7 → padrino-helpers-0.11.2}/test/test_form_builder.rb

@@ -20,7 +20,7 @@ describe "FormBuilder" do
       mock_model('Role', :name => 'Moderate', :id => 2),  mock_model('Role', :name => 'Limited', :id => 3)]
     @user = mock_model("User", :first_name => "Joe", :email => '', :session_id => 54)
     @user.stubs(:errors => {:a => "must be present", :b => "must be valid", :email => "Must be valid", :first_name => []})
-    @user.stubs(:role_types => role_types, :role => "1")
+    @user.stubs(:role_types => role_types, :role => "1", :roles => [1,3])
     @user_none = mock_model("User")
   end
 
@@ -103,6 +103,7 @@ describe "FormBuilder" do
       assert_have_selector :form, :action => '/demo', :id => 'demo'
       assert_have_selector :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
       assert_have_selector :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
+      assert_have_selector :input, :name => 'authenticity_token'
     end
 
     should "display correct form in erb" do
@@ -110,6 +111,7 @@ describe "FormBuilder" do
       assert_have_selector :form, :action => '/demo', :id => 'demo'
       assert_have_selector :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
       assert_have_selector :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
+      assert_have_selector :input, :name => 'authenticity_token'
     end
 
     should "display correct form in slim" do
@@ -117,6 +119,7 @@ describe "FormBuilder" do
       assert_have_selector :form, :action => '/demo', :id => 'demo'
       assert_have_selector :form, :action => '/another_demo', :id => 'demo2', :method => 'get'
       assert_have_selector :form, :action => '/third_demo', :id => 'demo3', :method => 'get'
+      assert_have_selector :input, :name => 'authenticity_token'
     end
 
     should "have a class of 'invalid' for fields with errors" do
@@ -253,6 +256,12 @@ describe "FormBuilder" do
       assert_has_tag('label', :class => 'large', :for => 'user_first_name', :content => "F. Name: ") { actual_html }
     end
 
+    should "set specific content inside the label if a block was provided" do
+      actual_html = standard_builder.label(:admin, :class => 'large') { input_tag :checkbox }
+      assert_has_tag('label', :class => 'large', :for => 'user_admin', :content => "Admin: ") { actual_html }
+      assert_has_tag('label input[type=checkbox]') { actual_html }
+    end
+
     should "display correct label in haml" do
       visit '/haml/form_for'
       assert_have_selector '#demo label', :content => "Login: ", :class => 'user-label'
@@ -492,6 +501,37 @@ describe "FormBuilder" do
     end
   end
 
+  context 'for #check_box_group and #radio_button_group methods' do
+    should 'display checkbox group html' do
+      checkboxes = standard_builder.check_box_group(:role, :collection => @user.role_types, :fields => [:name, :id], :selected => [2,3])
+      assert_has_tag('input[type=checkbox]', :value => '1') { checkboxes }
+      assert_has_no_tag('input[type=checkbox][checked]', :value => '1') { checkboxes }
+      assert_has_tag('input[type=checkbox]', :checked => 'checked', :value => '2') { checkboxes }
+      assert_has_tag('label[for=user_role_3] input[name="user[role][]"][value="3"][checked]') { checkboxes }
+    end
+
+    should 'display checkbox group html and extract selected values from the object' do
+      checkboxes = standard_builder.check_box_group(:roles, :collection => @user.role_types, :fields => [:name, :id])
+      assert_has_tag('input[type=checkbox][name="user[roles][]"][value="1"][checked]') { checkboxes }
+      assert_has_tag('input[type=checkbox][name="user[roles][]"][value="3"][checked]') { checkboxes }
+      assert_has_no_tag('input[type=checkbox][name="user[roles][]"][value="2"][checked]') { checkboxes }
+    end
+
+    should 'display radio group html' do
+      radios = standard_builder.radio_button_group(:role, :options => %W(red yellow blue), :selected => 'yellow')
+      assert_has_tag('input[type=radio]', :value => 'red') { radios }
+      assert_has_no_tag('input[type=radio][checked]', :value => 'red') { radios }
+      assert_has_tag('input[type=radio]', :checked => 'checked', :value => 'yellow') { radios }
+      assert_has_tag('label[for=user_role_blue] input[name="user[role]"][value=blue]') { radios }
+    end
+
+    should 'display radio group html and extract selected value from the object' do
+      radios = standard_builder.radio_button_group(:role, :collection => @user.role_types)
+      assert_has_tag('input[type=radio][value="1"][checked]') { radios }
+      assert_has_no_tag('input[type=radio][value="2"][checked]') { radios }
+    end
+  end
+
   context 'for #radio_button method' do
     should "display correct radio button html" do
       actual_html = standard_builder.radio_button(:gender, :value => 'male', :class => 'large')