egregious 0.1.5 → 0.1.6

data/egregious.gemspec

@@ -22,10 +22,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec"
   s.add_development_dependency "json"
   s.add_development_dependency "hpricot"
-  s.add_development_dependency "rails", '~> 3.1.0'
-  s.add_development_dependency "rails", '~> 3.1.0'
   s.add_development_dependency "warden"
   s.add_development_dependency "cancan"
 
+  s.add_runtime_dependency "rails", '~> 3.1.0'
   s.add_runtime_dependency "rack"
+  s.add_runtime_dependency "htmlentities"
+
 end

data/lib/egregious/extensions/exception.rb

@@ -1,3 +1,4 @@
+require 'htmlentities'
 #
 # We are opening up Exception and adding to_xml and to_json.
 #
@@ -8,10 +9,11 @@ class Exception
   end
 
   def to_xml
-    "<errors><error>#{self.message}</error><type>#{self.exception_type}</type></errors>"
+    "<errors><error>#{HTMLEntities.new.encode(self.message)}</error><type>#{self.exception_type}</type></errors>"
   end
 
   def to_json
-    "{\"error\":\"#{self.message.gsub(/\r/, ' ').gsub(/\n/, ' ').squeeze(' ')}\", \"type\":\"#{self.exception_type}\"}"
+    "{\"error\":#{ActiveSupport::JSON.encode(self.message.gsub(/\r/, ' ').gsub(/\n/, ' ').squeeze(' '))}, \"type\":\"#{self.exception_type}\"}"
   end
+
 end

data/lib/egregious/version.rb

@@ -1,3 +1,3 @@
 module Egregious
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/exceptions_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'json'
 require 'hpricot'
+require 'htmlentities'
 
 describe Exception do
   it "should output valid xml on to_xml" do
@@ -11,12 +12,25 @@ describe Exception do
     end
   end
 
+  it "should output valid xml on to_xml with values to escape" do
+    doc = Hpricot.XML(Exception.new('<a title="1<2"/>').to_xml)
+    (doc/:errors).each do |error|
+       HTMLEntities.new.decode((error/:error).inner_html).should=='<a title="1<2"/>'
+    end
+  end
+
   it "should output be valid json on to_json" do
     result = JSON.parse(Exception.new("Yes").to_json)
     result['error'].should == "Yes"
     result['type'].should == "Exception"
   end
 
+  it "should output be valid json on to_json with quotes" do
+      result = JSON.parse(Exception.new('Yes "its good"').to_json)
+      result['error'].should == 'Yes "its good"'
+    end
+
+
   it "should parse module names out" do
     module X
       module Y

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: egregious
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Russell Edens
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 -04:00
+date: 2011-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,53 +61,51 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: warden
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 3
-        - 1
         - 0
-        version: 3.1.0
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: cancan
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 3
-        - 1
         - 0
-        version: 3.1.0
+        version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: warden
+  name: rails
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 3
+        - 1
         - 0
-        version: "0"
-  type: :development
+        version: 3.1.0
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: cancan
+  name: rack
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -118,10 +116,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: htmlentities
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false