best_in_place 0.2.0 → 0.2.1

data/lib/best_in_place.rb

@@ -1,3 +1,4 @@
+require "best_in_place/utils"
 require "best_in_place/helper"
 
 module BestInPlace

data/lib/best_in_place/helper.rb

@@ -1,5 +1,6 @@
 module BestInPlace
   module BestInPlaceHelpers
+
     def best_in_place(object, field, opts = {})
       opts[:type] ||= :input
       opts[:collection] ||= []
@@ -20,7 +21,7 @@ module BestInPlace
         collection = opts[:collection].to_json
       end
       out = "<span class='best_in_place'"
-      out << " id='best_in_place_#{object.class.to_s.gsub("::", "_").underscore}_#{field}'"
+      out << " id='#{BestInPlace::Utils.build_best_in_place_id(object, field)}'"
       out << " data-url='#{opts[:path].blank? ? url_for(object).to_s : url_for(opts[:path])}'"
       out << " data-object='#{object.class.to_s.gsub("::", "_").underscore}'"
       out << " data-collection='#{collection}'" unless collection.blank?

data/lib/best_in_place/test_helpers.rb

@@ -1,24 +1,28 @@
 module BestInPlace
   module TestHelpers
+
     def bip_text(model, attr, new_value)
+      id = BestInPlace::Utils.build_best_in_place_id model, attr
       page.execute_script <<-JS
-        $("#best_in_place_#{model}_#{attr}").click();
-        $("#best_in_place_#{model}_#{attr} input[name='#{attr}']").val('#{new_value}');
-        $("#best_in_place_#{model}_#{attr} form").submit();
+        $("##{id}").click();
+        $("##{id} input[name='#{attr}']").val('#{new_value}');
+        $("##{id} form").submit();
       JS
     end
 
     def bip_bool(model, attr)
-      page.execute_script("$('#best_in_place_#{model}_#{attr}').click();")
+      id = BestInPlace::Utils.build_best_in_place_id model, attr
+      page.execute_script("$('##{id}').click();")
     end
 
     def bip_select(model, attr, name)
+      id = BestInPlace::Utils.build_best_in_place_id model, attr
       page.execute_script <<-JS
         (function() {
-          $("#best_in_place_#{model}_#{attr}").click();
-          var opt_value = $("#best_in_place_#{model}_#{attr} select option:contains('#{name}')").attr('value');
-          $("#best_in_place_#{model}_#{attr} select option[value='" + opt_value + "']").attr('selected', true);
-          $("#best_in_place_#{model}_#{attr} select").change();
+          $("##{id}").click();
+          var opt_value = $("##{id} select option:contains('#{name}')").attr('value');
+          $("##{id} select option[value='" + opt_value + "']").attr('selected', true);
+          $("##{id} select").change();
         })();
       JS
     end

data/lib/best_in_place/utils.rb

@@ -0,0 +1,15 @@
+module BestInPlace
+  class Utils
+
+    def self.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 << "_#{object.id}" if object.class.ancestors.include?(ActiveRecord::Base)
+      id << "_#{field}"
+      id
+    end
+  end
+end

data/lib/best_in_place/version.rb

@@ -1,3 +1,3 @@
 module BestInPlace
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/public/javascripts/best_in_place.js

@@ -339,7 +339,9 @@ BestInPlaceEditor.forms = {
 
 jQuery.fn.best_in_place = function() {
   this.each(function(){
-    jQuery(this).data('bestInPlaceEditor', new BestInPlaceEditor(this));
+    if (!jQuery(this).data('bestInPlaceEditor')) {
+      jQuery(this).data('bestInPlaceEditor', new BestInPlaceEditor(this));
+    }
   });
   return this;
 };

data/spec/helpers/best_in_place_spec.rb

@@ -26,8 +26,18 @@ describe BestInPlace::BestInPlaceHelpers do
         @span = nk.css("span")
       end
 
-      it "should have a proper id" do
-        @span.attribute("id").value.should == "best_in_place_user_name"
+      context "when it's an ActiveRecord model" do
+        it "should have a proper id" do
+          @span.attribute("id").value.should == "best_in_place_user_#{@user.id}_name"
+        end
+      end
+
+      context "when it's not an AR model" do
+        it "shold generate an html id without any id" do
+          nk = Nokogiri::HTML.parse(helper.best_in_place [1,2,3], :first, :path => @user)
+          span = nk.css("span")
+          span.attribute("id").value.should == "best_in_place_array_first"
+        end
       end
 
       it "should have the best_in_place class" do

data/spec/integration/double_init_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require "spec_helper"
 
-describe "Double initialization bug", :js => true, :pending => true do
+describe "Double initialization bug", :js => true do
   before do
     @user = User.new :name => "Lucia",
       :last_name => "Napoli",
@@ -21,7 +21,7 @@ describe "Double initialization bug", :js => true, :pending => true do
       page.should have_content("No thanks")
     end
 
-    bip_bool :user, :receive_email
+    bip_bool @user, :receive_email
 
     visit double_init_user_path(@user)
     within("#receive_email") do

data/spec/integration/js_spec.rb

@@ -35,14 +35,14 @@ describe "JS behaviour", :js => true do
     end
   end
 
-  it "should be able to use the bip_text to update a text field" do
+  it "should be able to use bip_text to update a text field" do
     @user.save!
     visit user_path(@user)
     within("#email") do
       page.should have_content("lucianapoli@gmail.com")
     end
 
-    bip_text :user, :email, "new@email.com"
+    bip_text @user, :email, "new@email.com"
 
     visit user_path(@user)
     within("#email") do
@@ -54,13 +54,13 @@ describe "JS behaviour", :js => true do
     @user.save!
     visit user_path(@user)
 
-    bip_text :user, :email, "new@email.com"
+    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"
+    bip_text @user, :email, "new_two@email.com"
 
     within("#email") do
       page.should have_content("new_two@email.com")
@@ -76,10 +76,10 @@ describe "JS behaviour", :js => true do
     @user.save!
     visit user_path(@user)
 
-    bip_text :user, :email, "wrong format"
+    bip_text @user, :email, "wrong format"
     page.should have_content("Email has wrong email format")
 
-    bip_text :user, :email, "another@email.com"
+    bip_text @user, :email, "another@email.com"
     within("#email") do
       page.should have_content("another@email.com")
     end
@@ -97,7 +97,7 @@ describe "JS behaviour", :js => true do
       page.should have_content("Italy")
     end
 
-    bip_select :user, :country, "France"
+    bip_select @user, :country, "France"
 
     visit user_path(@user)
     within("#country") do
@@ -113,7 +113,7 @@ describe "JS behaviour", :js => true do
       page.should have_content("No thanks")
     end
 
-    bip_bool :user, :receive_email
+    bip_bool @user, :receive_email
 
     visit user_path(@user)
     within("#receive_email") do
@@ -125,7 +125,7 @@ describe "JS behaviour", :js => true do
     @user.save!
     visit user_path(@user)
 
-    bip_text :user, :address, ""
+    bip_text @user, :address, ""
     page.should have_content("Address can't be blank")
     within("#address") do
       page.should have_content("Via Roma 99")
@@ -136,7 +136,7 @@ describe "JS behaviour", :js => true do
     @user.save!
     visit user_path(@user)
 
-    bip_text :user, :last_name, "a"
+    bip_text @user, :last_name, "a"
     page.should have_content("last_name has invalid length")
   end
 
@@ -144,13 +144,13 @@ describe "JS behaviour", :js => true do
     @user.save!
     visit user_path(@user)
 
-    bip_text :user, :last_name, "a"
+    bip_text @user, :last_name, "a"
 
     within("#last_name") do
       page.should have_content("Napoli")
     end
 
-    bip_text :user, :last_name, "Another"
+    bip_text @user, :last_name, "Another"
 
     within("#last_name") do
       page.should have_content("Another")

data/test_app/public/javascripts/best_in_place.js

@@ -178,6 +178,8 @@ BestInPlaceEditor.prototype = {
 
   loadSuccessCallback : function(data) {
     this.element.html(data[this.objectName]);
+    this.element.trigger($.Event("ajax:success"), data);
+
     // Binding back after being clicked
     $(this.activator).bind('click', {editor: this}, this.clickHandler);
   },
@@ -337,7 +339,9 @@ BestInPlaceEditor.forms = {
 
 jQuery.fn.best_in_place = function() {
   this.each(function(){
-    jQuery(this).data('bestInPlaceEditor', new BestInPlaceEditor(this));
+    if (!jQuery(this).data('bestInPlaceEditor')) {
+      jQuery(this).data('bestInPlaceEditor', new BestInPlaceEditor(this));
+    }
   });
   return this;
 };

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-26 00:00:00.000000000 Z
+date: 2011-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &84765280 !ruby/object:Gem::Requirement
+  requirement: &75417920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *84765280
+  version_requirements: *75417920
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &84764870 !ruby/object:Gem::Requirement
+  requirement: &75415930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *84764870
+  version_requirements: *75415930
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &84764560 !ruby/object:Gem::Requirement
+  requirement: &75435180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *84764560
+  version_requirements: *75435180
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &84763970 !ruby/object:Gem::Requirement
+  requirement: &75431500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *84763970
+  version_requirements: *75431500
 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
@@ -75,6 +75,7 @@ files:
 - lib/best_in_place.rb
 - lib/best_in_place/helper.rb
 - lib/best_in_place/test_helpers.rb
+- lib/best_in_place/utils.rb
 - lib/best_in_place/version.rb
 - lib/generators/best_in_place/setup_generator.rb
 - public/javascripts/best_in_place.js
@@ -160,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 982211869
+      hash: -404382943
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 982211869
+      hash: -404382943
 requirements: []
 rubyforge_project: best_in_place
 rubygems_version: 1.8.10