best_in_place 2.1.0 → 3.0.0.rc1

data/spec/internal/app/views/users/edit.html.erb

@@ -0,0 +1,5 @@
+<h1>Edit user</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', users_path %>

data/{test_app → spec/internal}/app/views/users/show.html.erb

@@ -7,19 +7,19 @@
     <tr>
       <td>Name <a id="editme" href="#">(edit me)</a></td>
       <td id="name">
-        <%= best_in_place @user, :name, :type => :input, :activator => "#editme" %>
+        <%= best_in_place @user, :name, as: :input, :activator => "#editme" %>
       </td>
     </tr>
     <tr>
       <td>Last Name</td>
       <td id="last_name">
-        <%= best_in_place @user, :last_name, :nil => "Nothing to show" %>
+        <%= best_in_place @user, :last_name, place_holder: 'Nothing to show' %>
       </td>
     </tr>
     <tr>
       <td>Height</td>
       <td id="height">
-        <%= best_in_place @user, :height, :type => :select, :collection => height_collection.zip(height_collection), :sanitize => false %>
+        <%= best_in_place @user, :height, as: :select, :collection => height_collection, :raw => true %>
       </td>
     </tr>
     <tr>
@@ -31,7 +31,7 @@
     <tr>
       <td>Birth date</td>
       <td id="birth_date">
-        <%= best_in_place @user, :birth_date, :type => :date %>
+        <%= best_in_place @user, :birth_date, as: :date %>
       </td>
     </tr>
     <tr>
@@ -43,46 +43,46 @@
     <tr>
       <td>ZIP</td>
       <td id="zip">
-        <%= best_in_place @user, :zip %>
+        <%= best_in_place @user, :zip, :display_as => :zip_format %>
       </td>
     </tr>
     <tr>
       <td>Country</td>
       <td id="country">
-        <%= best_in_place @user, :country, :type => :select, :collection => @countries, :inner_class => :some_class %>
+        <%= best_in_place @user, :country, as: :select, :collection => @countries, :inner_class => :some_class %>
       </td>
     </tr>
     <tr>
       <td>Receive newsletter?</td>
       <td id="receive_email">
-        <%= best_in_place @user, :receive_email, :type => :checkbox, :collection => ["No thanks", "Yes of course"] %>
+        <%= best_in_place @user, :receive_email, as: :checkbox, collection: {'false' => "No thanks", 'true' => "Yes of course"} %>
       </td>
     </tr>
     <tr>
       <td>Receive newsletter (image)?</td>
       <td id="receive_email_image">
-        <%= best_in_place @user, :receive_email, :type => :checkbox, :collection => [image_tag('no.png'), image_tag('yes.png')] %>
+        <%= best_in_place @user, :receive_email, as: :checkbox, :collection => {'false' => image_tag('no.png'), 'true' => image_tag('yes.png')} %>
       </td>
     </tr>
     <tr>
       <td>Favorite color</td>
       <td id="favorite_color">
-        <%- opts = { :ok_button => 'Do it!', :cancel_button => 'Nope', :ok_button_class => 'custom-submit other-custom-submit', :cancel_button_class => 'custom-cancel other-custom-cancel' } %>
+        <%- opts = {:ok_button => 'Do it!', :cancel_button => 'Nope', :ok_button_class => 'custom-submit other-custom-submit', :cancel_button_class => 'custom-cancel other-custom-cancel'} %>
         <%- opts.delete(:ok_button) if params[:suppress_ok_button] %>
-        <%- opts[:nil] = "<span class='nil'>Click to add your favorite color</span>" %>
+        <%- opts[:place_holder] = "<span class='placeholder'>Click to add your favorite color</span>" %>
         <%= best_in_place @user, :favorite_color, opts %>
       </td>
     </tr>
     <tr>
       <td>Favorite locale</td>
       <td id="favorite_locale">
-        <%= best_in_place @user, :favorite_locale, :nil => "N/A" %>
+        <%= best_in_place @user, :favorite_locale, place_holder: 'N/A' %>
       </td>
     </tr>
     <tr>
       <td>Favorite books</td>
       <td id="favorite_books">
-        <%- opts = { :type => :textarea, :ok_button => 'Save', :cancel_button => 'Cancel' } %>
+        <%- opts = {as: :textarea, :ok_button => 'Save', :cancel_button => 'Cancel'} %>
         <%- opts.delete(:ok_button) if params[:suppress_ok_button] %>
         <%= best_in_place @user, :favorite_books, opts %>
       </td>
@@ -90,13 +90,13 @@
     <tr>
       <td>User description</td>
       <td id="description">
-        <%= best_in_place @user, :description, :display_as => :markdown_desc, :type => :textarea, :sanitize => false %>
+        <%= best_in_place @user, :description, :display_as => :markdown_desc, as: :textarea, :raw => true %>
       </td>
     </tr>
     <tr>
       <td>Simple-formatted user description</td>
       <td id="dw_description">
-        <%= best_in_place @user, :description, :display_with => :simple_format, :type => :textarea %>
+        <%= best_in_place @user, :description, :display_with => :simple_format, as: :textarea %>
       </td>
     </tr>
     <tr>
@@ -108,7 +108,7 @@
     <tr>
       <td>Money with proc</td>
       <td id="money_proc">
-        <%= best_in_place @user, :money_proc, :display_with => lambda{ |v| v.blank? ? "No money" : number_to_currency(v) } %>
+        <%= best_in_place @user, :money_proc, :display_with => lambda { |v| v.blank? ? "No money" : number_to_currency(v) } %>
       </td>
     </tr>
     <tr>
@@ -117,25 +117,33 @@
         <%= best_in_place @user, :money_custom, :display_with => lambda { |x| bb(x) } %>
       </td>
     </tr>
+    <tr>
+      <td>Money with value</td>
+      <td id="money_value">
+        <%= best_in_place @user, :money, :display_with => :number_to_currency, value: 'Custom Value' %>
+      </td>
+    </tr>
     <tr>
       <td>Favorite Movie</td>
       <td id="favorite_movie">
-        <%- opts = { :ok_button => 'Do it!', :cancel_button => 'Nope', :use_confirm => false } %>
+        <%- opts = {:ok_button => 'Do it!', :cancel_button => 'Nope', :use_confirm => false} %>
         <%- opts.delete(:ok_button) if params[:suppress_ok_button] %>
         <%= best_in_place @user, :favorite_movie, opts %>
       </td>
     </tr>
   </table>
-  <br />
-  <hr />
+  <br/>
+  <hr/>
   <p>Try the <b>features of Best In Place</b>:</p>
   <ul>
-  <li>Try giving wrong email values or too short address, inputs to see server errors.</li>
-  <li>Click on newsletter to change a boolean value</li>
-  <li>Click on country to change the value in a collection of values</li>
-  <li>Use the external handler to change the value of the name</li>
-  <li>Try making changes inside inputs or textareas and then press the ESC key to recover the old value</li>
+    <li>Try giving wrong email values or too short address, inputs to see server errors.</li>
+    <li>Click on newsletter to change a boolean value</li>
+    <li>Click on country to change the value in a collection of values</li>
+    <li>Use the external handler to change the value of the name</li>
+    <li>Try making changes inside inputs or textareas and then press the ESC key to recover the old value</li>
   </ul>
-  <p>More information on <a href="http://github.com/bernat/best_in_place">github</a> or <a href="http://blog.bernatfarrero.com/in-place-editing-with-javascript-jquery-and-rails-3/">bernatfarrero.com</a>.</p>
+  <p>More information on <a href="http://github.com/bernat/best_in_place">github</a> or
+    <a href="http://blog.bernatfarrero.com/in-place-editing-with-javascript-jquery-and-rails-3/">bernatfarrero.com</a>.
+  </p>
 
 </div>

data/spec/internal/config/database.yml

@@ -0,0 +1,5 @@
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000

data/spec/internal/config/initializers/development.rb

@@ -0,0 +1,8 @@
+if ENV['dev']
+  Rails.application.configure do
+    config.cache_classes = false
+    config.eager_load = false
+    config.assets.debug = true
+  end
+end
+I18n.enforce_available_locales = true

data/{test_app → spec/internal}/config/routes.rb

@@ -1,7 +1,6 @@
-BipApp::Application.routes.draw do
+Rails.application.routes.draw do
   resources :users do
     member do
-      put :test_respond_with
       get :double_init
       get :show_ajax
       get :email_field

data/spec/internal/db/schema.rb

@@ -0,0 +1,26 @@
+ActiveRecord::Schema.define do
+  create_table "cars", :force => true do |t|
+    t.string "model"
+  end
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.string   "last_name"
+    t.string   "address"
+    t.string   "email",           :null => false
+    t.string   "zip"
+    t.string   "country"
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.boolean  "receive_email"
+    t.text     "description"
+    t.string   "favorite_color"
+    t.text     "favorite_books"
+    t.datetime "birth_date"
+    t.float    "money"
+    t.float    "money_proc"
+    t.string   "height"
+    t.string   "favorite_movie"
+    t.string   "favorite_locale"
+  end
+end

data/spec/rails_helper.rb

@@ -0,0 +1,21 @@
+ENV['RAILS_ENV'] ||= 'test'
+
+require 'combustion'
+require 'capybara/rspec'
+require 'best_in_place'
+
+Combustion.initialize! :active_record, :action_controller,
+                       :action_view, :sprockets
+
+require 'rspec/rails'
+require 'capybara/rails'
+
+require 'best_in_place/test_helpers'
+require_relative 'support/retry_on_timeout'
+
+
+RSpec.configure do |config|
+  config.include BestInPlace::TestHelpers
+  config.use_transactional_fixtures = false
+  config.raise_errors_for_deprecations!
+end

data/spec/support/retry_on_timeout.rb

@@ -1,10 +1,7 @@
 def retry_on_timeout(n = 3, &block)
   block.call
-rescue Capybara::TimeoutError, Capybara::ElementNotFound => e
-  if n > 0
-    puts "Catched error: #{e.message}. #{n-1} more attempts."
-    retry_on_timeout(n - 1, &block)
-  else
-    raise
-  end
+rescue => e
+  fail if n.zero?
+  puts "Catched error: #{e.message}. #{n-1} more attempts."
+  retry_on_timeout(n - 1, &block)
 end

data/spec/utils_spec.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+describe BestInPlace::Utils do
+  include BestInPlace::Utils
+  describe '#build_best_in_place_id' do
+    it 'build id from symbol' do
+      expect(build_best_in_place_id(:user, :login)).to eq('best_in_place_user_login')
+    end
+
+      it 'build id from record' do
+        car = Cuca::Car.create
+        expect(build_best_in_place_id(car, :model)).to eq("best_in_place_cuca_car_#{car.id}_model")
+      end
+
+
+  end
+
+  describe '#object_to_key' do
+
+  end
+end

data/vendor/assets/javascripts/jquery.autosize.js

@@ -0,0 +1,272 @@
+/*!
+	Autosize v1.18.9 - 2014-05-27
+	Automatically adjust textarea height based on user input.
+	(c) 2014 Jack Moore - http://www.jacklmoore.com/autosize
+	license: http://www.opensource.org/licenses/mit-license.php
+*/
+(function ($) {
+    'use strict';
+	var	defaults = {
+		className: 'autosizejs',
+		id: 'autosizejs',
+		append: '\n',
+		callback: false,
+		resizeDelay: 10,
+		placeholder: true
+	},
+
+	// border:0 is unnecessary, but avoids a bug in Firefox on OSX
+	copy = '<textarea tabindex="-1" style="position:absolute; top:-999px; left:0; right:auto; bottom:auto; border:0; padding: 0; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; word-wrap:break-word; height:0 !important; min-height:0 !important; overflow:hidden; transition:none; -webkit-transition:none; -moz-transition:none;"/>',
+
+	// line-height is conditionally included because IE7/IE8/old Opera do not return the correct value.
+	typographyStyles = [
+		'fontFamily',
+		'fontSize',
+		'fontWeight',
+		'fontStyle',
+		'letterSpacing',
+		'textTransform',
+		'wordSpacing',
+		'textIndent'
+	],
+
+	// to keep track which textarea is being mirrored when adjust() is called.
+	mirrored,
+
+	// the mirror element, which is used to calculate what size the mirrored element should be.
+	mirror = $(copy).data('autosize', true)[0];
+
+	// test that line-height can be accurately copied.
+	mirror.style.lineHeight = '99px';
+	if ($(mirror).css('lineHeight') === '99px') {
+		typographyStyles.push('lineHeight');
+	}
+	mirror.style.lineHeight = '';
+
+	$.fn.autosize = function (options) {
+		if (!this.length) {
+			return this;
+		}
+
+		options = $.extend({}, defaults, options || {});
+
+		if (mirror.parentNode !== document.body) {
+			$(document.body).append(mirror);
+		}
+
+		return this.each(function () {
+			var
+			ta = this,
+			$ta = $(ta),
+			maxHeight,
+			minHeight,
+			boxOffset = 0,
+			callback = $.isFunction(options.callback),
+			originalStyles = {
+				height: ta.style.height,
+				overflow: ta.style.overflow,
+				overflowY: ta.style.overflowY,
+				wordWrap: ta.style.wordWrap,
+				resize: ta.style.resize
+			},
+			timeout,
+			width = $ta.width(),
+			taResize = $ta.css('resize');
+
+			if ($ta.data('autosize')) {
+				// exit if autosize has already been applied, or if the textarea is the mirror element.
+				return;
+			}
+			$ta.data('autosize', true);
+
+			if ($ta.css('box-sizing') === 'border-box' || $ta.css('-moz-box-sizing') === 'border-box' || $ta.css('-webkit-box-sizing') === 'border-box'){
+				boxOffset = $ta.outerHeight() - $ta.height();
+			}
+
+			// IE8 and lower return 'auto', which parses to NaN, if no min-height is set.
+			minHeight = Math.max(parseInt($ta.css('minHeight'), 10) - boxOffset || 0, $ta.height());
+
+			$ta.css({
+				overflow: 'hidden',
+				overflowY: 'hidden',
+				wordWrap: 'break-word' // horizontal overflow is hidden, so break-word is necessary for handling words longer than the textarea width
+			});
+
+			if (taResize === 'vertical') {
+				$ta.css('resize','none');
+			} else if (taResize === 'both') {
+				$ta.css('resize', 'horizontal');
+			}
+
+			// The mirror width must exactly match the textarea width, so using getBoundingClientRect because it doesn't round the sub-pixel value.
+			// window.getComputedStyle, getBoundingClientRect returning a width are unsupported, but also unneeded in IE8 and lower.
+			function setWidth() {
+				var width;
+				var style = window.getComputedStyle ? window.getComputedStyle(ta, null) : false;
+				
+				if (style) {
+
+					width = ta.getBoundingClientRect().width;
+
+					if (width === 0 || typeof width !== 'number') {
+						width = parseInt(style.width,10);
+					}
+
+					$.each(['paddingLeft', 'paddingRight', 'borderLeftWidth', 'borderRightWidth'], function(i,val){
+						width -= parseInt(style[val],10);
+					});
+				} else {
+					width = $ta.width();
+				}
+
+				mirror.style.width = Math.max(width,0) + 'px';
+			}
+
+			function initMirror() {
+				var styles = {};
+
+				mirrored = ta;
+				mirror.className = options.className;
+				mirror.id = options.id;
+				maxHeight = parseInt($ta.css('maxHeight'), 10);
+
+				// mirror is a duplicate textarea located off-screen that
+				// is automatically updated to contain the same text as the
+				// original textarea.  mirror always has a height of 0.
+				// This gives a cross-browser supported way getting the actual
+				// height of the text, through the scrollTop property.
+				$.each(typographyStyles, function(i,val){
+					styles[val] = $ta.css(val);
+				});
+				
+				$(mirror).css(styles).attr('wrap', $ta.attr('wrap'));
+
+				setWidth();
+
+				// Chrome-specific fix:
+				// When the textarea y-overflow is hidden, Chrome doesn't reflow the text to account for the space
+				// made available by removing the scrollbar. This workaround triggers the reflow for Chrome.
+				if (window.chrome) {
+					var width = ta.style.width;
+					ta.style.width = '0px';
+					var ignore = ta.offsetWidth;
+					ta.style.width = width;
+				}
+			}
+
+			// Using mainly bare JS in this function because it is going
+			// to fire very often while typing, and needs to very efficient.
+			function adjust() {
+				var height, original;
+
+				if (mirrored !== ta) {
+					initMirror();
+				} else {
+					setWidth();
+				}
+
+				if (!ta.value && options.placeholder) {
+					// If the textarea is empty, copy the placeholder text into 
+					// the mirror control and use that for sizing so that we 
+					// don't end up with placeholder getting trimmed.
+					mirror.value = ($ta.attr("placeholder") || '') + options.append;
+				} else {
+					mirror.value = ta.value + options.append;
+				}
+
+				mirror.style.overflowY = ta.style.overflowY;
+				original = parseInt(ta.style.height,10);
+
+				// Setting scrollTop to zero is needed in IE8 and lower for the next step to be accurately applied
+				mirror.scrollTop = 0;
+
+				mirror.scrollTop = 9e4;
+
+				// Using scrollTop rather than scrollHeight because scrollHeight is non-standard and includes padding.
+				height = mirror.scrollTop;
+
+				if (maxHeight && height > maxHeight) {
+					ta.style.overflowY = 'scroll';
+					height = maxHeight;
+				} else {
+					ta.style.overflowY = 'hidden';
+					if (height < minHeight) {
+						height = minHeight;
+					}
+				}
+
+				height += boxOffset;
+
+				if (original !== height) {
+					ta.style.height = height + 'px';
+					if (callback) {
+						options.callback.call(ta,ta);
+					}
+				}
+			}
+
+			function resize () {
+				clearTimeout(timeout);
+				timeout = setTimeout(function(){
+					var newWidth = $ta.width();
+
+					if (newWidth !== width) {
+						width = newWidth;
+						adjust();
+					}
+				}, parseInt(options.resizeDelay,10));
+			}
+
+			if ('onpropertychange' in ta) {
+				if ('oninput' in ta) {
+					// Detects IE9.  IE9 does not fire onpropertychange or oninput for deletions,
+					// so binding to onkeyup to catch most of those occasions.  There is no way that I
+					// know of to detect something like 'cut' in IE9.
+					$ta.on('input.autosize keyup.autosize', adjust);
+				} else {
+					// IE7 / IE8
+					$ta.on('propertychange.autosize', function(){
+						if(event.propertyName === 'value'){
+							adjust();
+						}
+					});
+				}
+			} else {
+				// Modern Browsers
+				$ta.on('input.autosize', adjust);
+			}
+
+			// Set options.resizeDelay to false if using fixed-width textarea elements.
+			// Uses a timeout and width check to reduce the amount of times adjust needs to be called after window resize.
+
+			if (options.resizeDelay !== false) {
+				$(window).on('resize.autosize', resize);
+			}
+
+			// Event for manual triggering if needed.
+			// Should only be needed when the value of the textarea is changed through JavaScript rather than user input.
+			$ta.on('autosize.resize', adjust);
+
+			// Event for manual triggering that also forces the styles to update as well.
+			// Should only be needed if one of typography styles of the textarea change, and the textarea is already the target of the adjust method.
+			$ta.on('autosize.resizeIncludeStyle', function() {
+				mirrored = null;
+				adjust();
+			});
+
+			$ta.on('autosize.destroy', function(){
+				mirrored = null;
+				clearTimeout(timeout);
+				$(window).off('resize', resize);
+				$ta
+					.off('autosize')
+					.off('.autosize')
+					.css(originalStyles)
+					.removeData('autosize');
+			});
+
+			// Call adjust in case the textarea already contains text.
+			adjust();
+		});
+	};
+}(window.jQuery || window.$)); // jQuery or jQuery-like library, such as Zepto