rgeo 0.4.0 → 0.5.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
-- Daniel Azuma
+- Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,18 +66,36 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.35'
 description: RGeo is a geospatial data library for Ruby. It provides an implementation
   of the Open Geospatial Consortium's Simple Features Specification, used by most
   standard spatial/geographic data storage systems such as PostGIS. A number of add-on
   modules are also available to help with writing location-based applications using
   Ruby-based frameworks such as Ruby On Rails.
-email: dazuma@gmail.com
+email: dazuma@gmail.com, parhameter@gmail.com
 executables: []
 extensions:
 - ext/geos_c_impl/extconf.rb
 - ext/proj4_c_impl/extconf.rb
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- ext/geos_c_impl/Makefile_2.2.3
+- ext/geos_c_impl/coordinates.c
+- ext/geos_c_impl/coordinates.h
 - ext/geos_c_impl/extconf.rb
 - ext/geos_c_impl/factory.c
 - ext/geos_c_impl/factory.h
@@ -85,16 +103,21 @@ files:
 - ext/geos_c_impl/geometry.h
 - ext/geos_c_impl/geometry_collection.c
 - ext/geos_c_impl/geometry_collection.h
+- ext/geos_c_impl/geos_c_impl_2.2.3.bundle
 - ext/geos_c_impl/line_string.c
 - ext/geos_c_impl/line_string.h
 - ext/geos_c_impl/main.c
+- ext/geos_c_impl/mkmf.log
 - ext/geos_c_impl/point.c
 - ext/geos_c_impl/point.h
 - ext/geos_c_impl/polygon.c
 - ext/geos_c_impl/polygon.h
 - ext/geos_c_impl/preface.h
+- ext/proj4_c_impl/Makefile_2.2.3
 - ext/proj4_c_impl/extconf.rb
 - ext/proj4_c_impl/main.c
+- ext/proj4_c_impl/mkmf.log
+- ext/proj4_c_impl/proj4_c_impl_2.2.3.bundle
 - lib/rgeo.rb
 - lib/rgeo/cartesian.rb
 - lib/rgeo/cartesian/analysis.rb
@@ -109,7 +132,7 @@ files:
 - lib/rgeo/coord_sys/cs/factories.rb
 - lib/rgeo/coord_sys/cs/wkt_parser.rb
 - lib/rgeo/coord_sys/proj4.rb
-- lib/rgeo/coord_sys/srs_database/active_record_table.rb
+- lib/rgeo/coord_sys/proj4_c_impl.bundle
 - lib/rgeo/coord_sys/srs_database/interface.rb
 - lib/rgeo/coord_sys/srs_database/proj4_data.rb
 - lib/rgeo/coord_sys/srs_database/sr_org.rb
@@ -151,6 +174,7 @@ files:
 - lib/rgeo/geos/ffi_factory.rb
 - lib/rgeo/geos/ffi_feature_classes.rb
 - lib/rgeo/geos/ffi_feature_methods.rb
+- lib/rgeo/geos/geos_c_impl.bundle
 - lib/rgeo/geos/interface.rb
 - lib/rgeo/geos/utils.rb
 - lib/rgeo/geos/zm_factory.rb
@@ -179,7 +203,6 @@ files:
 - test/common/multi_polygon_tests.rb
 - test/common/point_tests.rb
 - test/common/polygon_tests.rb
-- test/coord_sys/tc_active_record_table.rb
 - test/coord_sys/tc_ogc_cs.rb
 - test/coord_sys/tc_proj4.rb
 - test/coord_sys/tc_proj4_srs_data.rb
@@ -251,7 +274,7 @@ files:
 - test/wkrep/tc_wkb_parser.rb
 - test/wkrep/tc_wkt_generator.rb
 - test/wkrep/tc_wkt_parser.rb
-homepage: http://github.com/rgeo/rgeo
+homepage: https://github.com/rgeo/rgeo
 licenses: []
 metadata: {}
 post_install_message: 
@@ -270,12 +293,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: RGeo is a geospatial data library for Ruby.
 test_files:
-- test/coord_sys/tc_active_record_table.rb
+- test/common/factory_tests.rb
+- test/common/geometry_collection_tests.rb
+- test/common/line_string_tests.rb
+- test/common/multi_line_string_tests.rb
+- test/common/multi_point_tests.rb
+- test/common/multi_polygon_tests.rb
+- test/common/point_tests.rb
+- test/common/polygon_tests.rb
 - test/coord_sys/tc_ogc_cs.rb
 - test/coord_sys/tc_proj4.rb
 - test/coord_sys/tc_proj4_srs_data.rb

data/lib/rgeo/coord_sys/srs_database/active_record_table.rb

@@ -1,166 +0,0 @@
-# -----------------------------------------------------------------------------
-#
-# SRS database interface
-#
-# -----------------------------------------------------------------------------
-
-module RGeo
-
-  module CoordSys
-
-    module SRSDatabase
-
-
-      # A spatial reference database implementation that uses ActiveRecord
-      # to access a spatial reference table provided by a spatial database
-      # implementation. You can use this class to obtain coordinate system
-      # information from your installation of, e.g. PostGIS.
-
-      class ActiveRecordTable
-
-        @@class_counter = 0
-
-
-        # Create a new ActiveRecord-backed database connection.
-        #
-        # Options include:
-        #
-        # [<tt>:ar_class</tt>]
-        #   An ActiveRecord class to use. You may provide this if you
-        #   already have an ActiveRecord class that accesses the table.
-        #   If not provided, an ActiveRecord class will be generated
-        #   for you, using the <tt>:ar_base_class</tt>,
-        #   <tt>:database_config</tt>, and <tt>:table_name</tt> options.
-        # [<tt>:ar_base_class</tt>]
-        #   Specify an ActiveRecord base class to use when generating an
-        #   ActiveRecord class. Default is ::ActiveRecord::Base. You may
-        #   want to use this if you have a base class already that
-        #   specifies an existing database connection and/or other
-        #   class-scope options.
-        # [<tt>:database_config</tt>]
-        #   If provided, <tt>establish_connection</tt> will be called on
-        #   the generated ActiveRecord class, with the given value.
-        # [<tt>:table_name</tt>]
-        #   The table name for the new ActiveRecord class. Defaults to
-        #   the value <tt>spatial_ref_sys</tt>, which is the OGC-specified
-        #   name for this table.
-        # [<tt>:srid_column</tt>]
-        #   The name of the SRID column. Defaults to "srid", which is the
-        #   OGC-specified name for this column.
-        # [<tt>:auth_name_column</tt>]
-        #   The name of the authority name column. On an OGC-compliant
-        #   database, this column should be named "auth_name". However,
-        #   the default is set to nil; you should set this option
-        #   explicitly if you want to read the authority name.
-        # [<tt>:auth_srid_column</tt>]
-        #   The name of the authority srid column. On an OGC-compliant
-        #   database, this column should be named "auth_srid". However,
-        #   the default is set to nil; you should set this option
-        #   explicitly if you want to read the authority's srid.
-        # [<tt>:name_column</tt>]
-        #   The name of the coordinate system name column. This column is
-        #   not part of the OGC spec, but it is included in some spatial
-        #   database implementations. Default is nil.
-        # [<tt>:description_column</tt>]
-        #   The name of the coordinate system description column. This
-        #   column is not part of the OGC spec, but may be included in
-        #   some spatial database implementations. Default is nil.
-        # [<tt>:srtext_column</tt>]
-        #   The name of the spatial reference WKT column. On an
-        #   OGC-compliant database, this column should be named "srtext".
-        #   However, not all databases include this column, so the default
-        #   is set to nil; you should set this option explicitly if you
-        #   want to read the OGC coordinate system specification.
-        # [<tt>:proj4text_column</tt>]
-        #   The name of the Proj4 format projection spec column. This
-        #   column is not part of the OGC spec, but may be included in
-        #   some spatial database implementations. Default is nil.
-        # [<tt>:cache</tt>]
-        #   If set to true, entries are cached when first retrieved, so
-        #   subsequent requests do not have to make a database round trip.
-        #   Default is false.
-        #
-        # Some option settings may be provided by the ActiveRecord
-        # connection adapter, if the ActiveRecord class's connection uses
-        # an adapter that is RGeo-savvy. The "postgis" and "spatialite"
-        # adapters are such adapters. They automatically provide the
-        # <tt>:table_name</tt> and all the relevant column settings for
-        # the database-provided spatial reference table as defaults.
-        # However, you can still override those settings if you want to
-        # use a custom table.
-
-        def initialize(opts_={})
-          @cache = opts_[:cache] ? {} : nil
-          @ar_class = opts_[:ar_class]
-          unless @ar_class
-            ar_base_class_ = opts_[:ar_base_class] || ::ActiveRecord::Base
-            @ar_class = ::Class.new(ar_base_class_)
-            self.class.const_set("Klass#{@@class_counter}", @ar_class)
-            @@class_counter += 1
-            if opts_[:database_config]
-              @ar_class.class_eval do
-                establish_connection(opts_[:database_config])
-              end
-            end
-          end
-          connection_ = @ar_class.connection
-          if connection_.respond_to?(:srs_database_columns)
-            opts_ = connection_.srs_database_columns.merge(opts_)
-          end
-          unless opts_[:ar_class]
-            @ar_class.class_eval do
-              self.table_name = opts_[:table_name] || 'spatial_ref_sys'
-            end
-          end
-          @srid_column = opts_[:srid_column] || 'srid'
-          @auth_name_column = opts_[:auth_name_column]
-          @auth_srid_column = opts_[:auth_srid_column]
-          @name_column = opts_[:name_column]
-          @description_column = opts_[:description_column]
-          @srtext_column = opts_[:srtext_column]
-          @proj4text_column = opts_[:proj4text_column]
-        end
-
-
-        # Retrieve an Entry given an integer SRID.
-
-        def get(ident_)
-          ident_ = ident_.to_i
-          return @cache[ident_] if @cache && @cache.include?(ident_)
-          obj_ = @ar_class.where(@srid_column => ident_).first
-          unless obj_
-            @cache[ident_] = nil if @cache
-            return nil
-          end
-          auth_name_ = @auth_name_column ? obj_[@auth_name_column] : nil
-          auth_srid_ = @auth_srid_column ? obj_[@auth_srid_column] : nil
-          name_ = @name_column ? obj_[@name_column] : nil
-          description_ = @description_column ? obj_[@description_column] : nil
-          coord_sys_ = proj4_ = nil
-          if @srtext_column
-            coord_sys_ = CS.create_from_wkt(obj_[@srtext_column]) rescue nil
-          end
-          if @proj4text_column && Proj4.supported?
-            proj4_ = Proj4.create(obj_[@proj4text_column].strip) rescue nil
-          end
-          result_ = Entry.new(ident_, :authority => auth_name_, :authority_code => auth_srid_, :name => name_, :description => description_, :coord_sys => coord_sys_, :proj4 => proj4_)
-          @cache[ident_] = result_ if @cache
-          result_
-        end
-
-
-        # Clears the cache if a cache is active.
-
-        def clear_cache
-          @cache.clear if @cache
-        end
-
-
-      end
-
-
-    end
-
-  end
-
-end

data/test/coord_sys/tc_active_record_table.rb

@@ -1,79 +0,0 @@
-# -----------------------------------------------------------------------------
-#
-# Tests for OGC CS classes
-#
-# -----------------------------------------------------------------------------
-
-require 'test/unit'
-require 'rgeo'
-require 'yaml'
-
-
-module RGeo
-  module Tests  # :nodoc:
-    module CoordSys  # :nodoc:
-      module ActiveRecordTableTests  # :nodoc:
-
-        database_configs_ = ::YAML.load_file(::File.dirname(__FILE__)+'/database.yml') rescue nil
-        if database_configs_
-          begin
-            require 'active_record'
-          rescue ::LoadError
-            database_configs_ = nil
-          end
-        end
-
-        if database_configs_
-
-          PostGIS_CONFIG = database_configs_['postgis'] rescue nil
-
-
-          if PostGIS_CONFIG
-
-            class TestPostGIS < ::Test::Unit::TestCase  # :nodoc:
-
-              @@db = ::RGeo::CoordSys::SRSDatabase::ActiveRecordTable.new(
-                :database_config => PostGIS_CONFIG,
-                :auth_name_column => 'auth_name', :auth_srid_column => 'auth_srid',
-                :srtext_column => 'srtext', :proj4text_column => 'proj4text')
-
-
-              def test_4326
-                entry_ = @@db.get(4326)
-                allowed_vals_ = [
-                  '+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs',  # Proj 4.7
-                  '+proj=longlat +datum=WGS84 +no_defs'  # Proj 4.8
-                ]
-                assert(allowed_vals_.include?(entry_.proj4.original_str))
-                assert_kind_of(::RGeo::CoordSys::CS::GeographicCoordinateSystem, entry_.coord_sys)
-                assert_equal('WGS 84', entry_.name)
-              end
-
-
-              def test_3857
-                entry_ = @@db.get(3857)
-                allowed_vals_ = [
-                  '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +units=m +k=1.0 +nadgrids=@null +no_defs',  # Proj 4.7
-                  '+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs'  # Proj 4.8
-                ]
-                assert(allowed_vals_.include?(entry_.proj4.original_str))
-                assert_kind_of(::RGeo::CoordSys::CS::ProjectedCoordinateSystem, entry_.coord_sys)
-                assert_equal('Popular Visualisation CRS / Mercator (deprecated)', entry_.name)
-              end
-
-
-            end
-
-          else
-            puts "WARNING: No postgis section in database.yml; skipping PostGIS tests."
-          end
-
-
-        else
-          puts "WARNING: Couldn't find database.yml or ActiveRecord gem is not present; skipping ActiveRecord tests."
-        end
-
-      end
-    end
-  end
-end