Merge branch 'zenspider-zenspider/ruby-2.7'

flori · Nov 29, 2019 · 05de02f · 05de02f
2 parents e5e9a77 + bfe61e1
commit 05de02f
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ rvm:
   - 2.4
   - 2.5
   - 2.6
+  - 2.7.0-preview2
   - ruby-head
   - jruby
 matrix:

diff --git a/Rakefile b/Rakefile
@@ -89,7 +89,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
 
     s.require_path = 'lib'
     s.add_development_dependency 'rake'
-    s.add_development_dependency 'test-unit', '~> 2.0'
+    s.add_development_dependency 'test-unit', '~> 3.0'
 
     s.extra_rdoc_files << 'README.md'
     s.rdoc_options <<
@@ -127,7 +127,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
 
     s.require_path = 'lib'
     s.add_development_dependency 'rake'
-    s.add_development_dependency 'test-unit', '~> 2.0'
+    s.add_development_dependency 'test-unit', '~> 3.0'
 
     s.extra_rdoc_files << 'README.md'
     s.rdoc_options <<

diff --git a/json-java.gemspec b/json-java.gemspec
@@ -19,14 +19,14 @@ spec = Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, ["~> 2.0"])
+      s.add_development_dependency(%q<test-unit>, ["~> 3.0"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<test-unit>, ["~> 2.0"])
+      s.add_dependency(%q<test-unit>, ["~> 3.0"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<test-unit>, ["~> 2.0"])
+    s.add_dependency(%q<test-unit>, ["~> 3.0"])
   end
 end
 

diff --git a/json_pure.gemspec b/json_pure.gemspec
@@ -23,16 +23,13 @@ Gem::Specification.new do |s|
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<test-unit>.freeze, ["~> 2.0"])
-    else
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<test-unit>.freeze, ["~> 2.0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+    s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.0"])
   else
     s.add_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_dependency(%q<test-unit>.freeze, ["~> 2.0"])
+    s.add_dependency(%q<test-unit>.freeze, ["~> 3.0"])
   end
 end
diff --git a/lib/json/pure/generator.rb b/lib/json/pure/generator.rb
@@ -250,7 +250,8 @@ def [](name)
           if respond_to?(name)
             __send__(name)
           else
-            instance_variable_get("@#{name}")
+            instance_variable_get("@#{name}") if
+              instance_variables.include?("@#{name}".to_sym) # avoid warning
           end
         end
 

diff --git a/lib/json/pure/parser.rb b/lib/json/pure/parser.rb
@@ -197,7 +197,15 @@ def parse_string
       def parse_value
         case
         when scan(FLOAT)
-          @decimal_class && @decimal_class.new(self[1]) || Float(self[1])
+          if @decimal_class then
+            if @decimal_class == BigDecimal then
+              BigDecimal(self[1])
+            else
+              @decimal_class.new(self[1]) || Float(self[1])
+            end
+          else
+            Float(self[1])
+          end
         when scan(INTEGER)
           Integer(self[1])
         when scan(TRUE)