best_in_place 3.0.0 → 3.0.1

data/spec/integration/live_spec.rb

@@ -18,22 +18,16 @@ describe "Monitor new fields", :js => true do
     @user.save!
     visit show_ajax_user_path(@user)
 
-    sleep(1) #give time to the ajax request to work
+    wait_for_ajax
 
-    within("#email") do
-      expect(page).to have_content("lucianapoli@gmail")
-    end
+    expect(find('#email')).to have_content('lucianapoli@gmail')
 
     bip_text @user, :email, "new@email.com"
 
-    within("#email") do
-      expect(page).to have_content("new@email.com")
-    end
+    expect(find('#email')).to have_content('new@email.com')
 
     bip_text @user, :email, "new_two@email.com"
 
-    within("#email") do
-      expect(page).to have_content("new_two@email.com")
-    end
+    expect(find('#email')).to have_content('new_two@email.com')
   end
 end

data/spec/integration/text_area_spec.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'rails_helper'
 
 describe "JS behaviour", :js => true do
   before do
@@ -17,24 +16,20 @@ describe "JS behaviour", :js => true do
   it "should be able to use bip_text to update a text area" do
     @user.save!
     visit user_path(@user)
-    within("#description") do
-      expect(page).to have_content("User description")
-    end
+    expect(find('#description')).to have_content('User description')
 
     bip_area @user, :description, "A new description"
 
     visit user_path(@user)
-    within("#description") do
-      expect(page).to have_content("A new description")
-    end
+
+    expect(find('#description')).to have_content('A new description')
   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
-      expect(page).to have_content("I'm so awesome")
-    end
+
+    expect(find('#dw_description')).to have_content("I'm so awesome")
   end
 end

data/spec/internal/app/assets/stylesheets/{style.css.erb → style.css}

@@ -47,7 +47,7 @@ textarea {
 }
 .best_in_place:hover, #user_account .do_hover {
   padding-right: 1.5em;
-  background: url(<%= asset_path "red_pen.png" %>) no-repeat right;
+  background: url("/assets/red_pen.png") no-repeat right;
   background-color: #CCC;
 }
 .info_edit {
@@ -81,5 +81,5 @@ textarea {
   width: 25px;
   height: 25px;
   text-indent: -9999px;
-  background: url(<%= image_path("purrClose.png") %>) no-repeat;
+  background: url("assets/purrClose.png") no-repeat;
 }

data/spec/internal/app/controllers/users_controller.rb

@@ -14,7 +14,7 @@ class UsersController < ApplicationController
   # GET /users/1.xml
   def show
     @user = User.find(params[:id])
-    @countries = COUNTRIES
+    @countries = COUNTRIES_HASH
 
     respond_to do |format|
       format.html # show.html.erb
@@ -29,12 +29,12 @@ class UsersController < ApplicationController
 
   def show_ajax
     @user = User.find(params[:id])
-    @countries = COUNTRIES
+    @countries = COUNTRIES_HASH
   end
 
   def double_init
     @user = User.find(params[:id])
-    @countries = COUNTRIES
+    @countries = COUNTRIES_HASH
   end
 
   # GET /users/1/edit

data/spec/internal/app/models/user.rb

@@ -16,6 +16,9 @@ class User < ActiveRecord::Base
   validates_numericality_of :money_proc, :allow_blank => true
 
   alias_attribute :money_custom, :money
+  alias_attribute :money_value, :money
+  alias_attribute :receive_email_image, :receive_email
+  alias_attribute :description_simple, :description
 
   def address_format
     "<b>addr => [#{address}]</b>".html_safe

data/spec/internal/app/views/users/_form.html.erb

@@ -37,7 +37,7 @@
   </div>
   <div class="field">
     <%= f.label :country %><br />
-    <%= f.select :country, COUNTRIES.map {|c|
+    <%= f.select :country, COUNTRIES_HASH.map {|c|
         v0 = c[0]
         c[0] = c[1]
         c[1] = v0

data/spec/internal/app/views/users/index.html.erb

@@ -17,7 +17,7 @@
     </td>
     <td><small><a href="#" id="edit_<%= user.id %>">edit</a></small></td>
     <td><%= user.last_name %></td>
-    <td><%= COUNTRIES[user.country.to_i] %></td>
+    <td><%= COUNTRIES_HASH[user.country.to_i] %></td>
   </tr>
 <% end %>
 </table>

data/spec/internal/app/views/users/show.html.erb

@@ -61,7 +61,7 @@
     <tr>
       <td>Receive newsletter (image)?</td>
       <td id="receive_email_image">
-        <%= best_in_place @user, :receive_email, as: :checkbox, :collection => {'false' => image_tag('no.png'), 'true' => image_tag('yes.png')} %>
+        <%= best_in_place @user, :receive_email_image, as: :checkbox, :collection => {'false' => image_tag('no.png'), 'true' => image_tag('yes.png')} %>
       </td>
     </tr>
     <tr>
@@ -96,7 +96,7 @@
     <tr>
       <td>Simple-formatted user description</td>
       <td id="dw_description">
-        <%= best_in_place @user, :description, :display_with => :simple_format, as: :textarea %>
+        <%= best_in_place @user, :description_simple, :display_with => :simple_format, as: :textarea %>
       </td>
     </tr>
     <tr>
@@ -120,7 +120,7 @@
     <tr>
       <td>Money with value</td>
       <td id="money_value">
-        <%= best_in_place @user, :money, :display_with => :number_to_currency, value: 'Custom Value' %>
+        <%= best_in_place @user, :money_value, :display_with => :number_to_currency, value: 'Custom Value' %>
       </td>
     </tr>
     <tr>

data/spec/internal/config/initializers/countries.rb

@@ -1 +1,5 @@
-COUNTRIES = { 1 => "Spain", 2 => "Italy", 3 => "Germany", 4 => "France" }
+COUNTRIES_HASH = { 1 => 'Spain', 2 => 'Italy', 3 => 'Germany', 4 => 'France' }
+COUNTRIES_HASH_STRING_KEYS = { es: 'Spain', it: 'Italy', de: 'Germany', fr: 'France' }
+COUNTRIES_ARRAY = %w(Spain Italy Germany France)
+COUNTRIES_APOSTROPHE_HASH = {1 => "Joe's Country", 2 => "Bob's Country"}
+COUNTRIES_APOSTROPHE_ARRAY = ["Joe's Country", "Bob's Country"]

data/spec/rails_helper.rb

@@ -2,6 +2,14 @@ ENV['RAILS_ENV'] ||= 'test'
 
 require 'combustion'
 require 'capybara/rspec'
+
+require 'capybara/poltergeist'
+require_relative 'support/screenshot'
+Capybara.register_driver :poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, {js_errors: false, inspector: true})
+end
+Capybara.javascript_driver = :poltergeist
+
 require 'best_in_place'
 
 Combustion.initialize! :active_record, :action_controller,

data/spec/support/screenshot.rb

@@ -0,0 +1,7 @@
+def screenshot
+  path = Rails.root.join("local", "screenshot.png")
+  File.delete(path) if File.exists?(path)
+
+  save_screenshot(path, full: true)
+  Launchy.open(path.to_s)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Bernat Farrero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -104,7 +104,7 @@ files:
 - spec/internal/app/assets/stylesheets/.gitkeep
 - spec/internal/app/assets/stylesheets/jquery-ui-1.8.16.custom.css.erb
 - spec/internal/app/assets/stylesheets/scaffold.css
-- spec/internal/app/assets/stylesheets/style.css.erb
+- spec/internal/app/assets/stylesheets/style.css
 - spec/internal/app/controllers/admin/users_controller.rb
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/controllers/cuca/cars_controller.rb
@@ -133,6 +133,7 @@ files:
 - spec/internal/public/favicon.ico
 - spec/rails_helper.rb
 - spec/support/retry_on_timeout.rb
+- spec/support/screenshot.rb
 - spec/utils_spec.rb
 - vendor/assets/javascripts/jquery.autosize.js
 - vendor/assets/javascripts/jquery.purr.js
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: It makes any field in place editable by clicking on it, it works for inputs,