on_the_spot 1.0.0 → 1.0.1

data/README.markdown

@@ -12,7 +12,7 @@ On-the-spot is a Rails3 compliant unobtrusive javascript in-place-editing plugin
 * will check your server-side validations and show the error
 * you can check the access-rights before doing any update (to check against tampering)
 * you can use custom display methods, e.g when using markdown
-* watch the demo-project [here]() ([source](https://github.com/nathanvda/on_the_spot_tester))
+* watch the demo-project [here](http://on-the-spot-demo.heroku.com/) ([source](https://github.com/nathanvda/on_the_spot_tester))
 
 
 ## Installation

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

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

@@ -21,6 +21,7 @@ module OnTheSpot
 
       def copy_locales
         copy_file "on_the_spot.en.yml", "config/locales/on_the_spot.en.yml"
+        copy_file "on_the_spot.fr.yml", "config/locales/on_the_spot.fr.yml"
       end
 
     end

data/lib/generators/on_the_spot/install/templates/on_the_spot.en.yml

@@ -2,4 +2,5 @@ en:
   on_the_spot:
     ok: Ok
     cancel: Cancel
-    tooltip: Click to edit ...
+    tooltip: Click to edit ...
+    access_not_allowed: Access is not allowed

data/lib/generators/on_the_spot/install/templates/on_the_spot.fr.yml

@@ -0,0 +1,6 @@
+fr:
+  on_the_spot:
+    ok: Ok
+    cancel: Annuler
+    tooltip: Cliquer pour modifier ...
+    access_not_allowed: Il n'est pas permis de modifier cette valeur

data/lib/on_the_spot/controller_extension.rb

@@ -29,14 +29,14 @@ module OnTheSpot
                                   end
                 render :text => field_or_method
               else
-                parsed_data = JSON.parse(select_data.gsub("'", '"'))
+                parsed_data = JSON.parse(select_data.gsub("'", '"').gsub('\"', "'"))
                 render :text => parsed_data[object.send(field).to_s]
               end
             else
               render :text => object.errors.full_messages.join("\n"), :status => 422
             end
           else
-            render :text => "Acces is not allowed", :status => 422
+            render :text => t('on_the_spot.access_not_allowed'), :status => 422
           end
         end
 
@@ -50,7 +50,7 @@ module OnTheSpot
           if is_allowed
             render :text => object.send(field)
           else
-            render :text => "Acces is not allowed", :status => 422
+            render :text => t('on_the_spot.access_not_allowed'), :status => 422
           end
         end
       end

data/lib/on_the_spot/on_the_spot_helpers.rb

@@ -81,8 +81,8 @@ module OnTheSpot
     end
 
     def convert_array_to_json(id_value_array, selected_id)
-      conv_arr = id_value_array.map{|idv| "'#{idv[0]}':'#{idv[1]}'" }
-      result = "{ #{conv_arr.join', '}"
+      conv_arr = id_value_array.map{|idv| "'#{idv[0]}':'#{escape_javascript(idv[1])}'" }
+      result = "{ #{conv_arr.join(', ')}"
       result += ", 'selected':'#{ selected_id.to_s}'" unless selected_id.nil?
       result += "}"
       result

data/on_the_spot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "on_the_spot"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = "2012-01-25"
+  s.date = "2012-05-17"
   s.description = "Unobtrusive in place editing, using jEditable; only works in Rails 3"
   s.email = "nathan@dixis.com"
   s.extra_rdoc_files = [
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "lib/generators/on_the_spot/install/install_generator.rb",
     "lib/generators/on_the_spot/install/templates/jquery.jeditable.mini.js",
     "lib/generators/on_the_spot/install/templates/on_the_spot.en.yml",
+    "lib/generators/on_the_spot/install/templates/on_the_spot.fr.yml",
     "lib/on_the_spot.rb",
     "lib/on_the_spot/controller_extension.rb",
     "lib/on_the_spot/on_the_spot_helpers.rb",

data/spec/on_the_spot_spec.rb

@@ -12,7 +12,7 @@ describe "OnTheSpot" do
       end
 
       @tester = TestClass.new
-      @test_array_nr  = [[1,"abc"], [2, "def"], [3, "ghi"]]
+      @test_array_nr  = [[1,"abc"], [2, "def"], [3, "ghi"], [4, "Freddy's Nightmare"]]
       @test_array_str = [["key", "value"], ["key2", "value2"]]
     end
 
@@ -29,11 +29,21 @@ describe "OnTheSpot" do
         @tester.lookup_display_value(@test_array_str, 'key1').should == ''
       end
 
+      it "can handle single quotes normally" do
+        @tester.lookup_display_value(@test_array_nr, 4).should == "Freddy's Nightmare"
+      end
+
     end
 
     context "convert array to json" do
       it "should convert correctly" do
-        @tester.convert_array_to_json(@test_array_nr, 1).should == "{ '1':'abc', '2':'def', '3':'ghi', 'selected':'1'}"
+        @tester.convert_array_to_json(@test_array_nr, 1).should == "{ '1':'abc', '2':'def', '3':'ghi', '4':'Freddy\\'s Nightmare', 'selected':'1'}"
+      end
+
+      it "convert an array containing an item with single quotes to valid JSON" do
+        test_array_with_single_quote = [[1, "tree"], [2, "bike"], [3, "John's hat"]]
+        json_str = @tester.convert_array_to_json(test_array_with_single_quote, 1)
+        json_str.should == "{ '1':'tree', '2':'bike', '3':'John\\'s hat', 'selected':'1'}"
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: on_the_spot
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -23,7 +23,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1401735994
+        hash: 28106001
         segments: 
         - 2
         - 0
@@ -95,6 +95,7 @@ files:
 - lib/generators/on_the_spot/install/install_generator.rb
 - lib/generators/on_the_spot/install/templates/jquery.jeditable.mini.js
 - lib/generators/on_the_spot/install/templates/on_the_spot.en.yml
+- lib/generators/on_the_spot/install/templates/on_the_spot.fr.yml
 - lib/on_the_spot.rb
 - lib/on_the_spot/controller_extension.rb
 - lib/on_the_spot/on_the_spot_helpers.rb