ffi-yajl 2.2.0 → 2.2.1

data/lib/ffi_yajl/ffi/encoder.rb

@@ -20,13 +20,14 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'ffi_yajl/ffi'
+require 'date'
+require 'stringio'
 
 module FFI_Yajl
   module FFI
     module Encoder
       def do_yajl_encode(obj, yajl_gen_opts, opts)
-        yajl_gen = FFI_Yajl.yajl_gen_alloc(nil);
+        yajl_gen = FFI_Yajl.yajl_gen_alloc(nil)
 
         # configure the yajl encoder
         if yajl_gen_opts[:yajl_gen_beautify]
@@ -40,8 +41,8 @@ module FFI_Yajl
 
         # setup our own state
         state = {
-          :json_opts => opts,
-          :processing_key => false,
+          json_opts: opts,
+          processing_key: false,
         }
 
         # do the encoding
@@ -53,14 +54,12 @@ module FFI_Yajl
         if ( status = FFI_Yajl.yajl_gen_get_buf(yajl_gen, string_ptr, length_ptr) ) != 0
           FFI_Yajl::Encoder.raise_error_for_status(status)
         end
-        length = length_ptr.read_int
         string = string_ptr.get_pointer(0).read_string
 
         FFI_Yajl.yajl_gen_free(yajl_gen)
 
-        return string
+        string
       end
-
     end
   end
 end
@@ -68,7 +67,7 @@ end
 class Hash
   def ffi_yajl(yajl_gen, state)
     if state[:processing_key]
-      str = self.to_s
+      str = to_s
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
       end
@@ -76,7 +75,7 @@ class Hash
       if ( status = FFI_Yajl.yajl_gen_map_open(yajl_gen) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, '{')
       end
-      self.each do |key, value|
+      each do |key, value|
         # Perf Fix: mutate state hash rather than creating new copy
         state[:processing_key] = true
         key.ffi_yajl(yajl_gen, state)
@@ -93,7 +92,7 @@ end
 class Array
   def ffi_yajl(yajl_gen, state)
     if state[:processing_key]
-      str = self.to_s
+      str = to_s
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
       end
@@ -101,7 +100,7 @@ class Array
       if ( status = FFI_Yajl.yajl_gen_array_open(yajl_gen) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, '[')
       end
-      self.each do |value|
+      each do |value|
         value.ffi_yajl(yajl_gen, state)
       end
       if ( status = FFI_Yajl.yajl_gen_array_close(yajl_gen) ) != 0
@@ -113,7 +112,7 @@ end
 
 class NilClass
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
@@ -128,7 +127,7 @@ end
 
 class TrueClass
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
@@ -143,7 +142,7 @@ end
 
 class FalseClass
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
@@ -158,9 +157,9 @@ end
 
 class Fixnum
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if str == "NaN" || str == "Infinity" || str == "-Infinity"
-      raise ::FFI_Yajl::EncodeError.new("'#{str}' is an invalid number")
+      raise ::FFI_Yajl::EncodeError, "'#{str}' is an invalid number"
     end
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
@@ -176,9 +175,9 @@ end
 
 class Bignum
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if str == "NaN" || str == "Infinity" || str == "-Infinity"
-      raise ::FFI_Yajl::EncodeError.new("'#{str}' is an invalid number")
+      raise ::FFI_Yajl::EncodeError, "'#{str}' is an invalid number"
     end
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
@@ -194,9 +193,9 @@ end
 
 class Float
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if str == "NaN" || str == "Infinity" || str == "-Infinity"
-      raise ::FFI_Yajl::EncodeError.new("'#{str}' is an invalid number")
+      raise ::FFI_Yajl::EncodeError, "'#{str}' is an invalid number"
     end
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
@@ -212,7 +211,7 @@ end
 
 class Symbol
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, str)
     end
@@ -221,7 +220,7 @@ end
 
 class String
   def ffi_yajl(yajl_gen, state)
-    if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, self, self.bytesize) ) != 0
+    if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, self, bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, self)
     end
   end
@@ -229,7 +228,7 @@ end
 
 class StringIO
   def ffi_yajl(yajl_gen, state)
-    str = self.read
+    str = read
     if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, str)
     end
@@ -238,7 +237,7 @@ end
 
 class Date
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, str)
     end
@@ -247,16 +246,16 @@ end
 
 class Time
   def ffi_yajl(yajl_gen, state)
-    str = self.strftime "%Y-%m-%d %H:%M:%S %z"
+    str = strftime "%Y-%m-%d %H:%M:%S %z"
     if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, str)
     end
   end
 end
 
-class DateTime < Date
+class DateTime
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, str)
     end
@@ -267,15 +266,13 @@ end
 class Object
   def ffi_yajl(yajl_gen, state)
     if !state[:processing_key] && self.respond_to?(:to_json)
-      str = self.to_json(state[:json_opts])
+      str = to_json(state[:json_opts])
       # #yajl_gen_number outputs a string without quotes around it
       status = FFI_Yajl.yajl_gen_number(yajl_gen, str, str.bytesize)
     else
-      str = self.to_s
+      str = to_s
       status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize)
     end
-    if ( status ) != 0
-      FFI_Yajl::Encoder.raise_error_for_status(status, str)
-    end
+    FFI_Yajl::Encoder.raise_error_for_status(status, str) if ( status ) != 0
   end
 end

data/lib/ffi_yajl/ffi/parser.rb

@@ -20,41 +20,35 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'ffi_yajl/ffi'
-
 module FFI_Yajl
   module FFI
     module Parser
-
-        def set_value(val)
-          case stack.last
-          when Hash
-            raise FFI_Yajl::ParseError.new("internal error: missing key in parse") if key.nil?
-            if @opts[:unique_key_checking] && stack.last.has_key?(key)
-              raise FFI_Yajl::ParseError.new("repeated key: #{key}")
-            end
-            stack.last[key] = val
-          when Array
-            stack.last.push(val)
-          else
-            stack.push(val)
-          end
-        end
-
-        def stack_pop
-          if stack.length > 1
-            set_value( stack.pop )
+      def set_value(val) # rubocop:disable Style/AccessorMethodName
+        case stack.last
+        when Hash
+          raise FFI_Yajl::ParseError, "internal error: missing key in parse" if key.nil?
+          if @opts[:unique_key_checking] && stack.last.key?(key)
+            raise FFI_Yajl::ParseError, "repeated key: #{key}"
           end
+          stack.last[key] = val
+        when Array
+          stack.last.push(val)
+        else
+          stack.push(val)
         end
+      end
 
-        def key_push
-          key_stack.push(key)
-        end
+      def stack_pop
+        set_value( stack.pop ) if stack.length > 1
+      end
 
-        def key_pop
-          @key = key_stack.pop()
-        end
+      def key_push
+        key_stack.push(key)
+      end
 
+      def key_pop
+        @key = key_stack.pop
+      end
 
       def setup_callbacks
         @null_callback = ::FFI::Function.new(:int, [:pointer]) do |ctx|
@@ -70,7 +64,7 @@ module FFI_Yajl
           1
         end
         @number_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t ]) do |ctx, stringval, stringlen|
-          s = stringval.slice(0,stringlen)
+          s = stringval.slice(0, stringlen)
           s.force_encoding('UTF-8') if defined? Encoding
           # XXX: I can't think of a better way to do this right now.  need to call to_f if and only if its a float.
           v = ( s =~ /[\.eE]/ ) ? s.to_f : s.to_i
@@ -82,18 +76,18 @@ module FFI_Yajl
           1
         end
         @string_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t]) do |ctx, stringval, stringlen|
-          s = stringval.slice(0,stringlen)
+          s = stringval.slice(0, stringlen)
           s.force_encoding('UTF-8') if defined? Encoding
           set_value(s)
           1
         end
         @start_map_callback = ::FFI::Function.new(:int, [:pointer]) do |ctx|
           key_push  # for key => { } case, save the key
-          stack.push(Hash.new)
+          stack.push({})
           1
         end
         @map_key_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t]) do |ctx, key, keylen|
-          s = key.slice(0,keylen)
+          s = key.slice(0, keylen)
           s.force_encoding('UTF-8') if defined? Encoding
           self.key = @opts[:symbolize_keys] ? s.to_sym : s
           1
@@ -105,7 +99,7 @@ module FFI_Yajl
         end
         @start_array_callback = ::FFI::Function.new(:int, [:pointer]) do |ctx|
           key_push  # for key => [ ] case, save the key
-          stack.push(Array.new)
+          stack.push([])
           1
         end
         @end_array_callback = ::FFI::Function.new(:int, [:pointer]) do |ctx|
@@ -115,7 +109,6 @@ module FFI_Yajl
         end
       end
 
-
       def do_yajl_parse(str, yajl_opts = {})
         setup_callbacks
         callback_ptr = ::FFI::MemoryPointer.new(::FFI_Yajl::YajlCallbacks)
@@ -150,15 +143,15 @@ module FFI_Yajl
           ::FFI_Yajl.yajl_config(yajl_handle, :yajl_allow_partial_values, :int, 1)
         end
 
-        if ( stat = ::FFI_Yajl.yajl_parse(yajl_handle, str, str.bytesize) != :yajl_status_ok )
+        if ( ::FFI_Yajl.yajl_parse(yajl_handle, str, str.bytesize) != :yajl_status_ok )
           # FIXME: dup the error and call yajl_free_error?
           error = ::FFI_Yajl.yajl_get_error(yajl_handle, 1, str, str.bytesize)
-          raise ::FFI_Yajl::ParseError.new(error)
+          raise ::FFI_Yajl::ParseError, error
         end
-        if ( stat = FFI_Yajl.yajl_complete_parse(yajl_handle) != :yajl_status_ok )
+        if ( ::FFI_Yajl.yajl_complete_parse(yajl_handle) != :yajl_status_ok )
           # FIXME: dup the error and call yajl_free_error?
           error = ::FFI_Yajl.yajl_get_error(yajl_handle, 1, str, str.bytesize)
-          raise ::FFI_Yajl::ParseError.new(error)
+          raise ::FFI_Yajl::ParseError, error
         end
         stack.pop
       ensure

data/lib/ffi_yajl/ffi.rb

@@ -42,16 +42,16 @@ module FFI_Yajl
 
   class YajlCallbacks < ::FFI::Struct
     layout :yajl_null, :pointer,
-      :yajl_boolean, :pointer,
-      :yajl_integer, :pointer,
-      :yajl_double, :pointer,
-      :yajl_number, :pointer,
-      :yajl_string, :pointer,
-      :yajl_start_map, :pointer,
-      :yajl_map_key, :pointer,
-      :yajl_end_map, :pointer,
-      :yajl_start_array, :pointer,
-      :yajl_end_array, :pointer
+           :yajl_boolean, :pointer,
+           :yajl_integer, :pointer,
+           :yajl_double, :pointer,
+           :yajl_number, :pointer,
+           :yajl_string, :pointer,
+           :yajl_start_map, :pointer,
+           :yajl_map_key, :pointer,
+           :yajl_end_map, :pointer,
+           :yajl_start_array, :pointer,
+           :yajl_end_array, :pointer
   end
 
   enum :yajl_status, [
@@ -61,30 +61,30 @@ module FFI_Yajl
     :yajl_status_error,
   ]
 
-# FFI::Enums are slow, should remove the rest
-#  enum :yajl_gen_status, [
-#    :yajl_gen_status_ok,
-#    :yajl_gen_keys_must_be_strings,
-#    :yajl_max_depth_exceeded,
-#    :yajl_gen_in_error_state,
-#    :yajl_gen_generation_complete,
-#    :yajl_gen_invalid_number,
-#    :yajl_gen_no_buf,
-#  ]
+  # FFI::Enums are slow, should remove the rest
+  #  enum :yajl_gen_status, [
+  #    :yajl_gen_status_ok,
+  #    :yajl_gen_keys_must_be_strings,
+  #    :yajl_max_depth_exceeded,
+  #    :yajl_gen_in_error_state,
+  #    :yajl_gen_generation_complete,
+  #    :yajl_gen_invalid_number,
+  #    :yajl_gen_no_buf,
+  #  ]
 
   enum :yajl_option, [
     :yajl_allow_comments, 0x01,
     :yajl_dont_validate_strings, 0x02,
     :yajl_allow_trailing_garbage, 0x04,
     :yajl_allow_multiple_values, 0x08,
-    :yajl_allow_partial_values, 0x10,
+    :yajl_allow_partial_values, 0x10
   ]
 
   enum :yajl_gen_option, [
     :yajl_gen_beautify, 0x01,
     :yajl_gen_indent_string, 0x02,
     :yajl_gen_print_callback, 0x04,
-    :yajl_gen_validate_utf8, 0x08,
+    :yajl_gen_validate_utf8, 0x08
   ]
 
   typedef :pointer, :yajl_handle
@@ -132,10 +132,9 @@ module FFI_Yajl
   attach_function :yajl_gen_array_open, [:yajl_gen], :int
   attach_function :yajl_gen_array_close, [:yajl_gen], :int
   # yajl_gen_status yajl_gen_get_buf (yajl_gen hand, const unsigned char **buf, unsigned int *len)
-  attach_function :yajl_gen_get_buf, [:yajl_gen, :pointer ,:pointer], :int
+  attach_function :yajl_gen_get_buf, [:yajl_gen, :pointer, :pointer], :int
   # void yajl_gen_clear (yajl_gen hand)
   attach_function :yajl_gen_clear, [:yajl_gen], :void
-
 end
 
 require 'ffi_yajl/encoder'

data/lib/ffi_yajl/map_library_name.rb

@@ -29,7 +29,6 @@ require 'libyajl2'
 
 module FFI_Yajl
   module MapLibraryName
-
     private
 
     # Stub for tests to override the host_os

data/lib/ffi_yajl/parser.rb

@@ -23,7 +23,8 @@
 module FFI_Yajl
   class ParseError < StandardError; end
   class Parser
-    attr_accessor :stack, :key_stack, :key, :finished
+    attr_writer :stack, :key_stack
+    attr_accessor :key, :finished
 
     attr_accessor :opts
 
@@ -31,14 +32,14 @@ module FFI_Yajl
     # stack used to build up our complex object
     #
     def stack
-      @stack ||= Array.new
+      @stack ||= []
     end
 
     #
     # stack to keep track of keys as we create nested hashes
     #
     def key_stack
-      @key_stack ||= Array.new
+      @key_stack ||= []
     end
 
     def self.parse(obj, *args)
@@ -80,9 +81,7 @@ module FFI_Yajl
       # XXX: bug-compat with ruby-yajl
       return nil if str == ""
 
-      if str.respond_to?(:read)
-        str = str.read()
-      end
+      str = str.read if str.respond_to?(:read)
 
       # call either the ext or ffi hook
       do_yajl_parse(str, yajl_opts)

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.0"
+  VERSION = "2.2.1"
 end

data/spec/ffi_yajl/encoder_spec.rb

@@ -25,18 +25,17 @@ require 'spec_helper'
 require 'date'
 
 describe "FFI_Yajl::Encoder" do
-
   let(:options) { {} }
 
   let(:encoder) { FFI_Yajl::Encoder.new(options) }
 
-  it "encodes hashes in keys as strings", :ruby_gte_193 => true do
-    ruby = { {'a' => 'b'} => 2 }
+  it "encodes hashes in keys as strings", ruby_gte_193: true do
+    ruby = { { 'a' => 'b' } => 2 }
     expect(encoder.encode(ruby)).to eq('{"{\"a\"=>\"b\"}":2}')
   end
 
-  it "encodes arrays in keys as strings", :ruby_gte_193 => true do
-    ruby = { [0,1] => 2 }
+  it "encodes arrays in keys as strings", ruby_gte_193: true do
+    ruby = { [0, 1] => 2 }
     expect(encoder.encode(ruby)).to eq('{"[0, 1]":2}')
   end
 
@@ -66,14 +65,14 @@ describe "FFI_Yajl::Encoder" do
   end
 
   it "encodes bignums in keys as strings" do
-    ruby = { 12345678901234567890 => 2 }
+    ruby = { 12_345_678_901_234_567_890 => 2 }
     expect(encoder.encode(ruby)).to eq('{"12345678901234567890":2}')
   end
 
   it "encodes objects in keys as strings" do
     o = Object.new
     ruby = { o => 2 }
-    expect(encoder.encode(ruby)).to eq(%Q{{"#{o.to_s}":2}})
+    expect(encoder.encode(ruby)).to eq(%{{"#{o}":2}})
   end
 
   it "encodes an object in a key which has a #to_json method as strings" do
@@ -84,7 +83,7 @@ describe "FFI_Yajl::Encoder" do
     end
     o = Thing.new
     ruby = { o => 2 }
-    expect(encoder.encode(ruby)).to eq(%Q{{"#{o.to_s}":2}})
+    expect(encoder.encode(ruby)).to eq(%{{"#{o}":2}})
   end
 
   # XXX: 127 == YAJL_MAX_DEPTH hardcodedness, zero control for us, it isn't even a twiddleable #define
@@ -92,18 +91,18 @@ describe "FFI_Yajl::Encoder" do
     root = []
     a = root
     127.times { |_| a << []; a = a[0] }
-    expect{ encoder.encode(root) }.to raise_error(FFI_Yajl::EncodeError)
+    expect { encoder.encode(root) }.to raise_error(FFI_Yajl::EncodeError)
   end
 
   it "raises an exception for deeply nested hashes" do
     root = {}
     a = root
-    127.times {|_| a["a"] = {}; a = a["a"] }
-    expect{ encoder.encode(root) }.to raise_error(FFI_Yajl::EncodeError)
+    127.times { |_| a["a"] = {}; a = a["a"] }
+    expect { encoder.encode(root) }.to raise_error(FFI_Yajl::EncodeError)
   end
 
   it "encodes symbols in keys as strings" do
-    ruby = { :thing => 1 }
+    ruby = { thing: 1 }
     expect(encoder.encode(ruby)).to eq('{"thing":1}')
   end
 
@@ -113,7 +112,7 @@ describe "FFI_Yajl::Encoder" do
   end
 
   it "can encode 32-bit unsigned ints" do
-    ruby = { "gid"=>4294967294 }
+    ruby = { "gid" => 4_294_967_294 }
     expect(encoder.encode(ruby)).to eq('{"gid":4294967294}')
   end
 
@@ -128,7 +127,7 @@ describe "FFI_Yajl::Encoder" do
 
   it "can encode Date objects" do
     ruby = Date.parse('2001-02-03')
-    expect(encoder.encode(ruby)).to eq( %q{"2001-02-03"} )
+    expect(encoder.encode(ruby)).to eq( '"2001-02-03"' )
   end
 
   it "can encode StringIOs" do
@@ -148,13 +147,13 @@ describe "FFI_Yajl::Encoder" do
 
     it "encodes them correctly" do
       ruby = Time.local(2001, 02, 02, 21, 05, 06)
-      expect(encoder.encode(ruby)).to eq( %q{"2001-02-02 21:05:06 +0000"} )
+      expect(encoder.encode(ruby)).to eq( '"2001-02-02 21:05:06 +0000"' )
     end
   end
 
   it "can encode DateTime objects" do
     ruby = DateTime.parse('2001-02-03T04:05:06.1+07:00')
-    expect(encoder.encode(ruby)).to eq( %q{"2001-02-03T04:05:06+07:00"} )
+    expect(encoder.encode(ruby)).to eq( '"2001-02-03T04:05:06+07:00"' )
   end
 
   describe "testing .to_json for Objects" do
@@ -176,25 +175,25 @@ describe "FFI_Yajl::Encoder" do
 
   context "when encoding invalid utf-8" do
     ruby = {
-      "automatic"=>{
-        "etc"=>{
-          "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"},
-          }
+      "automatic" => {
+        "etc" => {
+          "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" },
+          },
         },
       },
     }
 
     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.e': cannot encode to UTF-8/)
     end
 
     context "when validate_utf8 is off" do
-      let(:options) {  { :validate_utf8 => false } }
+      let(:options) {  { validate_utf8: false } }
 
       it "does not raise an error" do
-        expect{ encoder.encode(ruby) }.not_to raise_error
+        expect { encoder.encode(ruby) }.not_to raise_error
       end
 
       it "returns utf8" do

data/spec/ffi_yajl/map_library_name_spec.rb

@@ -47,7 +47,6 @@ describe "FFI_Yajl::MapLibraryName" do
   end
 
   host_os_library_name_mapping.each do |host_os, library_names|
-
     context "#library_names" do
       it "maps #{host_os} correctly" do
         allow(Test).to receive(:host_os).and_return(host_os)
@@ -112,6 +111,5 @@ describe "FFI_Yajl::MapLibraryName" do
         Test.send(:ffi_open_yajl_library)
       end
     end
-
   end
 end