multi_json 1.7.5 → 1.7.6

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+1.7.6
+-----
+* [Bring back MultiJson::VERSION constant](https://github.com/intridea/multi_json/commit/31b990c2725e6673bf8ce57540fe66b57a751a72)
+
 1.7.5
 -----
 * [Fix warning '*' interpreted as argument prefix](https://github.com/intridea/multi_json/commit/b698962c7f64430222a1f06430669706a47aff89)

data/lib/multi_json/adapters/oj.rb

@@ -8,11 +8,7 @@ module MultiJson
       defaults :load, :mode => :strict, :symbolize_keys => false
       defaults :dump, :mode => :compat, :time_format => :ruby
 
-      ParseError = if defined?(::Oj::ParseError)
-        ::Oj::ParseError
-      else
-        SyntaxError
-      end
+      ParseError = defined?(::Oj::ParseError) ? ::Oj::ParseError : SyntaxError
 
       def load(string, options={})
         options[:symbol_keys] = options.delete(:symbolize_keys)

data/lib/multi_json/version.rb

@@ -2,7 +2,7 @@ module MultiJson
   class Version
     MAJOR = 1 unless defined? MultiJson::Version::MAJOR
     MINOR = 7 unless defined? MultiJson::Version::MINOR
-    PATCH = 5 unless defined? MultiJson::Version::PATCH
+    PATCH = 6 unless defined? MultiJson::Version::PATCH
     PRE = nil unless defined? MultiJson::Version::PRE
 
     class << self
@@ -15,4 +15,6 @@ module MultiJson
     end
 
   end
+
+  VERSION = Version.to_s.freeze
 end

data/spec/helper.rb

@@ -6,6 +6,7 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   Coveralls::SimpleCov::Formatter
 ]
 SimpleCov.start do
+  add_filter 'spec'
   add_filter 'vendor'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -39,7 +39,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler