summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix uninitialized instance variable when using extuninitialized-variable-in-extdanielsdeleo2015-06-191-0/+1
|
* Merge pull request #62 from kou/fix-superclass-mismatch-for-stringioLamont Granquist2015-05-271-1/+4
|\ | | | | Fix superclass mismatch for class StringIO
| * Ensure DateTime defined instead of specifying super classKouhei Sutou2015-05-271-1/+2
| |
| * Fix superclass mismatch for class StringIOKouhei Sutou2015-05-271-0/+2
|/ | | | | | % ruby -I lib -r ffi_yajl/ffi -r stringio -e '' /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require': superclass mismatch for class StringIO (TypeError) from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require'
* Merge pull request #61 from kou/suppress-asigned-but-unused-variable-warningsLamont Granquist2015-05-241-1/+0
|\ | | | | Suppress assigned but unused variable warning
| * Suppress assigned but unused variable warningKouhei Sutou2015-05-211-1/+0
| | | | | | | | | | | | % FORCE_FFI_YAJL=ffi ruby -w -I lib -e 'require "ffi_yajl"' ... lib/ffi_yajl/ffi/encoder.rb:56: warning: assigned but unused variable - length
* | Merge pull request #60 from kou/suppress-circular-require-warningsLamont Granquist2015-05-242-4/+0
|\ \ | |/ |/| Suppress circular require warnings
| * Suppress circular require warningsKouhei Sutou2015-05-212-4/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | % FORCE_FFI_YAJL=ffi ruby -w -I lib -e 'require "ffi_yajl"' ... /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55: warning: loading in progress, circular require considered harmful - lib/ffi_yajl/ffi.rb from -e:1:in `<main>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl.rb:40:in `<top (required)>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl/ffi.rb:144:in `<top (required)>' from lib/ffi_yajl/ffi.rb:145:in `<module:FFI_Yajl>' from lib/ffi_yajl/ffi.rb:146:in `<class:Parser>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl/ffi/parser.rb:23:in `<top (required)>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' lib/ffi_yajl/ffi/encoder.rb:56: warning: assigned but unused variable - length /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55: warning: loading in progress, circular require considered harmful - lib/ffi_yajl/ffi.rb from -e:1:in `<main>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl.rb:40:in `<top (required)>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl/ffi.rb:144:in `<top (required)>' from lib/ffi_yajl/ffi.rb:150:in `<module:FFI_Yajl>' from lib/ffi_yajl/ffi.rb:151:in `<class:Encoder>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from lib/ffi_yajl/ffi/encoder.rb:23:in `<top (required)>' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' from /usr/lib/ruby/2.1.0/rubygems/core_ext/kernel_require.rb:55:in `require' ...
* Merge pull request #58 from AaronLasseigne/patch-1Thom May2015-05-111-3/+3
|\ | | | | fix parse error in travis.yml
| * fix parse error in travis.ymlAaron Lasseigne2015-05-091-3/+3
|/ | | Having one space before "branches:" causes `YAML.load` to throw a syntax parse error.
* removing whitespace, testing travisLamont Granquist2015-05-051-1/+0
|
* add master to whitelistLamont Granquist2015-05-051-0/+3
|
* bump version to 2.2.02.2.0Lamont Granquist2015-04-301-1/+1
|
* update changelog for releaseLamont Granquist2015-04-301-0/+11
|
* derp, really force to utf8, really checkLamont Granquist2015-04-242-1/+5
|
* add more notes on what options doLamont Granquist2015-04-241-2/+4
|
* fix omitted options_hash in README APILamont Granquist2015-04-241-2/+2
|
* Merge pull request #57 from chef/lcg/utf8-string-replacementLamont Granquist2015-04-243-5/+12
|\ | | | | change :validate_utf8=false to still emit utf8
| * typofixLamont Granquist2015-04-241-1/+1
| |
| * change :validate_utf8=false to still emit utf8lcg/utf8-string-replacementLamont Granquist2015-04-233-5/+12
|/ | | | | | | | | | | validate_utf8=true raises on bad input validate_utf8=false now does not raise, but still produces valid UTF-8 clean JSON by replacing characters. the previous behavior of emitting bad JSON that was not UTF-8 clean when validate_utf8 was false is dropped (and this was behavior only of the C extension and not the ffi extension since the ffi layer must do some scrubbing of its own).
* Merge pull request #56 from chef/lcg/identify-bad-utf8-stringsLamont Granquist2015-04-228-223/+207
|\ | | | | emit token that failed utf-8 validation
| * add 1.8.7 note in README and drop support in gemspeclcg/identify-bad-utf8-stringsLamont Granquist2015-04-212-0/+4
| |
| * dropping support for ruby 1.8.7Lamont Granquist2015-04-213-15/+1
| | | | | | | | | | adding support for UTF-8 encoding issues and making it backcompat with 1.8.7 is too painful for words, goodbye...
| * emit token that failed utf-8 validationLamont Granquist2015-04-214-208/+202
|/ | | | plus code cleanup of the c-extension
* add more READMELamont Granquist2015-04-201-13/+91
|
* bumping version to 2.1.02.1.0Lamont Granquist2015-04-201-1/+1
|
* adding CHANGELOG.md for mergesLamont Granquist2015-04-201-0/+13
|
* Merge pull request #19 from chef/lcg/stringio-encodingLamont Granquist2015-04-203-15/+31
|\ | | | | support encoding StringIOs
| * add c ext sidelcg/stringio-encodingLamont Granquist2015-04-171-15/+17
| |
| * fix ffi sideLamont Granquist2015-04-172-1/+10
| |
| * add busted specLamont Granquist2015-04-171-0/+5
| |
* | Merge pull request #55 from chef/lcg/unique_key_checkingLamont Granquist2015-04-207-3/+32
|\ \ | |/ |/| add :unique_key_checking flag to parser
| * remove unnecessary castLamont Granquist2015-04-201-1/+1
| |
| * add :unique_key_checking flag to parserlcg/unique_key_checkingLamont Granquist2015-04-177-3/+32
|/ | | | | can be used to error out if keys are duplicated in input rather than silently replacing.
* Merge pull request #54 from chef/lcg/copyrightLamont Granquist2015-04-1414-0/+299
|\ | | | | add copyright notices
| * add copyright noticesLamont Granquist2015-04-1414-0/+299
|/
* Merge pull request #52 from chef/lcg/dlopen-extensionLamont Granquist2015-04-1412-100/+298
|\ | | | | add DLopen extension
| * add specs for library mapping helperslcg/dlopen-extensionLamont Granquist2015-04-131-0/+96
| |
| * limit rescue to just LoadErrorLamont Granquist2015-04-131-2/+12
| |
| * add explanatory commentLamont Granquist2015-04-131-0/+3
| |
| * test with yajl-ruby concurrently loadedLamont Granquist2015-04-112-0/+11
| |
| * add note on using system librariesLamont Granquist2015-04-061-6/+20
| |
| * remove commented codeLamont Granquist2015-04-061-4/+0
| |
| * add commentsLamont Granquist2015-04-061-0/+50
| |
| * move dlopen to c extensionLamont Granquist2015-04-062-5/+2
| | | | | | | | jruby can't load this
| * fixing libname guessing logicLamont Granquist2015-04-064-44/+49
| | | | | | | | | | run through multiple different possible library names and extensions, favoring the libyajl2 gem versions first.
| * add native dlopen extension codeLamont Granquist2015-04-066-53/+69
|/ | | | | This will get dlopen in a consistent place on all the platforms which need it.
* Merge pull request #53 from chef/lcg/tweak-travisLamont Granquist2015-04-061-15/+10
|\ | | | | add ruby 2.2.0 track latest rbx
| * track latest 2.1 and 2.2lcg/tweak-travisLamont Granquist2015-03-271-16/+6
| |
| * add ruby 2.2.0 track latest rbxLamont Granquist2015-03-271-4/+9
|/