best_in_place 1.0.6 → 1.1.0

data/CHANGELOG.md

@@ -0,0 +1,36 @@
+#Changelog
+
+##Master branch (and part of the Rails 3.0 branch)
+- v.0.1.0 Initial commit
+- v.0.1.2 Fixing errors in collections (taken value[0] instead of index) and fixing test_app controller responses
+- v.0.1.3 Bug in Rails Helper. Key wrongly considered an Integer.
+- v.0.1.4 Adding two new parameters for further customization urlObject and nilValue and making input update on blur.
+- v.0.1.5 **Attention: this release is not backwards compatible**. Changing params from list to option hash, helper's refactoring,
+  fixing bug with objects inside namespaces, adding feature for passing an external activator handler as param. Adding feature
+  of key ESCAPE for destroying changes before they are made permanent (in inputs and textarea).
+- v.0.1.6-0.1.7 Avoiding request when the input is not modified and allowing the user to not sanitize input data.
+- v.0.1.8 jslint compliant, sanitizing tags in the gem, getting right csrf params, controlling size of textarea (elastic script, for autogrowing textarea)
+- v.0.1.9 Adding elastic autogrowing textareas
+- v.1.0.0 Setting RSpec and Capybara up, and adding some utilities. Mantaining some HTML attributes. Fix a respond_with bug (thanks, @moabite). Triggering ajax:success when ajax call is complete (thanks, @indrekj). Setting up Travis CI. Updated for Rails 3.1.
+- v.1.0.1 Fixing a double initialization bug
+- v.1.0.2 New bip_area text helper to work with text areas.
+- v.1.0.3 replace apostrophes in collection with corresponding HTML entity,
+  thanks @taavo. Implemented `:display_as` option and adding
+  `respond_with_bip` to be used in the controller.
+- v.1.0.4 Depend on ActiveModel instead of ActiveRecord (thanks,
+  @skinnyfit). Added date type (thanks @taavo). Added new feature:
+display_with.
+- v.1.0.5 Fix a bug involving quotes (thanks @ygoldshtrakh). Minor fixes
+  by @bfalling. Add object name option (thanks @nicholassm). Check
+version of Rails before booting. Minor fixes.
+- v.1.0.6 Fix issue with display_with. Update test_app to 3.2.
+- v.1.1.0 Changed $ by jQuery for compatibility (thanks @tschmitz), new
+  events for 'deactivate' (thanks @glebtv), added new 'data' attribute
+to BIP's span (thanks @straydogstudio), works with dynamically added
+elements to the page (thanks @enriclluelles), added object detection to
+the 'path' parameter and some more bugfixes.
+
+##Rails 3.0 branch only
+- v.0.2.0 Added RSpec and Capybara setup, and some tests. Fix countries map syntax, Allowing href and some other HTML attributes. Adding Travis CI too. Added the best_in_place_if option. Added ajax:success trigger, thanks to @indrekj.
+- v.0.2.1 Fixing double initialization bug.
+- v.0.2.2 New bip_area text helper.

data/README.md

@@ -45,7 +45,7 @@ Params:
 
 Options:
 
-- **:type** It can be only [:input, :textarea, :select, :checkbox, :date] or if undefined it defaults to :input.
+- **:type** It can be only [:input, :textarea, :select, :checkbox, :date (>= 1.0.4)] or if undefined it defaults to :input.
 - **:collection**: In case you are using the :select type then you must specify the collection of values it takes. In case you are
   using the :checkbox type you can specify the two values it can take, or otherwise they will default to Yes and No.
 - **:path**: URL to which the updating action will be sent. If not defined it defaults to the :object path.
@@ -60,6 +60,7 @@ Options:
 - **: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.
+- **:data**: Hash of custom data attributes to be added to span. Can be used to provide data to the ajax:success callback.
 
 ###best_in_place_if
 **best_in_place_if condition, object, field, OPTIONS**
@@ -176,6 +177,27 @@ additional `helper_options` hash:
 
     = best_in_place @user, :money, :display_with => :number_to_currency, :helper_options => {:unit => "€"}
 
+You can also pass in a proc or lambda like this:
+
+    = best_in_place @post, :body, :display_with => lambda { |v| textilize(v).html_safe }
+
+## Ajax success callback
+
+### Binding to ajax:success
+
+The 'ajax:success' event is triggered upon success. Use bind:
+
+    $('.best_in_place').bind("ajax:success", function(){$(this).closest('tr').effect('highlight'));});
+
+### Providing data to the callback
+
+Use the :data option to add HTML5 data attributes to the best_in_place span. For example, in your view:
+
+    <%= best_in_place @user, :name, :data => {:user_name => @user.name} %>
+
+And in your javascript:
+
+    $('.best_in_place').bind("ajax:success", function(){ alert('Name updated for '+$(this).data('userName')); });
 
 ##Non Active Record environments
 We are not planning to support other ORMs apart from Active Record, at least for now. So, you can perfectly consider the following workaround as *the right way* until a specific implementation is done for your ORM.
@@ -380,33 +402,6 @@ Fork the project on [github](https://github.com/bernat/best_in_place 'bernat / b
 
 ---
 
-##Changelog
-
-###Master branch (and part of the Rails 3.0 branch)
-- v.0.1.0 Initial commit
-- v.0.1.2 Fixing errors in collections (taken value[0] instead of index) and fixing test_app controller responses
-- v.0.1.3 Bug in Rails Helper. Key wrongly considered an Integer.
-- v.0.1.4 Adding two new parameters for further customization urlObject and nilValue and making input update on blur.
-- v.0.1.5 **Attention: this release is not backwards compatible**. Changing params from list to option hash, helper's refactoring,
-  fixing bug with objects inside namespaces, adding feature for passing an external activator handler as param. Adding feature
-  of key ESCAPE for destroying changes before they are made permanent (in inputs and textarea).
-- v.0.1.6-0.1.7 Avoiding request when the input is not modified and allowing the user to not sanitize input data.
-- v.0.1.8 jslint compliant, sanitizing tags in the gem, getting right csrf params, controlling size of textarea (elastic script, for autogrowing textarea)
-- v.0.1.9 Adding elastic autogrowing textareas
-- v.1.0.0 Setting RSpec and Capybara up, and adding some utilities. Mantaining some HTML attributes. Fix a respond_with bug (thanks, @moabite). Triggering ajax:success when ajax call is complete (thanks, @indrekj). Setting up Travis CI. Updated for Rails 3.1.
-- v.1.0.1 Fixing a double initialization bug
-- v.1.0.2 New bip_area text helper to work with text areas.
-- v.1.0.3 replace apostrophes in collection with corresponding HTML entity,
-  thanks @taavo. Implemented `:display_as` option and adding
-  `respond_with_bip` to be used in the controller.
-
-###Rails 3.0 branch only
-- v.0.2.0 Added RSpec and Capybara setup, and some tests. Fix countries map syntax, Allowing href and some other HTML attributes. Adding Travis CI too. Added the best_in_place_if option. Added ajax:success trigger, thanks to @indrekj.
-- v.0.2.1 Fixing double initialization bug.
-- v.0.2.2 New bip_area text helper.
-
----
-
 ##Authors, License and Stuff
 
 Code by [Bernat Farrero](http://bernatfarrero.com) from [Itnig Web Services](http://itnig.net) (it was based on the [original project](http://github.com/janv/rest_in_place/) of Jan Varwig) and released under [MIT license](http://www.opensource.org/licenses/mit-license.php).

data/lib/assets/javascripts/best_in_place.js

@@ -20,11 +20,11 @@
 */
 
 function BestInPlaceEditor(e) {
-  this.element = jQuery(e);
+  this.element = e;
   this.initOptions();
   this.bindForm();
   this.initNil();
-  $(this.activator).bind('click', {editor: this}, this.clickHandler);
+  jQuery(this.activator).bind('click', {editor: this}, this.clickHandler);
 }
 
 BestInPlaceEditor.prototype = {
@@ -45,14 +45,17 @@ BestInPlaceEditor.prototype = {
     var elem = this.isNil ? "" : this.element.html();
     this.oldValue = elem;
     this.display_value = to_display;
-    $(this.activator).unbind("click", this.clickHandler);
+    jQuery(this.activator).unbind("click", this.clickHandler);
+    this.element.trigger(jQuery.Event("best_in_place:activate"));
     this.activateForm();
   },
 
   abort : function() {
     if (this.isNil) this.element.html(this.nil);
     else            this.element.html(this.oldValue);
-    $(this.activator).bind('click', {editor: this}, this.clickHandler);
+    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"));
   },
 
   abortIfConfirm : function () {
@@ -78,7 +81,7 @@ BestInPlaceEditor.prototype = {
     });
     if (this.formType == "select") {
       var value = this.getValue();
-      $.each(this.values, function(i, v) {
+      jQuery.each(this.values, function(i, v) {
         if (value == v[0]) {
           editor.element.html(v[1]);
         }
@@ -89,7 +92,7 @@ BestInPlaceEditor.prototype = {
     } else {
       editor.element.html(this.getValue() != "" ? this.getValue() : this.nil);
     }
-    editor.element.trigger($.Event("best_in_place:update"));
+    editor.element.trigger(jQuery.Event("best_in_place:update"));
   },
 
   activateForm : function() {
@@ -182,8 +185,8 @@ BestInPlaceEditor.prototype = {
   /* Generate the data sent in the POST request */
   requestData : function() {
     // To prevent xss attacks, a csrf token must be defined as a meta attribute
-    csrf_token = $('meta[name=csrf-token]').attr('content');
-    csrf_param = $('meta[name=csrf-param]').attr('content');
+    csrf_token = jQuery('meta[name=csrf-token]').attr('content');
+    csrf_param = jQuery('meta[name=csrf-param]').attr('content');
 
     var data = "_method=put";
     data += "&" + this.objectName + '[' + this.attributeName + ']=' + encodeURIComponent(this.getValue());
@@ -203,33 +206,37 @@ BestInPlaceEditor.prototype = {
   // Handlers ////////////////////////////////////////////////////////////////
 
   loadSuccessCallback : function(data) {
-    var response = $.parseJSON($.trim(data));
+    var response = jQuery.parseJSON(jQuery.trim(data));
     if (response != null && response.hasOwnProperty("display_as")) {
       this.element.attr("data-original-content", this.element.html());
       this.original_content = this.element.html();
       this.element.html(response["display_as"]);
     }
-    this.element.trigger($.Event("ajax:success"), data);
+    this.element.trigger(jQuery.Event("ajax:success"), data);
 
     // Binding back after being clicked
-    $(this.activator).bind('click', {editor: this}, this.clickHandler);
+    jQuery(this.activator).bind('click', {editor: this}, this.clickHandler);
+    this.element.trigger(jQuery.Event("best_in_place:deactivate"));
   },
 
   loadErrorCallback : function(request, error) {
     this.element.html(this.oldValue);
 
     // Display all error messages from server side validation
-    $.each(jQuery.parseJSON(request.responseText), function(index, value) {
+    jQuery.each(jQuery.parseJSON(request.responseText), function(index, value) {
       if( typeof(value) == "object") {value = index + " " + value.toString(); }
-      var container = $("<span class='flash-error'></span>").html(value);
+      var container = jQuery("<span class='flash-error'></span>").html(value);
       container.purr();
     });
+    this.element.trigger(jQuery.Event("ajax:error"));
 
     // Binding back after being clicked
-    $(this.activator).bind('click', {editor: this}, this.clickHandler);
+    jQuery(this.activator).bind('click', {editor: this}, this.clickHandler);
+    this.element.trigger(jQuery.Event("best_in_place:deactivate"));
   },
 
   clickHandler : function(event) {
+    event.preventDefault();
     event.data.editor.activate();
   },
 
@@ -366,7 +373,7 @@ BestInPlaceEditor.forms = {
       var output = "<form action='javascript:void(0)' style='display:inline;'><select>";
       var selected = "";
       var oldValue = this.oldValue;
-      $.each(this.values, function(index, value) {
+      jQuery.each(this.values, function(index, value) {
         selected = (value[1] == oldValue ? "selected='selected'" : "");
         output += "<option value='" + value[0] + "' " + selected + ">" + value[1] + "</option>";
        });
@@ -488,11 +495,24 @@ BestInPlaceEditor.forms = {
 };
 
 jQuery.fn.best_in_place = function() {
-  this.each(function(){
-    if (!jQuery(this).data('bestInPlaceEditor')) {
-      jQuery(this).data('bestInPlaceEditor', new BestInPlaceEditor(this));
+
+  function setBestInPlace(element) {
+    if (!element.data('bestInPlaceEditor')) {
+      element.data('bestInPlaceEditor', new BestInPlaceEditor(element));
+      return true;
     }
+  }
+
+  jQuery(this.context).delegate(this.selector, 'click', function () {
+    var el = jQuery(this);
+    if (setBestInPlace(el))
+      el.click();
   });
+
+  this.each(function () {
+    setBestInPlace(jQuery(this));
+  });
+
   return this;
 };
 

data/lib/best_in_place/controller_extensions.rb

@@ -7,7 +7,8 @@ module BestInPlace
   private
     def respond_bip_ok(obj)
       klass = obj.class.to_s
-      updating_attr = params[klass.underscore].keys.first
+      param_key = BestInPlace::Utils.object_to_key(obj)
+      updating_attr = params[param_key].keys.first
 
       if renderer = BestInPlace::DisplayMethods.lookup(klass, updating_attr)
         render :json => renderer.render_json(obj)

data/lib/best_in_place/helper.rb

@@ -6,24 +6,25 @@ module BestInPlace
         raise ArgumentError, "Can't use both 'display_as' and 'display_with' options at the same time"
       end
 
-      if opts[:display_with] && !ViewHelpers.respond_to?(opts[:display_with])
+      if opts[:display_with] && !opts[:display_with].is_a?(Proc) && !ViewHelpers.respond_to?(opts[:display_with])
         raise ArgumentError, "Can't find helper #{opts[:display_with]}"
       end
 
+      real_object = (object.is_a?(Array) && object.last.class.respond_to?(:model_name)) ? object.last : object
       opts[:type] ||= :input
       opts[:collection] ||= []
       field = field.to_s
 
-      value = build_value_for(object, field, opts)
+      value = build_value_for(real_object, field, opts)
 
       collection = nil
       if opts[:type] == :select && !opts[:collection].blank?
-        v = object.send(field)
+        v = real_object.send(field)
         value = Hash[opts[:collection]][!!(v =~ /^[0-9]+$/) ? v.to_i : v]
         collection = opts[:collection].to_json
       end
       if opts[:type] == :checkbox
-        fieldValue = !!object.send(field)
+        fieldValue = !!real_object.send(field)
         if opts[:collection].blank? || opts[:collection].size != 2
           opts[:collection] = ["No", "Yes"]
         end
@@ -31,10 +32,10 @@ module BestInPlace
         collection = opts[:collection].to_json
       end
       out = "<span class='best_in_place'"
-      out << " id='#{BestInPlace::Utils.build_best_in_place_id(object, field)}'"
+      out << " id='#{BestInPlace::Utils.build_best_in_place_id(real_object, field)}'"
       out << " data-url='#{opts[:path].blank? ? url_for(object) : url_for(opts[:path])}'"
-      out << " data-object='#{opts[:object_name] || object.class.to_s.gsub("::", "_").underscore}'"
-      out << " data-collection='#{collection.gsub(/'/, "&#39;")}'" unless collection.blank?
+      out << " data-object='#{opts[:object_name] || BestInPlace::Utils.object_to_key(real_object)}'"
+      out << " data-collection='#{attribute_escape(collection)}'" 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?
@@ -43,7 +44,15 @@ module BestInPlace
       out << " data-type='#{opts[:type]}'"
       out << " data-inner-class='#{opts[:inner_class]}'" if opts[:inner_class]
       out << " data-html-attrs='#{opts[:html_attrs].to_json}'" unless opts[:html_attrs].blank?
-      out << " data-original-content='#{attribute_escape(object.send(field))}'" if opts[:display_as] || opts[:display_with]
+      out << " data-original-content='#{attribute_escape(real_object.send(field))}'" if opts[:display_as] || opts[:display_with]
+      if opts[:data] && opts[:data].is_a?(Hash)
+        opts[:data].each do |k, v|
+          if !v.is_a?(String) && !v.is_a?(Symbol)
+            v = v.to_json
+          end
+          out << %( data-#{k.to_s.dasherize}="#{v}")
+        end
+      end
       if !opts[:sanitize].nil? && !opts[:sanitize]
         out << " data-sanitize='false'>"
         out << sanitize(value, :tags => %w(b i u s a strong em p h1 h2 h3 h4 h5 ul li ol hr pre span img br), :attributes => %w(id class href))
@@ -64,10 +73,15 @@ module BestInPlace
 
   private
     def build_value_for(object, field, opts)
+      return "" if object.send(field).blank?
+
       if opts[:display_as]
         BestInPlace::DisplayMethods.add_model_method(object.class.to_s, field, opts[:display_as])
         object.send(opts[:display_as]).to_s
 
+      elsif opts[:display_with].try(:is_a?, Proc)
+        opts[:display_with].call(object.send(field))
+
       elsif opts[:display_with]
         BestInPlace::DisplayMethods.add_helper_method(object.class.to_s, field, opts[:display_with], opts[:helper_options])
         if opts[:helper_options]
@@ -82,7 +96,12 @@ module BestInPlace
     end
 
     def attribute_escape(data)
-      data.to_s.gsub("&", "&amp;").gsub("'", "&apos;") unless data.nil?
+      return unless data
+
+      data.to_s.
+        gsub("&", "&amp;").
+        gsub("'", "&apos;").
+        gsub("\n", "&#10;")
     end
   end
 end

data/lib/best_in_place/utils.rb

@@ -1,15 +1,21 @@
 module BestInPlace
-  class Utils
+  module Utils
+    extend self
 
-    def self.build_best_in_place_id(object, field)
+    def build_best_in_place_id(object, field)
       if object.is_a?(Symbol) || object.is_a?(String)
         return "best_in_place_#{object}_#{field}"
       end
 
-      id = "best_in_place_#{object.class.to_s.demodulize.underscore}"
+      id = "best_in_place_#{object_to_key(object)}"
       id << "_#{object.id}" if object.class.ancestors.include?(ActiveModel::Serializers::JSON)
       id << "_#{field}"
       id
     end
+
+    def object_to_key(object)
+      return object.class.to_s.underscore unless object.class.respond_to?(:model_name)
+      ActiveModel::Naming.param_key(object.class)
+    end
   end
 end

data/lib/best_in_place/version.rb

@@ -1,3 +1,3 @@
 module BestInPlace
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

data/spec/helpers/best_in_place_spec.rb

@@ -16,6 +16,14 @@ describe BestInPlace::BestInPlaceHelpers do
         :money => 150
     end
 
+    it "should generate a proper id for namespaced models" do
+      @car = Cuca::Car.create :model => "Ford"
+
+      nk = Nokogiri::HTML.parse(helper.best_in_place @car, :model, :path => helper.cuca_cars_path)
+      span = nk.css("span")
+      span.attribute("id").value.should == "best_in_place_cuca_car_#{@car.id}_model"
+    end
+
     it "should generate a proper span" do
       nk = Nokogiri::HTML.parse(helper.best_in_place @user, :name)
       span = nk.css("span")
@@ -161,6 +169,14 @@ describe BestInPlace::BestInPlaceHelpers do
         end
       end
 
+      it "should have html5 data attributes" do
+        out = helper.best_in_place @user, :name, :data => { :foo => "awesome", :bar => "nasty" }
+        nk = Nokogiri::HTML.parse(out)
+        span = nk.css("span")
+        span.attribute("data-foo").value.should == "awesome"
+        span.attribute("data-bar").value.should == "nasty"
+      end
+
       describe "display_as" do
         it "should render the address with a custom renderer" do
           @user.should_receive(:address_format).and_return("the result")
@@ -179,6 +195,13 @@ describe BestInPlace::BestInPlaceHelpers do
           span.text.should == "$150.00"
         end
 
+        it "accepts a proc" do
+          out = helper.best_in_place @user, :name, :display_with => Proc.new { |v| v.upcase }
+          nk = Nokogiri::HTML.parse(out)
+          span = nk.css("span")
+          span.text.should == "LUCIA"
+        end
+
         it "should raise an error if the given helper can't be found" do
           lambda { helper.best_in_place @user, :money, :display_with => :fk_number_to_currency }.should raise_error(ArgumentError)
         end

data/spec/integration/js_spec.rb

@@ -18,6 +18,18 @@ describe "JS behaviour", :js => true do
       :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 "namespaced controllers" do
+    it "should be able to use array-notation to describe both object and path" do
+      @user.save!
+      visit admin_user_path(@user)
+
+      within("#last_name") { page.should have_content("Napoli") }
+      bip_text @user, :last_name, "Other thing"
+
+      within("#last_name") { page.should have_content("Other thing") }
+    end
+  end
+
   describe "nil option" do
     it "should render the default '-' string when the field is empty" do
       @user.name = ""
@@ -465,6 +477,15 @@ describe "JS behaviour", :js => true do
   end
 
   describe "display_with" do
+    it "should show nil text when original value is nil" do
+      @user.description = ""
+      @user.save!
+
+      visit user_path(@user)
+
+      within("#dw_description") { page.should have_content("-") }
+    end
+
     it "should render the money using number_to_currency" do
       @user.save!
       visit user_path(@user)

data/spec/integration/live_spec.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe "Monitor new fields", :js => true do
+  before do
+    @user = User.new :name => "Lucia",
+      :last_name => "Napoli",
+      :email => "lucianapoli@gmail.com",
+      :address => "Via Roma 99",
+      :zip => "25123",
+      :country => "2",
+      :receive_email => false,
+      :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
+  end
+
+  it "should work when new best_in_place spans are added to the page" do
+    @user.save!
+    visit show_ajax_user_path(@user)
+
+    sleep(1) #give time to the ajax request to work
+
+    within("#email") do
+      page.should have_content("lucianapoli@gmail")
+    end
+
+    bip_text @user, :email, "new@email.com"
+
+    within("#email") do
+      page.should have_content("new@email.com")
+    end
+
+    bip_text @user, :email, "new_two@email.com"
+
+    within("#email") do
+      page.should have_content("new_two@email.com")
+    end
+  end
+end

data/test_app/app/controllers/admin/users_controller.rb

@@ -0,0 +1,14 @@
+class Admin::UsersController < ApplicationController
+  def show
+    @user = User.find params[:id]
+  end
+
+  def update
+    @user = User.find(params[:id])
+
+    respond_to do |format|
+      @user.update_attributes(params[:user])
+      format.json { respond_with_bip(@user) }
+    end
+  end
+end

data/test_app/app/controllers/cuca/cars_controller.rb

@@ -0,0 +1,16 @@
+module Cuca
+  class CarsController < ApplicationController
+    def show
+      @car = Car.find params[:id]
+    end
+
+    def update
+      @car = Car.find params[:id]
+
+      respond_to do |format|
+        @car.update_attributes params[:cuca_car]
+        format.json { respond_with_bip(@car) }
+      end
+    end
+  end
+end

data/test_app/app/controllers/users_controller.rb

@@ -22,6 +22,16 @@ class UsersController < ApplicationController
     end
   end
 
+  def email_field
+    @user = User.find(params[:id])
+    render :action => :email_field, :layout => false
+  end
+
+  def show_ajax
+    @user = User.find(params[:id])
+    @countries = COUNTRIES.to_a
+  end
+
   def double_init
     @user = User.find(params[:id])
     @countries = COUNTRIES.to_a

data/test_app/app/models/cuca/car.rb

@@ -0,0 +1,5 @@
+module Cuca
+  class Car < ActiveRecord::Base
+
+  end
+end

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

@@ -0,0 +1,20 @@
+<p id="notice"><%= notice %></p>
+<div id="user_account">
+  <h1>User details</h1>
+  <%= link_to "Go back to USERS", users_path %>
+  <p style="margin-left:48em">Click to edit</p>
+  <table>
+    <tr>
+      <td id="name">
+        <%= best_in_place [:admin, @user], :name %>
+      </td>
+    </tr>
+    <tr>
+      <td>Last Name</td>
+      <td id="last_name">
+        <%= best_in_place [:admin, @user], :last_name, :nil => "Nothing to show" %>
+      </td>
+    </tr>
+  </table>
+</div>
+

data/test_app/app/views/cuca/cars/show.html.erb

@@ -0,0 +1,13 @@
+<p id="notice"><%= notice %></p>
+<div id="user_account">
+  <h1>Car details</h1>
+  <p style="margin-left:48em">Click to edit</p>
+  <table>
+    <tr>
+      <td>Model</td>
+      <td id="model">
+        <%= best_in_place @car, :model %>
+      </td>
+    </tr>
+  </table>
+</div>

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

@@ -0,0 +1 @@
+<%= best_in_place @user, :email %>

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

@@ -0,0 +1,12 @@
+<%= render :template => 'users/show' %>
+<script>
+  $(document).ready(function () {
+    $('#email').html('');
+    setTimeout( function () { //give time to the other document.ready callbacks to be executed
+      $.get("/users/<%= params[:id]%>/email_field", function(data, status) {
+        $('#email').html(data);
+      });
+    },
+    500);
+  });
+</script>

data/test_app/config/routes.rb

@@ -3,8 +3,18 @@ BipApp::Application.routes.draw do
     member do
       put :test_respond_with
       get :double_init
+      get :show_ajax
+      get :email_field
     end
   end
 
+  namespace :cuca do
+    resources :cars
+  end
+
+  namespace :admin do
+    resources :users
+  end
+
   root :to => "users#index"
 end

data/test_app/db/migrate/20120513003308_create_cars.rb

@@ -0,0 +1,11 @@
+class CreateCars < ActiveRecord::Migration
+  def up
+    create_table :cars do |t|
+      t.string :model
+    end
+  end
+
+  def down
+    drop_table :cars
+  end
+end

data/test_app/db/schema.rb

@@ -11,7 +11,12 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111224181356) do
+ActiveRecord::Schema.define(:version => 20120513003308) 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"
@@ -19,13 +24,14 @@ ActiveRecord::Schema.define(:version => 20111224181356) do
     t.string   "email",          :null => false
     t.string   "zip"
     t.string   "country"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
     t.boolean  "receive_email"
     t.text     "description"
-    t.datetime "birth_date"
-    t.float    "money"
     t.string   "favorite_color"
     t.text     "favorite_books"
+    t.datetime "birth_date"
+    t.float    "money"
   end
+
 end

data/test_app/db/seeds.rb

@@ -13,3 +13,7 @@ User.create!(:name => "Lucia", :last_name => "Napoli", :email => "lucianapoli@gm
 User.create!(:name => "Carmen", :last_name => "Luciago", :email => "carmen@luciago.com", :address => "c/Ambrosio 10", :zip => "21333", :country => "2", :receive_email => true, :birth_date => Date.today - 18.years, :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.")
 User.create!(:name => "Angels", :last_name => "Domènech", :email => "angels@gmail.com", :address => "Avinguda Sant Andreu 1", :zip => "08033", :country => "3", :receive_email => false, :birth_date => Date.today - 65.years, :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.")
 User.create!(:name => "Dominic", :last_name => "Lepoin", :email => "dominiclepoin@gmail.com", :address => "Rue Tour Eiffel 4993", :zip => "11192", :country => "4", :receive_email => true, :birth_date => Date.today - 40.years, :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.")
+
+
+Cuca::Car.delete_all
+Cuca::Car.create! :model => "Ford"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &83802130 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *83802130
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &83801750 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83801750
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &83800970 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *83800970
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &83800320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *83800320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &83819560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *83819560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 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
@@ -79,6 +104,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -98,6 +124,7 @@ 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
@@ -124,17 +151,24 @@ files:
 - test_app/app/assets/stylesheets/jquery-ui-1.8.16.custom.css.erb
 - test_app/app/assets/stylesheets/scaffold.css
 - test_app/app/assets/stylesheets/style.css.erb
+- test_app/app/controllers/admin/users_controller.rb
 - test_app/app/controllers/application_controller.rb
+- test_app/app/controllers/cuca/cars_controller.rb
 - test_app/app/controllers/users_controller.rb
 - test_app/app/helpers/application_helper.rb
 - test_app/app/helpers/users_helper.rb
+- test_app/app/models/cuca/car.rb
 - test_app/app/models/user.rb
+- test_app/app/views/admin/users/show.html.erb
+- test_app/app/views/cuca/cars/show.html.erb
 - test_app/app/views/layouts/application.html.erb
 - test_app/app/views/users/_form.html.erb
 - test_app/app/views/users/double_init.html.erb
+- test_app/app/views/users/email_field.html.erb
 - test_app/app/views/users/index.html.erb
 - test_app/app/views/users/new.html.erb
 - test_app/app/views/users/show.html.erb
+- test_app/app/views/users/show_ajax.html.erb
 - test_app/config.ru
 - test_app/config/application.rb
 - test_app/config/boot.rb
@@ -159,6 +193,7 @@ files:
 - 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/migrate/20120513003308_create_cars.rb
 - test_app/db/schema.rb
 - test_app/db/seeds.rb
 - test_app/doc/README_FOR_APP
@@ -191,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -802068595
+      hash: -3850247748831605605
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -200,12 +235,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -802068595
+      hash: -3850247748831605605
 requirements: []
 rubyforge_project: best_in_place
-rubygems_version: 1.8.10
+rubygems_version: 1.8.19
 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: []
+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