rgeo-geojson 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8822528ccb5ba382e80fc9713194331cd1d959c330268255cb2209de89fbcaa4
-  data.tar.gz: 5083e680f0aff2d54ceadfb3c7304e5ade6890cb93990e10ca51f0da2d5afd33
+  metadata.gz: d19417fa49fc036ec401b5d31bcd199127f4763271ea4dabf9ba71c42f52c597
+  data.tar.gz: 5cc770263b8cf0fabaab1afc4e5460ba09286817eb6e6c5141ceb60a79e141fe
 SHA512:
-  metadata.gz: 0d5433b8f2993175a546ee059e220ce0c6b4146eab7d87dd4c183809a998565125696865f46535f7fda09beb723103b12143a5cc5a501f31649ea7a396e5eac1
-  data.tar.gz: 6eacff7a1aefc10ae96b4ce0eca4efab188a7ddcd905b6fea17af30d15a676b98e08e352553bcccceb6c30c27997dce01e92817d10f76f99a87d6feb0ec343e3
+  metadata.gz: 2674558dd3cc38448be259d1559b8e8e30a6320a35c20d09c6ddb7e16a02cd5c6ef78cbf6629793781921a6dcae8ce5360ade73fb9e0b35b7cc52c362c2dcc80
+  data.tar.gz: 42cbf6b73fede00bd88970eb29cecdd6a6128450615cd366da2bae91a40243182ed17dccbd21c7e7f97a8a9622f1f9ac402f2ff9b64545eb69b0f5cb488bc302

data/History.md

@@ -1,4 +1,16 @@
-### 0.4.2 / 2016-1-5
+### 2.0.0 / 2018-01-13
+
+* Remove :json_parser option #38
+  * Use stdlib JSON parser
+
+
+### 1.0.0 / 2017-12-02
+
+* Require ruby 2.1+
+* Require rgeo 1.0+ #36
+
+
+### 0.4.2 / 2016-01-05
 
 * Fix Feature#inspect #21
 
@@ -10,9 +22,9 @@
 
 ### 0.4.0 / 2015-12-28
 
-* Removed error handling for missing parser gems
-* Removed class variables in Coder
-* Removed rgeo/geo_json.rb
+* Remove error handling for missing parser gems
+* Remove class variables in Coder
+* Remove rgeo/geo_json.rb
 
 
 ### 0.3.3 / 2015-12-23
@@ -24,7 +36,7 @@
 ### 0.3.2 / 2015-12-10
 
 * Faster coordinates methods (tneems) #18
-* Requires rgeo 0.5.0+
+* Require rgeo 0.5.0+
 
 
 ### 0.3.1 / 2014-05-29

data/README.md

@@ -25,13 +25,13 @@ Example:
 require 'rgeo/geo_json'
 
 str1 = '{"type":"Point","coordinates":[1,2]}'
-geom = RGeo::GeoJSON.decode(str1, json_parser: :json)
-geom.as_text              # => "POINT(1.0 2.0)"
+geom = RGeo::GeoJSON.decode(str1)
+geom.as_text              # => "POINT (1.0 2.0)"
 
 str2 = '{"type":"Feature","geometry":{"type":"Point","coordinates":[2.5,4.0]},"properties":{"color":"red"}}'
-feature = RGeo::GeoJSON.decode(str2, json_parser: :json)
+feature = RGeo::GeoJSON.decode(str2)
 feature['color']          # => 'red'
-feature.geometry.as_text  # => "POINT(2.5 4.0)"
+feature.geometry.as_text  # => "POINT (2.5 4.0)"
 
 hash = RGeo::GeoJSON.encode(feature)
 hash.to_json == str2      # => true
@@ -39,10 +39,10 @@ hash.to_json == str2      # => true
 
 ## Install
 
-`RGeo::GeoJSON` has the following requirements:
+`RGeo::GeoJSON` requires:
 
-* Ruby 1.9.3 or later
-* rgeo 0.5.0 or later.
+* Ruby 2.1.0 or later
+* rgeo 1.0.0 or later
 
 Include in your bundle:
 
@@ -56,7 +56,7 @@ Install `rgeo-geojson` as a gem:
 gem install rgeo-geojson
 ```
 
-See the README for the "rgeo" gem, a required dependency, for further installation information.
+See the README for the `rgeo` gem, a required dependency, for further installation information.
 
 ### Development and support
 
@@ -72,7 +72,7 @@ Report bugs on Github issues at http://github.com/rgeo/rgeo-geojson/issues
 
 RGeo was created by Daniel Azuma (http://www.daniel-azuma.com).
 
-Development is supported by [Pirq](http://www.pirq.com) and
+Development is/was supported by [Pirq](http://www.pirq.com) and
 [Neighborland](https://neighborland.com).
 
 ### License

data/lib/rgeo/geo_json.rb

@@ -3,3 +3,4 @@ require "rgeo/geo_json/version"
 require "rgeo/geo_json/entities"
 require "rgeo/geo_json/coder"
 require "rgeo/geo_json/interface"
+require "json"

data/lib/rgeo/geo_json/coder.rb

@@ -20,37 +20,9 @@ module RGeo
       #   RGeo::GeoJSON::EntityFactory, which generates objects of type
       #   RGeo::GeoJSON::Feature or RGeo::GeoJSON::FeatureCollection.
       #   See RGeo::GeoJSON::EntityFactory for more information.
-      # [<tt>:json_parser</tt>]
-      #   Specifies a JSON parser to use when decoding a String or IO
-      #   object. The value may be a Proc object taking the string as the
-      #   sole argument and returning the JSON hash, or it may be one of
-      #   the special values <tt>:json</tt>, <tt>:yajl</tt>, or
-      #   <tt>:active_support</tt>. Setting one of those special values
-      #   will require the corresponding library to be available. Note
-      #   that the <tt>:json</tt> library is present in the standard
-      #   library in Ruby 1.9.
-      #   If a parser is not specified, then the decode method will not
-      #   accept a String or IO object; it will require a Hash.
-
       def initialize(opts = {})
         @geo_factory = opts[:geo_factory] || RGeo::Cartesian.preferred_factory
         @entity_factory = opts[:entity_factory] || EntityFactory.instance
-        @json_parser = opts[:json_parser]
-        case @json_parser
-        when :json
-          require "json" unless defined?(JSON)
-          @json_parser = proc { |str| JSON.parse(str) }
-        when :yajl
-          require "yajl" unless defined?(Yajl)
-          @json_parser = proc { |str| Yajl::Parser.new.parse(str) }
-        when :active_support
-          require "active_support/json" unless defined?(ActiveSupport::JSON)
-          @json_parser = proc { |str| ActiveSupport::JSON.decode(str) }
-        when Proc, nil
-          # Leave as is
-        else
-          raise ::ArgumentError, "Unrecognzied json_parser: #{@json_parser.inspect}"
-        end
         @num_coordinates = 2
         @num_coordinates += 1 if @geo_factory.property(:has_z_coordinate)
         @num_coordinates += 1 if @geo_factory.property(:has_m_coordinate)
@@ -92,7 +64,7 @@ module RGeo
           input = input.read rescue nil
         end
         if input.is_a?(String)
-          input = @json_parser.call(input) rescue nil
+          input = JSON.parse(input)
         end
         unless input.is_a?(Hash)
           return nil
@@ -124,6 +96,8 @@ module RGeo
 
       attr_reader :entity_factory
 
+      private
+
       def _encode_feature(object) # :nodoc:
         json = {
           "type" => "Feature",

data/lib/rgeo/geo_json/interface.rb

@@ -31,18 +31,6 @@ module RGeo
       #   RGeo::GeoJSON::EntityFactory, which generates objects of type
       #   RGeo::GeoJSON::Feature or RGeo::GeoJSON::FeatureCollection.
       #   See RGeo::GeoJSON::EntityFactory for more information.
-      # [<tt>:json_parser</tt>]
-      #   Specifies a JSON parser to use when decoding a String or IO
-      #   object. The value may be a Proc object taking the string as the
-      #   sole argument and returning the JSON hash, or it may be one of
-      #   the special values <tt>:json</tt>, <tt>:yajl</tt>, or
-      #   <tt>:active_support</tt>. Setting one of those special values
-      #   will require the corresponding library to be available. Note
-      #   that the <tt>:json</tt> library is present in the standard
-      #   library in Ruby 1.9, but requires the "json" gem in Ruby 1.8.
-      #   If a parser is not specified, then the decode method will not
-      #   accept a String or IO object; it will require a Hash.
-
       def decode(input_, opts = {})
         Coder.new(opts).decode(input_)
       end
@@ -63,18 +51,6 @@ module RGeo
       #   RGeo::GeoJSON::EntityFactory, which generates objects of type
       #   RGeo::GeoJSON::Feature or RGeo::GeoJSON::FeatureCollection.
       #   See RGeo::GeoJSON::EntityFactory for more information.
-      # [<tt>:json_parser</tt>]
-      #   Specifies a JSON parser to use when decoding a String or IO
-      #   object. The value may be a Proc object taking the string as the
-      #   sole argument and returning the JSON hash, or it may be one of
-      #   the special values <tt>:json</tt>, <tt>:yajl</tt>, or
-      #   <tt>:active_support</tt>. Setting one of those special values
-      #   will require the corresponding library to be available. Note
-      #   that the <tt>:json</tt> library is present in the standard
-      #   library in Ruby 1.9, but requires the "json" gem in Ruby 1.8.
-      #   If a parser is not specified, then the decode method will not
-      #   accept a String or IO object; it will require a Hash.
-
       def coder(opts = {})
         Coder.new(opts)
       end

data/lib/rgeo/geo_json/version.rb

@@ -1,5 +1,5 @@
 module RGeo
   module GeoJSON
-    VERSION = "1.0.0".freeze
+    VERSION = "2.0.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-geojson
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2018-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Convert RGeo data to and from GeoJSON.