ffi-yajl 0.2.0 → 0.2.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ad912796d62ff75534ab7056d42be6ddb3b340bd
4
- data.tar.gz: 1368094d6809554303390c8dc38e33b837d6da5d
3
+ metadata.gz: c76d6d5d0e11f2a085fdd78272c55a492ee362d7
4
+ data.tar.gz: 3cc812f89db0660b5dce02787eccd2a44b366396
5
5
  SHA512:
6
- metadata.gz: 7e7d9eaedc22292ea2817b75cba4fa04c90cf6ca7032675a0d8b400e4b1f7df8bc7120ff3b9a0952c55f8c7c3129d6279f92f5ae97671368979cf9f0af99c024
7
- data.tar.gz: 690d495c1fe962fefae46cb73520e8690151ab40424cb2ebca0f162fe2b5bbcf1cac481be5b0ce73f408e4c03eaa676ae7284601e0b992e6b85c8e13449e1919
6
+ metadata.gz: 794001e042b96c7c02eb61df28ef2090461ac4875422ade497aaf2ea53c44763a38e10326a8746608f38303f6d57ef8e9985a71b946298ee02edf898162c3756
7
+ data.tar.gz: 05412d987bb69c21c85cd1cb8993b6fbcf6bdcc07b37df32cc723a29a0b852462a774adaa88a9bd038b43fceab807da140a3be5ec8bc4f8c4843490d092895ec
data/LICENSE CHANGED
@@ -1,201 +1,22 @@
1
- Apache License
2
- Version 2.0, January 2004
3
- http://www.apache.org/licenses/
4
-
5
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6
-
7
- 1. Definitions.
8
-
9
- "License" shall mean the terms and conditions for use, reproduction,
10
- and distribution as defined by Sections 1 through 9 of this document.
11
-
12
- "Licensor" shall mean the copyright owner or entity authorized by
13
- the copyright owner that is granting the License.
14
-
15
- "Legal Entity" shall mean the union of the acting entity and all
16
- other entities that control, are controlled by, or are under common
17
- control with that entity. For the purposes of this definition,
18
- "control" means (i) the power, direct or indirect, to cause the
19
- direction or management of such entity, whether by contract or
20
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
21
- outstanding shares, or (iii) beneficial ownership of such entity.
22
-
23
- "You" (or "Your") shall mean an individual or Legal Entity
24
- exercising permissions granted by this License.
25
-
26
- "Source" form shall mean the preferred form for making modifications,
27
- including but not limited to software source code, documentation
28
- source, and configuration files.
29
-
30
- "Object" form shall mean any form resulting from mechanical
31
- transformation or translation of a Source form, including but
32
- not limited to compiled object code, generated documentation,
33
- and conversions to other media types.
34
-
35
- "Work" shall mean the work of authorship, whether in Source or
36
- Object form, made available under the License, as indicated by a
37
- copyright notice that is included in or attached to the work
38
- (an example is provided in the Appendix below).
39
-
40
- "Derivative Works" shall mean any work, whether in Source or Object
41
- form, that is based on (or derived from) the Work and for which the
42
- editorial revisions, annotations, elaborations, or other modifications
43
- represent, as a whole, an original work of authorship. For the purposes
44
- of this License, Derivative Works shall not include works that remain
45
- separable from, or merely link (or bind by name) to the interfaces of,
46
- the Work and Derivative Works thereof.
47
-
48
- "Contribution" shall mean any work of authorship, including
49
- the original version of the Work and any modifications or additions
50
- to that Work or Derivative Works thereof, that is intentionally
51
- submitted to Licensor for inclusion in the Work by the copyright owner
52
- or by an individual or Legal Entity authorized to submit on behalf of
53
- the copyright owner. For the purposes of this definition, "submitted"
54
- means any form of electronic, verbal, or written communication sent
55
- to the Licensor or its representatives, including but not limited to
56
- communication on electronic mailing lists, source code control systems,
57
- and issue tracking systems that are managed by, or on behalf of, the
58
- Licensor for the purpose of discussing and improving the Work, but
59
- excluding communication that is conspicuously marked or otherwise
60
- designated in writing by the copyright owner as "Not a Contribution."
61
-
62
- "Contributor" shall mean Licensor and any individual or Legal Entity
63
- on behalf of whom a Contribution has been received by Licensor and
64
- subsequently incorporated within the Work.
65
-
66
- 2. Grant of Copyright License. Subject to the terms and conditions of
67
- this License, each Contributor hereby grants to You a perpetual,
68
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69
- copyright license to reproduce, prepare Derivative Works of,
70
- publicly display, publicly perform, sublicense, and distribute the
71
- Work and such Derivative Works in Source or Object form.
72
-
73
- 3. Grant of Patent License. Subject to the terms and conditions of
74
- this License, each Contributor hereby grants to You a perpetual,
75
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76
- (except as stated in this section) patent license to make, have made,
77
- use, offer to sell, sell, import, and otherwise transfer the Work,
78
- where such license applies only to those patent claims licensable
79
- by such Contributor that are necessarily infringed by their
80
- Contribution(s) alone or by combination of their Contribution(s)
81
- with the Work to which such Contribution(s) was submitted. If You
82
- institute patent litigation against any entity (including a
83
- cross-claim or counterclaim in a lawsuit) alleging that the Work
84
- or a Contribution incorporated within the Work constitutes direct
85
- or contributory patent infringement, then any patent licenses
86
- granted to You under this License for that Work shall terminate
87
- as of the date such litigation is filed.
88
-
89
- 4. Redistribution. You may reproduce and distribute copies of the
90
- Work or Derivative Works thereof in any medium, with or without
91
- modifications, and in Source or Object form, provided that You
92
- meet the following conditions:
93
-
94
- (a) You must give any other recipients of the Work or
95
- Derivative Works a copy of this License; and
96
-
97
- (b) You must cause any modified files to carry prominent notices
98
- stating that You changed the files; and
99
-
100
- (c) You must retain, in the Source form of any Derivative Works
101
- that You distribute, all copyright, patent, trademark, and
102
- attribution notices from the Source form of the Work,
103
- excluding those notices that do not pertain to any part of
104
- the Derivative Works; and
105
-
106
- (d) If the Work includes a "NOTICE" text file as part of its
107
- distribution, then any Derivative Works that You distribute must
108
- include a readable copy of the attribution notices contained
109
- within such NOTICE file, excluding those notices that do not
110
- pertain to any part of the Derivative Works, in at least one
111
- of the following places: within a NOTICE text file distributed
112
- as part of the Derivative Works; within the Source form or
113
- documentation, if provided along with the Derivative Works; or,
114
- within a display generated by the Derivative Works, if and
115
- wherever such third-party notices normally appear. The contents
116
- of the NOTICE file are for informational purposes only and
117
- do not modify the License. You may add Your own attribution
118
- notices within Derivative Works that You distribute, alongside
119
- or as an addendum to the NOTICE text from the Work, provided
120
- that such additional attribution notices cannot be construed
121
- as modifying the License.
122
-
123
- You may add Your own copyright statement to Your modifications and
124
- may provide additional or different license terms and conditions
125
- for use, reproduction, or distribution of Your modifications, or
126
- for any such Derivative Works as a whole, provided Your use,
127
- reproduction, and distribution of the Work otherwise complies with
128
- the conditions stated in this License.
129
-
130
- 5. Submission of Contributions. Unless You explicitly state otherwise,
131
- any Contribution intentionally submitted for inclusion in the Work
132
- by You to the Licensor shall be under the terms and conditions of
133
- this License, without any additional terms or conditions.
134
- Notwithstanding the above, nothing herein shall supersede or modify
135
- the terms of any separate license agreement you may have executed
136
- with Licensor regarding such Contributions.
137
-
138
- 6. Trademarks. This License does not grant permission to use the trade
139
- names, trademarks, service marks, or product names of the Licensor,
140
- except as required for reasonable and customary use in describing the
141
- origin of the Work and reproducing the content of the NOTICE file.
142
-
143
- 7. Disclaimer of Warranty. Unless required by applicable law or
144
- agreed to in writing, Licensor provides the Work (and each
145
- Contributor provides its Contributions) on an "AS IS" BASIS,
146
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147
- implied, including, without limitation, any warranties or conditions
148
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149
- PARTICULAR PURPOSE. You are solely responsible for determining the
150
- appropriateness of using or redistributing the Work and assume any
151
- risks associated with Your exercise of permissions under this License.
152
-
153
- 8. Limitation of Liability. In no event and under no legal theory,
154
- whether in tort (including negligence), contract, or otherwise,
155
- unless required by applicable law (such as deliberate and grossly
156
- negligent acts) or agreed to in writing, shall any Contributor be
157
- liable to You for damages, including any direct, indirect, special,
158
- incidental, or consequential damages of any character arising as a
159
- result of this License or out of the use or inability to use the
160
- Work (including but not limited to damages for loss of goodwill,
161
- work stoppage, computer failure or malfunction, or any and all
162
- other commercial damages or losses), even if such Contributor
163
- has been advised of the possibility of such damages.
164
-
165
- 9. Accepting Warranty or Additional Liability. While redistributing
166
- the Work or Derivative Works thereof, You may choose to offer,
167
- and charge a fee for, acceptance of support, warranty, indemnity,
168
- or other liability obligations and/or rights consistent with this
169
- License. However, in accepting such obligations, You may act only
170
- on Your own behalf and on Your sole responsibility, not on behalf
171
- of any other Contributor, and only if You agree to indemnify,
172
- defend, and hold each Contributor harmless for any liability
173
- incurred by, or claims asserted against, such Contributor by reason
174
- of your accepting any such warranty or additional liability.
175
-
176
- END OF TERMS AND CONDITIONS
177
-
178
- APPENDIX: How to apply the Apache License to your work.
179
-
180
- To apply the Apache License to your work, attach the following
181
- boilerplate notice, with the fields enclosed by brackets "[]"
182
- replaced with your own identifying information. (Don't include
183
- the brackets!) The text should be enclosed in the appropriate
184
- comment syntax for the file format. We also recommend that a
185
- file or class name and description of purpose be included on the
186
- same "printed page" as the copyright notice for easier
187
- identification within third-party archives.
188
-
189
- Copyright [yyyy] [name of copyright owner]
190
-
191
- Licensed under the Apache License, Version 2.0 (the "License");
192
- you may not use this file except in compliance with the License.
193
- You may obtain a copy of the License at
194
-
195
- http://www.apache.org/licenses/LICENSE-2.0
196
-
197
- Unless required by applicable law or agreed to in writing, software
198
- distributed under the License is distributed on an "AS IS" BASIS,
199
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200
- See the License for the specific language governing permissions and
201
- limitations under the License.
1
+ Copyright (c) 2014 Lamont Granquist
2
+ Copyright (c) 2014 Chef Software, Inc.
3
+ Copyright (c) 2008-2011 Brian Lopez - http://github.com/brianmario
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining
6
+ a copy of this software and associated documentation files (the
7
+ "Software"), to deal in the Software without restriction, including
8
+ without limitation the rights to use, copy, modify, merge, publish,
9
+ distribute, sublicense, and/or sell copies of the Software, and to
10
+ permit persons to whom the Software is furnished to do so, subject to
11
+ the following conditions:
12
+
13
+ The above copyright notice and this permission notice shall be
14
+ included in all copies or substantial portions of the Software.
15
+
16
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
20
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/README.md CHANGED
@@ -3,13 +3,17 @@
3
3
 
4
4
  ## TODO
5
5
 
6
- - fix int conversion issue in chef specs in c extension
7
6
 
8
7
  ## BUILD NOTES
9
8
 
10
- - building libyajl2 requires 'apt-get install cmake' on ubuntu, but note
11
- that 'apt-get install libyajl2' will be better
12
9
 
13
10
  ## KNOWN BUGS
14
11
 
15
- - 'rake compile' broken on mac, only tested to work on linux (ubuntu)
12
+
13
+ ## Thanks
14
+
15
+ This was initially going to be a clean rewrite of an ffi ruby wrapper around yajl2, but as it progressed more and more code was
16
+ pulled in from brianmario's existing yajl-ruby gem, particularly all the c extension code, lots of specs and the benchmarks. And the
17
+ process of writing this would have been much more difficult without being able to draw heavily from already solved problems in
18
+ yajl-ruby.
19
+
@@ -28,6 +28,34 @@ if windows?
28
28
  $libs = "#{$libs} -lyajldll"
29
29
  end
30
30
 
31
+ # NOTE: find_library has the side effect of adding -lyajl to the flags which we are deliberately
32
+ # avoiding doing with the libyajl2-gem (allowing it to be lazily loaded with dlopen)
33
+ if !windows? && !find_header('yajl/yajl_tree.h')
34
+ puts "libyajl2 headers not found in libyajl2-gem, searching for system libraries..."
35
+
36
+ HEADER_DIRS = [
37
+ "/opt/local/include", # MacPorts
38
+ "/usr/local/include", # /usr/local
39
+ RbConfig::CONFIG['includedir'], # Ruby
40
+ "/usr/include", # (default)
41
+ ]
42
+
43
+ LIB_DIRS = [
44
+ "/opt/local/lib", # MacPorts
45
+ "/usr/local/lib", # /usr/local + Homebrew
46
+ RbConfig::CONFIG['libdir'], # Ruby
47
+ "/usr/lib", # (default)
48
+ ]
49
+
50
+ # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib
51
+ dir_config('yajl', HEADER_DIRS, LIB_DIRS)
52
+
53
+ # here we use find_library in order to deliberately link with -lyajl as a useful side-effect
54
+ if !(find_header('yajl/yajl_tree.h') && find_library('yajl', 'yajl_complete_parse'))
55
+ abort "libyajl2 is missing. please install libyajl2"
56
+ end
57
+ end
58
+
31
59
  dir_config 'encoder'
32
60
 
33
61
  create_makefile 'ffi_yajl/ext/encoder'
@@ -28,6 +28,34 @@ if windows?
28
28
  $libs = "#{$libs} -lyajldll"
29
29
  end
30
30
 
31
+ # NOTE: find_library has the side effect of adding -lyajl to the flags which we are deliberately
32
+ # avoiding doing with the libyajl2-gem (allowing it to be lazily loaded with dlopen)
33
+ if !windows? && !find_header('yajl/yajl_tree.h')
34
+ puts "libyajl2 headers not found in libyajl2-gem, searching for system libraries..."
35
+
36
+ HEADER_DIRS = [
37
+ "/opt/local/include", # MacPorts
38
+ "/usr/local/include", # /usr/local
39
+ RbConfig::CONFIG['includedir'], # Ruby
40
+ "/usr/include", # (default)
41
+ ]
42
+
43
+ LIB_DIRS = [
44
+ "/opt/local/lib", # MacPorts
45
+ "/usr/local/lib", # /usr/local + Homebrew
46
+ RbConfig::CONFIG['libdir'], # Ruby
47
+ "/usr/lib", # (default)
48
+ ]
49
+
50
+ # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib
51
+ dir_config('yajl', HEADER_DIRS, LIB_DIRS)
52
+
53
+ # here we use find_library in order to deliberately link with -lyajl as a useful side-effect
54
+ if !(find_header('yajl/yajl_tree.h') && find_library('yajl', 'yajl_complete_parse'))
55
+ abort "libyajl2 is missing. please install libyajl2"
56
+ end
57
+ end
58
+
31
59
  dir_config 'parser'
32
60
 
33
61
  create_makefile 'ffi_yajl/ext/parser'
@@ -8,10 +8,6 @@ begin
8
8
  require 'fiddle'
9
9
  rescue LoadError
10
10
  end
11
- begin
12
- require 'dl'
13
- rescue LoadError
14
- end
15
11
 
16
12
  module FFI_Yajl
17
13
  # FIXME: DRY with ffi_yajl/ffi.rb
@@ -21,11 +17,15 @@ module FFI_Yajl
21
17
  libpath = ::FFI.map_library_name("yajl") unless File.exist?(libpath)
22
18
  if defined?(Fiddle) && Fiddle.respond_to?(:dlopen)
23
19
  ::Fiddle.dlopen(libpath)
24
- elsif defined?(DL) && DL.respond_to?(:dlopen)
25
- ::DL.dlopen(libpath)
26
20
  else
27
- extend ::FFI::Library
28
- ffi_lib libpath
21
+ # deliberately convoluted delayed require here to avoid deprecation
22
+ # warning from requiring dl
23
+ require 'dl'
24
+ if defined?(DL) && DL.respond_to?(:dlopen)
25
+ ::DL.dlopen(libpath)
26
+ else
27
+ raise "cannot find dlopen in either DL or Fiddle, cannot proceed"
28
+ end
29
29
  end
30
30
 
31
31
  class Parser
@@ -1,3 +1,3 @@
1
1
  module FFI_Yajl
2
- VERSION = "0.2.0"
2
+ VERSION = "0.2.1"
3
3
  end
@@ -85,6 +85,18 @@ describe "JSON Gem Compat API" do
85
85
  expect(JSON.respond_to?(:dump)).to be true
86
86
  end
87
87
 
88
+ it "JSON#pretty_generate should work with an explicit nil for options" do
89
+ expect(JSON.pretty_generate({'foo' => 1234}, nil)).to eql("{\n \"foo\": 1234\n}")
90
+ end
91
+
92
+ it "JSON#pretty_generate should work without options" do
93
+ expect(JSON.pretty_generate({'foo' => 1234})).to eql("{\n \"foo\": 1234\n}")
94
+ end
95
+
96
+ it "JSON#pretty_generate should work with an empty options hash" do
97
+ expect(JSON.pretty_generate({'foo' => 1234}, {})).to eql("{\n \"foo\": 1234\n}")
98
+ end
99
+
88
100
  context "when setting symbolize_keys via JSON.default_options" do
89
101
  after(:each) { JSON.default_options[:symbolize_keys] = false }
90
102
 
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: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Lamont Granquist
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-23 00:00:00.000000000 Z
11
+ date: 2014-07-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rake
@@ -151,6 +151,8 @@ files:
151
151
  - lib/ffi_yajl/encoder.rb
152
152
  - lib/ffi_yajl/ext.rb
153
153
  - lib/ffi_yajl/ext/.keep
154
+ - lib/ffi_yajl/ext/encoder.bundle
155
+ - lib/ffi_yajl/ext/parser.bundle
154
156
  - lib/ffi_yajl/ffi.rb
155
157
  - lib/ffi_yajl/ffi/encoder.rb
156
158
  - lib/ffi_yajl/ffi/parser.rb