rgeo-shapefile 1.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9512fb719b3dbba3c3091ab9bffce6875379845c20b75730b8e3f037b48cc5af
-  data.tar.gz: 8390a9d14c38cee0c620b1e38a03550c25c9da15c123049814ddbb91ea9b9bfb
+  metadata.gz: b6e5256b3e85525a1eaf405a0d77df1e4f5e607a36164cad539b07f0f8008ad2
+  data.tar.gz: 69c7b87747813c5ae3bbb76a8dd9b635b8c3d6c96dcf86a3a6b50b311e126038
 SHA512:
-  metadata.gz: 87942c272ed29bf6ba113116a56adf108143fa9a1dc4814f0c1727b24bddc24c6700bb978d07c13ebabf8be251f99027f398e629de6ad091432efc415324fbfd
-  data.tar.gz: 4d39372c04b67837fd9db6176c4e2cc48ea15c9d63c40ab5d4d14efceb0c82aacaf7daa0dd80d32f0818eb1e93c78c396faac9c1ad0af4163ef8666cb962cb6c
+  metadata.gz: 302a221acc3cac6842143dedaff74380d5dce58959b8b7381c00cce52401fa0e4343b31a999340f40ba08947c4245b15f2f1962e66f2422bab937b71de5bdd3e
+  data.tar.gz: 56c09783ed155a8fcb95ad9596bae125a4b0a54cedd655fff07cfb4d1786c1011738c1a4768dff4e023b025ce75bee788c22f368a1b5c6ea4d5d3f1237fe1bd1

data/History.md

@@ -1,7 +1,40 @@
+### 3.0.0 / 2020-08-02
+
+* Handle invalid DBF file (#37, rywall)
+* Update DBF gem to version 4.x, bump minimum Ruby version to 2.4 (#38, alvir)
+
+### 2.0.1 / 2019-04-01
+
+* Check dbf record attributes / allow DBF file to have fewer records than SHX (#34, womanonrails / #28, marcisv)
+
+
+### 2.0.0 / 2019-02-23
+
+* Use .cpg file to specify the DBF encoding (#32, rywall)
+* Remove :dbf_encoding option introduced in 1.2.0
+
+
+### 1.2.0 / 2019-02-21
+
+* Add ability to specify the DBF encoding (#30, rywall)
+
+
+### 1.1.0 / 2018-11-30
+
+* Allow rgeo 2.0 (#29, sunpoet)
+* Require ruby 2.3+
+
+
+### 1.0.0 / 2018-3-6
+
+* Require rgeo 1.0 (#27)
+* Freeze strings
+
+
 ### 0.4.2 / 2017-1-31
 
-* Require ruby 2.1
-* Handle non-string path objects in Reader #20
+* Require ruby 2.1+
+* Handle non-string path objects in Reader (#20, msimonborg)
 
 ### 0.4.1 / 2015-2-8
 

data/README.md

@@ -42,9 +42,11 @@ end
 
 `RGeo::Shapefile` has the following requirements:
 
-* Ruby 2.1.0 or later
+* Ruby 2.4.0 or later
 * rgeo 1.0.0 or later.
-* dbf 3.0 or later.
+* dbf 4.0 or later.
+
+If you need support for older Rubies, please use 2.x version  
 
 Include in your bundle:
 
@@ -58,15 +60,21 @@ Install `RGeo::Shapefile` as a gem:
 gem install rgeo-shapefile
 ```
 
-See the README for the "rgeo" gem, a required dependency, for further installation information.
+See the [`rgeo`](https://github.com/rgeo/rgeo) gem, a required dependency,
+for further installation information.
 
-If you are using Ruby 1.8, use version `0.2.x` of this gem.
+If you are using Ruby 2.3, use version `2.0.x` of this gem.
+
+If you are using Ruby 2.0-2.2, use version `1.0.x` of this gem.
 
 If you are using Ruby 1.9, use version `0.3.x` of this gem.
 
+If you are using Ruby 1.8, use version `0.2.x` of this gem.
+
+
 ## Development and support
 
-Documentation is available at http://rdoc.info/gems/rgeo-shapefile
+Documentation is available at https://www.rubydoc.info/gems/rgeo-shapefile
 
 Source code is hosted on Github at https://github.com/rgeo/rgeo-shapefile
 

data/lib/rgeo/shapefile/reader.rb

@@ -180,9 +180,14 @@ module RGeo
         @opened = true
         @main_file = ::File.open(path_ + ".shp", "rb:ascii-8bit")
         @index_file = ::File.open(path_ + ".shx", "rb:ascii-8bit")
-        @attr_dbf = if ::File.file?(path_ + ".dbf") && ::File.readable?(path_ + ".dbf")
-                      ::DBF::Table.new(path_ + ".dbf")
-                    end
+        @attr_dbf =
+          if ::File.file?(path_ + ".dbf") && ::File.readable?(path_ + ".dbf")
+            if ::File.file?(path_ + ".cpg") && ::File.readable?(path_ + ".cpg")
+              dbf_encoding_ = ::File.read(path_ + ".cpg")
+            end
+
+            ::DBF::Table.new(path_ + ".dbf", nil, dbf_encoding_)
+          end
         @main_length, @shape_type_code, @xmin, @ymin, @xmax, @ymax, @zmin, @zmax, @mmin, @mmax = @main_file.read(100).unpack("x24Nx4VE8")
         @main_length *= 2
         index_length_ = @index_file.read(100).unpack("x24Nx72").first
@@ -393,7 +398,7 @@ module RGeo
           when 31 then _read_multipatch(data_)
           end
         attrs_ = {}
-        if @attr_dbf
+        if @attr_dbf && !@attr_dbf.columns.empty? && @attr_dbf.record(@cur_record_index)
           dbf_record_attrs_ = @attr_dbf.record(@cur_record_index).attributes
           @attr_dbf.columns.each do |col_|
             name_ = col_.name

data/lib/rgeo/shapefile/version.rb

@@ -2,6 +2,6 @@
 
 module RGeo
   module Shapefile
-    VERSION = "1.0.0"
+    VERSION = "3.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-shapefile
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -31,28 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -110,15 +96,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: An RGeo module for reading ESRI shapefiles.