on_the_spot 0.0.18 → 1.0.0

data/README.markdown

@@ -37,9 +37,9 @@ Or, inside your `application.html.haml` you could still include the needed javas
 
     = javascript_include_tag :on_the_spot
 
-To use the default styling, add the following to application.css so it compiles to the asset_pipeline
+To use the default styling, add the following to `application.css` so it compiles to the asset_pipeline
 
-	//= require on_the_spot
+	*= require on_the_spot
 
 Or, inside your `application.html.haml` you could still include the needed css, using
 
@@ -122,6 +122,7 @@ The `on_the_spot_edit` also accepts options:
 * `:display_method`: the name of a method that is used to get the value to display of a field. When you use this, we will automatically
    attempt to look up the raw value of the field to edit.  This differs from the `:display_text` option, as this will also be called after update.
    This supersedes the `:display_text` option.
+* `:raw`: if set to true, evaluate the field value as raw HTML.
 
 
 For the texts: if a text is not specified, the default is taken from the `on_the_spot.en.yml` (or your current language).
@@ -165,7 +166,7 @@ You can use these classes to style the elements.
 When using `on_the_spot` together with `cancan`, you will have to explicitly exclude the on_the_spot method,
 like so:
 
-    before_filter :load_and_authorize_resource, :except => [:update_attribute_on_the_spot]
+    load_and_authorize_resource :except => [:update_attribute_on_the_spot, :get_attribute_on_the_spot]
     
 The `load_and_authorize_resource` will try to find the object, based on the id in the parameters, but `on_the_spot` uses a different
 encoding to store the object, field and id in one attribute. So if you exclude that, there will not be a problem.

data/VERSION

@@ -1 +1 @@
-0.0.18
+1.0.0

data/lib/on_the_spot/controller_extension.rb

@@ -24,7 +24,8 @@ module OnTheSpot
                 field_or_method = if display_method.present?
                                     object.send(display_method)
                                   else
-                                    CGI::escapeHTML(object.send(field).to_s)
+                                    value = object.send(field).to_s
+                                    params[:raw] ? value : CGI::escapeHTML(value)
                                   end
                 render :text => field_or_method
               else

data/lib/on_the_spot/on_the_spot_helpers.rb

@@ -28,9 +28,11 @@ module OnTheSpot
                              :url         => {:action => 'update_attribute_on_the_spot'}
                             )
 
+      options[:url].merge!(:raw => true) if options[:raw]
       update_url = url_for(options[:url])
 
       field_value =  object.send(field.to_sym).to_s
+      field_value = field_value.html_safe if options[:raw]
 
       html_options = { :id => "#{object.class.name.underscore}__#{field}__#{object.id}",
                        :class => 'on_the_spot_editing',

data/on_the_spot.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{on_the_spot}
-  s.version = "0.0.18"
+  s.name = "on_the_spot"
+  s.version = "1.0.0"
 
   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-12-12}
-  s.description = %q{Unobtrusive in place editing, using jEditable; only works in Rails 3}
-  s.email = %q{nathan@dixis.com}
+  s.date = "2012-01-25"
+  s.description = "Unobtrusive in place editing, using jEditable; only works in Rails 3"
+  s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.markdown"
@@ -78,10 +78,10 @@ Gem::Specification.new do |s|
     "spec/on_the_spot_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/nathanvda/on_the_spot}
+  s.homepage = "http://github.com/nathanvda/on_the_spot"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{unobtrusive in place editing}
+  s.rubygems_version = "1.8.15"
+  s.summary = "unobtrusive in place editing"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/on_the_spot_spec.rb

@@ -142,7 +142,18 @@ describe "OnTheSpot" 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
 
+      context "with raw parameter" do
+        before(:each) do
+          @tester.should_receive(:url_for).with({:action => 'update_attribute_on_the_spot', :raw => true}).and_return('/bla?raw=true')
+        end
+
+        it "supports raw html" do
+          @dummy.stub!(:content).and_return('<b>test</b>')
+          @result = @tester.on_the_spot_edit @dummy, :content, :raw => true
+          @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-ok=\"ok\" data-tooltip=\"tooltip\" data-url=\"/bla?raw=true\" id=\"r_spec/mocks/mock__content__123\"><b>test</b></span>"
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: on_the_spot
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  version: 1.0.0
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -15,28 +15,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-12 00:00:00 +01:00
-default_executable: 
+date: 2012-01-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7712058
+        hash: 1401735994
         segments: 
         - 2
         - 0
         - 0
         - rc
         version: 2.0.0rc
-  name: rspec
   version_requirements: *id001
+  name: rspec
   prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +46,11 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  name: actionpack
   version_requirements: *id002
+  name: actionpack
   prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,9 +62,10 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
-  name: json_pure
   version_requirements: *id003
+  name: json_pure
   prerelease: false
+  type: :runtime
 description: Unobtrusive in place editing, using jEditable; only works in Rails 3
 email: nathan@dixis.com
 executables: []
@@ -137,7 +136,6 @@ files:
 - spec/generators/install_generator_spec.rb
 - spec/on_the_spot_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/nathanvda/on_the_spot
 licenses: []
 
@@ -167,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: unobtrusive in place editing