ffi-yajl 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d07aff0a45df417a5b0fe9fa0fef6f5fd26ee68
-  data.tar.gz: d9e8e77d8ee6d8259acab2aeb21a261d32ca7fc0
+  metadata.gz: d781f4b2a16bfdf584c9e5e18aacc4acead4e2d1
+  data.tar.gz: b983d62ab1c69061965c697c28d4a2f3eb903fff
 SHA512:
-  metadata.gz: 036fb796941adbf951a11fdbf82d1c6e7de4fbfee8cce3ec497b7eed09b084436082fcc7acc7a8f360b1a800eeb648d0cbabeeedf6c2953a55a8cc60b10ae8bd
-  data.tar.gz: c980a1037e3fa00a18189d3d440e80c48716ce1cd229f8f817e49d943c8d386fee43a721970f25bf635d1fa98c379113c7e70ed41c3d9b5b8a11d9992e804a31
+  metadata.gz: 3ff1a41b3526497a2c8b76ddba312121973aa1191d968e284ca084c96db7c243dc38f01443de87c0673565f09a68604586e0a036732fbda6a18dda24d590f524
+  data.tar.gz: ab3ac6089aa276b4937ec8c51cffc76800e1595d17b40c6449df7cd30edeeba27959c87a34ed1fea658c6b8a1fbbbc4198591748630a4c6c8e7123de2f182f5d

data/Rakefile

@@ -4,12 +4,18 @@ require 'rspec/core/rake_task'
 require 'rubygems/package_task'
 require 'rake/extensiontask'
 require 'ffi_yajl/version'
+require 'github_changelog_generator/task'
 
 Dir[File.expand_path("../*gemspec", __FILE__)].reverse_each do |gemspec_path|
   gemspec = eval(IO.read(gemspec_path))
   Gem::PackageTask.new(gemspec).define
 end
 
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.since_tag = '1.0.1'
+  config.exclude_labels = %w{duplicate question invalid wontfix changelog_skip}
+end
+
 desc "Build it and ship it"
 task ship: [:clean, :gem] do
   sh("git tag #{FFI_Yajl::VERSION}")

data/lib/ffi_yajl/encoder.rb

@@ -41,7 +41,15 @@ module FFI_Yajl
       # call either the ext or ffi hook
       str = do_yajl_encode(obj, yajl_gen_opts, opts)
       # we can skip cleaning the whole string for utf-8 issues if we have yajl validate as we go
-      str.encode!("utf-8", "binary", undef: :replace) unless yajl_gen_opts[:yajl_gen_validate_utf8]
+
+      str.force_encoding("UTF-8")
+      unless yajl_gen_opts[:yajl_gen_validate_utf8]
+        if str.respond_to?(:scrub)
+          str.scrub!
+        else
+          str.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!('UTF-8')
+        end
+      end
       str
     end
 
@@ -56,7 +64,12 @@ module FFI_Yajl
 
     def self.raise_error_for_status(status, token = nil)
       # scrub token to valid utf-8 since we may be issuing an exception on an invalid utf-8 token
-      token = token.to_s.encode("utf-8", "binary", undef: :replace)
+      token = token.to_s.force_encoding("UTF-8")
+      if token.respond_to?(:scrub)
+        token.scrub!
+      else
+        token.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!('UTF-8')
+      end
       case status
       when 1 # yajl_gen_keys_must_be_strings
         raise FFI_Yajl::EncodeError, "YAJL internal error: attempted use of non-string object as key"

data/lib/ffi_yajl/version.rb

@@ -21,5 +21,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module FFI_Yajl
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

data/spec/ffi_yajl/encoder_spec.rb

@@ -180,13 +180,14 @@ describe "FFI_Yajl::Encoder" do
           "passwd" => {
             "root" => { "dir" => "/root", "gid" => 0, "uid" => 0, "shell" => "/bin/sh", "gecos" => "Elan Ruusam\xc3\xa4e" },
             "glen" => { "dir" => "/home/glen", "gid" => 500, "uid" => 500, "shell" => "/bin/bash", "gecos" => "Elan Ruusam\xE4e" },
+            "helmüt" => { "dir" => "/home/helmüt", "gid" => 500, "uid" => 500, "shell" => "/bin/bash", "gecos" => "Hañs Helmüt" },
           },
         },
       },
     }
 
     it "raises an error on invalid json" do
-      expect { encoder.encode(ruby) }.to raise_error(FFI_Yajl::EncodeError, /Invalid UTF-8 string 'Elan Ruusam.e': cannot encode to UTF-8/)
+      expect { encoder.encode(ruby) }.to raise_error(FFI_Yajl::EncodeError, /Invalid UTF-8 string 'Elan Ruusam.*': cannot encode to UTF-8/)
     end
 
     context "when validate_utf8 is off" do
@@ -203,6 +204,18 @@ describe "FFI_Yajl::Encoder" do
       it "returns valid utf8" do
         expect( encoder.encode(ruby).valid_encoding? ).to be true
       end
+
+      it "does not mangle valid utf8" do
+        json = encoder.encode(ruby)
+        expect(json).to match(/Hañs Helmüt/)
+      end
+
+      it "does not grow after a round trip" do
+        json = encoder.encode(ruby)
+        ruby2 = FFI_Yajl::Parser.parse(json)
+        json2 = encoder.encode(ruby2)
+        expect(json).to eql(json2)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby FFI wrapper around YAJL 2.x