sendgrid-parse 0.1.5 → 0.1.6

data/lib/sendgrid-parse/encodable_hash.rb

@@ -56,11 +56,16 @@ module Sendgrid
       def _encode(value, from, to)
         if RUBY_VERSION >= '1.9'
           if value.respond_to? :force_encoding
-            value = value.force_encoding(from)
+            from_enc = Encoding.find(from) rescue nil
+
+            value = value.force_encoding(from) if from_enc
             value = value.encode(to, :invalid => :replace, :undef => :replace, :replace => '')
           end
         else
-          value = Iconv.conv("#{to}//IGNORE", from, value)
+          # Iconv doesn't have a way to find the charset, so we have to just try it and rescue
+          from_enc = Iconv.conv("UTF-8", from, "test string") rescue nil
+
+          value = Iconv.conv("#{to}//IGNORE", from, value) if from_enc
         end
 
         value

data/lib/sendgrid-parse/version.rb

@@ -1,5 +1,5 @@
 module Sendgrid
   module Parse
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/spec/sendgrid-parse_spec.rb

@@ -37,6 +37,16 @@ describe Sendgrid::Parse::EncodableHash do
     new_params[:text].should eql(test_string_1)
   end
 
+  it "should skip unknown 'charsets' encoding types" do
+    params = {
+      :charsets => '{"text":"x-user-defined"}',
+      :text => test_string_1
+    }
+
+    new_params = Sendgrid::Parse::EncodableHash.new(params).encode("UTF-8")
+    new_params[:text].should eql(test_string_1)
+  end
+
   it "should strip unconvertible characters" do
     params = {
       :charsets => '{"text":"UTF-8"}',
@@ -107,6 +117,15 @@ describe Sendgrid::Parse::EncodableHash do
   end
 
   if RUBY_VERSION >= '1.9'
+    it "should blow up on unknown target encoding type" do
+      params = {
+        :charsets => '{"text":"UTF-8"}',
+        :text => test_string_1
+      }
+
+      expect { new_params = Sendgrid::Parse::EncodableHash.new(params).encode("UTF-88") }.to raise_error(Encoding::ConverterNotFoundError)
+    end
+
     it "should correctly change encoding types of charsets" do
       params = {
         :charsets => '{"text":"WINDOWS-1252"}',
@@ -135,5 +154,14 @@ describe Sendgrid::Parse::EncodableHash do
       new_params[:text].encoding.should eql(Encoding::UTF_8)
       new_params[:subject].encoding.should eql(Encoding::UTF_8)
     end
+  else
+    it "should blow up on unknown target encoding type" do
+      params = {
+        :charsets => '{"text":"UTF-8"}',
+        :text => test_string_1
+      }
+
+      expect { new_params = Sendgrid::Parse::EncodableHash.new(params).encode("UTF-88") }.to raise_error(Iconv::InvalidEncoding)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sendgrid-parse
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000Z
+date: 2012-06-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70183411666560 !ruby/object:Gem::Requirement
+  requirement: &70101262154740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.7.3
   type: :runtime
   prerelease: false
-  version_requirements: *70183411666560
+  version_requirements: *70101262154740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70183411666060 !ruby/object:Gem::Requirement
+  requirement: &70101262154220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70183411666060
+  version_requirements: *70101262154220
 - !ruby/object:Gem::Dependency
   name: active_support
-  requirement: &70183411665600 !ruby/object:Gem::Requirement
+  requirement: &70101262153760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70183411665600
+  version_requirements: *70101262153760
 description: Library to dynamically set or change the encoding type for fields, ie
   params from SendGrid Parse API.
 email: