ffi-yajl 2.2.0-universal-java → 2.2.1-universal-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -2
  3. data/Rakefile +11 -12
  4. data/bin/ffi-yajl-bench +4 -5
  5. data/ext/ffi_yajl/ext/dlopen/extconf.rb +1 -0
  6. data/ext/ffi_yajl/ext/encoder/encoder.c +9 -4
  7. data/ext/ffi_yajl/ext/encoder/extconf.rb +2 -1
  8. data/ext/ffi_yajl/ext/parser/extconf.rb +2 -1
  9. data/ext/ffi_yajl/ext/parser/parser.c +1 -0
  10. data/lib/ffi_yajl/benchmark.rb +0 -1
  11. data/lib/ffi_yajl/benchmark/encode.rb +32 -90
  12. data/lib/ffi_yajl/benchmark/encode_json_and_marshal.rb +14 -14
  13. data/lib/ffi_yajl/benchmark/encode_json_and_yaml.rb +13 -19
  14. data/lib/ffi_yajl/benchmark/encode_profile.rb +11 -15
  15. data/lib/ffi_yajl/benchmark/http.rb +9 -13
  16. data/lib/ffi_yajl/benchmark/parse.rb +71 -124
  17. data/lib/ffi_yajl/benchmark/parse_json_and_marshal.rb +17 -17
  18. data/lib/ffi_yajl/benchmark/parse_json_and_yaml.rb +19 -19
  19. data/lib/ffi_yajl/benchmark/parse_profile.rb +10 -14
  20. data/lib/ffi_yajl/benchmark/parse_profile_ruby_prof.rb +11 -16
  21. data/lib/ffi_yajl/benchmark/parse_stream.rb +17 -17
  22. data/lib/ffi_yajl/encoder.rb +3 -3
  23. data/lib/ffi_yajl/ffi.rb +23 -24
  24. data/lib/ffi_yajl/ffi/encoder.rb +29 -32
  25. data/lib/ffi_yajl/ffi/parser.rb +30 -37
  26. data/lib/ffi_yajl/map_library_name.rb +0 -1
  27. data/lib/ffi_yajl/parser.rb +5 -6
  28. data/lib/ffi_yajl/version.rb +1 -1
  29. data/spec/ffi_yajl/encoder_spec.rb +24 -25
  30. data/spec/ffi_yajl/map_library_name_spec.rb +0 -2
  31. data/spec/ffi_yajl/parser_spec.rb +54 -56
  32. data/spec/spec_helper.rb +8 -9
  33. metadata +2 -2
data/spec/spec_helper.rb CHANGED
@@ -20,7 +20,7 @@
20
20
  # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
21
21
  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22
22
 
23
- $: << File.expand_path(File.join(File.dirname( __FILE__ ), "../lib"))
23
+ $LOAD_PATH << File.expand_path(File.join(File.dirname( __FILE__ ), "../lib"))
24
24
 
25
25
  # load yajl-ruby into the same process (tests that both c-libs can be
26
26
  # linked in the same process). this should work, see:
@@ -28,19 +28,18 @@ $: << File.expand_path(File.join(File.dirname( __FILE__ ), "../lib"))
28
28
  begin
29
29
  require 'yajl'
30
30
  rescue LoadError
31
- # yajl can't be installed on jruby
31
+ puts 'WARN: yajl cannot be loaded, expected if this is jruby'
32
32
  end
33
33
 
34
34
  require 'ffi_yajl'
35
35
 
36
- RSpec.configure do |c|
37
- c.filter_run_excluding :unix_only => true unless RUBY_PLATFORM !~ /mswin|mingw|windows/
38
- c.filter_run_excluding :ruby_gte_193 => true unless RUBY_VERSION.to_f >= 2.0 || RUBY_VERSION =~ /^1\.9\.3/
36
+ RSpec.configure do |conf|
37
+ conf.filter_run_excluding unix_only: true unless RUBY_PLATFORM !~ /mswin|mingw|windows/
38
+ conf.filter_run_excluding ruby_gte_193: true unless RUBY_VERSION.to_f >= 2.0 || RUBY_VERSION =~ /^1\.9\.3/
39
39
 
40
- c.order = 'random'
40
+ conf.order = 'random'
41
41
 
42
- c.expect_with :rspec do |c|
43
- c.syntax = :expect
42
+ conf.expect_with :rspec do |rspec|
43
+ rspec.syntax = :expect
44
44
  end
45
-
46
45
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ffi-yajl
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.0
4
+ version: 2.2.1
5
5
  platform: universal-java
6
6
  authors:
7
7
  - Lamont Granquist
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-30 00:00:00.000000000 Z
11
+ date: 2015-07-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake