Merge pull request #5 from opscode/lcg/default-opts-hash

ensure opts hash is never nil

2 files changed, 10 insertions, 1 deletions

diff --git a/lib/ffi_yajl/encoder.rb b/lib/ffi_yajl/encoder.rb
index bd3ff31..7abcf00 100644
--- a/lib/ffi_yajl/encoder.rb
+++ b/lib/ffi_yajl/encoder.rb
@@ -29,6 +29,7 @@ module FFI_Yajl
 
     def initialize(opts = {})
       @opts = opts
+      @opts ||= {}
     end
 
     def self.raise_error_for_status(status)
diff --git a/spec/ffi_yajl/encoder_spec.rb b/spec/ffi_yajl/encoder_spec.rb
index 00df5d1..67945e0 100644
--- a/spec/ffi_yajl/encoder_spec.rb
+++ b/spec/ffi_yajl/encoder_spec.rb
@@ -51,5 +51,13 @@ describe "FFI_Yajl::Encoder" do
     expect(encoder.encode(ruby)).to eq('{"gid":4294967294}')
   end
 
-end
+  context "when the encoder has nil passed in for options" do
+    let(:encoder) { FFI_Yajl::Encoder.new(nil) }
+
+    it "does not throw an exception" do
+      ruby = { "foo" => "bar" }
+      expect(encoder.encode(ruby)).to eq("{\"foo\":\"bar\"}")
+    end
+  end
 
+end