ffi-yajl 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad912796d62ff75534ab7056d42be6ddb3b340bd
-  data.tar.gz: 1368094d6809554303390c8dc38e33b837d6da5d
+  metadata.gz: c76d6d5d0e11f2a085fdd78272c55a492ee362d7
+  data.tar.gz: 3cc812f89db0660b5dce02787eccd2a44b366396
 SHA512:
-  metadata.gz: 7e7d9eaedc22292ea2817b75cba4fa04c90cf6ca7032675a0d8b400e4b1f7df8bc7120ff3b9a0952c55f8c7c3129d6279f92f5ae97671368979cf9f0af99c024
-  data.tar.gz: 690d495c1fe962fefae46cb73520e8690151ab40424cb2ebca0f162fe2b5bbcf1cac481be5b0ce73f408e4c03eaa676ae7284601e0b992e6b85c8e13449e1919
+  metadata.gz: 794001e042b96c7c02eb61df28ef2090461ac4875422ade497aaf2ea53c44763a38e10326a8746608f38303f6d57ef8e9985a71b946298ee02edf898162c3756
+  data.tar.gz: 05412d987bb69c21c85cd1cb8993b6fbcf6bdcc07b37df32cc723a29a0b852462a774adaa88a9bd038b43fceab807da140a3be5ec8bc4f8c4843490d092895ec

data/LICENSE

@@ -1,201 +1,22 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Copyright (c) 2014 Lamont Granquist
+Copyright (c) 2014 Chef Software, Inc.
+Copyright (c) 2008-2011 Brian Lopez - http://github.com/brianmario
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -3,13 +3,17 @@
 
 ## TODO
 
-- fix int conversion issue in chef specs in c extension
 
 ## BUILD NOTES
 
-- building libyajl2 requires 'apt-get install cmake' on ubuntu, but note
-  that 'apt-get install libyajl2' will be better
 
 ## KNOWN BUGS
 
-- 'rake compile' broken on mac, only tested to work on linux (ubuntu)
+
+## Thanks
+
+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
+pulled in from brianmario's existing yajl-ruby gem, particularly all the c extension code, lots of specs and the benchmarks.  And the
+process of writing this would have been much more difficult without being able to draw heavily from already solved problems in
+yajl-ruby.
+

data/ext/ffi_yajl/ext/encoder/extconf.rb

@@ -28,6 +28,34 @@ if windows?
   $libs = "#{$libs} -lyajldll"
 end
 
+# NOTE: find_library has the side effect of adding -lyajl to the flags which we are deliberately
+# avoiding doing with the libyajl2-gem (allowing it to be lazily loaded with dlopen)
+if !windows? && !find_header('yajl/yajl_tree.h')
+  puts "libyajl2 headers not found in libyajl2-gem, searching for system libraries..."
+
+  HEADER_DIRS = [
+    "/opt/local/include",                   # MacPorts
+    "/usr/local/include",                   # /usr/local
+    RbConfig::CONFIG['includedir'],         # Ruby
+    "/usr/include",                         # (default)
+  ]
+
+  LIB_DIRS = [
+    "/opt/local/lib",                       # MacPorts
+    "/usr/local/lib",                       # /usr/local + Homebrew
+    RbConfig::CONFIG['libdir'],             # Ruby
+    "/usr/lib",                             # (default)
+  ]
+
+  # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib
+  dir_config('yajl', HEADER_DIRS, LIB_DIRS)
+
+  # here we use find_library in order to deliberately link with -lyajl as a useful side-effect
+  if !(find_header('yajl/yajl_tree.h') && find_library('yajl', 'yajl_complete_parse'))
+    abort "libyajl2 is missing.  please install libyajl2"
+  end
+end
+
 dir_config 'encoder'
 
 create_makefile 'ffi_yajl/ext/encoder'

data/ext/ffi_yajl/ext/parser/extconf.rb

@@ -28,6 +28,34 @@ if windows?
   $libs = "#{$libs} -lyajldll"
 end
 
+# NOTE: find_library has the side effect of adding -lyajl to the flags which we are deliberately
+# avoiding doing with the libyajl2-gem (allowing it to be lazily loaded with dlopen)
+if !windows? && !find_header('yajl/yajl_tree.h')
+  puts "libyajl2 headers not found in libyajl2-gem, searching for system libraries..."
+
+  HEADER_DIRS = [
+    "/opt/local/include",                   # MacPorts
+    "/usr/local/include",                   # /usr/local
+    RbConfig::CONFIG['includedir'],         # Ruby
+    "/usr/include",                         # (default)
+  ]
+
+  LIB_DIRS = [
+    "/opt/local/lib",                       # MacPorts
+    "/usr/local/lib",                       # /usr/local + Homebrew
+    RbConfig::CONFIG['libdir'],             # Ruby
+    "/usr/lib",                             # (default)
+  ]
+
+  # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib
+  dir_config('yajl', HEADER_DIRS, LIB_DIRS)
+
+  # here we use find_library in order to deliberately link with -lyajl as a useful side-effect
+  if !(find_header('yajl/yajl_tree.h') && find_library('yajl', 'yajl_complete_parse'))
+    abort "libyajl2 is missing.  please install libyajl2"
+  end
+end
+
 dir_config 'parser'
 
 create_makefile 'ffi_yajl/ext/parser'

data/lib/ffi_yajl/ext.rb

@@ -8,10 +8,6 @@ begin
   require 'fiddle'
 rescue LoadError
 end
-begin
-  require 'dl'
-rescue LoadError
-end
 
 module FFI_Yajl
   # FIXME: DRY with ffi_yajl/ffi.rb
@@ -21,11 +17,15 @@ module FFI_Yajl
   libpath = ::FFI.map_library_name("yajl") unless File.exist?(libpath)
   if defined?(Fiddle) && Fiddle.respond_to?(:dlopen)
     ::Fiddle.dlopen(libpath)
-  elsif defined?(DL) && DL.respond_to?(:dlopen)
-    ::DL.dlopen(libpath)
   else
-    extend ::FFI::Library
-    ffi_lib libpath
+    # deliberately convoluted delayed require here to avoid deprecation
+    # warning from requiring dl
+    require 'dl'
+    if defined?(DL) && DL.respond_to?(:dlopen)
+      ::DL.dlopen(libpath)
+    else
+      raise "cannot find dlopen in either DL or Fiddle, cannot proceed"
+    end
   end
 
   class Parser

data/lib/ffi_yajl/version.rb

@@ -1,3 +1,3 @@
 module FFI_Yajl
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/ffi_yajl/json_gem_spec.rb

@@ -85,6 +85,18 @@ describe "JSON Gem Compat API" do
       expect(JSON.respond_to?(:dump)).to be true
     end
 
+    it "JSON#pretty_generate should work with an explicit nil for options" do
+      expect(JSON.pretty_generate({'foo' => 1234}, nil)).to eql("{\n  \"foo\": 1234\n}")
+    end
+
+    it "JSON#pretty_generate should work without options" do
+      expect(JSON.pretty_generate({'foo' => 1234})).to eql("{\n  \"foo\": 1234\n}")
+    end
+
+    it "JSON#pretty_generate should work with an empty options hash" do
+      expect(JSON.pretty_generate({'foo' => 1234}, {})).to eql("{\n  \"foo\": 1234\n}")
+    end
+
     context "when setting symbolize_keys via JSON.default_options" do
       after(:each) { JSON.default_options[:symbolize_keys] = false }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -151,6 +151,8 @@ files:
 - lib/ffi_yajl/encoder.rb
 - lib/ffi_yajl/ext.rb
 - lib/ffi_yajl/ext/.keep
+- lib/ffi_yajl/ext/encoder.bundle
+- lib/ffi_yajl/ext/parser.bundle
 - lib/ffi_yajl/ffi.rb
 - lib/ffi_yajl/ffi/encoder.rb
 - lib/ffi_yajl/ffi/parser.rb