sendgrid-parse 0.1.6 → 0.1.7

data/lib/sendgrid-parse/encodable_hash.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'json'
 require 'delegate'
 require 'iconv' unless RUBY_VERSION >= '1.9'
@@ -25,6 +26,8 @@ module Sendgrid
       end
 
       def encode(to_encoding, ignore=[])
+        _test_encoding(to_encoding)
+
         component = __getobj__.dup
         ignore.each { |e| component.delete(e) if component.has_key?(e)}
 
@@ -36,8 +39,12 @@ module Sendgrid
         component.each do |key, value|
           if charsets.has_key?(key)
             from_encoding = charsets[key]
-            component[key] = _encode(component[key], from_encoding, to_encoding)
-            charsets[key] = to_encoding
+            transcoded_value = _encode(component[key], from_encoding, to_encoding) rescue nil
+
+            if transcoded_value
+              component[key] = transcoded_value
+              charsets[key] = to_encoding
+            end
           else
             # If we weren't told, set it to the target encoding type.
             component[key] = _encode(component[key], to_encoding, to_encoding)
@@ -53,19 +60,22 @@ module Sendgrid
       end
 
     protected
+      def _test_encoding(to)
+        if RUBY_VERSION >= '1.9'
+          "".force_encoding("UTF-8").encode(to)
+        else
+          Iconv.conv("#{to}", "UTF-8", "")
+        end
+      end
+
       def _encode(value, from, to)
         if RUBY_VERSION >= '1.9'
           if value.respond_to? :force_encoding
-            from_enc = Encoding.find(from) rescue nil
-
-            value = value.force_encoding(from) if from_enc
+            value = value.force_encoding(from)
             value = value.encode(to, :invalid => :replace, :undef => :replace, :replace => '')
           end
         else
-          # 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
+          value = Iconv.conv("#{to}//IGNORE", from, value)
         end
 
         value

data/lib/sendgrid-parse/version.rb

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

data/spec/sendgrid-parse_spec.rb

@@ -47,6 +47,17 @@ describe Sendgrid::Parse::EncodableHash do
     new_params[:text].should eql(test_string_1)
   end
 
+  it "should not claim to have encoded skipped '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)
+    new_params[:charsets].should eql "{\"text\":\"x-user-defined\"}"
+  end
+
   it "should strip unconvertible characters" do
     params = {
       :charsets => '{"text":"UTF-8"}',

metadata

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