in_place_editing 1.1.2 → 1.2.0

data/Gemfile

@@ -1,3 +1,4 @@
 source :rubygems
 
-gem "rails", "~> 3.0.10"
+gem 'rails', '~> 3.0', '>= 3.0.10'
+gem 'rdoc'

data/README.rdoc

@@ -2,11 +2,15 @@
 
 A Rails plugin for in-place editing fields.
 
-= Installation
 
-  gem install in_place_editing
+== Installation
 
-= Usage
+In the +Gemfile+:
+
+  gem 'in_place_editing'
+
+
+== Usage
 
 In your controller define what model and fields you want in-place editing support for.
 

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/in_place_editing.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "in_place_editing"
-  s.version     = "1.1.2"
+  s.version     = "1.2.0"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["David Heinemeier Hansson", "Jeremy Kemper", "Jose Fernandez", "Pawel Stradomski, Mark Turner"]
   s.email       = ["mark@amerine.net"]

data/lib/in_place_editing/helper_methods.rb

@@ -70,12 +70,20 @@ module InPlaceMacrosHelper
   end
   
   # Renders the value of the specified object and method with in-place editing capabilities.
-  def in_place_editor_field(object, method, tag_options = {}, in_place_editor_options = {})
-    instance_tag = ::ActionView::Helpers::InstanceTag.new(object, method, self)
+  def in_place_editor_field(object_or_name, method, tag_options = {}, in_place_editor_options = {})
+    if object_or_name.respond_to? :to_model
+      object_name = object_or_name.to_model.class.model_name.singular
+      object = object_or_name.to_model
+    else
+      object_name = object_or_name
+      object = nil
+    end
+
+    instance_tag = ::ActionView::Helpers::InstanceTag.new(object_name, method, self, object)
     tag_options = {:tag => "span",
-                   :id => "#{object}_#{method}_#{instance_tag.object.id}_in_place_editor",
+                   :id => "#{object_name}_#{method}_#{instance_tag.object.id}_in_place_editor",
                    :class => "in_place_editor_field"}.merge!(tag_options)
-    in_place_editor_options[:url] = in_place_editor_options[:url] || url_for({ :action => "set_#{object}_#{method}", :id => instance_tag.object.id })
+    in_place_editor_options[:url] = in_place_editor_options[:url] || url_for({ :action => "set_#{object_name}_#{method}", :id => instance_tag.object.id })
     tag = content_tag(tag_options.delete(:tag), h(instance_tag.value(instance_tag.object)),tag_options)
     return tag + in_place_editor(tag_options[:id], in_place_editor_options)
   end

data/test/in_place_editing_test.rb

@@ -21,7 +21,6 @@ class InPlaceEditingTest < Test::Unit::TestCase
       url
     end
 
-
     @controller = InPlaceEditingController.new
     @protect_against_forgery = false
   end
@@ -31,28 +30,28 @@ class InPlaceEditingTest < Test::Unit::TestCase
   end
 
   def test_in_place_editor_external_control
-      assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Ajax.InPlaceEditor('some_input', 'http://www.example.com/inplace_edit', {externalControl:'blah'})\n//]]>\n</script>),
-        in_place_editor('some_input', {:url => {:action => 'inplace_edit'}, :external_control => 'blah'})
+    html = javascript_tag "new Ajax.InPlaceEditor('some_input', 'http://www.example.com/inplace_edit', {externalControl:'blah'})"
+    assert_dom_equal html, in_place_editor('some_input', {:url => {:action => 'inplace_edit'}, :external_control => 'blah'})
   end
   
   def test_in_place_editor_size
-      assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Ajax.InPlaceEditor('some_input', 'http://www.example.com/inplace_edit', {size:4})\n//]]>\n</script>),
-        in_place_editor('some_input', {:url => {:action => 'inplace_edit'}, :size => 4})
+    html = javascript_tag "new Ajax.InPlaceEditor('some_input', 'http://www.example.com/inplace_edit', {size:4})"
+    assert_dom_equal html, in_place_editor('some_input', {:url => {:action => 'inplace_edit'}, :size => 4})
   end
   
   def test_in_place_editor_cols_no_rows
-      assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Ajax.InPlaceEditor('some_input', 'http://www.example.com/inplace_edit', {cols:4})\n//]]>\n</script>),
-        in_place_editor('some_input', {:url => {:action => 'inplace_edit'}, :cols => 4})
+    html = javascript_tag "new Ajax.InPlaceEditor('some_input', 'http://www.example.com/inplace_edit', {cols:4})"
+    assert_dom_equal html, in_place_editor('some_input', {:url => {:action => 'inplace_edit'}, :cols => 4})
   end
   
   def test_in_place_editor_cols_with_rows
-      assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Ajax.InPlaceEditor('some_input', 'http://www.example.com/inplace_edit', {cols:40, rows:5})\n//]]>\n</script>),
-        in_place_editor('some_input', {:url => {:action => 'inplace_edit'}, :rows => 5, :cols => 40})
+    html = javascript_tag "new Ajax.InPlaceEditor('some_input', 'http://www.example.com/inplace_edit', {cols:40, rows:5})"
+    assert_dom_equal html, in_place_editor('some_input', {:url => {:action => 'inplace_edit'}, :rows => 5, :cols => 40})
   end
 
   def test_inplace_editor_loading_text
-      assert_dom_equal %(<script type=\"text/javascript\">\n//<![CDATA[\nnew Ajax.InPlaceEditor('some_input', 'http://www.example.com/inplace_edit', {loadingText:'Why are we waiting?'})\n//]]>\n</script>),
-        in_place_editor('some_input', {:url => {:action => 'inplace_edit'}, :loading_text => 'Why are we waiting?'})
+    html = javascript_tag "new Ajax.InPlaceEditor('some_input', 'http://www.example.com/inplace_edit', {loadingText:'Why are we waiting?'})"
+    assert_dom_equal html, in_place_editor('some_input', {:url => {:action => 'inplace_edit'}, :loading_text => 'Why are we waiting?'})
   end
   
   def test_in_place_editor_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: in_place_editing
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies: []
 description: In Place Editing Rails Plugin
 email:
@@ -53,10 +53,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: in_place_editing
-rubygems_version: 1.8.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: In Place Editing Rails Plugin
 test_files:
 - test/in_place_editing_test.rb
 - test/test_helper.rb
+has_rdoc: