rgeo 1.0.0 → 1.1.1

data/lib/rgeo/geos/ffi_feature_methods.rb

@@ -105,7 +105,7 @@ module RGeo
         str_.force_encoding("US-ASCII") if str_.respond_to?(:force_encoding)
         str_
       end
-      alias_method :to_s, :as_text
+      alias to_s as_text
 
       def as_binary
         @factory._generate_wkb(self)
@@ -120,7 +120,7 @@ module RGeo
       end
 
       def equals?(rhs_)
-        return false unless rhs_.is_a?(::RGeo::Feature::Instance)
+        return false unless rhs_.is_a?(RGeo::Feature::Instance)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         if !fg_
           false
@@ -132,7 +132,7 @@ module RGeo
           @fg_geom.eql?(fg_)
         end
       end
-      alias_method :==, :equals?
+      alias == equals?
 
       def disjoint?(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
@@ -208,7 +208,7 @@ module RGeo
         fg_ = factory._convert_to_fg_geometry(rhs_)
         fg_ ? @fg_geom.relate_pattern(fg_, pattern_) : nil
       end
-      alias_method :relate, :relate? # DEPRECATED
+      alias relate relate? # DEPRECATED
 
       def distance(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
@@ -228,14 +228,14 @@ module RGeo
         fg_ ? @factory._wrap_fg_geom(@fg_geom.intersection(fg_), nil) : nil
       end
 
-      alias_method :*, :intersection
+      alias * intersection
 
       def union(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
         fg_ ? @factory._wrap_fg_geom(@fg_geom.union(fg_), nil) : nil
       end
 
-      alias_method :+, :union
+      alias + union
 
       def unary_union
         return unless @fg_geom.respond_to?(:unary_union)
@@ -247,7 +247,7 @@ module RGeo
         fg_ ? @factory._wrap_fg_geom(@fg_geom.difference(fg_), nil) : nil
       end
 
-      alias_method :-, :difference
+      alias - difference
 
       def sym_difference(rhs_)
         fg_ = factory._convert_to_fg_geometry(rhs_)
@@ -481,7 +481,7 @@ module RGeo
       def num_geometries
         @fg_geom.num_geometries
       end
-      alias_method :size, :num_geometries
+      alias size num_geometries
 
       def geometry_n(n_)
         if n_ >= 0 && n_ < @fg_geom.num_geometries

data/lib/rgeo/geos/interface.rb

@@ -60,9 +60,9 @@ module RGeo
 
       def version
         unless defined?(@version)
-          if ::RGeo::Geos::CAPI_SUPPORTED
-            @version = ::RGeo::Geos::CAPIFactory._geos_version.freeze
-          elsif ::RGeo::Geos::FFI_SUPPORTED
+          if RGeo::Geos::CAPI_SUPPORTED
+            @version = RGeo::Geos::CAPIFactory._geos_version.freeze
+          elsif RGeo::Geos::FFI_SUPPORTED
             @version = ::Geos::FFIGeos.GEOSversion.sub(/-CAPI-.*$/, "").freeze
           else
             @version = nil

data/lib/rgeo/geos/zm_factory.rb

@@ -236,7 +236,7 @@ module RGeo
       def eql?(rhs_)
         rhs_.is_a?(ZMFactory) && rhs_.z_factory == @zfactory
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       # Standard hash code
 
@@ -244,7 +244,7 @@ module RGeo
         @hash ||= [@zfactory, @mfactory].hash
       end
 
-      # See ::RGeo::Feature::Factory#property
+      # See RGeo::Feature::Factory#property
 
       def property(name_)
         case name_
@@ -253,85 +253,85 @@ module RGeo
         end
       end
 
-      # See ::RGeo::Feature::Factory#parse_wkt
+      # See RGeo::Feature::Factory#parse_wkt
 
       def parse_wkt(str_)
         @wkt_parser.parse(str_)
       end
 
-      # See ::RGeo::Feature::Factory#parse_wkb
+      # See RGeo::Feature::Factory#parse_wkb
 
       def parse_wkb(str_)
         @wkb_parser.parse(str_)
       end
 
-      # See ::RGeo::Feature::Factory#point
+      # See RGeo::Feature::Factory#point
 
       def point(x_, y_, z_ = 0, m_ = 0)
         _create_feature(ZMPointImpl, @zfactory.point(x_, y_, z_), @mfactory.point(x_, y_, m_))
       end
 
-      # See ::RGeo::Feature::Factory#line_string
+      # See RGeo::Feature::Factory#line_string
 
       def line_string(points_)
         _create_feature(ZMLineStringImpl, @zfactory.line_string(points_), @mfactory.line_string(points_))
       end
 
-      # See ::RGeo::Feature::Factory#line
+      # See RGeo::Feature::Factory#line
 
       def line(start_, end_)
         _create_feature(ZMLineImpl, @zfactory.line(start_, end_), @mfactory.line(start_, end_))
       end
 
-      # See ::RGeo::Feature::Factory#linear_ring
+      # See RGeo::Feature::Factory#linear_ring
 
       def linear_ring(points_)
         _create_feature(ZMLinearRingImpl, @zfactory.linear_ring(points_), @mfactory.linear_ring(points_))
       end
 
-      # See ::RGeo::Feature::Factory#polygon
+      # See RGeo::Feature::Factory#polygon
 
       def polygon(outer_ring_, inner_rings_ = nil)
         _create_feature(ZMPolygonImpl, @zfactory.polygon(outer_ring_, inner_rings_), @mfactory.polygon(outer_ring_, inner_rings_))
       end
 
-      # See ::RGeo::Feature::Factory#collection
+      # See RGeo::Feature::Factory#collection
 
       def collection(elems_)
         _create_feature(ZMGeometryCollectionImpl, @zfactory.collection(elems_), @mfactory.collection(elems_))
       end
 
-      # See ::RGeo::Feature::Factory#multi_point
+      # See RGeo::Feature::Factory#multi_point
 
       def multi_point(elems_)
         _create_feature(ZMMultiPointImpl, @zfactory.multi_point(elems_), @mfactory.multi_point(elems_))
       end
 
-      # See ::RGeo::Feature::Factory#multi_line_string
+      # See RGeo::Feature::Factory#multi_line_string
 
       def multi_line_string(elems_)
         _create_feature(ZMMultiLineStringImpl, @zfactory.multi_line_string(elems_), @mfactory.multi_line_string(elems_))
       end
 
-      # See ::RGeo::Feature::Factory#multi_polygon
+      # See RGeo::Feature::Factory#multi_polygon
 
       def multi_polygon(elems_)
         _create_feature(ZMMultiPolygonImpl, @zfactory.multi_polygon(elems_), @mfactory.multi_polygon(elems_))
       end
 
-      # See ::RGeo::Feature::Factory#proj4
+      # See RGeo::Feature::Factory#proj4
 
       def proj4
         @zfactory.proj4
       end
 
-      # See ::RGeo::Feature::Factory#coord_sys
+      # See RGeo::Feature::Factory#coord_sys
 
       def coord_sys
         @zfactory.coord_sys
       end
 
-      # See ::RGeo::Feature::Factory#override_cast
+      # See RGeo::Feature::Factory#override_cast
 
       def override_cast(original_, ntype_, flags_)
         return nil unless Geos.supported?
@@ -372,7 +372,7 @@ module RGeo
 
       def _marshal_wkb_generator # :nodoc:
         unless defined?(@marshal_wkb_generator)
-          @marshal_wkb_generator = ::RGeo::WKRep::WKBGenerator.new(
+          @marshal_wkb_generator = RGeo::WKRep::WKBGenerator.new(
             type_format: :wkb12)
         end
         @marshal_wkb_generator
@@ -380,7 +380,7 @@ module RGeo
 
       def _marshal_wkb_parser # :nodoc:
         unless defined?(@marshal_wkb_parser)
-          @marshal_wkb_parser = ::RGeo::WKRep::WKBParser.new(self,
+          @marshal_wkb_parser = RGeo::WKRep::WKBParser.new(self,
             support_wkb12: true)
         end
         @marshal_wkb_parser
@@ -388,7 +388,7 @@ module RGeo
 
       def _psych_wkt_generator # :nodoc:
         unless defined?(@psych_wkt_generator)
-          @psych_wkt_generator = ::RGeo::WKRep::WKTGenerator.new(
+          @psych_wkt_generator = RGeo::WKRep::WKTGenerator.new(
             tag_format: :wkt12)
         end
         @psych_wkt_generator
@@ -396,7 +396,7 @@ module RGeo
 
       def _psych_wkt_parser # :nodoc:
         unless defined?(@psych_wkt_parser)
-          @psych_wkt_parser = ::RGeo::WKRep::WKTParser.new(self,
+          @psych_wkt_parser = RGeo::WKRep::WKTParser.new(self,
             support_wkt12: true, support_ewkt: true)
         end
         @psych_wkt_parser

data/lib/rgeo/geos/zm_feature_methods.rb

@@ -76,44 +76,44 @@ module RGeo
       end
 
       def equals?(rhs_)
-        @zgeometry.equals?(::RGeo::Feature.cast(rhs_, self).z_geometry)
+        @zgeometry.equals?(RGeo::Feature.cast(rhs_, self).z_geometry)
       end
 
       def disjoint?(rhs_)
-        @zgeometry.disjoint?(::RGeo::Feature.cast(rhs_, self).z_geometry)
+        @zgeometry.disjoint?(RGeo::Feature.cast(rhs_, self).z_geometry)
       end
 
       def intersects?(rhs_)
-        @zgeometry.intersects?(::RGeo::Feature.cast(rhs_, self).z_geometry)
+        @zgeometry.intersects?(RGeo::Feature.cast(rhs_, self).z_geometry)
       end
 
       def touches?(rhs_)
-        @zgeometry.touches?(::RGeo::Feature.cast(rhs_, self).z_geometry)
+        @zgeometry.touches?(RGeo::Feature.cast(rhs_, self).z_geometry)
       end
 
       def crosses?(rhs_)
-        @zgeometry.crosses?(::RGeo::Feature.cast(rhs_, self).z_geometry)
+        @zgeometry.crosses?(RGeo::Feature.cast(rhs_, self).z_geometry)
       end
 
       def within?(rhs_)
-        @zgeometry.within?(::RGeo::Feature.cast(rhs_, self).z_geometry)
+        @zgeometry.within?(RGeo::Feature.cast(rhs_, self).z_geometry)
       end
 
       def contains?(rhs_)
-        @zgeometry.contains?(::RGeo::Feature.cast(rhs_, self).z_geometry)
+        @zgeometry.contains?(RGeo::Feature.cast(rhs_, self).z_geometry)
       end
 
       def overlaps?(rhs_)
-        @zgeometry.overlaps?(::RGeo::Feature.cast(rhs_, self).z_geometry)
+        @zgeometry.overlaps?(RGeo::Feature.cast(rhs_, self).z_geometry)
       end
 
       def relate?(rhs_, pattern_)
-        @zgeometry.relate?(::RGeo::Feature.cast(rhs_, self).z_geometry, pattern_)
+        @zgeometry.relate?(RGeo::Feature.cast(rhs_, self).z_geometry, pattern_)
       end
-      alias_method :relate, :relate? # DEPRECATED
+      alias relate relate? # DEPRECATED
 
       def distance(rhs_)
-        @zgeometry.distance(::RGeo::Feature.cast(rhs_, self).z_geometry)
+        @zgeometry.distance(RGeo::Feature.cast(rhs_, self).z_geometry)
       end
 
       def buffer(distance_)
@@ -125,36 +125,36 @@ module RGeo
       end
 
       def intersection(rhs_)
-        rhs_ = ::RGeo::Feature.cast(rhs_, self)
+        rhs_ = RGeo::Feature.cast(rhs_, self)
         @factory._create_feature(nil, @zgeometry.intersection(rhs_.z_geometry), @mgeometry.intersection(rhs_.m_geometry))
       end
 
       def union(rhs_)
-        rhs_ = ::RGeo::Feature.cast(rhs_, self)
+        rhs_ = RGeo::Feature.cast(rhs_, self)
         @factory._create_feature(nil, @zgeometry.union(rhs_.z_geometry), @mgeometry.union(rhs_.m_geometry))
       end
 
       def difference(rhs_)
-        rhs_ = ::RGeo::Feature.cast(rhs_, self)
+        rhs_ = RGeo::Feature.cast(rhs_, self)
         @factory._create_feature(nil, @zgeometry.difference(rhs_.z_geometry), @mgeometry.difference(rhs_.m_geometry))
       end
 
       def sym_difference(rhs_)
-        rhs_ = ::RGeo::Feature.cast(rhs_, self)
+        rhs_ = RGeo::Feature.cast(rhs_, self)
         @factory._create_feature(nil, @zgeometry.sym_difference(rhs_.z_geometry), @mgeometry.sym_difference(rhs_.m_geometry))
       end
 
       def rep_equals?(rhs_)
-        rhs_ = ::RGeo::Feature.cast(rhs_, self)
+        rhs_ = RGeo::Feature.cast(rhs_, self)
         rhs_.is_a?(self.class) && @factory.eql?(rhs_.factory) && @zgeometry.rep_equals?(rhs_.z_geometry) && @mgeometry.rep_equals?(rhs_.m_geometry)
       end
 
-      alias_method :eql?, :rep_equals?
-      alias_method :==, :equals?
+      alias eql? rep_equals?
+      alias == equals?
 
-      alias_method :-, :difference
-      alias_method :+, :union
-      alias_method :*, :intersection
+      alias - difference
+      alias + union
+      alias * intersection
 
       def _copy_state_from(obj_) # :nodoc:
         @factory = obj_.factory
@@ -293,12 +293,12 @@ module RGeo
       def num_geometries
         @zgeometry.num_geometries
       end
-      alias_method :size, :num_geometries
+      alias size num_geometries
 
       def geometry_n(n_)
         @factory._create_feature(nil, @zgeometry.geometry_n(n_), @mgeometry.geometry_n(n_))
       end
-      alias_method :[], :geometry_n
+      alias [] geometry_n
 
       def each
         if block_given?

data/lib/rgeo/version.rb

@@ -1,3 +1,3 @@
 module RGeo
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.1".freeze
 end

data/lib/rgeo/wkrep/wkb_parser.rb

@@ -123,7 +123,7 @@ module RGeo
         end
         obj_
       end
-      alias_method :parse_hex, :parse
+      alias parse_hex parse
 
       def _parse_object(contained_) # :nodoc:
         endian_value_ = _get_byte

data/lib/rgeo/wkrep/wkt_generator.rb

@@ -58,7 +58,7 @@ module RGeo
 
       # Returns the format for type tags. See WKTGenerator for details.
       attr_reader :tag_format
-      alias_method :type_format, :tag_format
+      alias type_format tag_format
 
       # Returns whether SRID is embedded. See WKTGenerator for details.
       def emit_ewkt_srid?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-02 00:00:00.000000000 Z
+date: 2018-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -198,11 +198,7 @@ files:
 homepage: https://github.com/rgeo/rgeo
 licenses: []
 metadata: {}
-post_install_message: |2
-
-  rgeo has moved Proj4 support to a separate gem. If you use Proj4, add this to your Gemfile:
-
-  gem "rgeo-proj4"
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -210,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -218,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.0
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: RGeo is a geospatial data library for Ruby.