best_in_place 1.0.4 → 1.0.5

data/README.md

@@ -25,6 +25,7 @@ The editor works by PUTting the updated value to the server and GETting the upda
 - Sanitize HTML and trim spaces of user's input on user's choice
 - Displays server-side **validation** errors
 - Allows external activator
+- Allows optional, configurable OK and Cancel buttons for inputs and textareas
 - ESC key destroys changes (requires user confirmation)
 - Autogrowing textarea
 - Helper for generating the best_in_place field only if a condition is satisfied
@@ -51,11 +52,14 @@ Options:
 - **:nil**: The nil param defines the content displayed in case no value is defined for that field. It can be something like "click me to edit".
   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.
+- **:cancel_button**: (Inputs and textareas only) If set to a string, then a Cancel button will be shown with the string as its label.
 - **: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.
 - **:display_as**: A model method which will be called in order to display
   this field.
+- **:object_name**: Used for overriding the default params key used for the object (the data-object attribute). Useful for e.g. STI scenarios where best_in_place should post to a common controller for different models.
 
 ###best_in_place_if
 **best_in_place_if condition, object, field, OPTIONS**
@@ -97,6 +101,8 @@ Examples (code in the views):
 
     <%= best_in_place @user, :description, :type => :textarea %>
 
+    <%= best_in_place @user, :favorite_books, :type => :textarea, :ok_button => 'Save', :cancel_button => 'Cancel' %>
+
 ### Select
 
     <%= best_in_place @user, :country, :type => :select, :collection => [[1, "Spain"], [2, "Italy"], [3, "Germany"], [4, "France"]] %>

data/best_in_place.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", "~> 3.1.0"
+  s.add_dependency "rails", "~> 3.1"
   s.add_dependency "jquery-rails"
 
   s.add_development_dependency "rspec-rails", "~> 2.7.0"

data/lib/assets/javascripts/best_in_place.js

@@ -55,6 +55,12 @@ BestInPlaceEditor.prototype = {
     $(this.activator).bind('click', {editor: this}, this.clickHandler);
   },
 
+  abortIfConfirm : function () {
+    if (confirm("Are you sure you want to discard your changes?")) {
+      this.abort();
+    }
+  },
+
   update : function() {
     var editor = this;
     if (this.formType in {"input":1, "textarea":1} && this.getValue() == this.oldValue)
@@ -101,6 +107,9 @@ BestInPlaceEditor.prototype = {
       self.formType      = self.formType      || jQuery(this).attr("data-type");
       self.objectName    = self.objectName    || jQuery(this).attr("data-object");
       self.attributeName = self.attributeName || jQuery(this).attr("data-attribute");
+      self.activator     = self.activator     || jQuery(this).attr("data-activator");
+      self.okButton      = self.okButton      || jQuery(this).attr("data-ok-button");
+      self.cancelButton  = self.cancelButton  || jQuery(this).attr("data-cancel-button");
       self.nil           = self.nil           || jQuery(this).attr("data-nil");
       self.inner_class   = self.inner_class   || jQuery(this).attr("data-inner-class");
       self.html_attrs    = self.html_attrs    || jQuery(this).attr("data-html-attrs");
@@ -116,15 +125,17 @@ 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.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.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;
 
     if (!self.element.attr("data-sanitize")) {
@@ -165,7 +176,7 @@ BestInPlaceEditor.prototype = {
       tmp.innerHTML = s;
       s = tmp.textContent || tmp.innerText;
     }
-   return jQuery.trim(s);
+   return jQuery.trim(s).replace(/"/g, '"');
   },
 
   /* Generate the data sent in the POST request */
@@ -232,6 +243,11 @@ BestInPlaceEditor.prototype = {
 };
 
 
+// Button cases:
+// If no buttons, then blur saves, ESC cancels
+// If just Cancel button, then blur saves, ESC or clicking Cancel cancels (careful of blur event!)
+// If just OK button, then clicking OK saves (careful of blur event!), ESC or blur cancels
+// If both buttons, then clicking OK saves, ESC or clicking Cancel or blur cancels
 BestInPlaceEditor.forms = {
   "input" : {
     activateForm : function() {
@@ -240,27 +256,65 @@ BestInPlaceEditor.forms = {
       if (this.inner_class != null) {
         output += ' class="' + this.inner_class + '"';
       }
-      output += '></form>'
+      output += '>';
+      if (this.okButton) {
+        output += '<input type="submit" value="' + this.okButton + '" />'
+      }
+      if (this.cancelButton) {
+        output += '<input type="button" value="' + this.cancelButton + '" />'
+      }
+      output += '</form>';
       this.element.html(output);
       this.setHtmlAttributes();
-      this.element.find('input')[0].select();
+      this.element.find("input[type='text']")[0].select();
       this.element.find("form").bind('submit', {editor: this}, BestInPlaceEditor.forms.input.submitHandler);
-      this.element.find("input").bind('blur',   {editor: this}, BestInPlaceEditor.forms.input.inputBlurHandler);
-      this.element.find("input").bind('keyup', {editor: this}, BestInPlaceEditor.forms.input.keyupHandler);
+      if (this.cancelButton) {
+        this.element.find("input[type='button']").bind('click', {editor: this}, BestInPlaceEditor.forms.input.cancelButtonHandler)
+      }
+      this.element.find("input[type='text']").bind('blur', {editor: this}, BestInPlaceEditor.forms.input.inputBlurHandler);
+      this.element.find("input[type='text']").bind('keyup', {editor: this}, BestInPlaceEditor.forms.input.keyupHandler);
+      this.blurTimer = null;
+      this.userClicked = false;
     },
 
-    getValue :  function() {
+    getValue : function() {
       return this.sanitizeValue(this.element.find("input").val());
     },
 
+    // When buttons are present, use a timer on the blur event to give precedence to clicks
     inputBlurHandler : function(event) {
-      event.data.editor.update();
+      if (event.data.editor.okButton) {
+        event.data.editor.blurTimer = setTimeout(function () {
+          if (!event.data.editor.userClicked) {
+            event.data.editor.abort();
+          }
+        }, 500);
+      } else {
+        if (event.data.editor.cancelButton) {
+          event.data.editor.blurTimer = setTimeout(function () {
+            if (!event.data.editor.userClicked) {
+              event.data.editor.update();
+            }
+          }, 500);
+        } else {
+          event.data.editor.update();
+        }
+      }
     },
 
     submitHandler : function(event) {
+      event.data.editor.userClicked = true;
+      clearTimeout(event.data.editor.blurTimer);
       event.data.editor.update();
     },
 
+    cancelButtonHandler : function(event) {
+      event.data.editor.userClicked = true;
+      clearTimeout(event.data.editor.blurTimer);
+      event.data.editor.abort();
+      event.stopPropagation(); // Without this, click isn't handled
+    },
+
     keyupHandler : function(event) {
       if (event.keyCode == 27) {
         event.data.editor.abort();
@@ -361,7 +415,14 @@ BestInPlaceEditor.forms = {
       // construct the form
       var output = '<form action="javascript:void(0)" style="display:inline;"><textarea>';
       output += this.sanitizeValue(this.display_value);
-      output += '</textarea></form>';
+      output += '</textarea>';
+      if (this.okButton) {
+        output += '<input type="submit" value="' + this.okButton + '" />'
+      }
+      if (this.cancelButton) {
+        output += '<input type="button" value="' + this.cancelButton + '" />'
+      }
+      output += '</form>';
       this.element.html(output);
       this.setHtmlAttributes();
 
@@ -370,27 +431,57 @@ BestInPlaceEditor.forms = {
       jQuery(this.element.find("textarea")[0]).elastic();
 
       this.element.find("textarea")[0].focus();
+      this.element.find("form").bind('submit', {editor: this}, BestInPlaceEditor.forms.textarea.submitHandler);
+      if (this.cancelButton) {
+        this.element.find("input[type='button']").bind('click', {editor: this}, BestInPlaceEditor.forms.textarea.cancelButtonHandler)
+      }
       this.element.find("textarea").bind('blur', {editor: this}, BestInPlaceEditor.forms.textarea.blurHandler);
       this.element.find("textarea").bind('keyup', {editor: this}, BestInPlaceEditor.forms.textarea.keyupHandler);
+      this.blurTimer = null;
+      this.userClicked = false;
     },
 
     getValue :  function() {
       return this.sanitizeValue(this.element.find("textarea").val());
     },
 
+    // When buttons are present, use a timer on the blur event to give precedence to clicks
     blurHandler : function(event) {
+      if (event.data.editor.okButton) {
+        event.data.editor.blurTimer = setTimeout(function () {
+          if (!event.data.editor.userClicked) {
+            event.data.editor.abortIfConfirm();
+          }
+        }, 500);
+      } else {
+        if (event.data.editor.cancelButton) {
+          event.data.editor.blurTimer = setTimeout(function () {
+            if (!event.data.editor.userClicked) {
+              event.data.editor.update();
+            }
+          }, 500);
+        } else {
+          event.data.editor.update();
+        }
+      }
+    },
+
+    submitHandler : function(event) {
+      event.data.editor.userClicked = true;
+      clearTimeout(event.data.editor.blurTimer);
       event.data.editor.update();
     },
 
-    keyupHandler : function(event) {
-      if (event.keyCode == 27) {
-        BestInPlaceEditor.forms.textarea.abort(event.data.editor);
-      }
+    cancelButtonHandler : function(event) {
+      event.data.editor.userClicked = true;
+      clearTimeout(event.data.editor.blurTimer);
+      event.data.editor.abortIfConfirm();
+      event.stopPropagation(); // Without this, click isn't handled
     },
 
-    abort : function(editor) {
-      if (confirm("Are you sure you want to discard your changes?")) {
-        editor.abort();
+    keyupHandler : function(event) {
+      if (event.keyCode == 27) {
+        event.data.editor.abortIfConfirm();
       }
     }
   }

data/lib/best_in_place.rb

@@ -1,13 +1,12 @@
+require "best_in_place/check_version"
 require "best_in_place/utils"
 require "best_in_place/helper"
 require "best_in_place/engine"
+require "best_in_place/railtie"
 require "best_in_place/controller_extensions"
 require "best_in_place/display_methods"
+require "action_view"
 
 module BestInPlace
   autoload :TestHelpers, "best_in_place/test_helpers"
-
-  module ViewHelpers
-    extend ActionView::Helpers
-  end
 end

data/lib/best_in_place/check_version.rb

@@ -0,0 +1,8 @@
+module BestInPlace
+  module CheckVersion
+    if Rails::VERSION::STRING < "3.1"
+      raise "This version of Best in Place is intended to be used for Rails >= 3.1. If you want to use it with Rails 3.0 or lower, please use the rails-3.0 branch."
+      return
+    end
+  end
+end

data/lib/best_in_place/helper.rb

@@ -33,10 +33,12 @@ module BestInPlace
       out = "<span class='best_in_place'"
       out << " id='#{BestInPlace::Utils.build_best_in_place_id(object, field)}'"
       out << " data-url='#{opts[:path].blank? ? url_for(object) : url_for(opts[:path])}'"
-      out << " data-object='#{object.class.to_s.gsub("::", "_").underscore}'"
+      out << " data-object='#{opts[:object_name] || object.class.to_s.gsub("::", "_").underscore}'"
       out << " data-collection='#{collection.gsub(/'/, "&#39;")}'" unless collection.blank?
       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-cancel-button='#{opts[:cancel_button]}'" unless opts[:cancel_button].blank?
       out << " data-nil='#{opts[:nil]}'" unless opts[:nil].blank?
       out << " data-type='#{opts[:type]}'"
       out << " data-inner-class='#{opts[:inner_class]}'" if opts[:inner_class]

data/lib/best_in_place/railtie.rb

@@ -0,0 +1,7 @@
+module BestInPlace
+  class Railtie < Rails::Railtie
+    initializer "set view helpers" do
+      BestInPlace::ViewHelpers = ActionView::Base.new
+    end
+  end
+end

data/lib/best_in_place/version.rb

@@ -1,3 +1,3 @@
 module BestInPlace
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/spec/helpers/best_in_place_spec.rb

@@ -62,6 +62,14 @@ describe BestInPlace::BestInPlaceHelpers do
         @span.attribute("data-activator").should be_nil
       end
 
+      it "should have no OK button text by default" do
+        @span.attribute("data-ok-button").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 inner_class by default" do
         @span.attribute("data-inner-class").should be_nil
       end
@@ -130,6 +138,29 @@ describe BestInPlace::BestInPlaceHelpers do
         span.attribute("data-activator").value.should == "awesome"
       end
 
+      it "should have the given OK button text" do
+        out = helper.best_in_place @user, :name, :ok_button => "okay"
+        nk = Nokogiri::HTML.parse(out)
+        span = nk.css("span")
+        span.attribute("data-ok-button").value.should == "okay"
+      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)
+        span = nk.css("span")
+        span.attribute("data-cancel-button").value.should == "nasty"
+      end
+
+      describe "object_name" do
+        it "should change the data-object value" do
+          out = helper.best_in_place @user, :name, :object_name => "my_user"
+          nk = Nokogiri::HTML.parse(out)
+          span = nk.css("span")
+          span.attribute("data-object").value.should == "my_user"
+        end
+      end
+
       describe "display_as" do
         it "should render the address with a custom renderer" do
           @user.should_receive(:address_format).and_return("the result")
@@ -161,7 +192,6 @@ describe BestInPlace::BestInPlaceHelpers do
       end
     end
 
-
     context "with a text field attribute" do
       before do
         nk = Nokogiri::HTML.parse(helper.best_in_place @user, :name)

data/spec/integration/js_spec.rb

@@ -12,7 +12,10 @@ describe "JS behaviour", :js => true do
       :receive_email => false,
       :birth_date => Time.now.utc,
       :description => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus a lectus et lacus ultrices auctor. Morbi aliquet convallis tincidunt. Praesent enim libero, iaculis at commodo nec, fermentum a dolor. Quisque eget eros id felis lacinia faucibus feugiat et ante. Aenean justo nisi, aliquam vel egestas vel, porta in ligula. Etiam molestie, lacus eget tincidunt accumsan, elit justo rhoncus urna, nec pretium neque mi et lorem. Aliquam posuere, dolor quis pulvinar luctus, felis dolor tincidunt leo, eget pretium orci purus ac nibh. Ut enim sem, suscipit ac elementum vitae, sodales vel sem.",
-      :money => 100
+      :money => 100,
+      :favorite_color => 'Red',
+      :favorite_books => "The City of Gold and Lead",
+      :description => "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus a lectus et lacus ultrices auctor. Morbi aliquet convallis tincidunt. Praesent enim libero, iaculis at commodo nec, fermentum a dolor. Quisque eget eros id felis lacinia faucibus feugiat et ante. Aenean justo nisi, aliquam vel egestas vel, porta in ligula. Etiam molestie, lacus eget tincidunt accumsan, elit justo rhoncus urna, nec pretium neque mi et lorem. Aliquam posuere, dolor quis pulvinar luctus, felis dolor tincidunt leo, eget pretium orci purus ac nibh. Ut enim sem, suscipit ac elementum vitae, sodales vel sem."
   end
 
   describe "nil option" do
@@ -178,6 +181,182 @@ describe "JS behaviour", :js => true do
     end
   end
 
+  it "should correctly use an OK submit button when so configured for an input" do
+    @user.save!
+    visit user_path(@user)
+
+    within("#favorite_color") do
+      page.should have_content('Red')
+    end
+
+    id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_color
+    page.execute_script <<-JS
+      $("##{id}").click();
+      $("##{id} input[name='favorite_color']").val('Blue');
+      $("##{id} input[type='submit']").click();
+    JS
+
+    visit user_path(@user)
+    within("#favorite_color") do
+      page.should have_content('Blue')
+    end
+  end
+
+  it "should correctly use a Cancel button when so configured for an input" do
+    @user.save!
+    visit user_path(@user)
+
+    within("#favorite_color") do
+      page.should have_content('Red')
+    end
+
+    id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_color
+    page.execute_script <<-JS
+      $("##{id}").click();
+      $("##{id} input[name='favorite_color']").val('Blue');
+      $("##{id} input[type='button']").click();
+    JS
+
+    visit user_path(@user)
+    within("#favorite_color") do
+      page.should have_content('Red')
+    end
+  end
+
+  it "should not submit input on blur if there's an OK button present" do
+    @user.save!
+    visit user_path(@user)
+
+    within("#favorite_color") do
+      page.should have_content('Red')
+    end
+
+    id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_color
+    page.execute_script <<-JS
+      $("##{id}").click();
+      $("##{id} input[name='favorite_color']").val('Blue');
+      $("##{id} input[name='favorite_color']").blur();
+    JS
+    sleep 1 # Increase if browser is slow
+
+    visit user_path(@user)
+    within("#favorite_color") do
+      page.should have_content('Red')
+    end
+  end
+
+  it "should still submit input on blur if there's only a Cancel button present" do
+    @user.save!
+    visit user_path(@user, :suppress_ok_button => 1)
+
+    within("#favorite_color") do
+      page.should have_content('Red')
+    end
+
+    id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_color
+    page.execute_script %{$("##{id}").click();}
+    page.should have_no_css("##{id} input[type='submit']")
+    page.execute_script <<-JS
+      $("##{id} input[name='favorite_color']").val('Blue');
+      $("##{id} input[name='favorite_color']").blur();
+    JS
+    sleep 1 # Increase if browser is slow
+
+    visit user_path(@user)
+    within("#favorite_color") do
+      page.should have_content('Blue')
+    end
+  end
+
+  it "should correctly use an OK submit button when so configured for a text area" do
+    @user.save!
+    visit user_path(@user)
+
+    within("#favorite_books") do
+      page.should have_content('The City of Gold and Lead')
+    end
+
+    id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_books
+    page.execute_script <<-JS
+      $("##{id}").click();
+      $("##{id} textarea").val('1Q84');
+      $("##{id} input[type='submit']").click();
+    JS
+
+    visit user_path(@user)
+    within("#favorite_books") do
+      page.should have_content('1Q84')
+    end
+  end
+
+  it "should correctly use a Cancel button when so configured for a text area" do
+    @user.save!
+    visit user_path(@user)
+
+    within("#favorite_books") do
+      page.should have_content('The City of Gold and Lead')
+    end
+
+    id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_books
+    page.execute_script <<-JS
+      $("##{id}").click();
+      $("##{id} textarea").val('1Q84');
+      $("##{id} input[type='button']").click();
+    JS
+    page.driver.browser.switch_to.alert.accept
+
+    visit user_path(@user)
+    within("#favorite_books") do
+      page.should have_content('The City of Gold and Lead')
+    end
+  end
+
+  it "should not submit text area on blur if there's an OK button present" do
+    @user.save!
+    visit user_path(@user)
+
+    within("#favorite_books") do
+      page.should have_content('The City of Gold and Lead')
+    end
+
+    id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_books
+    page.execute_script <<-JS
+      $("##{id}").click();
+      $("##{id} textarea").val('1Q84');
+      $("##{id} textarea").blur();
+    JS
+    sleep 1 # Increase if browser is slow
+    page.driver.browser.switch_to.alert.accept
+
+    visit user_path(@user)
+    within("#favorite_books") do
+      page.should have_content('The City of Gold and Lead')
+    end
+  end
+
+  it "should still submit text area on blur if there's only a Cancel button present" do
+    @user.save!
+    visit user_path(@user, :suppress_ok_button => 1)
+
+    within("#favorite_books") do
+      page.should have_content('The City of Gold and Lead')
+    end
+
+    id = BestInPlace::Utils.build_best_in_place_id @user, :favorite_books
+    page.execute_script %{$("##{id}").click();}
+    page.should have_no_css("##{id} input[type='submit']")
+    page.execute_script <<-JS
+      $("##{id} textarea").val('1Q84');
+      $("##{id} textarea").blur();
+    JS
+    sleep 1 # Increase if browser is slow
+
+    visit user_path(@user)
+    within("#favorite_books") do
+      page.should have_content('1Q84')
+    end
+  end
+
   it "should show validation errors" do
     @user.save!
     visit user_path(@user)
@@ -377,5 +556,21 @@ describe "JS behaviour", :js => true do
     end
 
   end
-end
 
+  it "should display strings with quotes correctly in fields" do
+    @user.last_name = "A last name \"with double quotes\""
+    @user.save!
+
+    retry_on_timeout do
+      visit user_path(@user)
+
+      id = BestInPlace::Utils.build_best_in_place_id @user, :last_name
+      page.execute_script <<-JS
+        $("##{id}").click();
+      JS
+
+      text = page.find("##{id} input").value
+      text.should == "A last name \"with double quotes\""
+    end
+  end
+end

data/spec/integration/text_area_spec.rb

@@ -27,4 +27,13 @@ describe "JS behaviour", :js => true do
       page.should have_content("A new description")
     end
   end
+
+  it "should be able to use a bip_text with :display_with option" do
+    @user.description = "I'm so awesome"
+    @user.save!
+    visit user_path(@user)
+    within("#dw_description") do
+      page.should have_content("I'm so awesome")
+    end
+  end
 end

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

@@ -17,7 +17,7 @@ table th {
 input {
   width: 80%;
 }
-input[type=submit] {
+input[type=submit], input[type=button] {
   width: 5em;
 }
 input[type=checkbox] {

data/test_app/app/models/user.rb

@@ -3,7 +3,7 @@ class User < ActiveRecord::Base
     :length => { :minimum => 2, :maximum => 24, :message => "has invalid length"},
     :presence => {:message => "can't be blank"}
   validates :last_name,
-    :length => { :minimum => 2, :maximum => 24, :message => "has invalid length"},
+    :length => { :minimum => 2, :maximum => 50, :message => "has invalid length"},
     :presence => {:message => "can't be blank"}
   validates :address,
     :length => { :minimum => 5, :message => "too short length"},

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

@@ -52,12 +52,34 @@
         <%= best_in_place @user, :receive_email, :type => :checkbox, :collection => ["No thanks", "Yes of course"] %>
       </td>
     </tr>
+    <tr>
+      <td>Favorite color</td>
+      <td id="favorite_color">
+        <%- opts = { :ok_button => 'Do it!', :cancel_button => 'Nope' } %>
+        <%- opts.delete(:ok_button) if params[:suppress_ok_button] %>
+        <%= best_in_place @user, :favorite_color, opts %>
+      </td>
+    </tr>
+    <tr>
+      <td>Favorite books</td>
+      <td id="favorite_books">
+        <%- opts = { :type => :textarea, :ok_button => 'Save', :cancel_button => 'Cancel' } %>
+        <%- opts.delete(:ok_button) if params[:suppress_ok_button] %>
+        <%= best_in_place @user, :favorite_books, opts %>
+      </td>
+    </tr>
     <tr>
       <td>User description</td>
       <td id="description">
         <%= best_in_place @user, :description, :display_as => :markdown_desc, :type => :textarea, :sanitize => false %>
       </td>
     </tr>
+    <tr>
+      <td>Simple-formatted user description</td>
+      <td id="dw_description">
+        <%= best_in_place @user, :description, :display_with => :simple_format, :type => :textarea %>
+      </td>
+    </tr>
     <tr>
       <td>Money</td>
       <td id="money">

data/test_app/db/migrate/20111210084202_add_favorite_color_to_users.rb

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

data/test_app/db/migrate/20111210084251_add_favorite_books_to_users.rb

@@ -0,0 +1,5 @@
+class AddFavoriteBooksToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :favorite_books, :text
+  end
+end

data/test_app/db/schema.rb

@@ -12,12 +12,11 @@
 # It's strongly recommended to check this file into your version control system.
 
 ActiveRecord::Schema.define(:version => 20111224181356) do
-
   create_table "users", :force => true do |t|
     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"
@@ -26,6 +25,7 @@ ActiveRecord::Schema.define(:version => 20111224181356) do
     t.text     "description"
     t.datetime "birth_date"
     t.float    "money"
+    t.string   "favorite_color"
+    t.text     "favorite_books"
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-02 00:00:00.000000000 Z
+date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &69170780 !ruby/object:Gem::Requirement
+  requirement: &83572300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *69170780
+  version_requirements: *83572300
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &69170510 !ruby/object:Gem::Requirement
+  requirement: &83572040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69170510
+  version_requirements: *83572040
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &69170120 !ruby/object:Gem::Requirement
+  requirement: &83571670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *69170120
+  version_requirements: *83571670
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &69169800 !ruby/object:Gem::Requirement
+  requirement: &83571350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *69169800
+  version_requirements: *83571350
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &69169540 !ruby/object:Gem::Requirement
+  requirement: &83571040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *69169540
+  version_requirements: *83571040
 description: BestInPlace is a jQuery script and a Rails 3 helper that provide the
   method best_in_place to display any object field easily editable for the user by
   just clicking on it. It supports input data, text data, boolean data and custom
@@ -86,10 +86,12 @@ files:
 - lib/assets/javascripts/best_in_place.js
 - lib/assets/javascripts/jquery.purr.js
 - lib/best_in_place.rb
+- lib/best_in_place/check_version.rb
 - lib/best_in_place/controller_extensions.rb
 - lib/best_in_place/display_methods.rb
 - lib/best_in_place/engine.rb
 - lib/best_in_place/helper.rb
+- lib/best_in_place/railtie.rb
 - lib/best_in_place/test_helpers.rb
 - lib/best_in_place/utils.rb
 - lib/best_in_place/version.rb
@@ -154,6 +156,8 @@ files:
 - test_app/db/migrate/20101206205922_create_users.rb
 - test_app/db/migrate/20101212170114_add_receive_email_to_user.rb
 - test_app/db/migrate/20110115204441_add_description_to_user.rb
+- test_app/db/migrate/20111210084202_add_favorite_color_to_users.rb
+- test_app/db/migrate/20111210084251_add_favorite_books_to_users.rb
 - test_app/db/migrate/20111217215935_add_birth_date_to_users.rb
 - test_app/db/migrate/20111224181356_add_money_to_user.rb
 - test_app/db/schema.rb
@@ -188,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -35281219
+      hash: -572262513
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -35281219
+      hash: -572262513
 requirements: []
 rubyforge_project: best_in_place
 rubygems_version: 1.8.10