on_the_spot 0.0.3 → 0.0.4

data/Gemfile

@@ -7,4 +7,6 @@ gem "json_pure"
 group :test do
   gem "rspec",   ">= 2.0.0.rc"
   gem "actionpack", ">=3.0.0"
+  #gem "rcov"
+  gem "simplecov", :require => false
 end

data/Gemfile.lock

@@ -47,6 +47,9 @@ GEM
       rspec-expectations (= 2.0.0.rc)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
+    simplecov (0.3.6)
+      simplecov-html (>= 0.3.7)
+    simplecov-html (0.3.8)
     tzinfo (0.3.23)
 
 PLATFORMS
@@ -55,5 +58,7 @@ PLATFORMS
 DEPENDENCIES
   actionpack (>= 3.0.0)
   jeweler
+  json_pure
   rake
   rspec (>= 2.0.0.rc)
+  simplecov

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/generators/on_the_spot/install/templates/on_the_spot.js

@@ -21,7 +21,12 @@ $(document).ready(function() {
         var options = {
             tooltip: tooltip_text,
             cancel: cancel_text,
-            submit: ok_text
+            submit: ok_text,
+            onerror: function (settings, original, xhr) {
+                original.reset();
+                //just show the error-msg for now
+                alert(xhr.responseText);
+            }
         };
         if (edit_type != null) {
             options.type = edit_type;
@@ -37,7 +42,7 @@ $(document).ready(function() {
         }
         else if (edit_type == 'textarea') {
             options.rows = rows;
-            options.columns = columns;
+            options.cols = columns;
         }
 
         el.editable(data_url, options)

data/lib/on_the_spot/controller_extension.rb

@@ -13,12 +13,15 @@ module OnTheSpot
           klass, field, id = params[:id].split('__')
           select_data = params[:select_array]
           object = klass.camelize.constantize.find(id)
-          object.update_attribute(field, params[:value])
-          if select_data.nil?
-            render :text => CGI::escapeHTML(object.send(field).to_s)
+          if object.update_attributes(field => params[:value])
+            if select_data.nil?
+              render :text => CGI::escapeHTML(object.send(field).to_s)
+            else
+              parsed_data = JSON.parse(select_data.gsub("'", '"'))
+              render :text => parsed_data[object.send(field).to_s]
+            end
           else
-            parsed_data = JSON.parse(select_data.gsub("'", '"'))
-            render :text => parsed_data[object.send(field).to_s]
+            render :text => object.errors.full_messages.join("\n"), :status => 422
           end
         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.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = %q{2010-10-07}
+  s.date = %q{2010-11-05}
   s.description = %q{Unobtrusive in place editing, using jEditable; only works in Rails 3}
   s.email = %q{nathan@dixis.com}
   s.extra_rdoc_files = [

data/spec/on_the_spot_spec.rb

@@ -37,7 +37,7 @@ describe "OnTheSpot" do
       end
     end
 
-    context "creating a simple edit-field" do
+    context "the helpers" do
       before(:each) do
         @dummy = mock()
         @dummy.stub!(:content).and_return('test')
@@ -46,11 +46,22 @@ describe "OnTheSpot" do
         @tester.should_receive(:t).with('on_the_spot.cancel').and_return("cancel")
         @tester.should_receive(:t).with('on_the_spot.tooltip').and_return("tooltip")
         @tester.should_receive(:url_for).and_return('/bla')
-        @result = @tester.on_the_spot_edit @dummy, :content
       end
-      it "should make the correct html" do
+
+      it "should make 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 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 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
     end
   end
 end

data/spec/spec_helper.rb

@@ -3,24 +3,10 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rspec/core'
 #require 'autotest/rspec2'
 
-
+require 'simplecov'
+SimpleCov.start 'rails'
 
 RSpec.configure do |c|
   c.color_enabled = true
-#  c.filter_run :focused => true
-#  c.run_all_when_everything_filtered = true
-#  c.filter_run_excluding :ruby => lambda {|version|
-#    case version.to_s
-#    when "!jruby"
-#      RUBY_ENGINE != "jruby"
-#    when /^> (.*)/
-#      !(RUBY_VERSION.to_s > $1)
-#    else
-#      !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
-#    end
-#  }
-#  c.around do |example|
-#    sandboxed { example.run }
-#  end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-11-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency