on_the_spot 0.0.16 → 0.0.17

data/.rspec

@@ -0,0 +1 @@
+--backtrace

data/History.md

@@ -1,6 +1,11 @@
 # Change History / Release Notes
 
-## Version 0.0.15 (12/10/2011)
+## Version 0.0.17 (1/11/2011)
+
+* added support for `onblur` action: when focus is lost, allow to autosave.
+* make sure that the loadurl can also work if not using a select. This allows the usage of TinyMCE, Markdown or otherwise formatted editable content.
+
+## Version 0.0.16 (12/10/2011)
 
 * added support for checkboxes (thanks to Peter Savichev)
 

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/app/assets/javascripts/on_the_spot_code.js

@@ -11,19 +11,21 @@ $(document).ready(function() {
 });
 
 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 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'),
+        onblur_action = el.attr('data-onblur') || 'cancel',
+        callback      = el.attr('data-callback');
+
 
     var options = {
         tooltip: tooltip_text,
@@ -36,6 +38,8 @@ function initializeOnTheSpot(n){
             //just show the error-msg for now
             alert(xhr.responseText);
         },
+        loadurl: load_url,
+        onblur: onblur_action,
         submitdata: {
           authenticity_token: auth_token,
           _method: 'put'

data/lib/on_the_spot/on_the_spot_helpers.rb

@@ -34,7 +34,6 @@ module OnTheSpot
                              :rows        => 5,
                              :columns     => 40,
                              :url         => {:action => 'update_attribute_on_the_spot'}
-                             
                             )
 
       update_url = url_for(options[:url])
@@ -47,16 +46,11 @@ module OnTheSpot
 
       editable_type = options[:type].nil? ? nil : options[:type].to_sym
       html_options[:'data-edittype']    = editable_type.to_s unless editable_type.nil?
-      if editable_type == :select
-        # we need either a data or loadurl
-        unless options[:loadurl].nil?
-          html_options[:'data-loadurl'] = options[:loadurl]
-        else
-          # we should find a hash
-          select_data = options[:data]
-          raise OnTheSpotMissingParameters.new("Using type select needs either data or loadurl to function!") if select_data.nil?
-          html_options[:'data-select']  = convert_array_to_json(select_data, field_value)
-        end
+      if editable_type == :select && options[:loadurl].nil?
+        # we should find a hash
+        select_data = options[:data]
+        raise OnTheSpotMissingParameters.new("Using type select needs either data or loadurl to function!") if select_data.nil?
+        html_options[:'data-select']  = convert_array_to_json(select_data, field_value)
       elsif editable_type == :textarea
         html_options[:'data-rows']      = options[:rows]
         html_options[:'data-columns']   = options[:columns]
@@ -67,6 +61,8 @@ module OnTheSpot
       html_options[:'data-auth']        = form_authenticity_token if defined? form_authenticity_token
       html_options[:'data-selected']    = options[:selected]
       html_options[:'data-callback']    = options[:callback]
+      html_options[:'data-onblur']      = options[:onblur] if options[:onblur] && ['cancel','submit', 'ignore'].include?(options[:onblur])
+      html_options[:'data-loadurl']     = options[:loadurl] unless options[:loadurl].nil?
         
       content_tag("span", html_options) do
         if options[:display_text]

data/on_the_spot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{on_the_spot}
-  s.version = "0.0.16"
+  s.version = "0.0.17"
 
   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-10-12}
+  s.date = %q{2011-11-06}
   s.description = %q{Unobtrusive in place editing, using jEditable; only works in Rails 3}
   s.email = %q{nathan@dixis.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".bundle/config",
     ".document",
+    ".rspec",
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",

data/spec/on_the_spot_spec.rb

@@ -52,56 +52,64 @@ describe "OnTheSpot" do
           @tester.should_receive(:url_for).with({:action => 'update_attribute_on_the_spot'}).and_return('/bla')
         end
 
-        it "should make the correct html for an edit-field" do
+        it "makes the correct html for an edit-field" do
           @result = @tester.on_the_spot_edit @dummy, :content
           @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-ok=\"ok\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
         end
 
-        it "should make the correct html for an edit-field with text selected on click" do
+        it "makes the correct html for an edit-field with text selected on click" do
           @result = @tester.on_the_spot_edit @dummy, :content, :selected => true
           @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-ok=\"ok\" data-selected=\"true\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
         end
 
-        it "should make the correct html for an edit-field and overrule display-text" do
+        it "makes the correct html for an edit-field and overrule display-text" do
           @result = @tester.on_the_spot_edit @dummy, :content, :display_text => 'jediknight'
           @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-ok=\"ok\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">jediknight</span>"
         end
 
-        it "should make the correct html for a text-area" do
+        it "makes the correct html for a text-area" do
           @result = @tester.on_the_spot_edit @dummy, :content, :type => :textarea
           @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-columns=\"40\" data-edittype=\"textarea\" data-ok=\"ok\" data-rows=\"5\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
         end
 
-        it "should make the correct html for a text-area with text selected on click" do
+        it "makes the correct html for a text-area with text selected on click" do
           @result = @tester.on_the_spot_edit @dummy, :content, :type => :textarea, :selected => true
           @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-columns=\"40\" data-edittype=\"textarea\" data-ok=\"ok\" data-rows=\"5\" data-selected=\"true\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
         end
 
-        it "should make the correct html for a select-box" do
+        it "makes the correct html for a select-box" do
           @result = @tester.on_the_spot_edit @dummy, :content, :type => :select, :data => [['test', 'This a test'], ['prod', 'Pure Production'], ['QA', 'Quality Assurance']]
           @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-edittype=\"select\" data-ok=\"ok\" data-select=\"{ 'test':'This a test', 'prod':'Pure Production', 'QA':'Quality Assurance', 'selected':'test'}\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">This a test</span>"
         end
 
-        it "should make the correct html for a checkbox" do
+        it "makes the correct html for a checkbox" do
           @dummy.stub!(:content).and_return(true)
           @result = @tester.on_the_spot_edit @dummy, :content, :type => :checkbox
           @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-edittype=\"checkbox\" data-ok=\"ok\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">true</span>"
         end
 
-        it "should make the correct html for an edit-field with a callback" do
+        it "makes the correct html for an edit-field with a callback" do
           @result = @tester.on_the_spot_edit @dummy, :content, :callback => 'testCallback(value, settings);'
           @result.should == "<span class=\"on_the_spot_editing\" data-callback=\"testCallback(value, settings);\" data-cancel=\"cancel\" data-ok=\"ok\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
         end
 
+        it "makes the correct html for an edit-field with an onblur action" do
+          @result = @tester.on_the_spot_edit @dummy, :content, :onblur => 'submit'
+          @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-ok=\"ok\" data-onblur=\"submit\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
+        end
 
+        it "makes the correct html for an edit-field with a loadurl" do
+          @result = @tester.on_the_spot_edit @dummy, :content, :loadurl => '/load/data'
+          @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-loadurl=\"/load/data\" data-ok=\"ok\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
+        end
 
         context "a select-box with a loadurl" do
-          it "should make the correct html (and not look up the value)" do
+          it "makea the correct html (and not look up the value)" do
             @result = @tester.on_the_spot_edit @dummy, :content, :type => :select, :loadurl => '/load/data'
             @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-edittype=\"select\" data-loadurl=\"/load/data\" data-ok=\"ok\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
           end
 
-          it "should use the display-text preferrably" do
+          it "usea the display-text preferrably" do
             @result = @tester.on_the_spot_edit @dummy, :content, :type => :select, :loadurl => '/load/data', :display_text => 'ninja'
             @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-edittype=\"select\" data-loadurl=\"/load/data\" data-ok=\"ok\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">ninja</span>"
           end
@@ -113,7 +121,7 @@ describe "OnTheSpot" do
           @tester.should_receive(:url_for).with({:action => 'update_it_otherwise'}).and_return('/bla')
         end
 
-        it "should make the correct html for an edit-field" do
+        it "make the correct html for an edit-field" do
           @result = @tester.on_the_spot_edit @dummy, :content, :url => {:action => 'update_it_otherwise' }
           @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-ok=\"ok\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: on_the_spot
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 +02:00
+date: 2011-11-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ extra_rdoc_files:
 files: 
 - .bundle/config
 - .document
+- .rspec
 - .travis.yml
 - Gemfile
 - Gemfile.lock