best_in_place 1.0.5 → 1.0.6

data/Gemfile

@@ -3,6 +3,6 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in best_in_place.gemspec
 gemspec
 
-gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'sqlite3'
 gem 'jquery-rails'
 gem 'rdiscount'

data/best_in_place.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", "~> 3.1"
   s.add_dependency "jquery-rails"
 
-  s.add_development_dependency "rspec-rails", "~> 2.7.0"
+  s.add_development_dependency "rspec-rails", "~> 2.8.0"
   s.add_development_dependency "nokogiri", ">= 1.5.0"
   s.add_development_dependency "capybara", ">= 1.0.1"
 end

data/lib/best_in_place/helper.rb

@@ -43,7 +43,7 @@ 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='#{object.send(field)}'" if opts[:display_as] || opts[:display_with]
+      out << " data-original-content='#{attribute_escape(object.send(field))}'" if opts[:display_as] || opts[:display_with]
       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))
@@ -80,6 +80,10 @@ module BestInPlace
         object.send(field).to_s.presence || ""
       end
     end
+
+    def attribute_escape(data)
+      data.to_s.gsub("&", "&amp;").gsub("'", "&apos;") unless data.nil?
+    end
   end
 end
 

data/lib/best_in_place/version.rb

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

data/spec/integration/js_spec.rb

@@ -368,36 +368,6 @@ describe "JS behaviour", :js => true do
     end
   end
 
-  it "should show validation errors using respond_with in the controller" do
-    @user.save!
-    visit user_path(@user)
-
-    bip_text @user, :last_name, "a"
-    page.should have_content("last_name has invalid length")
-  end
-
-  it "should be able to update a field after an error using respond_with in the controller" do
-    @user.save!
-    visit user_path(@user)
-
-    bip_text @user, :last_name, "a"
-
-    within("#last_name") do
-      page.should have_content("Napoli")
-    end
-
-    bip_text @user, :last_name, "Another"
-
-    within("#last_name") do
-      page.should have_content("Another")
-    end
-
-    visit user_path(@user)
-    within("#last_name") do
-      page.should have_content("Another")
-    end
-  end
-
   it "should fire off a callback when updating a field" do
     @user.save!
     visit user_path(@user)
@@ -466,15 +436,32 @@ describe "JS behaviour", :js => true do
 
         bip_text @user, :address, "New address"
 
+        sleep 1
+
         id = BestInPlace::Utils.build_best_in_place_id @user, :address
         page.execute_script <<-JS
           $("##{id}").click();
         JS
 
+        sleep 1
+
         text = page.find("##{id} input").value
         text.should == "New address"
       end
     end
+
+    it "should quote properly the data-original-content attribute" do
+      @user.address = "A's & B's"
+      @user.save!
+      retry_on_timeout do
+        visit user_path(@user)
+
+        id = BestInPlace::Utils.build_best_in_place_id @user, :address
+
+        text = page.find("##{id}")["data-original-content"]
+        text.should == "A's & B's"
+      end
+    end
   end
 
   describe "display_with" do
@@ -534,11 +521,15 @@ describe "JS behaviour", :js => true do
 
         bip_text @user, :money, "40"
 
+        sleep 1
+
         id = BestInPlace::Utils.build_best_in_place_id @user, :money
         page.execute_script <<-JS
           $("##{id}").click();
         JS
 
+        sleep 1
+
         text = page.find("##{id} input").value
         text.should == "40"
       end

data/test_app/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.1.0'
+gem 'rails', '3.2'
 gem 'sqlite3'
 
 gem 'best_in_place', :path => ".."
@@ -10,7 +10,7 @@ gem 'jquery-rails'
 gem 'rdiscount'
 
 group :assets do
-  gem 'sass-rails',   '~> 3.1.4'
-  gem 'coffee-rails', '~> 3.1.1'
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
 end

data/test_app/app/controllers/users_controller.rb

@@ -1,6 +1,4 @@
 class UsersController < ApplicationController
-  respond_to :html, :json
-
   # GET /users
   # GET /users.xml
   def index
@@ -88,11 +86,4 @@ class UsersController < ApplicationController
       format.xml  { head :ok }
     end
   end
-
-  def test_respond_with
-    @user = User.find(params[:id])
-
-    @user.update_attributes(params[:user])
-    respond_with(@user)
-  end
 end

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

@@ -13,7 +13,7 @@
     <tr>
       <td>Last Name</td>
       <td id="last_name">
-        <%= best_in_place @user, :last_name, :nil => "Nothing to show", :path => test_respond_with_user_path(@user) %>
+        <%= best_in_place @user, :last_name, :nil => "Nothing to show" %>
       </td>
     </tr>
     <tr>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-23 00:00:00.000000000 Z
+date: 2012-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &83572300 !ruby/object:Gem::Requirement
+  requirement: &83802130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *83572300
+  version_requirements: *83802130
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &83572040 !ruby/object:Gem::Requirement
+  requirement: &83801750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *83572040
+  version_requirements: *83801750
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &83571670 !ruby/object:Gem::Requirement
+  requirement: &83800970 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *83571670
+  version_requirements: *83800970
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &83571350 !ruby/object:Gem::Requirement
+  requirement: &83800320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *83571350
+  version_requirements: *83800320
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &83571040 !ruby/object:Gem::Requirement
+  requirement: &83819560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *83571040
+  version_requirements: *83819560
 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
@@ -102,7 +102,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/retry_on_timeout.rb
 - test_app/Gemfile
-- test_app/Gemfile.lock
 - test_app/README
 - test_app/Rakefile
 - test_app/app/assets/images/red_pen.png
@@ -192,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -572262513
+      hash: -802068595
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -572262513
+      hash: -802068595
 requirements: []
 rubyforge_project: best_in_place
 rubygems_version: 1.8.10