rgeo-shapefile 0.2.0 → 0.2.1

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 0.2.1 / 2011-03-31
+
+* The gem version is now accessible via an api.
+* Attributes were each listed twice under slightly different names. Fixed. (Reported by spara.)
+
 === 0.2.0 / 2010-12-07
 
 * Initial public alpha release. Spun rgeo-shapefile off from the core rgeo gem.

data/README.rdoc

@@ -38,7 +38,7 @@ Example:
 RGeo::Shapefile has the following requirements:
 
 * Ruby 1.8.7 or later. Ruby 1.9.2 or later preferred.
-* \RGeo 0.2.0 or later.
+* \RGeo 0.2.6 or later.
 * The "dbf" gem, version 1.5.2 or later, is recommended. This gem is
   needed to read the attributes file. If it is not present, shapefiles
   can still be read, but attributes will not be available.
@@ -79,7 +79,7 @@ ESRI shapefiles, we did borrow a bunch of their test cases.
 
 === License
 
-Copyright 2010 Daniel Azuma
+Copyright 2011 Daniel Azuma
 
 All rights reserved.
 

data/Version

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/rgeo/shapefile.rb

@@ -59,4 +59,5 @@ end
 
 
 # Implementation files
+require 'rgeo/shapefile/version'
 require 'rgeo/shapefile/reader'

data/lib/rgeo/shapefile/reader.rb

@@ -160,7 +160,7 @@ module RGeo
       # 
       # Options include:
       # 
-      # <tt>:factory_generator</tt>::
+      # [<tt>:factory_generator</tt>]
       #   A RGeo::Feature::FactoryGenerator that should return a factory
       #   based on the dimension settings in the input. It should
       #   understand the configuration options <tt>:has_z_coordinate</tt>
@@ -168,10 +168,10 @@ module RGeo
       #   RGeo::Feature::Factory. If no factory generator is provided,
       #   the default Cartesian factory generator is used. This option
       #   can also be specified using the <tt>:factory</tt> key.
-      # <tt>:srid</tt>::
+      # [<tt>:srid</tt>]
       #   If provided, this option is passed to the factory generator.
       #   This is useful because shapefiles do not contain a SRID.
-      # <tt>:assume_inner_follows_outer</tt>::
+      # [<tt>:assume_inner_follows_outer</tt>]
       #   If set to true, some assumptions are made about ring ordering
       #   in a polygon shapefile. See below for details. Default is false.
       # 
@@ -463,9 +463,13 @@ module RGeo
           when 31 then _read_multipatch(data_)
           else nil
           end
-        dbf_record_ = @attr_dbf ? @attr_dbf.record(@cur_record_index) : nil
         attrs_ = {}
-        attrs_.merge!(dbf_record_.attributes) if dbf_record_
+        if @attr_dbf
+          dbf_record_ = @attr_dbf.record(@cur_record_index)
+          @attr_dbf.columns.each do |col_|
+            attrs_[col_.name] = dbf_record_.send(col_.underscored_name)
+          end
+        end
         result_ = Record.new(@cur_record_index, geometry_, attrs_)
         @cur_record_index += 1
         result_

data/lib/rgeo/shapefile/version.rb

@@ -0,0 +1,56 @@
+# -----------------------------------------------------------------------------
+# 
+# Version of rgeo-shapefile
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+begin
+  require 'versionomy'
+rescue ::LoadError
+end
+
+
+module RGeo
+  
+  module Shapefile
+    
+    # Current version of RGeo::Shapefile as a frozen string
+    VERSION_STRING = ::File.read(::File.dirname(__FILE__)+'/../../../Version').strip.freeze
+    
+    # Current version of RGeo::Shapefile as a Versionomy object, if the
+    # Versionomy gem is available; otherwise equal to VERSION_STRING.
+    VERSION = defined?(::Versionomy) ? ::Versionomy.parse(VERSION_STRING) : VERSION_STRING
+    
+  end
+  
+end

data/test/tc_basic.rb

@@ -0,0 +1,57 @@
+# -----------------------------------------------------------------------------
+# 
+# Some shapefile reading test cases borrowed from shapelib
+# 
+# -----------------------------------------------------------------------------
+# Copyright 2010 Daniel Azuma
+# 
+# All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+# * Redistributions of source code must retain the above copyright notice,
+#   this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above copyright notice,
+#   this list of conditions and the following disclaimer in the documentation
+#   and/or other materials provided with the distribution.
+# * Neither the name of the copyright holder, nor the names of any other
+#   contributors to this software, may be used to endorse or promote products
+#   derived from this software without specific prior written permission.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+# -----------------------------------------------------------------------------
+;
+
+
+require 'test/unit'
+require 'rgeo/shapefile'
+
+
+module RGeo
+  module Shapefile
+    module Tests  # :nodoc:
+      
+      class TestBasic < ::Test::Unit::TestCase  # :nodoc:
+        
+        
+        def test_has_version
+          assert_not_nil(::RGeo::Shapefile::VERSION)
+        end
+        
+        
+      end
+      
+    end
+  end
+end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rgeo-shapefile
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
+  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors: 
 - Daniel Azuma
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -08:00
+date: 2011-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
+        version: 0.2.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,10 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :development
   version_requirements: *id002
@@ -58,9 +46,11 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/rgeo/shapefile/reader.rb
+- lib/rgeo/shapefile/version.rb
 - lib/rgeo/shapefile.rb
 - History.rdoc
 - README.rdoc
+- test/tc_basic.rb
 - test/tc_shapelib_tests.rb
 - test/shapelib_testcases/readme.txt
 - test/shapelib_testcases/test.shp
@@ -109,25 +99,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: virtuoso
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: RGeo::Shapefile is an RGeo module for reading ESRI shapefiles.
+summary: An RGeo module for reading ESRI shapefiles.
 test_files: 
+- test/tc_basic.rb
 - test/tc_shapelib_tests.rb