best_in_place 2.0.3 → 2.1.0

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.9.2
   - 1.9.3
 
 env: "RAILS_ENV=test DISPLAY=:99.0"

data/README.md

@@ -53,7 +53,9 @@ Options:
   If not defined it will show *"-"*.
 - **:activator**: Is the DOM object that can activate the field. If not defined the user will making editable by clicking on it.
 - **:ok_button**: (Inputs and textareas only) If set to a string, then an OK button will be shown with the string as its label, replacing save on blur.
+- **:ok_button_class**: (Inputs and textareas only) Specifies any extra classes to set on the OK button.
 - **:cancel_button**: (Inputs and textareas only) If set to a string, then a Cancel button will be shown with the string as its label.
+- **:cancel_button_class**: (Inputs and textareas only) Specifies any extra classes to set on the Cancel button.
 - **:sanitize**: True by default. If set to false the input/textarea will accept html tags.
 - **:html_attrs**: Hash of html arguments, such as maxlength, default-value etc.
 - **:inner_class**: Class that is set to the rendered form.
@@ -188,7 +190,7 @@ You can also pass in a proc or lambda like this:
 
 The 'ajax:success' event is triggered upon success. Use bind:
 
-    $('.best_in_place').bind("ajax:success", function(){$(this).closest('tr').effect('highlight'));});
+    $('.best_in_place').bind("ajax:success", function () {$(this).closest('tr').effect('highlight'); });
 
 To bind a callback that is specific to a particular field, use the 'classes' option in the helper method and 
 then bind to that class. 

data/lib/assets/javascripts/best_in_place.js

@@ -32,7 +32,7 @@ BestInPlaceEditor.prototype = {
 
   activate : function() {
     var to_display = "";
-    if (this.isNil) {
+    if (this.isNil()) {
       to_display = "";
     }
     else if (this.original_content) {
@@ -46,8 +46,7 @@ BestInPlaceEditor.prototype = {
       }
     }
 
-    var elem = this.isNil ? "-" : this.element.html();
-    this.oldValue = elem;
+    this.oldValue = this.isNil() ? "" : this.element.html();
     this.display_value = to_display;
     jQuery(this.activator).unbind("click", this.clickHandler);
     this.activateForm();
@@ -55,8 +54,7 @@ BestInPlaceEditor.prototype = {
   },
 
   abort : function() {
-    if (this.isNil) this.element.html(this.nil);
-    else            this.element.html(this.oldValue);
+    this.activateText(this.oldValue);
     jQuery(this.activator).bind('click', {editor: this}, this.clickHandler);
     this.element.trigger(jQuery.Event("best_in_place:abort"));
     this.element.trigger(jQuery.Event("best_in_place:deactivate"));
@@ -80,7 +78,6 @@ BestInPlaceEditor.prototype = {
       this.abort();
       return true;
     }
-    this.isNil = false;
     editor.ajax({
       "type"       : "post",
       "dataType"   : "text",
@@ -114,6 +111,11 @@ BestInPlaceEditor.prototype = {
     alert("The form was not properly initialized. activateForm is unbound");
   },
 
+  activateText : function(value){
+    this.element.html(value);
+    if(this.isNil()) this.element.html(this.nil);
+  },
+
   // Helper Functions ////////////////////////////////////////////////////////
 
   initOptions : function() {
@@ -121,19 +123,21 @@ BestInPlaceEditor.prototype = {
     var self = this;
     self.element.parents().each(function(){
       $parent = jQuery(this);
-      self.url           = self.url           || $parent.attr("data-url");
-      self.collection    = self.collection    || $parent.attr("data-collection");
-      self.formType      = self.formType      || $parent.attr("data-type");
-      self.objectName    = self.objectName    || $parent.attr("data-object");
-      self.attributeName = self.attributeName || $parent.attr("data-attribute");
-      self.activator     = self.activator     || $parent.attr("data-activator");
-      self.okButton      = self.okButton      || $parent.attr("data-ok-button");
-      self.cancelButton  = self.cancelButton  || $parent.attr("data-cancel-button");
-      self.nil           = self.nil           || $parent.attr("data-nil");
-      self.inner_class   = self.inner_class   || $parent.attr("data-inner-class");
-      self.html_attrs    = self.html_attrs    || $parent.attr("data-html-attrs");
-      self.original_content    = self.original_content    || $parent.attr("data-original-content");
-      self.collectionValue = self.collectionValue || $parent.attr("data-value");
+      self.url               = self.url               || $parent.attr("data-url");
+      self.collection        = self.collection        || $parent.attr("data-collection");
+      self.formType          = self.formType          || $parent.attr("data-type");
+      self.objectName        = self.objectName        || $parent.attr("data-object");
+      self.attributeName     = self.attributeName     || $parent.attr("data-attribute");
+      self.activator         = self.activator         || $parent.attr("data-activator");
+      self.okButton          = self.okButton          || $parent.attr("data-ok-button");
+      self.okButtonClass     = self.okButtonClass     || $parent.attr("data-ok-button-class");
+      self.cancelButton      = self.cancelButton      || $parent.attr("data-cancel-button");
+      self.cancelButtonClass = self.cancelButtonClass || $parent.attr("data-cancel-button-class");
+      self.nil               = self.nil               || $parent.attr("data-nil");
+      self.inner_class       = self.inner_class       || $parent.attr("data-inner-class");
+      self.html_attrs        = self.html_attrs        || $parent.attr("data-html-attrs");
+      self.original_content  = self.original_content  || $parent.attr("data-original-content");
+      self.collectionValue   = self.collectionValue   || $parent.attr("data-value");
     });
 
     // Try Rails-id based if parents did not explicitly supply something
@@ -145,19 +149,21 @@ BestInPlaceEditor.prototype = {
     });
 
     // Load own attributes (overrides all others)
-    self.url           = self.element.attr("data-url")           || self.url      || document.location.pathname;
-    self.collection    = self.element.attr("data-collection")    || self.collection;
-    self.formType      = self.element.attr("data-type")          || self.formtype || "input";
-    self.objectName    = self.element.attr("data-object")        || self.objectName;
-    self.attributeName = self.element.attr("data-attribute")     || self.attributeName;
-    self.activator     = self.element.attr("data-activator")     || self.element;
-    self.okButton      = self.element.attr("data-ok-button")     || self.okButton;
-    self.cancelButton  = self.element.attr("data-cancel-button") || self.cancelButton;
-    self.nil           = self.element.attr("data-nil")           || self.nil      || "-";
-    self.inner_class   = self.element.attr("data-inner-class")   || self.inner_class   || null;
-    self.html_attrs    = self.element.attr("data-html-attrs")    || self.html_attrs;
-    self.original_content    = self.element.attr("data-original-content") || self.original_content;
-    self.collectionValue     = self.element.attr("data-value")            || self.collectionValue;
+    self.url               = self.element.attr("data-url")                 || self.url      || document.location.pathname;
+    self.collection        = self.element.attr("data-collection")          || self.collection;
+    self.formType          = self.element.attr("data-type")                || self.formtype || "input";
+    self.objectName        = self.element.attr("data-object")              || self.objectName;
+    self.attributeName     = self.element.attr("data-attribute")           || self.attributeName;
+    self.activator         = self.element.attr("data-activator")           || self.element;
+    self.okButton          = self.element.attr("data-ok-button")           || self.okButton;
+    self.okButtonClass     = self.element.attr("data-ok-button-class")     || self.okButtonClass || "";
+    self.cancelButton      = self.element.attr("data-cancel-button")       || self.cancelButton;
+    self.cancelButtonClass = self.element.attr("data-cancel-button-class") || self.cancelButtonClass || "";
+    self.nil               = self.element.attr("data-nil")                 || self.nil      || "—";
+    self.inner_class       = self.element.attr("data-inner-class")         || self.inner_class   || null;
+    self.html_attrs        = self.element.attr("data-html-attrs")          || self.html_attrs;
+    self.original_content  = self.element.attr("data-original-content")    || self.original_content;
+    self.collectionValue   = self.element.attr("data-value")               || self.collectionValue;
 
     if (!self.element.attr("data-sanitize")) {
       self.sanitize = true;
@@ -187,11 +193,16 @@ BestInPlaceEditor.prototype = {
   initNil: function() {
     if (this.element.html() === "")
     {
-      this.isNil = true;
       this.element.html(this.nil);
     }
   },
 
+  isNil: function() {
+    // TODO: It only work when form is deactivated.
+    //       Condition will fail when form is activated
+    return this.element.html() === "" || this.element.html() === this.nil;
+  },
+
   getValue : function() {
     alert("The form was not properly initialized. getValue is unbound");
   },
@@ -225,7 +236,7 @@ BestInPlaceEditor.prototype = {
   // Handlers ////////////////////////////////////////////////////////////////
 
   loadSuccessCallback : function(data) {
-    data = $.trim(data);
+    data = jQuery.trim(data);
 
     if(data && data!=""){
       var response = jQuery.parseJSON(jQuery.trim(data));
@@ -234,8 +245,12 @@ BestInPlaceEditor.prototype = {
         this.original_content = this.element.text();
         this.element.html(response["display_as"]);
       }
+
       this.element.trigger(jQuery.Event("best_in_place:success"), data);
       this.element.trigger(jQuery.Event("ajax:success"), data);
+    } else {
+      this.element.trigger(jQuery.Event("best_in_place:success"));
+      this.element.trigger(jQuery.Event("ajax:success"));
     }
 
     // Binding back after being clicked
@@ -249,7 +264,7 @@ BestInPlaceEditor.prototype = {
   },
 
   loadErrorCallback : function(request, error) {
-    this.element.html(this.oldValue);
+    this.activateText(this.oldValue);
 
     this.element.trigger(jQuery.Event("best_in_place:error"), [request, error]);
     this.element.trigger(jQuery.Event("ajax:error"), request, error);
@@ -301,6 +316,7 @@ BestInPlaceEditor.forms = {
         output.append(
           jQuery(document.createElement('input'))
           .attr('type', 'submit')
+          .attr('class', this.okButtonClass)
           .attr('value', this.okButton)
         )
       }
@@ -308,6 +324,7 @@ BestInPlaceEditor.forms = {
         output.append(
           jQuery(document.createElement('input'))
           .attr('type', 'button')
+          .attr('class', this.cancelButtonClass)
           .attr('value', this.cancelButton)
         )
       }
@@ -423,7 +440,8 @@ BestInPlaceEditor.forms = {
                        .attr('style', 'display:inline');
           selected   = '',
           oldValue   = this.oldValue,
-          select_elt = jQuery(document.createElement('select')),
+          select_elt = jQuery(document.createElement('select'))
+                      .attr('class', this.inned_class !== null ? this.inner_class : '' ),
           currentCollectionValue = this.collectionValue;
 
       jQuery.each(this.values, function (index, value) {

data/lib/assets/javascripts/jquery.purr.js

@@ -62,7 +62,7 @@
 
       // If ESC is pressed remove notice
       jQuery(document).keyup(function(e) {
-        if (e.keyCode == 27) {
+        if (e.keyCode === 27) {
           removeNotice();
         }
       });
@@ -70,24 +70,15 @@
       // Add the notice to the page and keep it hidden initially
       notice.appendTo(cont).hide();
 
-      if (jQuery.browser.msie && options.usingTransparentPNG)
-      {
-        // IE7 and earlier can't handle the combination of opacity and transparent pngs, so if we're using transparent pngs in our
-        // notice style, we'll just skip the fading in.
-        notice.show();
-      }
-      else
-      {
-        //Fade in the notice we just added
-        notice.fadeIn(options.fadeInSpeed);
-      }
+      //Fade in the notice we just added
+      notice.fadeIn(options.fadeInSpeed);
 
       // Set up the removal interval for the added notice if that notice is not a sticky
       if (!options.isSticky)
       {
         var topSpotInt = setInterval(function() {
           // Check to see if our notice is the first non-sticky notice in the list
-          if (notice.prevAll('.purr').length == 0)
+          if (notice.prevAll('.purr').length === 0)
           {
             // Stop checking once the condition is met
             clearInterval(topSpotInt);
@@ -103,41 +94,24 @@
 
     function removeNotice()
     {
-      // IE7 and earlier can't handle the combination of opacity and transparent pngs, so if we're using transparent pngs in our
-      // notice style, we'll just skip the fading out.
-      if (jQuery.browser.msie && options.usingTransparentPNG)
-      {
-        notice.css({ opacity: 0 }).animate({ height: '0px'},
+      // Fade the object out before reducing its height to produce the sliding effect
+      notice.animate({ opacity: '0' },
+        {
+          duration: options.fadeOutSpeed,
+          complete: function ()
             {
-              duration: options.fadeOutSpeed,
-              complete: function ()
-              {
-                notice.remove();
-              }
+              notice.animate({ height: '0px' },
+                {
+                  duration: options.fadeOutSpeed,
+                  complete: function()
+                    {
+                      notice.remove();
+                    }
+                }
+              );
             }
-          );
-      }
-      else
-      {
-        // Fade the object out before reducing its height to produce the sliding effect
-        notice.animate({ opacity: '0' },
-          {
-            duration: options.fadeOutSpeed,
-            complete: function ()
-              {
-                notice.animate({ height: '0px' },
-                  {
-                    duration: options.fadeOutSpeed,
-                    complete: function()
-                      {
-                        notice.remove();
-                      }
-                  }
-                );
-              }
-          }
-        );
-      }
+        }
+      );
     };
   };
 

data/lib/best_in_place/controller_extensions.rb

@@ -17,7 +17,7 @@ module BestInPlace
       if renderer = BestInPlace::DisplayMethods.lookup(klass, updating_attr)
         render :json => renderer.render_json(obj)
       else
-        head :ok
+        head :no_content
       end
     end
 

data/lib/best_in_place/helper.rb

@@ -47,7 +47,9 @@ module BestInPlace
       out << " data-attribute='#{field}'"
       out << " data-activator='#{opts[:activator]}'" unless opts[:activator].blank?
       out << " data-ok-button='#{opts[:ok_button]}'" unless opts[:ok_button].blank?
+      out << " data-ok-button-class='#{opts[:ok_button_class]}'" unless opts[:ok_button_class].blank?
       out << " data-cancel-button='#{opts[:cancel_button]}'" unless opts[:cancel_button].blank?
+      out << " data-cancel-button-class='#{opts[:cancel_button_class]}'" unless opts[:cancel_button_class].blank?
       out << " data-nil='#{attribute_escape(opts[:nil])}'" unless opts[:nil].blank?
       out << " data-use-confirm='#{opts[:use_confirm]}'" unless opts[:use_confirm].nil?
       out << " data-type='#{opts[:type]}'"
@@ -86,11 +88,12 @@ module BestInPlace
     def build_value_for(object, field, opts)
       return "" if object.send(field).blank?
 
-      if (object.respond_to?(:id))
-        klass = "#{object.class}_#{object.id}"
+      klass = if object.respond_to?(:id)
+        "#{object.class}_#{object.id}"
       else
-        klass = object.class.to_s
+        object.class.to_s
       end
+
       if opts[:display_as]
         BestInPlace::DisplayMethods.add_model_method(klass, field, opts[:display_as])
         object.send(opts[:display_as]).to_s
@@ -98,6 +101,7 @@ module BestInPlace
       elsif opts[:display_with].try(:is_a?, Proc)
         BestInPlace::DisplayMethods.add_helper_proc(klass, field, opts[:display_with])
         opts[:display_with].call(object.send(field))
+
       elsif opts[:display_with]
         BestInPlace::DisplayMethods.add_helper_method(klass, field, opts[:display_with], opts[:helper_options])
         if opts[:helper_options]
@@ -107,7 +111,7 @@ module BestInPlace
         end
 
       else
-        object.send(field).to_s.presence || ""
+        object.send(field).to_s
       end
     end
 

data/lib/best_in_place/test_helpers.rb

@@ -9,6 +9,7 @@ module BestInPlace
         jQuery("##{id}").click();
         jQuery("##{id} form textarea").val('#{escape_javascript new_value.to_s}');
         jQuery("##{id} form textarea").blur();
+        jQuery("##{id} form textarea").blur();
       JS
     end
 

data/lib/best_in_place/version.rb

@@ -1,3 +1,3 @@
 module BestInPlace
-  VERSION = "2.0.3"
+  VERSION = "2.1.0"
 end

data/spec/helpers/best_in_place_spec.rb

@@ -75,10 +75,18 @@ describe BestInPlace::BestInPlaceHelpers do
         @span.attribute("data-ok-button").should be_nil
       end
 
+      it "should have no OK button class by default" do
+        @span.attribute("data-ok-button-class").should be_nil
+      end
+
       it "should have no Cancel button text by default" do
         @span.attribute("data-cancel-button").should be_nil
       end
 
+      it "should have no Cancel button class by default" do
+        @span.attribute("data-cancel-button-class").should be_nil
+      end
+
       it "should have no Use-Confirmation dialog option by default" do
         @span.attribute("data-use-confirm").should be_nil
       end
@@ -158,6 +166,13 @@ describe BestInPlace::BestInPlaceHelpers do
         span.attribute("data-ok-button").value.should == "okay"
       end
 
+      it "should have the given OK button class" do
+        out = helper.best_in_place @user, :name, :ok_button => "okay", :ok_button_class => "okay-class"
+        nk = Nokogiri::HTML.parse(out)
+        span = nk.css("span")
+        span.attribute("data-ok-button-class").value.should == "okay-class"
+      end
+
       it "should have the given Cancel button text" do
         out = helper.best_in_place @user, :name, :cancel_button => "nasty"
         nk = Nokogiri::HTML.parse(out)
@@ -165,6 +180,13 @@ describe BestInPlace::BestInPlaceHelpers do
         span.attribute("data-cancel-button").value.should == "nasty"
       end
 
+      it "should have the given Cancel button class" do
+        out = helper.best_in_place @user, :name, :cancel_button => "nasty", :cancel_button_class => "nasty-class"
+        nk = Nokogiri::HTML.parse(out)
+        span = nk.css("span")
+        span.attribute("data-cancel-button-class").value.should == "nasty-class"
+      end
+
       it "should have the given Use-Confirmation dialog option" do
         out = helper.best_in_place @user, :name, :use_confirm => "false"
         nk = Nokogiri::HTML.parse(out)

data/spec/integration/js_spec.rb

@@ -34,17 +34,17 @@ describe "JS behaviour", :js => true do
   end
 
   describe "nil option" do
-    it "should render the default '-' string when the field is empty" do
+    it "should render an em-dash when the field is empty" do
       @user.name = ""
       @user.save :validate => false
       visit user_path(@user)
 
       within("#name") do
-        page.should have_content("-")
+        page.should have_content("\u2014")
       end
     end
 
-    it "should render the default '-' string when there is an error and if the intial string is '-'" do
+    it "should render the default em-dash string when there is an error and if the intial string is em-dash" do
       @user.money = nil
       @user.save!
       visit user_path(@user)
@@ -52,7 +52,7 @@ describe "JS behaviour", :js => true do
       bip_text @user, :money, "abcd"
 
       within("#money") do
-        page.should have_content("-")
+        page.should have_content("\u2014")
       end
     end
 
@@ -87,6 +87,36 @@ describe "JS behaviour", :js => true do
       end
     end
 
+    it "should display an empty input field the second time I open it" do
+      @user.favorite_locale = nil
+      @user.save!
+      visit user_path(@user)
+
+      within("#favorite_locale") do
+        page.should have_content("N/A")
+      end
+
+      id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_locale
+      page.execute_script <<-JS
+        $("##{id}").click();
+      JS
+
+      text = page.find("##{id} input").value
+      text.should == ""
+
+      page.execute_script <<-JS
+        $("##{id} input[name='favorite_locale']").blur();
+        $("##{id} input[name='favorite_locale']").blur();
+      JS
+      sleep 1
+
+      page.execute_script <<-JS
+        $("##{id}").click();
+      JS
+
+      text = page.find("##{id} input").value
+      text.should == ""
+    end
   end
 
   it "should be able to update last but one item in list" do
@@ -196,6 +226,14 @@ describe "JS behaviour", :js => true do
     end
   end
 
+  it "should apply the inner_class option to a select field" do
+    @user.save!
+    visit user_path(@user)
+
+    find('#country span').click
+    find('#country').should have_css('select.some_class')
+  end
+
   it "should be able to use bip_text to change a date field" do
     @user.save!
     today = Time.now.utc.to_date
@@ -295,6 +333,12 @@ describe "JS behaviour", :js => true do
     page.execute_script <<-JS
       $("##{id}").click();
       $("##{id} input[name='favorite_color']").val('Blue');
+    JS
+
+    page.find("##{id} input[type='submit']").value.should == 'Do it!'
+    page.should have_css("##{id} input[type='submit'].custom-submit.other-custom-submit")
+
+    page.execute_script <<-JS
       $("##{id} input[type='submit']").click();
     JS
 
@@ -316,6 +360,12 @@ describe "JS behaviour", :js => true do
     page.execute_script <<-JS
       $("##{id}").click();
       $("##{id} input[name='favorite_color']").val('Blue');
+    JS
+
+    page.find("##{id} input[type='button']").value.should == 'Nope'
+    page.should have_css("##{id} input[type='button'].custom-cancel.other-custom-cancel")
+
+    page.execute_script <<-JS
       $("##{id} input[type='button']").click();
     JS
 
@@ -378,6 +428,7 @@ describe "JS behaviour", :js => true do
     page.execute_script <<-JS
       $("##{id} input[name='favorite_color']").val('Blue');
       $("##{id} input[name='favorite_color']").blur();
+      $("##{id} input[name='favorite_color']").blur();
     JS
     sleep 1 # Increase if browser is slow
 
@@ -443,6 +494,7 @@ describe "JS behaviour", :js => true do
       $("##{id}").click();
       $("##{id} textarea").val('1Q84');
       $("##{id} textarea").blur();
+      $("##{id} textarea").blur();
     JS
     sleep 1 # Increase if browser is slow
     page.driver.browser.switch_to.alert.accept
@@ -467,6 +519,7 @@ describe "JS behaviour", :js => true do
     page.execute_script <<-JS
       $("##{id} textarea").val('1Q84');
       $("##{id} textarea").blur();
+      $("##{id} textarea").blur();
     JS
     sleep 1 # Increase if browser is slow
 
@@ -501,6 +554,20 @@ describe "JS behaviour", :js => true do
     page.should have_content('Last name was updated!')
   end
 
+  it "should fire off a callback when retrieve success with empty data" do
+    @user.save!
+    visit user_path(@user)
+
+    id = BestInPlace::Utils.build_best_in_place_id @user, :last_name
+    page.execute_script <<-JS
+      $("##{id}").bind('best_in_place:success', function() { $('body').append('Updated successfully!') });
+    JS
+
+    page.should have_no_content('Updated successfully!')
+    bip_text @user, :last_name, 'Empty'
+    page.should have_content('Updated successfully!')
+  end
+
   describe "display_as" do
     it "should render the address with a custom format" do
       @user.save!
@@ -590,7 +657,7 @@ describe "JS behaviour", :js => true do
 
       visit user_path(@user)
 
-      within("#dw_description") { page.should have_content("-") }
+      within("#dw_description") { page.should have_content("\u2014") }
     end
 
     it "should render the money using number_to_currency" do
@@ -716,6 +783,7 @@ describe "JS behaviour", :js => true do
       page.execute_script <<-JS
         jQuery("#edit_#{@user.id}").click();
         jQuery("##{id} input[name='name']").blur();
+        jQuery("##{id} input[name='name']").blur();
       JS
       within("tr#user_#{@user.id} > .name > span") do
         page.should have_content("Lucia")
@@ -867,6 +935,7 @@ describe "JS behaviour", :js => true do
         $("##{id}").click();
         $("##{id} select").val("5' 7\\\"");
         $("##{id} select").blur();
+        $("##{id} select").blur();
       JS
 
       sleep 1

data/test_app/app/assets/stylesheets/style.css.erb

@@ -23,6 +23,14 @@ input[type=submit], input[type=button] {
 input[type=checkbox] {
   width: 1em;
 }
+.custom-submit {
+  color: white;
+  background-color: black;
+}
+.custom-cancel {
+  border: 2px solid red;
+  font-style: italic;
+}
 textarea {
   max-height:15em;
   min-width: 40em;

data/test_app/app/views/users/show.html.erb

@@ -49,7 +49,7 @@
     <tr>
       <td>Country</td>
       <td id="country">
-        <%= best_in_place @user, :country, :type => :select, :collection => @countries %>
+        <%= best_in_place @user, :country, :type => :select, :collection => @countries, :inner_class => :some_class %>
       </td>
     </tr>
     <tr>
@@ -67,12 +67,18 @@
     <tr>
       <td>Favorite color</td>
       <td id="favorite_color">
-        <%- opts = { :ok_button => 'Do it!', :cancel_button => 'Nope' } %>
+        <%- 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>" %>
         <%= 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" %>
+      </td>
+    </tr>
     <tr>
       <td>Favorite books</td>
       <td id="favorite_books">
@@ -102,7 +108,7 @@
     <tr>
       <td>Money with proc</td>
       <td id="money_proc">
-        <%= best_in_place @user, :money_proc, :display_with => lambda{ |v| 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>

data/test_app/db/migrate/20130213224102_add_favorite_locale_to_users.rb

@@ -0,0 +1,5 @@
+class AddFavoriteLocaleToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :favorite_locale, :string
+  end
+end

data/test_app/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120620165212) do
+ActiveRecord::Schema.define(:version => 20130213224102) do
 
   create_table "cars", :force => true do |t|
     t.string "model"
@@ -21,20 +21,21 @@ ActiveRecord::Schema.define(:version => 20120620165212) do
     t.string   "name"
     t.string   "last_name"
     t.string   "address"
-    t.string   "email",          :null => false
+    t.string   "email",           :null => false
     t.string   "zip"
     t.string   "country"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
+    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.string   "favorite_movie"
     t.float    "money_proc"
     t.string   "height"
-    t.string   "favorite_movie"
+    t.string   "favorite_locale"
   end
 
 end

metadata

@@ -1,91 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 2.0.3
   prerelease: 
+  version: 2.1.0
 platform: ruby
 authors:
 - Bernat Farrero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :runtime
   name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.8.0
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  type: :development
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -200,6 +200,7 @@ files:
 - test_app/db/migrate/20120607172609_add_favorite_movie_to_users.rb
 - test_app/db/migrate/20120616170454_add_money_proc_to_users.rb
 - test_app/db/migrate/20120620165212_add_height_to_user.rb
+- test_app/db/migrate/20130213224102_add_favorite_locale_to_users.rb
 - test_app/db/schema.rb
 - test_app/db/seeds.rb
 - test_app/doc/README_FOR_APP
@@ -230,30 +231,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1762438104594404996
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1762438104594404996
 requirements: []
 rubyforge_project: best_in_place
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: It makes any field in place editable by clicking on it, it works for inputs,
   textareas, select dropdowns and checkboxes
-test_files:
-- spec/helpers/best_in_place_spec.rb
-- spec/integration/double_init_spec.rb
-- spec/integration/js_spec.rb
-- spec/integration/live_spec.rb
-- spec/integration/text_area_spec.rb
-- spec/spec_helper.rb
-- spec/support/retry_on_timeout.rb
+test_files: []