best_in_place 0.2.3 → 1.0.0

data/.travis.yml

@@ -9,3 +9,8 @@ env: "RAILS_ENV=test DISPLAY=:99.0"
 before_script:
   - "sh -c 'cd test_app && bundle && bundle exec rake db:drop db:migrate'"
   - "sh -e /etc/init.d/xvfb start"
+
+branches:
+  only:
+    - master
+    - rails-3.0

data/Gemfile

@@ -4,3 +4,4 @@ source "http://rubygems.org"
 gemspec
 
 gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'jquery-rails'

data/best_in_place.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 3.0.0"
+  s.add_dependency "rails", "~> 3.1.0"
+  s.add_dependency "jquery-rails"
 
   s.add_development_dependency "rspec-rails", "~> 2.7.0"
   s.add_development_dependency "nokogiri", ">= 1.5.0"

data/{test_app/public → lib/assets}/javascripts/best_in_place.js

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

data/lib/best_in_place.rb

@@ -1,8 +1,6 @@
-require "best_in_place/utils"
 require "best_in_place/helper"
+require "best_in_place/engine"
 
 module BestInPlace
   autoload :TestHelpers, "best_in_place/test_helpers"
 end
-
-ActionView::Base.send(:include, BestInPlace::BestInPlaceHelpers)

data/lib/best_in_place/engine.rb

@@ -0,0 +1,7 @@
+module BestInPlace
+  class Engine < Rails::Engine
+    initializer "setup for rails" do
+      ActionView::Base.send(:include, BestInPlace::BestInPlaceHelpers)
+    end
+  end
+end

data/lib/best_in_place/helper.rb

@@ -1,6 +1,5 @@
 module BestInPlace
   module BestInPlaceHelpers
-
     def best_in_place(object, field, opts = {})
       opts[:type] ||= :input
       opts[:collection] ||= []
@@ -21,7 +20,7 @@ module BestInPlace
         collection = opts[:collection].to_json
       end
       out = "<span class='best_in_place'"
-      out << " id='#{BestInPlace::Utils.build_best_in_place_id(object, field)}'"
+      out << " id='best_in_place_#{object.class.to_s.gsub("::", "_").underscore}_#{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,37 +1,24 @@
 module BestInPlace
   module TestHelpers
-
-    def bip_area(model, attr, new_value)
-      id = BestInPlace::Utils.build_best_in_place_id model, attr
-      page.execute_script <<-JS
-        $("##{id}").click();
-        $("##{id} form textarea").val('#{new_value}');
-        $("##{id} form textarea").blur();
-      JS
-    end
-
     def bip_text(model, attr, new_value)
-      id = BestInPlace::Utils.build_best_in_place_id model, attr
       page.execute_script <<-JS
-        $("##{id}").click();
-        $("##{id} input[name='#{attr}']").val('#{new_value}');
-        $("##{id} form").submit();
+        $("#best_in_place_#{model}_#{attr}").click();
+        $("#best_in_place_#{model}_#{attr} input[name='#{attr}']").val('#{new_value}');
+        $("#best_in_place_#{model}_#{attr} form").submit();
       JS
     end
 
     def bip_bool(model, attr)
-      id = BestInPlace::Utils.build_best_in_place_id model, attr
-      page.execute_script("$('##{id}').click();")
+      page.execute_script("$('#best_in_place_#{model}_#{attr}').click();")
     end
 
     def bip_select(model, attr, name)
-      id = BestInPlace::Utils.build_best_in_place_id model, attr
       page.execute_script <<-JS
         (function() {
-          $("##{id}").click();
-          var opt_value = $("##{id} select option:contains('#{name}')").attr('value');
-          $("##{id} select option[value='" + opt_value + "']").attr('selected', true);
-          $("##{id} select").change();
+          $("#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();
         })();
       JS
     end

data/lib/best_in_place/version.rb

@@ -1,3 +1,3 @@
 module BestInPlace
-  VERSION = "0.2.3"
+  VERSION = "1.0.0"
 end

data/spec/helpers/best_in_place_spec.rb

@@ -26,18 +26,8 @@ describe BestInPlace::BestInPlaceHelpers do
         @span = nk.css("span")
       end
 
-      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
+      it "should have a proper id" do
+        @span.attribute("id").value.should == "best_in_place_user_name"
       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 do
+describe "Double initialization bug", :js => true, :pending => true do
   before do
     @user = User.new :name => "Lucia",
       :last_name => "Napoli",
@@ -21,7 +21,7 @@ describe "Double initialization bug", :js => 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 bip_text to update a text field" do
+  it "should be able to use the 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/Gemfile

@@ -1,7 +1,14 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.0.0'
-
-gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'rails', '~> 3.1.0'
+gem 'sqlite3'
 
 gem 'best_in_place', :path => ".."
+
+gem 'jquery-rails'
+
+group :assets do
+  gem 'sass-rails',   '~> 3.1.4'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'uglifier', '>= 1.0.3'
+end

data/test_app/{public → app/assets}/javascripts/application.js

@@ -1,5 +1,6 @@
-// Place your application-specific JavaScript functions and classes here
-// This file is automatically included by javascript_include_tag :defaults
+//= require jquery
+//= require best_in_place
+//= require jquery.purr
 
 $(document).ready(function() {
   /* Activating Best In Place */

data/test_app/app/views/layouts/application.html.erb

@@ -3,7 +3,7 @@
 <head>
   <title>Best In Place TEST APP</title>
   <%= stylesheet_link_tag "scaffold", "style" %>
-  <%= javascript_include_tag "jquery-1.4.4.min", "rails", "jquery.purr", "best_in_place", "application" %>
+  <%= javascript_include_tag "application" %>
   <%= csrf_meta_tag %>
 </head>
 <body>

data/test_app/config/application.rb

@@ -2,9 +2,12 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
 
 module BipApp
   class Application < Rails::Application
@@ -38,5 +41,11 @@ module BipApp
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000 Z
+date: 2011-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &73120460 !ruby/object:Gem::Requirement
+  requirement: &81861640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *81861640
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: &81861380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73120460
+  version_requirements: *81861380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &73117090 !ruby/object:Gem::Requirement
+  requirement: &81860990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *73117090
+  version_requirements: *81860990
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &73114350 !ruby/object:Gem::Requirement
+  requirement: &81860690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: *73114350
+  version_requirements: *81860690
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &73139010 !ruby/object:Gem::Requirement
+  requirement: &81860440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +65,7 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *73139010
+  version_requirements: *81860440
 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
@@ -72,24 +83,26 @@ files:
 - README.md
 - Rakefile
 - best_in_place.gemspec
+- lib/assets/javascripts/best_in_place.js
+- lib/assets/javascripts/jquery.purr.js
 - lib/best_in_place.rb
+- lib/best_in_place/engine.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
-- public/javascripts/jquery-1.4.4.js
-- public/javascripts/jquery.purr.js
 - spec/helpers/best_in_place_spec.rb
 - spec/integration/double_init_spec.rb
 - spec/integration/js_spec.rb
-- spec/integration/text_area_spec.rb
 - spec/spec_helper.rb
 - test_app/Gemfile
 - test_app/Gemfile.lock
 - test_app/README
 - test_app/Rakefile
+- test_app/app/assets/images/red_pen.png
+- test_app/app/assets/javascripts/application.js
+- test_app/app/assets/stylesheets/.gitkeep
+- test_app/app/assets/stylesheets/scaffold.css
+- test_app/app/assets/stylesheets/style.css
 - test_app/app/controllers/application_controller.rb
 - test_app/app/controllers/users_controller.rb
 - test_app/app/helpers/application_helper.rb
@@ -129,17 +142,7 @@ files:
 - test_app/public/422.html
 - test_app/public/500.html
 - test_app/public/favicon.ico
-- test_app/public/images/rails.png
-- test_app/public/images/red_pen.png
-- test_app/public/javascripts/application.js
-- test_app/public/javascripts/best_in_place.js
-- test_app/public/javascripts/jquery-1.4.4.min.js
-- test_app/public/javascripts/jquery.purr.js
-- test_app/public/javascripts/rails.js
 - test_app/public/robots.txt
-- test_app/public/stylesheets/.gitkeep
-- test_app/public/stylesheets/scaffold.css
-- test_app/public/stylesheets/style.css
 - test_app/script/rails
 - test_app/test/fixtures/users.yml
 - test_app/test/functional/users_controller_test.rb
@@ -162,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -48281395
+      hash: 151823247
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -171,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -48281395
+      hash: 151823247
 requirements: []
 rubyforge_project: best_in_place
 rubygems_version: 1.8.10