best_in_place 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5e84415483a33f06ae8ad58a61c1659b185568e
-  data.tar.gz: eb2b9be33ed3f859f29222028b4143ec05b8c582
+  metadata.gz: 84ce49122f38b9152cae6c9ce661307dd0f3d528
+  data.tar.gz: ad3e88ba32e9c656706661ef05e807f9fdfc7fb3
 SHA512:
-  metadata.gz: 5403e603dd30cd6d28be3e39ba6bec7a2c407918a7b8759da50712fcdce2fd9af5b59e69eacde956d21086c6ccbbee7980aa1fe2d1d0dbeaeb2c1f8c68269e92
-  data.tar.gz: ea7dc137ed0816109d9debb3b7782349d6fcf7a587c66725eab2e6ddc3a5ac1006dba2170e2c8ca7a6e8a58b990c86dcb530d104d6f85c79b043f8f2b818971f
+  metadata.gz: 1502b356495066e3c08541b068e8af62bd58bcc0c32d0ff84b5fdb570ffdd663fb9fa864ea2f78c77326ff0d359cf42b9819402a5052bf1245a5f47c19e11993
+  data.tar.gz: db75bf52797e26f7bb11253b4cadaaaede87ec84d46dfe736bfead6960469c76bc10fa5fb7284f211241f48da035f63d792a1197a8d2d79cb84ab458eb31d3a5

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 #Changelog
 
+- v.3.0.3 :
+  - Pass all callback arguments on $.ajax
+
 - v.3.0.0 :
   - Expect syntax for spec
   - Deprecated option[:path] in favor of option[:url]

data/README.md

@@ -76,7 +76,7 @@ Params:
 
 Options:
 
-- **:type** It can be only [:input, :textarea, :select, :checkbox, :date (>= 1.0.4)] or if undefined it defaults to :input.
+- **:as** It can be only [:input, :textarea, :select, :checkbox, :date] or if undefined it defaults to :input.
 - **:collection**: If you are using the :select type then you must specify the collection of values it takes as a hash where values represent the display text and keys are the option's value when selected. If you are using the :checkbox type you can specify the two values it can take, or otherwise they will default to Yes and No.
 - **:url**: URL to which the updating action will be sent. If not defined it defaults to the :object path.
 - **:place_holder**: 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".
@@ -92,7 +92,6 @@ Options:
 - **:display_as**: A **model** method which will be called in order to display this field. Cannot be used when using `display_with`.
 - **:display_with**: A **helper** method or proc will be called in order to display this field. Cannot be used with `display_as`.
 - **:helper_options**: A hash of parameters to be sent to the helper method specified by `display_with`.
-- **:as**: 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.
 - **:class**: Additional classes to apply to the best_in_place span.  Accepts either a string or Array of strings
 - **:value**: Customize the starting value of the inline input (defaults to to the field's value)
@@ -120,11 +119,11 @@ condition, is satisfied. Specifically:
 
 Say we have something like
 
-    <%= best_in_place_if condition, @user, :name, :type => :input %>
+    <%= best_in_place_if condition, @user, :name, :as => :input %>
 
 In case *condition* is satisfied, the outcome will be just the same as:
 
-    <%= best_in_place @user, :name, :type => :input %>
+    <%= best_in_place @user, :name, :as => :input %>
 
 Otherwise, we will have the same outcome as:
 
@@ -140,36 +139,36 @@ Examples (code in the views):
 
 ### Input
 
-    <%= best_in_place @user, :name, :type => :input %>
+    <%= best_in_place @user, :name, :as => :input %>
 
-    <%= best_in_place @user, :name, :type => :input, :nil => "Click me to add content!" %>
+    <%= best_in_place @user, :name, :as => :input, :nil => "Click me to add content!" %>
 
 ### Textarea
 
-    <%= best_in_place @user, :description, :type => :textarea %>
+    <%= best_in_place @user, :description, :as => :textarea %>
 
-    <%= best_in_place @user, :favorite_books, :type => :textarea, :ok_button => 'Save', :cancel_button => 'Cancel' %>
+    <%= best_in_place @user, :favorite_books, :as => :textarea, :ok_button => 'Save', :cancel_button => 'Cancel' %>
 
 ### Select
 
-    <%= best_in_place @user, :country, :type => :select, :collection => {"1" => "Spain", "2" => "Italy", "3" => "Germany", "4" => "France"} %>
-    <%= best_in_place @user, :country, :type => :select, :collection => { es: 'Spain', it: 'Italy', de: 'Germany', fr: 'France' } %>
-    <%= best_in_place @user, :country, :type => :select, :collection => %w(Spain Italy Germany France) %>
-    <%= best_in_place @user, :country, :type => :select, :collection => [[1, 'Spain'], [3, 'Germany'], [2, 'Italy'], [4, 'France']] %>
+    <%= best_in_place @user, :country, :as => :select, :collection => {"1" => "Spain", "2" => "Italy", "3" => "Germany", "4" => "France"} %>
+    <%= best_in_place @user, :country, :as => :select, :collection => { es: 'Spain', it: 'Italy', de: 'Germany', fr: 'France' } %>
+    <%= best_in_place @user, :country, :as => :select, :collection => %w(Spain Italy Germany France) %>
+    <%= best_in_place @user, :country, :as => :select, :collection => [[1, 'Spain'], [3, 'Germany'], [2, 'Italy'], [4, 'France']] %>
 
 Of course it can take an instance or global variable for the collection, just remember the structure is a hash.
 The value will always be converted to a string for display.
 
 ### Checkbox
 
-    <%= best_in_place @user, :receive_emails, :type => :checkbox, :collection => ["No, thanks", "Yes, of course!"] %>
+    <%= best_in_place @user, :receive_emails, :as => :checkbox, :collection => ["No, thanks", "Yes, of course!"] %>
 
 The first value is always the negative boolean value and the second the positive. Structure: `["false value", "true value"]`.
 If not defined, it will default to *Yes* and *No* options.
 
 ### Date
 
-    <%= best_in_place @user, :birth_date, :type => :date %>
+    <%= best_in_place @user, :birth_date, :as => :date %>
 
 With the :date type the input field will be initialized as a datepicker input.
 In order to provide custom options to the datepicker initialization you must
@@ -206,7 +205,7 @@ the :json format. This is a simple example showing an update action using it:
 As of best in place 1.0.3 you can use custom methods in your model in order to
 decide how a certain field has to be displayed. You can write something like:
 
-    = best_in_place @user, :description, :type => :textarea, :display_as => :mk_description
+    = best_in_place @user, :description, :as => :textarea, :display_as => :mk_description
 
 Then instead of using `@user.description` to show the actual value, best in
 place will call `@user.mk_description`. This can be used for any kind of
@@ -286,7 +285,7 @@ In the view, we'd do:
           th= size
           - flavours.each do |flavour|
             - v = @ice_cream.get_stock(flavour: flavour, size: size)
-            td= best_in_place v, :to_i, type: :input, url: set_stock_ice_cream_path(flavour: flavour, size: size)
+            td= best_in_place v, :to_i, as: :input, url: set_stock_ice_cream_path(flavour: flavour, size: size)
 
 Now we need a route to which send the stock updates:
 

data/lib/assets/javascripts/best_in_place.js

@@ -106,8 +106,8 @@ BestInPlaceEditor.prototype = {
             "type": BestInPlaceEditor.defaults.ajaxMethod,
             "dataType": BestInPlaceEditor.defaults.ajaxDataType,
             "data": editor.requestData(),
-            "success": function (data) {
-                editor.loadSuccessCallback(data);
+            "success": function (data, status, xhr) {
+                editor.loadSuccessCallback(data, status, xhr);
             },
             "error": function (request, error) {
                 editor.loadErrorCallback(request, error);
@@ -120,15 +120,11 @@ BestInPlaceEditor.prototype = {
                 this.previousCollectionValue = value;
 
                 // search for the text for the span
-                var key, val, _i, _len, _ref, a;
-                for (_i = 0, a = this.values, _len = a.length; _i < _len; _i++) {
-                    _ref = a[_i], key = _ref[0], val = _ref[1];
-                    if (String(value) === String(key)) editor.element.html(val);
-                };
+                editor.element.html(this.arrayToObject(this.values)[value]);
                 break;
 
             case "checkbox":
-                editor.element.html(this.values[value]);
+                editor.element.html(this.arrayToObject(this.values)[value]);
                 break;
 
             default:
@@ -240,6 +236,19 @@ BestInPlaceEditor.prototype = {
         alert(BestInPlaceEditor.defaults.locales[''].uninitializedForm);
     },
 
+    arrayToObject: function(list, values) {
+        if (list == null) return {};
+        var result = {};
+        for (var i = 0, length = list.length; i < length; i++) {
+            if (values) {
+                result[list[i]] = values[i];
+            } else {
+                result[list[i][0]] = list[i][1];
+            }
+        }
+        return result;
+    },
+
     // Trim and Strips HTML from text
     sanitizeValue: function (s) {
         'use strict';
@@ -273,7 +282,7 @@ BestInPlaceEditor.prototype = {
 
     // Handlers ////////////////////////////////////////////////////////////////
 
-    loadSuccessCallback: function (data) {
+    loadSuccessCallback: function (data, status, xhr) {
         'use strict';
         data = jQuery.trim(data);
         //Update original content with current text.
@@ -289,13 +298,11 @@ BestInPlaceEditor.prototype = {
                 this.element.data('bip-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"));
         }
+
+        this.element.trigger(jQuery.Event("best_in_place:success"), [data, status, xhr]);
+        this.element.trigger(jQuery.Event("ajax:success"), [data, status, xhr]);
+
         // Binding back after being clicked
         jQuery(this.activator).bind('click', {editor: this}, this.clickHandler);
         this.element.trigger(jQuery.Event("best_in_place:deactivate"));
@@ -392,7 +399,9 @@ BestInPlaceEditor.forms = {
             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);
+            if (!this.okButton) {
+                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;
@@ -459,15 +468,14 @@ BestInPlaceEditor.forms = {
                 select_elt = jQuery(document.createElement('select'))
                     .attr('class', this.inner_class !== null ? this.inner_class : ''),
                 currentCollectionValue = this.collectionValue,
-                a, key, value, _i, _len, _ref;
-            for (_i = 0, a = this.values, _len = a.length; _i < _len; _i++) {
-                _ref = a[_i], key = _ref[0], value = _ref[1];
+                key, value,
+                a = this.arrayToObject(this.values);
+            for (key in a) {
+                value = a[key];
                 var option_elt = jQuery(document.createElement('option'))
                     .val(key)
                     .html(value);
-                if (String(key) === String(currentCollectionValue)) {
-                    option_elt.attr('selected', 'selected');
-                };
+                if (String(key) === String(currentCollectionValue)) option_elt.attr('selected', 'selected');
                 select_elt.append(option_elt);
             };
             output.append(select_elt);

data/lib/best_in_place/test_helpers.rb

@@ -50,7 +50,7 @@ module BestInPlace
           if yield
             return true
           else
-            sleep(0.1)
+            sleep(0.2)
             next
           end
         end

data/lib/best_in_place/version.rb

@@ -1,3 +1,3 @@
 module BestInPlace
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

data/spec/integration/js_spec.rb

@@ -149,6 +149,8 @@ describe "JS behaviour", :js => true do
 
     bip_text @user, :email, "new@email.com"
 
+    expect(find('#email')).to have_content('new@email.com')
+
     visit user_path(@user)
     expect(find('#email')).to have_content('new@email.com')
   end
@@ -193,6 +195,8 @@ describe "JS behaviour", :js => true do
 
     bip_select @user, :country, "France"
 
+    expect(find('#country')).to have_content('France')
+
     visit user_path(@user)
 
     expect(find('#country')).to have_content('France')
@@ -215,6 +219,8 @@ describe "JS behaviour", :js => true do
 
     bip_text @user, :birth_date, (today - 1.days)
 
+    expect(find('#birth_date')).to have_content(today - 1.days)
+
     visit user_path(@user)
 
     expect(find('#birth_date')).to have_content(today - 1.days)
@@ -234,6 +240,8 @@ describe "JS behaviour", :js => true do
     JS
     wait_for_ajax
 
+    expect(find('#birth_date')).to have_content(today.beginning_of_month.strftime('%d-%m-%Y'))
+
     visit user_path(@user)
 
     expect(find('#birth_date')).to have_content(today.beginning_of_month)
@@ -265,6 +273,8 @@ describe "JS behaviour", :js => true do
 
     bip_bool @user, :receive_email
 
+    expect(find('#receive_email')).to have_content('Yes of course')
+
     visit user_path(@user)
 
     expect(find('#receive_email')).to have_content('Yes of course')
@@ -279,6 +289,8 @@ describe "JS behaviour", :js => true do
 
     bip_bool @user, :receive_email_image
 
+    expect(find('#receive_email_image')).to have_xpath("//img[contains(@src,'yes.png')]")
+
     visit user_path(@user)
 
     expect(find('#receive_email_image')).to have_xpath("//img[contains(@src,'yes.png')]")
@@ -300,6 +312,8 @@ describe "JS behaviour", :js => true do
     find("##{id} input[type='submit']").click
     wait_for_ajax
 
+    expect(find('#favorite_color')).to have_content('Blue')
+
     visit user_path(@user)
 
     expect(find('#favorite_color')).to have_content('Blue')
@@ -350,7 +364,8 @@ describe "JS behaviour", :js => true do
     execute_script <<-JS
       $("##{id} input[name='favorite_color']").blur();
     JS
-    wait_for_ajax
+    sleep 0.5
+    expect(page).to have_css("##{id} input[type='submit']")
 
     visit user_path(@user)
 
@@ -371,6 +386,8 @@ describe "JS behaviour", :js => true do
     execute_script("$('##{id} input[name=\"favorite_color\"]').blur()")
     wait_for_ajax
 
+    expect(find('#favorite_color')).to have_content('Blue')
+
     visit user_path(@user)
 
     expect(find('#favorite_color')).to have_content('Blue')
@@ -789,6 +806,9 @@ describe "JS behaviour", :js => true do
       visit double_init_user_path(@user)
 
       bip_area @user, :description, "A <a href=\"http://google.es\">link in this text</a> not sanitized."
+
+      expect(page).to have_link("link in this text", :href => "http://google.es")
+
       visit double_init_user_path(@user)
 
       expect(page).to have_link("link in this text", :href => "http://google.es")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Bernat Farrero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-20 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack