on_the_spot 0.0.7 → 0.0.8

data/README.markdown

@@ -60,10 +60,13 @@ The `on_the_spot_edit` also accepts options:
 * `:type`    : `:textarea` or `:select` (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`
 * `:tooltip` : the tooltip-text
 * `:rows`: for textarea, the number of rows, defaults to 5
 * `:columns`: for textarea, the number of columns, defaults to 40
 * `:data`: for select, the lookup-data, should be in an array of id-value pairs. E.g. `[[1, 'ok'], [2, 'not ok'], [3, 'not decided']]`.
+* `: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
 
 
 For the texts: if a text is not specified, the default is taken from the `on_the_spot.en.yml` (or your current language).

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/on_the_spot/on_the_spot_helpers.rb

@@ -7,18 +7,19 @@ module OnTheSpot
     class OnTheSpotMissingParameters < StandardError; end
 
     # Possible options:
-    #   ok_text     : the ok-button text
-    #   cancel_text : the cancel-button text
-    #   tooltip     : the tooltip to show
-    #   type        : {'textarea' || 'select' }
-    #   rows        : nr of rows for textarea
-    #   columns     : nr of columns for textarea
-    #   loadurl     : (for select) an url that will return the json for the select
-    #   data        : (for select) an array of options in the form [id, value]
+    #   ok_text      : the ok-button text
+    #   cancel_text  : the cancel-button text
+    #   tooltip      : the tooltip to show
+    #   type         : {'textarea' || 'select' }
+    #   rows         : nr of rows for textarea
+    #   columns      : nr of columns for textarea
+    #   loadurl      : (for select) an url that will return the json for the select
+    #   display_text : either overrule the normal display-value, or needed when using loadurl
+    #   data         : (for select) an array of options in the form [id, value]
+    #   url          : (optional) URL to post to if you don't want to use the standard routes
     def on_the_spot_edit(object, field, options={})
       #!!! to do: translate options to data-fields
       # Possible fields:
-      #  url?
       #  type: textarea or not
       #  button-translations ok-Text, cancel-Text
       #
@@ -29,10 +30,12 @@ module OnTheSpot
                              :cancel_text => t('on_the_spot.cancel'),
                              :tooltip     => t('on_the_spot.tooltip'),
                              :rows        => 5,
-                             :columns     => 40
+                             :columns     => 40,
+                             :url         => {:action => 'update_attribute_on_the_spot'}
+                             
                             )
 
-      update_url = url_for(:action => 'update_attribute_on_the_spot')
+      update_url = url_for(options[:url])
 
       field_value =  object.send(field.to_sym).to_s
 
@@ -61,7 +64,9 @@ module OnTheSpot
       html_options[:'data-tooltip']     = options[:tooltip]
 
       content_tag("span", html_options) do
-        if editable_type == :select
+        if options[:display_text]
+          options[:display_text]
+        elsif editable_type == :select && options[:loadurl].nil?
           lookup_display_value(select_data, field_value)
         else
           field_value

data/on_the_spot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{on_the_spot}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   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-03-23}
+  s.date = %q{2011-04-25}
   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

@@ -45,22 +45,58 @@ describe "OnTheSpot" do
         @tester.should_receive(:t).with('on_the_spot.ok').and_return("ok")
         @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')
       end
 
-      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
+      context "with standard route" do
+        before(:each) 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
+          @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 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
+          @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
 
-      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>"
+
+
+        context "a select-box with a loadurl" do
+          it "should make 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
+            @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
+        end
       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>"
+      context "with explicit route" do
+        before(:each) 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
+          @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
+
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 +01:00
+date: 2011-04-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency