mitigate .to_json segfaults on Ruby 1.8.7

.travis.yml

@@ -5,6 +5,7 @@ before_install: rm Gemfile.lock || true
 sudo: false
 cache: bundler
 rvm:
+  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0
@@ -13,6 +14,8 @@ env:
   - PUPPET_VERSION="~> 3.1.0"
   - PUPPET_VERSION="~> 3.3.0"
   - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes
+  - PUPPET_VERSION="~> 3.8.4"
+  - PUPPET_VERSION="~> 3.8.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.0.0"
   - PUPPET_VERSION="~> 4.1.0"
 matrix:
@@ -35,8 +38,12 @@ matrix:
     env: PUPPET_VERSION="~> 3.4.0"
   - rvm: 1.9.3
     env: PUPPET_VERSION="~> 4.0.0"
+  - rvm: 1.8.7
+    env: PUPPET_VERSION="~> 4.0.0"
   - rvm: 2.0.0
     env: PUPPET_VERSION="~> 4.0.0"
+  - rvm: 1.8.7
+    env: PUPPET_VERSION="~> 4.1.0"
   - rvm: 1.9.3
     env: PUPPET_VERSION="~> 4.1.0"
   - rvm: 2.0.0

lib/puppet/parser/functions/consul_sorted_json.rb

@@ -6,11 +6,8 @@ class << self
 
     def sorted_generate(obj)
       case obj
-        when Fixnum, Float, TrueClass, FalseClass, NilClass
-          return obj.to_json
-        when String
-          # Convert quoted integers (string) to int
-          return (obj.match(/\A[-]?[0-9]+\z/) ? obj.to_i : obj).to_json
+        when NilClass,Fixnum, Float, TrueClass, FalseClass,String
+          return simple_generate(obj)
         when Array
           arrayRet = []
           obj.each do |a|
@@ -34,14 +31,8 @@ def sorted_pretty_generate(obj, indent_len=4)
       indent = " " * indent_len
 
       case obj
-
-        when Fixnum, Float, TrueClass, FalseClass, NilClass
-          return obj.to_json
-
-        when String
-          # Convert quoted integers (string) to int
-          return (obj.match(/\A[-]?[0-9]+\z/) ? obj.to_i : obj).to_json
-
+        when NilClass,Fixnum, Float, TrueClass, FalseClass,String
+          return simple_generate(obj)
         when Array
           arrayRet = []
 
@@ -80,6 +71,20 @@ def sorted_pretty_generate(obj, indent_len=4)
       end
 
     end # end def
+    private
+    # simplify jsonification of standard types
+    def simple_generate(obj)
+      case obj
+        when NilClass
+          'null'
+        when Fixnum, Float, TrueClass, FalseClass
+          "#{obj}"
+        else
+          # Should be a string
+          # keep string integers unquoted
+          (obj =~ /\A[-]?\d+\z/) ? obj : obj.to_json
+      end
+    end
 
   end # end class
 

spec/classes/init_spec.rb

@@ -297,7 +297,7 @@
     it { should contain_file('consul config.json').with_content(/"server": true/) }
     it { should contain_file('consul config.json').with_content(/"http": -1,/) }
     it { should contain_file('consul config.json').with_content(/"https": 8500/) }
-    it { should contain_file('consul config.json').with_content(/"ports": {/) }
+    it { should contain_file('consul config.json').with_content(/"ports": \{/) }
   end
 
   context "When asked not to manage the user" do
@@ -360,7 +360,7 @@
     it { should contain_file('consul config.json').with(
       :owner => 'custom_consul_user',
       :group => 'custom_consul_group',
-      :mode  => '0600',
+      :mode  => '0600'
     )}
   end
 

spec/functions/consul_sorted_json_spec.rb

@@ -1,5 +1,37 @@
 require 'spec_helper'
 
+RSpec.shared_examples 'handling_simple_types' do |pretty|
+  it 'handles nil' do
+    expect(subject.call([ {'key' => nil }],pretty)).to eql('{"key":null}')
+  end
+  it 'handles true' do
+    expect(subject.call([{'key' => true }],pretty)).to eql('{"key":true}')
+  end
+  it 'handles nil' do
+    expect(subject.call([{'key' => false }],pretty)).to eql('{"key":false}')
+  end
+  it 'handles positive integer' do
+    expect(subject.call([{'key' => 1 }],pretty)).to eql('{"key":1}')
+  end
+  it 'handles negative integer' do
+    expect(subject.call([{'key' => -1 }],pretty)).to eql('{"key":-1}')
+  end
+  it 'handles positive float' do
+    expect(subject.call([{'key' => 1.1 }],pretty)).to eql('{"key":1.1}')
+  end
+  it 'handles negative float' do
+    expect(subject.call([{'key' => -1.1 }],pretty)).to eql('{"key":-1.1}')
+  end
+  it 'handles integer in a string' do
+    expect(subject.call([{'key' => '1' }],pretty)).to eql('{"key":1}')
+  end
+  it 'handles negative integer in a string' do
+    expect(subject.call([{'key' => '-1' }],pretty)).to eql('{"key":-1}')
+  end
+  it 'handles simple string' do
+    expect(subject.call([{'key' => 'aString' }],pretty)).to eql("{\"key\":\"aString\"}")
+  end
+end
 describe 'consul_sorted_json', :type => :puppet_function do
 
   let(:test_hash){ { 'z' => 3, 'a' => '1', 'p' => '2', 's' => '-7' } }
@@ -41,4 +73,12 @@
     end
 
   end
+  context 'test simple behavior' do
+    context 'sorted' do
+      include_examples 'handling_simple_types', false
+    end
+    context 'sorted pretty' do
+      include_examples 'handling_simple_types', true
+    end
+  end
 end

spec/spec_helper.rb

@@ -13,7 +13,7 @@ def hiera_stub
 RSpec.configure do |c|
   c.mock_framework = :rspec
   c.before(:each) do
-    Puppet::Indirector::Hiera.stub(:hiera => hiera_stub)
+    allow(Puppet::Indirector::Hiera).to receive(:hiera) { hiera_stub }
   end
 
 end