rgeo-shapefile 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a42cd096d3c0e6c58fa79c248c2de90c1e911910d9f798c8b14254ae44667c9c
-  data.tar.gz: ea81602df1862fb59824749648883a03d61547a4aa55ec8ec08c0fa45599c39a
+  metadata.gz: 5c4295f7f72cac7f64005b487f7afc5c9d09d3af8ce90a7a55d4f5455a97fa53
+  data.tar.gz: 588d82486bc992ab3f0b0cd497dd395de4d32e47ce05678451540674e8d908dc
 SHA512:
-  metadata.gz: fa18b8185a2a6dcdba4d0aaf2957a55c7ee47cbff735aa2bb0d40922ee039e48640670dee15d0f9f194e93a211b5915bac3854caa764a103a349112feda8f1ce
-  data.tar.gz: 9d4dd628de16180cba325a3fb907b9cce1133ea3bb3a53cc310f759128c96eb9cd70b42e51eba3d155088eba75b853a2cce9d514d094eed3467d5564d421f84f
+  metadata.gz: d3ab411058b49876b8e85ef15731682d8f214059912135c0bca833c40fd3933cb856e6386dcaa90e6b1cabdea6ac3b100adfca7bd954a098b12391efea27fa6b
+  data.tar.gz: 4470d988aca01690d234b6a61f2afcd1c3e1ec1ace22779080e909c7f13eb944b8e96fafcc505ce29ccbe89850b2e551763c802b64ded22c36e9d6f7bd97e341

data/History.md

@@ -1,3 +1,9 @@
+### 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)

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", nil, opts_[:dbf_encoding])
-                    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

data/lib/rgeo/shapefile/version.rb

@@ -2,6 +2,6 @@
 
 module RGeo
   module Shapefile
-    VERSION = "1.2.0"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-shapefile
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Daniel Azuma
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo