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}/test/test_form_helpers.rb

@@ -28,7 +28,7 @@ describe "FormHelpers" do
 
     should "display correct form with remote and method is put" do
       actual_html = form_tag('/update', :"accept-charset" => "UTF-8", :method => 'put', :remote => true) { "Demo" }
-      assert_has_tag(:form, "data-remote" => 'true', :"accept-charset" => "UTF-8", :"data-method" => 'put') { actual_html }
+      assert_has_tag(:form, "data-remote" => 'true', :"accept-charset" => "UTF-8") { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
     end
 
@@ -193,14 +193,14 @@ describe "FormHelpers" do
 
     should "display label tag in erb for simple form" do
       visit '/erb/form_tag'
-      assert_have_selector 'form.simple-form label', :count => 4
+      assert_have_selector 'form.simple-form label', :count => 9
       assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
       assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
     end
     should "display label tag in erb for advanced form" do
       visit '/erb/form_tag'
-      assert_have_selector 'form.advanced-form label', :count => 6
+      assert_have_selector 'form.advanced-form label', :count => 11
       assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
       assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
       assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
@@ -210,7 +210,7 @@ describe "FormHelpers" do
 
     should "display label tag in haml for simple form" do
       visit '/haml/form_tag'
-      assert_have_selector 'form.simple-form label', :count => 4
+      assert_have_selector 'form.simple-form label', :count => 9
       assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
       assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
@@ -218,7 +218,7 @@ describe "FormHelpers" do
 
     should "display label tag in haml for advanced form" do
       visit '/haml/form_tag'
-      assert_have_selector 'form.advanced-form label', :count => 6
+      assert_have_selector 'form.advanced-form label', :count => 11
       assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
       assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
       assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
@@ -228,7 +228,7 @@ describe "FormHelpers" do
 
     should "display label tag in slim for simple form" do
       visit '/slim/form_tag'
-      assert_have_selector 'form.simple-form label', :count => 4
+      assert_have_selector 'form.simple-form label', :count => 9
       assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
       assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
@@ -236,7 +236,7 @@ describe "FormHelpers" do
 
     should "display label tag in slim for advanced form" do
       visit '/slim/form_tag'
-      assert_have_selector 'form.advanced-form label', :count => 6
+      assert_have_selector 'form.advanced-form label', :count => 11
       assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
       assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
       assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
@@ -295,10 +295,135 @@ describe "FormHelpers" do
     end
   end
 
+  context 'for #number_field_tag method' do
+    should "display number field in ruby" do
+      actual_html = number_field_tag(:age, :class => 'numeric')
+      assert_has_tag(:input, :type => 'number', :class => 'numeric', :name => 'age') { actual_html }
+    end
+
+    should "display number field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=number]', :count => 1, :name => 'age'
+      assert_have_selector 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
+    end
+
+    should "display number field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=number]', :count => 1, :name => 'age'
+      assert_have_selector 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
+    end
+
+    should "display number field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=number]', :count => 1, :name => 'age'
+      assert_have_selector 'form.advanced-form fieldset input[type=number]', :count => 1, :name => 'age', :class => 'numeric'
+    end
+  end
+
+  context 'for #telephone_field_tag method' do
+    should "display number field in ruby" do
+      actual_html = telephone_field_tag(:telephone, :class => 'numeric')
+      assert_has_tag(:input, :type => 'tel', :class => 'numeric', :name => 'telephone') { actual_html }
+    end
+
+    should "display telephone field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
+      assert_have_selector 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
+    end
+
+    should "display telephone field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
+      assert_have_selector 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
+    end
+
+    should "display telephone field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=tel]', :count => 1, :name => 'telephone'
+      assert_have_selector 'form.advanced-form fieldset input[type=tel]', :count => 1, :name => 'telephone', :class => 'numeric'
+    end
+  end
+
+  context 'for #search_field_tag method' do
+    should "display search field in ruby" do
+      actual_html = search_field_tag(:search, :class => 'string')
+      assert_has_tag(:input, :type => 'search', :class => 'string', :name => 'search') { actual_html }
+    end
+
+    should "display search field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=search]', :count => 1, :name => 'search'
+      assert_have_selector 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
+    end
+
+    should "display search field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=search]', :count => 1, :name => 'search'
+      assert_have_selector 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
+    end
+
+    should "display search field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=search]', :count => 1, :name => 'search'
+      assert_have_selector 'form.advanced-form fieldset input[type=search]', :count => 1, :name => 'search', :class => 'string'
+    end
+  end
+
+  context 'for #email_field_tag method' do
+    should "display email field in ruby" do
+      actual_html = email_field_tag(:email, :class => 'string')
+      assert_has_tag(:input, :type => 'email', :class => 'string', :name => 'email') { actual_html }
+    end
+
+    should "display email field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=email]', :count => 1, :name => 'email'
+      assert_have_selector 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
+    end
+
+    should "display email field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=email]', :count => 1, :name => 'email'
+      assert_have_selector 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
+    end
+
+    should "display email field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=email]', :count => 1, :name => 'email'
+      assert_have_selector 'form.advanced-form fieldset input[type=email]', :count => 1, :name => 'email', :class => 'string'
+    end
+  end
+
+  context 'for #url_field_tag method' do
+    should "display url field in ruby" do
+      actual_html = url_field_tag(:webpage, :class => 'string')
+      assert_has_tag(:input, :type => 'url', :class => 'string', :name => 'webpage') { actual_html }
+    end
+
+    should "display url field in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
+      assert_have_selector 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
+    end
+
+    should "display url field in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
+      assert_have_selector 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
+    end
+
+    should "display url field in slim" do
+      visit '/slim/form_tag'
+      assert_have_selector 'form.simple-form input[type=url]', :count => 1, :name => 'webpage'
+      assert_have_selector 'form.advanced-form fieldset input[type=url]', :count => 1, :name => 'webpage', :class => 'string'
+    end
+  end
+
   context 'for #text_area_tag method' do
     should "display text area in ruby" do
       actual_html = text_area_tag(:about, :class => 'long')
-      assert_has_tag(:textarea, :class => "long", :name => 'about', :rows => '', :cols => '') { actual_html }
+      assert_has_tag(:textarea, :class => "long", :name => 'about') { actual_html }
     end
 
     should "display text area in ruby with specified content" do
@@ -624,7 +749,7 @@ describe "FormHelpers" do
 
     should "display image submit tag in ruby with absolute path" do
       actual_html = image_submit_tag('/system/ok.png', :class => 'success')
-      assert_has_tag(:input, :type => 'image', :class => "success", :src => "/system/ok.png?#{@stamp}") { actual_html }
+      assert_has_tag(:input, :type => 'image', :class => "success", :src => "/system/ok.png") { actual_html }
     end
 
     should "display image submit tag in erb" do

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

@@ -1,3 +1,6 @@
+require File.expand_path(File.dirname(__FILE__) + '/helper')
+require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
+
 describe "NumberHelpers" do
   include Padrino::Helpers::NumberHelpers
 

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

@@ -21,17 +21,18 @@ describe "TagHelpers" do
       assert_has_tag('option', :selected => 'selected') { actual_html }
     end
 
-    should "support tags with content no attributes" do
-      assert_has_tag(:p, :content => "Demo String") { tag(:p, :content => "Demo String") }
+    should "support data attributes" do
+      actual_html = tag(:a, :data => { :remote => true, :method => 'post'})
+      assert_has_tag(:a, 'data-remote' => 'true', 'data-method' => 'post') { actual_html }
     end
 
-    should "support tags with content and attributes" do
-      actual_html = tag(:p, :content => "Demo", :class => 'large', :id => 'intro')
-      assert_has_tag('p#intro.large', :content => "Demo") { actual_html }
+    should "support nested attributes" do
+      actual_html = tag(:div, :data => {:dojo => {:type => 'dijit.form.TextBox', :props => 'readOnly: true'}})
+      assert_has_tag(:div, 'data-dojo-type' => 'dijit.form.TextBox', 'data-dojo-props' => 'readOnly: true') { actual_html }
     end
 
     should "support open tags" do
-      actual_html = tag(:p, :class => 'demo', :open => true)
+      actual_html = tag(:p, { :class => 'demo' }, true)
       assert_equal "<p class=\"demo\">", actual_html
     end
 

data/lib/middleman-core/version.rb

@@ -4,10 +4,10 @@ require "rubygems"
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '3.0.0.beta.1' unless const_defined?(:VERSION)
+  VERSION = '3.0.0.beta.2' unless const_defined?(:VERSION)
   
   # Parsed version for RubyGems
   # @private
   # @return [String]
   GEM_VERSION = ::Gem::Version.create(VERSION) unless const_defined?(:GEM_VERSION)
-end
+end

data/lib/middleman-core/watcher.rb

@@ -1,9 +1,14 @@
-# Inspect Ruby env
-require "rbconfig"
-
 # File changes are forwarded to the currently running app via HTTP
 require "net/http"
 
+module Middleman
+  WINDOWS = !!(RUBY_PLATFORM =~ /(mingw|bccwin|wince|mswin32)/i) unless const_defined?(:WINDOWS)
+end
+
+require "win32/process" if ::Middleman::WINDOWS
+
+require "fileutils"
+
 module Middleman
   class Watcher
     class << self
@@ -14,43 +19,67 @@ module Middleman
         self.singleton.watch! unless options[:"disable-watcher"]
       end
       
-      # What command is sent to kill instances
-      # @return [Symbol, Fixnum]
-      def kill_command
-        ::Middleman::WINDOWS ? 1 : :INT
-      end
-      
       def ignore_list
         [
-          /\.sass-cache/,
+          /\.sass-cache\//,
           /\.git/,
-          /\.DS_Store/
+          /\.DS_Store$/,
+          /build\//,
+          /\.rbenv-version$/,
+          /Gemfile$/,
+          /Gemfile\.lock$/,
+          /\.mm-pid/
         ]
       end
     end
     
     def initialize(options)
       @options = options
-
-      if RbConfig::CONFIG['target_os'] =~ /darwin/i
-        $LOAD_PATH << File.expand_path('../../middleman-core/vendor/darwin/lib', __FILE__)
-      elsif RbConfig::CONFIG['target_os'] =~ /linux/i
-        $LOAD_PATH << File.expand_path('../../middleman-core/vendor/linux/lib', __FILE__)
-      end
       
+      register_signal_handlers
       start
     end
     
+    # What command is sent to kill instances
+    # @return [Symbol, Fixnum]
+    def kill_command
+      ::Middleman::WINDOWS ? 1 : "TERM"
+    end
+    
     def watch!
       local = self
 
       # Watcher Library
-      require "fssm"
+      require "listen"
       
-      FSSM.monitor(Dir.pwd) do
-        create { |base, relative| local.run_on_change([relative]) }
-        update { |base, relative| local.run_on_change([relative]) }
-        delete { |base, relative| local.run_on_deletion([relative]) }
+      Listen.to(Dir.pwd) do |modified, added, removed|
+        added_and_modified = modified + added
+        
+        if added_and_modified.length > 0
+          added_and_modified.map! { |p| p.sub(Dir.pwd, "").sub(/^\//, "") }
+          local.run_on_change(added_and_modified)
+        end
+        
+        if removed.length > 0
+          removed_relative = removed.map! { |p| p.sub(Dir.pwd, "").sub(/^\//, "") }
+          local.run_on_deletion(removed_relative) 
+        end
+      end
+    end
+    
+    def pid_name
+      ".mm-pid-#{@options[:port]||4567}"
+    end
+    
+    def kill_pid!
+      if File.exists?(pid_name)
+        current_pid = File.open(pid_name, 'rb') { |f| f.read }
+        begin
+          Process.kill(kill_command, current_pid.to_i)
+        rescue
+        ensure
+          FileUtils.rm(pid_name) if File.exists?(pid_name)
+        end
       end
     end
     
@@ -60,18 +89,25 @@ module Middleman
       if @options[:"disable-watcher"]
         bootup
       else
+        kill_pid!
+        
         @server_job = fork {
-          Signal.trap(::Middleman::WINDOWS ? :KILL : :TERM) { exit! }
+          # trap("INT")  { exit(0) }
+          # trap("TERM") { exit(0) }
+          # trap("QUIT") { exit(0) }
           bootup
         }
+        
+        File.open(pid_name, "w+") { |f| f.write(@server_job) }
       end
     end
     
-    # Start an instance of Middleman::Base
+    # Start an instance of Middleman::Application
     # @return [void]
     def bootup
       env = (@options[:environment] || "development").to_sym
-      is_logging = @options.has_key?(:debug) && (@options[:debug] == "true")
+      is_logging = @options.has_key?(:debug) && @options[:debug]
+      
       app = ::Middleman.server.inst do
         set :environment, env
         set :logging, is_logging
@@ -91,9 +127,10 @@ module Middleman
     def stop
       puts "== The Middleman is shutting down"
       if !@options[:"disable-watcher"]
-        Process.kill(::Middleman::WINDOWS ? :KILL : :TERM, @server_job)
-        Process.wait @server_job
-        @server_job = nil
+        kill_pid!
+        # Process.kill(::Middleman::WINDOWS ? :KILL : :TERM, @server_job)
+        # Process.wait @server_job
+        # @server_job = nil
       end
     end
     
@@ -131,12 +168,20 @@ module Middleman
     end
     
   private
-    # Whether the passed files are config.rb or lib/*.rb
+    # Trap the interupt signal and shut down FSSM (and thus the server) smoothly
+    def register_signal_handlers
+      trap("INT")  { stop; exit(0) }
+      trap("TERM") { stop }
+      trap("QUIT") { stop; exit(0) }
+    end
+  
+    # Whether the passed files are config.rb, lib/*.rb or helpers
     # @param [Array<String>] paths Array of paths to check
     # @return [Boolean] Whether the server needs to reload
     def needs_to_reload?(paths)
+      return false # disable reloading for now
       paths.any? do |path|
-        path.match(%{^config\.rb}) || path.match(%r{^lib/^[^\.](.*)\.rb$})
+        path.match(%{^config\.rb}) || path.match(%r{^lib/^[^\.](.*)\.rb$}) || path.match(%r{^helpers/^[^\.](.*)_helper\.rb$})
       end
     end
   
@@ -148,10 +193,4 @@ module Middleman
       Net::HTTP.post_form(uri, {}.merge(params))
     end
   end
-end
-
-# Trap the interupt signal and shut down FSSM (and thus the server) smoothly
-trap(::Middleman::Watcher.kill_command) do
-  ::Middleman::Watcher.singleton.stop
-  exit(0)
 end