best_in_place 2.1.0 → 3.0.0.rc1

data/spec/integration/live_spec.rb

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require "spec_helper"
 
 describe "Monitor new fields", :js => true do
   before do
@@ -22,19 +21,19 @@ describe "Monitor new fields", :js => true do
     sleep(1) #give time to the ajax request to work
 
     within("#email") do
-      page.should have_content("lucianapoli@gmail")
+      expect(page).to have_content("lucianapoli@gmail")
     end
 
     bip_text @user, :email, "new@email.com"
 
     within("#email") do
-      page.should have_content("new@email.com")
+      expect(page).to 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")
+      expect(page).to have_content("new_two@email.com")
     end
   end
 end

data/spec/integration/text_area_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require "spec_helper"
+require 'rails_helper'
 
 describe "JS behaviour", :js => true do
   before do
@@ -18,14 +18,14 @@ describe "JS behaviour", :js => true do
     @user.save!
     visit user_path(@user)
     within("#description") do
-      page.should have_content("User description")
+      expect(page).to have_content("User description")
     end
 
     bip_area @user, :description, "A new description"
 
     visit user_path(@user)
     within("#description") do
-      page.should have_content("A new description")
+      expect(page).to have_content("A new description")
     end
   end
 
@@ -34,7 +34,7 @@ describe "JS behaviour", :js => true do
     @user.save!
     visit user_path(@user)
     within("#dw_description") do
-      page.should have_content("I'm so awesome")
+      expect(page).to have_content("I'm so awesome")
     end
   end
 end

data/spec/internal/app/assets/javascripts/application.js

@@ -0,0 +1,37 @@
+//= require jquery
+//= require jquery-ui
+//= require jquery.purr
+//= require best_in_place
+//= require best_in_place.jquery-ui
+//= require best_in_place.purr
+//= require_self
+
+$(document).ready(function() {
+  /* Activating Best In Place */
+  jQuery(".best_in_place").best_in_place();
+});
+
+
+/* Inicialització en català per a l'extenció 'calendar' per jQuery. */
+/* Writers: (joan.leon@gmail.com). */
+jQuery(function($){
+    $.datepicker.regional['ca'] = {
+        closeText: 'Tancar',
+        prevText: '<Ant',
+        nextText: 'Seg>',
+        currentText: 'Avui',
+        monthNames: ['Gener','Febrer','Març','Abril','Maig','Juny',
+            'Juliol','Agost','Setembre','Octubre','Novembre','Desembre'],
+        monthNamesShort: ['Gen','Feb','Mar','Abr','Mai','Jun',
+            'Jul','Ago','Set','Oct','Nov','Des'],
+        dayNames: ['Diumenge','Dilluns','Dimarts','Dimecres','Dijous','Divendres','Dissabte'],
+        dayNamesShort: ['Dug','Dln','Dmt','Dmc','Djs','Dvn','Dsb'],
+        dayNamesMin: ['Dg','Dl','Dt','Dc','Dj','Dv','Ds'],
+        weekHeader: 'Sm',
+        dateFormat: 'dd-mm-yy',
+        firstDay: 1,
+        isRTL: false,
+        showMonthAfterYear: false,
+        yearSuffix: ''};
+    $.datepicker.setDefaults($.datepicker.regional['ca']);
+});

data/{test_app → spec/internal}/app/assets/stylesheets/jquery-ui-1.8.16.custom.css.erb

@@ -345,8 +345,7 @@
 
 /* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
 .ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
+    display: block; /*sorry for IE5*/
     position: absolute; /*must have*/
     z-index: -1; /*must have*/
     filter: mask(); /*must have*/

data/{test_app → spec/internal}/app/assets/stylesheets/scaffold.css

@@ -55,6 +55,6 @@ div.field, div.actions {
   list-style: square;
 }
 
-span.nil {
+span.placeholder {
   color: #999;
 }

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

@@ -36,8 +36,7 @@ textarea {
   min-width: 40em;
 }
 .best_in_place {
-  padding: .1m;
-  cursor: hand;
+  padding: 0.1em;
   cursor: pointer;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
@@ -53,7 +52,6 @@ textarea {
 }
 .info_edit {
   float: right;
-  cursor: hand;
   cursor: pointer;
 }
 
@@ -83,5 +81,5 @@ textarea {
   width: 25px;
   height: 25px;
   text-indent: -9999px;
-  background: url("/images/close-button.gif") no-repeat;
+  background: url(<%= image_path("purrClose.png") %>) no-repeat;
 }

data/{test_app → spec/internal}/app/controllers/admin/users_controller.rb

@@ -5,10 +5,15 @@ class Admin::UsersController < ApplicationController
 
   def update
     @user = User.find(params[:id])
-
     respond_to do |format|
-      @user.update_attributes(params[:user])
-      format.json { respond_with_bip(@user) }
+      @user.update_attributes(user_params)
+      format.json { respond_with_bip(@user, param: :admin) }
     end
   end
+
+  private
+
+  def user_params
+    params.require(:admin).permit!
+  end
 end

data/{test_app → 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.to_a
+    @countries = COUNTRIES
 
     respond_to do |format|
       format.html # show.html.erb
@@ -29,23 +29,12 @@ class UsersController < ApplicationController
 
   def show_ajax
     @user = User.find(params[:id])
-    @countries = COUNTRIES.to_a
+    @countries = COUNTRIES
   end
 
   def double_init
     @user = User.find(params[:id])
-    @countries = COUNTRIES.to_a
-  end
-
-  # GET /users/new
-  # GET /users/new.xml
-  def new
-    @user = User.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @user }
-    end
+    @countries = COUNTRIES
   end
 
   # GET /users/1/edit
@@ -53,29 +42,13 @@ class UsersController < ApplicationController
     @user = User.find(params[:id])
   end
 
-  # POST /users
-  # POST /users.xml
-  def create
-    @user = User.new(params[:user])
-
-    respond_to do |format|
-      if @user.save
-        format.html { redirect_to(@user, :notice => 'User was successfully created.') }
-        format.xml  { render :xml => @user, :status => :created, :location => @user }
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
   # PUT /users/1
   # PUT /users/1.xml
   def update
     @user = User.find(params[:id])
 
     respond_to do |format|
-      if @user.update_attributes(params[:user])
+      if @user.update_attributes(user_params)
         format.html { redirect_to(@user, :notice => 'User was successfully updated.') }
         format.json { respond_with_bip(@user) }
       else
@@ -85,15 +58,10 @@ class UsersController < ApplicationController
     end
   end
 
-  # DELETE /users/1
-  # DELETE /users/1.xml
-  def destroy
-    @user = User.find(params[:id])
-    @user.destroy
 
-    respond_to do |format|
-      format.html { redirect_to(users_url) }
-      format.xml  { head :ok }
-    end
+ private
+
+  def user_params
+    params.require(:user).permit!
   end
 end

data/spec/internal/app/helpers/users_helper.rb

@@ -0,0 +1,29 @@
+#encoding: utf-8
+module UsersHelper
+  def height_collection
+    {
+        'h51' => %{5' 1"},
+        'h52' => %{5' 2"},
+        'h53' => %{5' 3"},
+        'h54' => %{5' 4"},
+        'h55' => %{5' 5"},
+        '5\' 6"' => %{5' 6"}, # Using space and quotes in value is just asking for troubles
+        '5\' 7"' => %{5' 7"},
+        'h58' => %{5' 8"},
+        'h59' => %{5' 9"},
+        '5\' 10"' => %{5' 10"},
+        'h511' => %{5' 11"},
+        'h60' => %{6' 0"},
+        'h61' => %{6' 1"},
+        'h62' => %{6' 2"},
+        'h63' => %{6' 3"},
+        'h64' => %{6' 4"},
+        'h65' => %{6' 5"},
+        'h66' => %{6' 6"}
+    }
+  end
+
+  def bb(value)
+    "#{value} €"
+  end
+end

data/{test_app → spec/internal}/app/models/user.rb

@@ -10,7 +10,7 @@ class User < ActiveRecord::Base
     :presence => {:message => "can't be blank"}
   validates :email,
     :presence => {:message => "can't be blank"},
-    :format => {:with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :message => "has wrong email format"}
+    :format => {:with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :message => "has wrong email format"}
   validates :zip, :numericality => true, :length => { :minimum => 5 }
   validates_numericality_of :money, :allow_blank => true
   validates_numericality_of :money_proc, :allow_blank => true
@@ -24,4 +24,8 @@ class User < ActiveRecord::Base
   def markdown_desc
     RDiscount.new(description).to_html.html_safe
   end
+
+  def zip_format
+    nil
+  end
 end

data/{test_app → spec/internal}/app/views/admin/users/show.html.erb

@@ -6,13 +6,13 @@
   <table>
     <tr>
       <td id="name">
-        <%= best_in_place [:admin, @user], :name %>
+        <%= best_in_place @user, :name, url: {action: :update} , param: :admin %>
       </td>
     </tr>
     <tr>
       <td>Last Name</td>
       <td id="last_name">
-        <%= best_in_place [:admin, @user], :last_name, :nil => "Nothing to show" %>
+        <%= best_in_place [:admin, @user], :last_name, place_holder: 'Nothing to show' , param: :admin %>
       </td>
     </tr>
   </table>

data/{test_app → spec/internal}/app/views/layouts/application.html.erb

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Best In Place TEST APP</title>
+  <title>Best In Place TEST APP <%= Rails::VERSION::STRING %></title>
   <%= stylesheet_link_tag "scaffold", "style", "jquery-ui-1.8.16.custom" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tag %>

data/{test_app → spec/internal}/app/views/users/_form.html.erb

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

data/{test_app → spec/internal}/app/views/users/double_init.html.erb

@@ -7,13 +7,7 @@
     <tr>
       <td>Name <a id="editme" href="#">(edit me)</a></td>
       <td id="name">
-        <%= best_in_place @user, :name, :type => :input, :activator => "#editme" %>
-      </td>
-    </tr>
-    <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, :name, as: :input, :activator => "#editme" %>
       </td>
     </tr>
     <tr>
@@ -37,19 +31,19 @@
     <tr>
       <td>Country</td>
       <td id="country">
-        <%= best_in_place @user, :country, :type => :select, :collection => @countries %>
+        <%= best_in_place @user, :country, as: :select, :collection => @countries %>
       </td>
     </tr>
     <tr>
       <td>Receive newsletter?</td>
       <td id="receive_email">
-        <%= best_in_place @user, :receive_email, :type => :checkbox, :collection => ["No thanks", "Yes of course"] %>
+        <%= best_in_place @user, :receive_email, as: :checkbox, collection: {'false'=>"No thanks", 'true'=>"Yes of course"} %>
       </td>
     </tr>
     <tr>
       <td>User description</td>
       <td id="description">
-        <%= best_in_place @user, :description, :type => :textarea, :sanitize => false %>
+        <%= best_in_place @user, :description, as: :textarea, :raw => true %>
       </td>
     </tr>
     <tr>