on_the_spot 0.0.14 → 0.0.16

data/History.md

@@ -1,5 +1,18 @@
 # Change History / Release Notes
 
+## Version 0.0.15 (12/10/2011)
+
+* added support for checkboxes (thanks to Peter Savichev)
+
+## Version 0.0.14 (13/9/2011)
+
+* Fixed bugs #17 and #20
+* Improved rails 3.1 compatibility
+
+## Version 0.0.13 (24/7/2011)
+
+* Made on_the_spot rails 3.1 compatible
+
 ## Version 0.0.12 (02/07/2011)
 
 * Added the option to execute a callback after editing

data/README.markdown

@@ -9,18 +9,25 @@ On-the-spot is a Rails3 compliant unobtrusive javascript in-place-editing plugin
 Inside your `Gemfile` add the following:
 
     gem "on_the_spot"
-    
+
+Run the installation task:
+
+    rails g on_the_spot:install
+
+This will copy the default translation files, and for rails 3.0 it will also copy the needed assets (javascript files).
+
 ### Rails 3.1
 
 Add the following to application.js so it compiles to the asset_pipeline
 
     //= require on_the_spot
 
-### Rails 3.0.x
+Or, inside your `application.html.haml` you could still include the needed javascripts, using
 
-Run the installation task:
+    = javascript_include_tag :on_the_spot
 
-    rails g on_the_spot:install
+
+### Rails 3.0.x
 
 Inside your `application.html.haml` you will need to add below the default javascripts:
 
@@ -70,7 +77,7 @@ It should be as simple as that :)
 
 The `on_the_spot_edit` also accepts options:
 
-* `:type`    : `:textarea` or `:select` (none means default edit)
+* `:type`    : `:textarea`, `:select` or `:checkbox` (none means default edit)
 * `:ok_text` : the text for the ok-button
 * `:cancel_text` : the text for the cancel-button
 * `:display_text`: if you want to overrule the displayed text, especially useful when using your own `:url` or `:loadurl`
@@ -81,7 +88,7 @@ The `on_the_spot_edit` also accepts options:
 * `:loadurl`: for select, an url that will return the data in JSON format (use instead of `:data`)
 * `:url`: URL to post to if you don't want to use the standard routes
 * `:selected`: Text selected by default on edit (boolean, default is false)
-* `:callback`: The name of a javascript function that is called after form has been submitted 
+* `:callback`: The name of a javascript function that is called after form has been submitted
 
 
 For the texts: if a text is not specified, the default is taken from the `on_the_spot.en.yml` (or your current language).
@@ -132,7 +139,7 @@ and, after a `bundle install`, you run
 That will download and install all the necessary files for you.
 
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.16

data/app/assets/javascripts/jquery.jeditable.checkbox.js

@@ -0,0 +1,26 @@
+/**********************************************************************
+ *	Custom input types for the jquery.jeditable plugin
+ * By Richard Davies <Richard__at__richarddavies.us>, 2009
+ * By Peter Savichev (proton) <psavichev@gmail.com>, 2011
+ *********************************************************************/
+
+// Create a custom input type for checkboxes
+$.editable.addInputType("checkbox", {
+	element : function(settings, original) {
+		var input = $('<input type="checkbox">');
+		$(this).append(input);
+
+		$(input).change(function() {
+			var value = $(input).attr("checked") ? 1 : 0;
+			$(input).val(value);
+		});
+		return(input);
+	},
+	content : function(string, settings, original) {
+		var checked = (string == "true") ? 1 : 0;
+		var input = $(':input:first', this);
+		if(checked) $(input).attr("checked", "checked");
+		else $(input).removeAttr("checked");
+		$(input).val(checked);
+	}
+});

data/app/assets/javascripts/on_the_spot.js

@@ -4,4 +4,5 @@
 //    javascript_include_tag :on_the_spot
 //
 //= require jquery.jeditable.mini.js
+//= require jquery.jeditable.checkbox.js
 //= require on_the_spot_code

data/lib/generators/on_the_spot/install/install_generator.rb

@@ -15,6 +15,7 @@ module OnTheSpot
         else
           copy_file "../../../../../app/assets/javascripts/on_the_spot.js", "public/javascripts/on_the_spot.js"
           copy_file "../../../../../app/assets/javascripts/jquery.jeditable.mini.js", "public/javascripts/jquery.jeditable.mini.js"
+          copy_file "../../../../../app/assets/javascripts/jquery.jeditable.checkbox.js", "public/javascripts/jquery.jeditable.checkbox.js"
         end
       end
 

data/on_the_spot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{on_the_spot}
-  s.version = "0.0.14"
+  s.version = "0.0.16"
 
   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-09-13}
+  s.date = %q{2011-10-12}
   s.description = %q{Unobtrusive in place editing, using jEditable; only works in Rails 3}
   s.email = %q{nathan@dixis.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "README.markdown",
     "Rakefile",
     "VERSION",
+    "app/assets/javascripts/jquery.jeditable.checkbox.js",
     "app/assets/javascripts/jquery.jeditable.mini.js",
     "app/assets/javascripts/on_the_spot.js",
     "app/assets/javascripts/on_the_spot_code.js",

data/spec/generators/install_generator_spec.rb

@@ -29,8 +29,10 @@ describe OnTheSpot::Generators::InstallGenerator do
         test_version.should be_false
       end
 
-      it "copies on_the_spot.js to the correct folder" do
-        assert_file "public/javascripts/on_the_spot.js"
+      ['on_the_spot.js', 'jquery.jeditable.mini.js', 'jquery.jeditable.checkbox.js'].each do |js_file|
+        it "copies #{js_file} to the correct folder" do
+          assert_file "public/javascripts/#{js_file}"
+        end
       end
     end
   end
@@ -43,8 +45,10 @@ describe OnTheSpot::Generators::InstallGenerator do
         run_generator
       end
 
-      it "does not copy on_the_spot.js" do
-        assert_no_file "public/javascripts/on_the_spot.js"
+      ['on_the_spot.js', 'jquery.jeditable.mini.js', 'jquery.jeditable.checkbox.js'].each do |js_file|
+        it "does not copy #{js_file}" do
+          assert_no_file "public/javascripts/#{js_file}"
+        end
       end
     end
   end

data/spec/on_the_spot_spec.rb

@@ -56,7 +56,7 @@ describe "OnTheSpot" 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
           @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>"
@@ -71,7 +71,7 @@ describe "OnTheSpot" 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
           @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>"
@@ -81,7 +81,13 @@ describe "OnTheSpot" 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
+          @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
           @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>"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: on_the_spot
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 +02:00
+date: 2011-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- app/assets/javascripts/jquery.jeditable.checkbox.js
 - app/assets/javascripts/jquery.jeditable.mini.js
 - app/assets/javascripts/on_the_spot.js
 - app/assets/javascripts/on_the_spot_code.js