yajl-ruby 1.0.0 → 1.1.0

data/.travis.yml

@@ -0,0 +1,6 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx
+  - ree

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.0 (November 9th, 2011)
+* fix compilation due to a "bug" in gcc-llvm on 10.7.2
+* fix gemspec so ruby 1.8.6 or later is required
+*
+
 ## 1.0.0 (September 13th, 2011)
 * add deprecation notice for Yajl's Bzip2 support
 * add deprecation notice for Yajl's Deflate support
@@ -324,4 +329,4 @@
 * updated gemspec and README
 
 ## 0.1.0 (April 21st, 2009)
-* initial release - gemified
+* initial release - gemified

data/README.md

@@ -224,7 +224,7 @@ str = Yajl::Encoder.encode(obj)
 
 You can also use `Yajl::Bzip2::StreamWriter` and `Yajl::Deflate::StreamWriter`. So you can pick whichever fits your CPU/bandwidth sweet-spot.
 
-=== HTML Safety
+### HTML Safety
 
 If you plan on embedding the output from the encoder in the DOM, you'll want to make sure you use the html_safe option on the encoder. This will escape all '/' characters to ensure no closing tags can be injected, preventing XSS.
 
@@ -236,7 +236,7 @@ Meaning the following should be perfectly safe:
 </script>
 ```
 
-== JSON gem Compatibility API
+## JSON gem Compatibility API
 
 The JSON gem compatibility API isn't enabled by default. You have to explicitly require it like so:
 

data/ext/yajl/yajl_ext.c

@@ -33,7 +33,7 @@
  return rb_yajl_encoder_encode(1, &self, rb_encoder);     \
 
 /* Helpers for building objects */
-inline void yajl_check_and_fire_callback(void * ctx) {
+static void yajl_check_and_fire_callback(void * ctx) {
     yajl_parser_wrapper * wrapper;
     GetParser((VALUE)ctx, wrapper);
 
@@ -54,7 +54,7 @@ inline void yajl_check_and_fire_callback(void * ctx) {
     }
 }
 
-inline void yajl_set_static_value(void * ctx, VALUE val) {
+static void yajl_set_static_value(void * ctx, VALUE val) {
     yajl_parser_wrapper * wrapper;
     VALUE lastEntry, hash;
     int len;

data/ext/yajl/yajl_ext.h

@@ -61,8 +61,8 @@ static ID sym_allow_comments, sym_check_utf8, sym_pretty, sym_indent, sym_termin
 #define GetParser(obj, sval) (sval = (yajl_parser_wrapper*)DATA_PTR(obj));
 #define GetEncoder(obj, sval) (sval = (yajl_encoder_wrapper*)DATA_PTR(obj));
 
-inline void yajl_check_and_fire_callback(void * ctx);
-inline void yajl_set_static_value(void * ctx, VALUE val);
+static void yajl_check_and_fire_callback(void * ctx);
+static void yajl_set_static_value(void * ctx, VALUE val);
 void yajl_encode_part(void * wrapper, VALUE obj, VALUE io);
 void yajl_parse_chunk(const unsigned char * chunk, unsigned int len, yajl_handle parser);
 

data/lib/yajl/json_gem.rb

@@ -1,5 +1,3 @@
-puts "DEPRECATION WARNING: Yajl's JSON gem compatibility API is going to be removed in 2.0"
-
 require 'yajl' unless defined?(Yajl::Parser)
 require 'yajl/json_gem/parsing'
 require 'yajl/json_gem/encoding'
@@ -12,4 +10,4 @@ module ::Kernel
       JSON.generate(object, opts)
     end
   end
-end
+end

data/lib/yajl/version.rb

@@ -1,3 +1,3 @@
 module Yajl
-  VERSION = '1.0.0'
-end
+  VERSION = '1.1.0'
+end

data/spec/encoding/encoding_spec.rb

@@ -9,13 +9,13 @@ end
 
 class TheMindKiller
   def to_json
-    @wait_i_dont_exist_this_is_a_horrible_mistake_dont_do_it_aiiiiiiiiieeeeeee
+    nil
   end
 end
 
 class TheMindKillerDuce
   def to_s
-    @wait_i_dont_exist_this_is_a_horrible_mistake_dont_do_it_aiiiiiiiiieeeeeee
+    nil
   end
 end
 
@@ -265,6 +265,9 @@ describe "Yajl JSON encoder" do
 
   it "return value of #to_s must be a string" do
     lambda {
+      if TheMindKillerDuce.send(:method_defined?, :to_json)
+        TheMindKillerDuce.send(:undef_method, :to_json)
+      end
       Yajl::Encoder.encode(TheMindKillerDuce.new)
     }.should raise_error(TypeError)
   end

data/yajl-ruby.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Ruby C bindings to the excellent Yajl JSON stream-based parser library.}
   s.test_files = `git ls-files spec examples`.split("\n")
+  s.required_ruby_version = ">= 1.8.6"
 
   # tests
   s.add_development_dependency 'rake-compiler', ">= 0.7.5"

metadata

@@ -1,71 +1,96 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: yajl-ruby
-version: !ruby/object:Gem::Version
-  version: 1.0.0
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
-authors:
+authors: 
 - Brian Lopez
 - Lloyd Hilaiel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000 -07:00
+
+date: 2011-11-09 00:00:00 -08:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: &70167590495720 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 7
+        - 5
         version: 0.7.5
   type: :development
-  prerelease: false
-  version_requirements: *70167590495720
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70167590495220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
   type: :development
-  prerelease: false
-  version_requirements: *70167590495220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70167590494840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70167590494840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70167590494380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70167590494380
+  version_requirements: *id004
 description: 
 email: seniorlopez@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/yajl/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
@@ -215,29 +240,40 @@ files:
 has_rdoc: true
 homepage: http://github.com/brianmario/yajl-ruby
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
+      version: 1.8.6
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby C bindings to the excellent Yajl JSON stream-based parser library.
-test_files:
+test_files: 
 - examples/encoding/chunked_encoding.rb
 - examples/encoding/one_shot.rb
 - examples/encoding/to_an_io.rb