on_the_spot 0.0.13 → 0.0.14

data/.travis.yml

@@ -2,5 +2,4 @@ rvm:
   - 1.8.7
   - 1.9.2
   - rbx
-  - ree
-  - jruby
+  - ree

data/README.markdown

@@ -1,5 +1,7 @@
 # on_the_spot
 
+[![Build Status](http://travis-ci.org/nathanvda/on_the_spot.png)](http://travis-ci.org/nathanvda/on_the_spot)
+
 On-the-spot is a Rails3 compliant unobtrusive javascript in-place-editing plugin, using jEditable, and depends on jQuery.
 
 ## Installation
@@ -7,12 +9,30 @@ On-the-spot is a Rails3 compliant unobtrusive javascript in-place-editing plugin
 Inside your `Gemfile` add the following:
 
     gem "on_the_spot"
+    
+### Rails 3.1
+
+Add the following to application.js so it compiles to the asset_pipeline
+
+    //= require on_the_spot
+
+### Rails 3.0.x
 
 Run the installation task:
 
     rails g on_the_spot:install
 
-Inside your `routes.rb` you need to provide the following route:
+Inside your `application.html.haml` you will need to add below the default javascripts:
+
+    = javascript_include_tag :on_the_spot
+
+or using erb, you write
+
+    <%= javascript_include_tag :on_the_spot %>
+
+### Routes (for all Rails 3 versions)
+
+Inside your `routes.rb` you need to provide the following route :
 
     resources :posts do
       collection do
@@ -23,13 +43,6 @@ Inside your `routes.rb` you need to provide the following route:
 You need to do this for each controller that uses the on-the-spot editing.
 For the moment i do not know of any better solution, but i am always open for suggestions!
 
-Inside your `application.html.haml` you will need to add below the default javascripts:
-
-    = javascript_include_tag :on_the_spot
-
-or using erb, you write
-
-    <%= javascript_include_tag :on_the_spot %>
 
 That is all you need to do to start using it!
 

data/Rakefile

@@ -27,12 +27,6 @@ RSpec::Core::RakeTask.new(:spec)
 task :default => :spec
 
 
-desc  "Run all specs with rcov"
-RSpec::Core::RakeTask.new("test_cov") do |t|
-  t.rcov = true
-  t.rcov_opts = %w{--rails --include views -Ispec --exclude gems\/,spec\/,features\/,seeds\/}
-end
-
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/app/assets/javascripts/on_the_spot.js

@@ -1,63 +1,7 @@
-$(document).ready(function() {
-
-    $(".on_the_spot_editing").mouseover(function() {
-        $(this).css('background-color', '#EEF2A0');
-    });
-    $(".on_the_spot_editing").mouseout(function() {
-        $(this).css('background-color', 'inherit');
-    });
-    $('.on_the_spot_editing').each(initializeOnTheSpot);
-
-});
-
-function initializeOnTheSpot(n){
-    var el           = $(this),
-        auth_token   = el.attr('data-auth'),
-        data_url     = el.attr('data-url'),
-        ok_text      = el.attr('data-ok') || 'OK',
-        cancel_text  = el.attr('data-cancel') || 'Cancel',
-        tooltip_text = el.attr('data-tooltip') || 'Click to edit ...',
-        edit_type    = el.attr('data-edittype'),
-        select_data  = el.attr('data-select'),
-        rows         = el.attr('data-rows'),
-        columns      = el.attr('data-columns'),
-        load_url     = el.attr('data-loadurl'),
-        selected     = el.attr('data-selected'),
-        callback     = el.attr('data-callback');
-
-    var options = {
-        tooltip: tooltip_text,
-        placeholder: tooltip_text,
-        cancel: cancel_text,
-        submit: ok_text,
-        select: selected,
-        onerror: function (settings, original, xhr) {
-            original.reset();
-            //just show the error-msg for now
-            alert(xhr.responseText);
-        },
-        submitdata: {
-          authenticity_token: auth_token,
-          _method: 'put'
-        },
-        callback: new Function("value", "settings", "return "+callback+"(this, value, settings);")
-    };
-    if (edit_type != null) {
-        options.type = edit_type;
-    }
-    if (edit_type == 'select') {
-        if (select_data != null) {
-            options.data = select_data;
-            options.submitdata['select_array'] = select_data;
-        }
-        if (load_url != null) {
-            options.loadurl = load_url;
-        }
-    }
-    else if (edit_type == 'textarea') {
-        options.rows = rows;
-        options.cols = columns;
-    }
-
-    el.editable(data_url, options)
-}
+// This is the manifest file for rails 3.1
+//
+// now you can use just write
+//    javascript_include_tag :on_the_spot
+//
+//= require jquery.jeditable.mini.js
+//= require on_the_spot_code

data/app/assets/javascripts/on_the_spot_code.js

@@ -0,0 +1,63 @@
+$(document).ready(function() {
+
+    $(".on_the_spot_editing").mouseover(function() {
+        $(this).css('background-color', '#EEF2A0');
+    });
+    $(".on_the_spot_editing").mouseout(function() {
+        $(this).css('background-color', 'inherit');
+    });
+    $('.on_the_spot_editing').each(initializeOnTheSpot);
+
+});
+
+function initializeOnTheSpot(n){
+    var el           = $(this),
+        auth_token   = el.attr('data-auth'),
+        data_url     = el.attr('data-url'),
+        ok_text      = el.attr('data-ok') || 'OK',
+        cancel_text  = el.attr('data-cancel') || 'Cancel',
+        tooltip_text = el.attr('data-tooltip') || 'Click to edit ...',
+        edit_type    = el.attr('data-edittype'),
+        select_data  = el.attr('data-select'),
+        rows         = el.attr('data-rows'),
+        columns      = el.attr('data-columns'),
+        load_url     = el.attr('data-loadurl'),
+        selected     = el.attr('data-selected'),
+        callback     = el.attr('data-callback');
+
+    var options = {
+        tooltip: tooltip_text,
+        placeholder: tooltip_text,
+        cancel: cancel_text,
+        submit: ok_text,
+        select: selected,
+        onerror: function (settings, original, xhr) {
+            original.reset();
+            //just show the error-msg for now
+            alert(xhr.responseText);
+        },
+        submitdata: {
+          authenticity_token: auth_token,
+          _method: 'put'
+        },
+        callback: callback ? new Function("value", "settings", "return "+callback+"(this, value, settings);") : null
+    };
+    if (edit_type != null) {
+        options.type = edit_type;
+    }
+    if (edit_type == 'select') {
+        if (select_data != null) {
+            options.data = select_data;
+            options.submitdata['select_array'] = select_data;
+        }
+        if (load_url != null) {
+            options.loadurl = load_url;
+        }
+    }
+    else if (edit_type == 'textarea') {
+        options.rows = rows;
+        options.cols = columns;
+    }
+
+    el.editable(data_url, options)
+}

data/lib/on_the_spot.rb

@@ -5,7 +5,7 @@ module OnTheSpot
   class Engine < ::Rails::Engine
 
     config.before_initialize do
-      config.action_view.javascript_expansions[:on_the_spot] = %w(jquery.jeditable.mini.js on_the_spot)
+      config.action_view.javascript_expansions[:on_the_spot] = %w(jquery.jeditable.mini.js on_the_spot_code)
     end
 
     # configure our plugin on boot. other extension points such

data/on_the_spot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{on_the_spot}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = %q{2011-07-24}
+  s.date = %q{2011-09-13}
   s.description = %q{Unobtrusive in place editing, using jEditable; only works in Rails 3}
   s.email = %q{nathan@dixis.com}
   s.extra_rdoc_files = [
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/assets/javascripts/jquery.jeditable.mini.js",
     "app/assets/javascripts/on_the_spot.js",
+    "app/assets/javascripts/on_the_spot_code.js",
     "lib/generators/on_the_spot/install/install_generator.rb",
     "lib/generators/on_the_spot/install/templates/jquery.jeditable.mini.js",
     "lib/generators/on_the_spot/install/templates/on_the_spot.en.yml",
@@ -39,6 +40,7 @@ Gem::Specification.new do |s|
     "spec/dummy/Rakefile",
     "spec/dummy/app/controllers/application_controller.rb",
     "spec/dummy/app/helpers/application_helper.rb",
+    "spec/dummy/app/models/post.rb",
     "spec/dummy/app/views/layouts/application.html.erb",
     "spec/dummy/config.ru",
     "spec/dummy/config/application.rb",
@@ -55,6 +57,8 @@ Gem::Specification.new do |s|
     "spec/dummy/config/initializers/session_store.rb",
     "spec/dummy/config/locales/en.yml",
     "spec/dummy/config/routes.rb",
+    "spec/dummy/db/migrate/20110724190901_create_posts.rb",
+    "spec/dummy/db/schema.rb",
     "spec/dummy/public/404.html",
     "spec/dummy/public/422.html",
     "spec/dummy/public/500.html",

data/spec/dummy/app/models/post.rb

@@ -0,0 +1,2 @@
+class Post < ActiveRecord::Base
+end

data/spec/dummy/db/migrate/20110724190901_create_posts.rb

@@ -0,0 +1,14 @@
+class CreatePosts < ActiveRecord::Migration
+  def self.up
+    create_table :posts do |t|
+      t.string :title
+      t.string :content
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :posts
+  end
+end

data/spec/dummy/db/schema.rb

@@ -0,0 +1,22 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20110724190901) do
+
+  create_table "posts", :force => true do |t|
+    t.string   "title"
+    t.string   "content"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

data/spec/generators/install_generator_spec.rb

@@ -1,16 +1,21 @@
 require 'spec_helper'
+
+
 require 'generator_spec/test_case'
 require 'generators/on_the_spot/install/install_generator'
 
+require 'rspec/mocks'
+
 describe OnTheSpot::Generators::InstallGenerator do
   include GeneratorSpec::TestCase
 
   destination File.expand_path("../../tmp", __FILE__)
 
+
   context "in rails 3.0" do
     context "with no arguments" do
-      before(:all) do
-        ::Rails.stub(:version) { '3.0.8' }
+      before(:each) do
+        Rails.stub(:version) { '3.0.8' }
         prepare_destination
         run_generator
       end
@@ -32,8 +37,8 @@ describe OnTheSpot::Generators::InstallGenerator do
 
   context "in rails 3.1" do
     context "with no arguments" do
-      before(:all) do
-        ::Rails.stub(:version) { '3.1.0' }
+      before(:each) do
+        Rails.stub(:version) { '3.1.0' }
         prepare_destination
         run_generator
       end

data/spec/spec_helper.rb

@@ -4,8 +4,11 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 require "rspec/rails"
+require "rspec/mocks"
 require 'simplecov'
 
+SimpleCov.start 'rails'
+
 ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = "test.com"
@@ -26,8 +29,8 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 RSpec.configure do |config|
   # Remove this line if you don't want RSpec's should and should_not
   # methods or matchers
-  require 'rspec/expectations'
-  config.include RSpec::Matchers
+  #require 'rspec/expectations'
+  #config.include RSpec::Matchers
 
   # == Mock Framework
   config.mock_with :rspec

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: on_the_spot
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-24 00:00:00 +02:00
+date: 2011-09-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,7 @@ files:
 - VERSION
 - app/assets/javascripts/jquery.jeditable.mini.js
 - app/assets/javascripts/on_the_spot.js
+- app/assets/javascripts/on_the_spot_code.js
 - lib/generators/on_the_spot/install/install_generator.rb
 - lib/generators/on_the_spot/install/templates/jquery.jeditable.mini.js
 - lib/generators/on_the_spot/install/templates/on_the_spot.en.yml
@@ -99,6 +100,7 @@ files:
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/models/post.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
@@ -115,6 +117,8 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
+- spec/dummy/db/migrate/20110724190901_create_posts.rb
+- spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html