@@ -94,12 +94,18 @@ module JavascriptFu when /[)}\]]/ level -= 1 when /'/ + scanner.scan(/.*?'/) when /"/ + scanner.scan(/.*?"/) else raise "unimplemented" end end string = string[0...scanner.pos-1] if scanner.pos > 0 - ActiveSupport::JSON.decode('[' + string + ']') + begin + ActiveSupport::JSON.decode('[' + string + ']') + rescue ActiveSupport::JSON::ParseError => error + raise ActiveSupport::JSON::ParseError.new("#{string.inspect}") + end end end lib/js_fu_matchers.rb @@ -79,7 +79,7 @@ describe :call_js do end end - it "should include nested objects" do + it "should parse nested objects" do string = '<script>fname("string", [1,2], {a:3})</script>' string.should call_js('fname') do |args| args.should == ['string', [1,2], {'a' => 3}] spec/js_fu_matchers.rb @@ -22,8 +22,17 @@ describe JavascriptFu do JavascriptFu.read_json_arglist('1,[{a:[2],b:{c:3}},[4]],5)]]').should == [1, [{'a' => [2], 'b' => {'c' => 3}}, [4]], 5] end - it "should scan strings" - it "should scan strings with quoted quotes" + it "should scan strings" do + JavascriptFu.read_json_arglist("'str')").should == ['str'] + JavascriptFu.read_json_arglist('"str")').should == ['str'] + JavascriptFu.read_json_arglist("'str','ing')").should == ['str', 'ing'] + end + + it "should scan strings with quoted quotes" do + pending + JavascriptFu.read_json_arglist('"str\\\"ing")').should == ['str"ing'] + end + it "should scan simple regular expressions" end end spec/read_json_arglist_spec.rb 2118a1ea49a2503140ab2ea336852c6d1e449f47 Oliver Steele steele@osteele.com http://github.com/osteele/javascript_fu/commit/56fff8fbfa3a9c93dd10a7a4b5893ae4b59ef304 56fff8fbfa3a9c93dd10a7a4b5893ae4b59ef304 2008-04-14T18:54:11-07:00 2008-04-14T18:54:11-07:00 parse some strings 6656a848b8deea1e0a452b18ff6079498f9c655d Oliver Steele steele@osteele.com