rgeo-activerecord 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8241a074715943e7dcb035f37f99151a5cf9ec2f
-  data.tar.gz: cb3e2543f6514a61440adab0e992e2d0a7bb26db
+  metadata.gz: 9351a4fcf488090206ad83a19229b92643bf910e
+  data.tar.gz: e51d6642a744aeafe7272fd6a4c6a74d58ef90c5
 SHA512:
-  metadata.gz: 518773c88ab208d156736c320460ab637af0281e46a3c40cc62ec41b28c3ffcdec82d171b8137af2f4c84b3f4eb86e6075fe8d5563b233e1c6fa7f47abf03abb
-  data.tar.gz: d19b96993b420ba1d3798bf77e7adcbcb7c0093da81c8c01aa5335ab91ebb57a76df5e3fe0f3f169173dbd005606b5ced4483e09c3655dc376fa8118016d633e
+  metadata.gz: f2b967416e333ea7b00f482b077837cd6ff6938a4829dd226e63dfde2383d3ee65d41829465826da8e1c5efc6097dfa8954064cc7bdd263f5b441e11a8830148
+  data.tar.gz: 3e01c93cf12d161ca74c130d63faeb80a7d1912d24c4f39eb49f9e36f07ea4db9a4e3e71307bb7f4e314238a6608317859d56802f6a0531108c1ec89f5de813b

data/History.md

@@ -1,3 +1,9 @@
+### 4.0.2 / 2015-12-28
+
+* Remove unnecessary root namespacing
+* Remove unnecessary namespace qualifiers
+* Remove lib/rgeo/active_record.rb
+
 ### 4.0.1 / 2015-12-25
 
 * Rubocop style cleanup #31

data/lib/rgeo-activerecord.rb

@@ -1 +1,8 @@
-require "rgeo/active_record"
+require "rgeo"
+require "active_record"
+require "rgeo/active_record/version"
+require "rgeo/active_record/spatial_expressions"
+require "rgeo/active_record/spatial_factory_store"
+require "rgeo/active_record/arel_spatial_queries"
+require "rgeo/active_record/common_adapter_elements"
+require "rgeo/active_record/geometry_mixin"

data/lib/rgeo/active_record/arel_spatial_queries.rb

@@ -40,11 +40,11 @@ module RGeo
       # an RGeo feature, or a spatial attribute.
       def visit_in_spatial_context(node, collector)
         case node
-        when ::String
+        when String
           collector << "#{st_func('ST_WKTToSQL')}(#{quote(node)})"
-        when ::RGeo::Feature::Instance
+        when RGeo::Feature::Instance
           collector << visit_RGeo_Feature_Instance(node, collector)
-        when ::RGeo::Cartesian::BoundingBox
+        when RGeo::Cartesian::BoundingBox
           collector << visit_RGeo_Cartesian_BoundingBox(node, collector)
         else
           visit(node, collector)
@@ -54,7 +54,7 @@ module RGeo
 
     # This node wraps an RGeo feature and gives it spatial expression constructors.
     class SpatialConstantNode
-      include ::RGeo::ActiveRecord::SpatialExpressions
+      include RGeo::ActiveRecord::SpatialExpressions
 
       # The delegate should be the RGeo feature.
       def initialize(delegate)
@@ -69,7 +69,7 @@ module RGeo
 
     # Make sure the standard Arel visitors can handle RGeo feature objects by default.
 
-    ::Arel::Visitors::Visitor.class_eval do
+    Arel::Visitors::Visitor.class_eval do
       def visit_RGeo_ActiveRecord_SpatialConstantNode(node, collector)
         if respond_to?(:visit_in_spatial_context)
           visit_in_spatial_context(node.delegate, collector)
@@ -79,17 +79,17 @@ module RGeo
       end
     end
 
-    ::Arel::Visitors::Dot.class_eval do
+    Arel::Visitors::Dot.class_eval do
       alias :visit_RGeo_Feature_Instance :visit_String
       alias :visit_RGeo_Cartesian_BoundingBox :visit_String
     end
 
-    ::Arel::Visitors::DepthFirst.class_eval do
+    Arel::Visitors::DepthFirst.class_eval do
       alias :visit_RGeo_Feature_Instance :terminal
       alias :visit_RGeo_Cartesian_BoundingBox :terminal
     end
 
-    ::Arel::Visitors::ToSql.class_eval do
+    Arel::Visitors::ToSql.class_eval do
       alias :visit_RGeo_Feature_Instance :visit_String
       alias :visit_RGeo_Cartesian_BoundingBox :visit_String
     end
@@ -98,8 +98,8 @@ module RGeo
     # the arguments and return values, so that it can provide context to
     # visitors that want to interpret syntax differently when dealing with
     # spatial elements.
-    class SpatialNamedFunction < ::Arel::Nodes::NamedFunction
-      include ::RGeo::ActiveRecord::SpatialExpressions
+    class SpatialNamedFunction < Arel::Nodes::NamedFunction
+      include SpatialExpressions
 
       def initialize(name, expr, spatial_flags = [], aliaz = nil)
         super(name, expr, aliaz)

data/lib/rgeo/active_record/common_adapter_elements.rb

@@ -1,5 +1,5 @@
 # autoload AbstractAdapter
-::ActiveRecord::ConnectionAdapters::AbstractAdapter
+ActiveRecord::ConnectionAdapters::AbstractAdapter
 
 module RGeo
   module ActiveRecord
@@ -25,14 +25,14 @@ module RGeo
 
     def self.geometric_type_from_name(name)
       case name.to_s
-      when /^geometry/i then ::RGeo::Feature::Geometry
-      when /^point/i then ::RGeo::Feature::Point
-      when /^linestring/i then ::RGeo::Feature::LineString
-      when /^polygon/i then ::RGeo::Feature::Polygon
-      when /^geometrycollection/i then ::RGeo::Feature::GeometryCollection
-      when /^multipoint/i then ::RGeo::Feature::MultiPoint
-      when /^multilinestring/i then ::RGeo::Feature::MultiLineString
-      when /^multipolygon/i then ::RGeo::Feature::MultiPolygon
+      when /^geometry/i then Feature::Geometry
+      when /^point/i then Feature::Point
+      when /^linestring/i then Feature::LineString
+      when /^polygon/i then Feature::Polygon
+      when /^geometrycollection/i then Feature::GeometryCollection
+      when /^multipoint/i then Feature::MultiPoint
+      when /^multilinestring/i then Feature::MultiLineString
+      when /^multipolygon/i then Feature::MultiPolygon
       end
     end
   end

data/lib/rgeo/active_record/geometry_mixin.rb

@@ -6,7 +6,7 @@ module RGeo
 
     module GeometryMixin
       # The default JSON generator Proc. Renders geometry fields as WKT.
-      DEFAULT_JSON_GENERATOR = ::Proc.new(&:to_s)
+      DEFAULT_JSON_GENERATOR = Proc.new(&:to_s)
 
       @json_generator = DEFAULT_JSON_GENERATOR
 
@@ -27,9 +27,9 @@ module RGeo
           value = block
         elsif value == :geojson
           require "rgeo/geo_json"
-          value = ::Proc.new { |geom_| ::RGeo::GeoJSON.encode(geom_) }
+          value = proc { |geom| GeoJSON.encode(geom) }
         end
-        if value.is_a?(::Proc)
+        if value.is_a?(Proc)
           @json_generator = value
         else
           @json_generator = DEFAULT_JSON_GENERATOR
@@ -54,5 +54,5 @@ module RGeo
   end
 end
 
-::RGeo::Feature::MixinCollection::GLOBAL.for_type(::RGeo::Feature::Geometry)
-  .add(::RGeo::ActiveRecord::GeometryMixin)
+RGeo::Feature::MixinCollection::GLOBAL.for_type(RGeo::Feature::Geometry)
+  .add(RGeo::ActiveRecord::GeometryMixin)

data/lib/rgeo/active_record/spatial_expressions.rb

@@ -3,7 +3,7 @@ module RGeo
     # Returns true if spatial expressions (i.e. the methods in the
     # SpatialExpressions module) are supported.
     def self.spatial_expressions_supported?
-      defined?(::Arel::Nodes::NamedFunction)
+      defined?(Arel::Nodes::NamedFunction)
     end
 
     # A set of spatial expression builders.
@@ -16,7 +16,7 @@ module RGeo
 
       def st_function(function, *args)
         spatial_info = args.last.is_a?(::Array) ? args.pop : []
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new(function, [self] + args, spatial_info)
+        SpatialNamedFunction.new(function, [self] + args, spatial_info)
       end
 
       #--
@@ -24,109 +24,109 @@ module RGeo
       #++
 
       def st_dimension
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Dimension", [self], [false, true])
+        SpatialNamedFunction.new("ST_Dimension", [self], [false, true])
       end
 
       def st_geometrytype
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_GeometryType", [self], [false, true])
+        SpatialNamedFunction.new("ST_GeometryType", [self], [false, true])
       end
 
       def st_astext
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_AsText", [self], [false, true])
+        SpatialNamedFunction.new("ST_AsText", [self], [false, true])
       end
 
       def st_asbinary
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_AsBinary", [self], [false, true])
+        SpatialNamedFunction.new("ST_AsBinary", [self], [false, true])
       end
 
       def st_srid
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_SRID", [self], [false, true])
+        SpatialNamedFunction.new("ST_SRID", [self], [false, true])
       end
 
       def st_isempty
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_IsEmpty", [self], [false, true])
+        SpatialNamedFunction.new("ST_IsEmpty", [self], [false, true])
       end
 
       def st_issimple
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_IsSimple", [self], [false, true])
+        SpatialNamedFunction.new("ST_IsSimple", [self], [false, true])
       end
 
       def st_boundary
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Boundary", [self], [true, true])
+        SpatialNamedFunction.new("ST_Boundary", [self], [true, true])
       end
 
       def st_envelope
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Envelope", [self], [true, true])
+        SpatialNamedFunction.new("ST_Envelope", [self], [true, true])
       end
 
       def st_equals(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Equals", [self, rhs], [false, true, true])
+        SpatialNamedFunction.new("ST_Equals", [self, rhs], [false, true, true])
       end
 
       def st_disjoint(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Disjoint", [self, rhs], [false, true, true])
+        SpatialNamedFunction.new("ST_Disjoint", [self, rhs], [false, true, true])
       end
 
       def st_intersects(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Intersects", [self, rhs], [false, true, true])
+        SpatialNamedFunction.new("ST_Intersects", [self, rhs], [false, true, true])
       end
 
       def st_touches(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Touches", [self, rhs], [false, true, true])
+        SpatialNamedFunction.new("ST_Touches", [self, rhs], [false, true, true])
       end
 
       def st_crosses(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Crosses", [self, rhs], [false, true, true])
+        SpatialNamedFunction.new("ST_Crosses", [self, rhs], [false, true, true])
       end
 
       def st_within(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Within", [self, rhs], [false, true, true])
+        SpatialNamedFunction.new("ST_Within", [self, rhs], [false, true, true])
       end
 
       def st_contains(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Contains", [self, rhs], [false, true, true])
+        SpatialNamedFunction.new("ST_Contains", [self, rhs], [false, true, true])
       end
 
       def st_overlaps(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Overlaps", [self, rhs], [false, true, true])
+        SpatialNamedFunction.new("ST_Overlaps", [self, rhs], [false, true, true])
       end
 
       def st_relate(rhs, matrix = nil)
         args = [self, rhs]
         args << matrix.to_s if matrix
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Relate", args, [false, true, true, false])
+        SpatialNamedFunction.new("ST_Relate", args, [false, true, true, false])
       end
 
       def st_distance(rhs, units = nil)
         args = [self, rhs]
         args << units.to_s if units
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Distance", args, [false, true, true, false])
+        SpatialNamedFunction.new("ST_Distance", args, [false, true, true, false])
       end
 
       def st_intersection(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Intersection", [self, rhs], [true, true, true])
+        SpatialNamedFunction.new("ST_Intersection", [self, rhs], [true, true, true])
       end
 
       def st_difference(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Difference", [self, rhs], [true, true, true])
+        SpatialNamedFunction.new("ST_Difference", [self, rhs], [true, true, true])
       end
 
       def st_union(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Union", [self, rhs], [true, true, true])
+        SpatialNamedFunction.new("ST_Union", [self, rhs], [true, true, true])
       end
 
       def st_symdifference(rhs)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_SymDifference", [self, rhs], [true, true, true])
+        SpatialNamedFunction.new("ST_SymDifference", [self, rhs], [true, true, true])
       end
 
       def st_buffer(distance, units = nil)
         args = [self, distance.to_f]
         args << units.to_s if units
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Buffer", args, [true, true, false])
+        SpatialNamedFunction.new("ST_Buffer", args, [true, true, false])
       end
 
       def st_convexhull
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_ConvexHull", [self], [true, true])
+        SpatialNamedFunction.new("ST_ConvexHull", [self], [true, true])
       end
 
       #--
@@ -134,19 +134,19 @@ module RGeo
       #++
 
       def st_x
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_X", [self], [false, true])
+        SpatialNamedFunction.new("ST_X", [self], [false, true])
       end
 
       def st_y
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Y", [self], [false, true])
+        SpatialNamedFunction.new("ST_Y", [self], [false, true])
       end
 
       def st_z
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Z", [self], [false, true])
+        SpatialNamedFunction.new("ST_Z", [self], [false, true])
       end
 
       def st_m
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_M", [self], [false, true])
+        SpatialNamedFunction.new("ST_M", [self], [false, true])
       end
 
       #--
@@ -154,25 +154,25 @@ module RGeo
       #++
 
       def st_startpoint
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_StartPoint", [self], [true, true])
+        SpatialNamedFunction.new("ST_StartPoint", [self], [true, true])
       end
 
       def st_endpoint
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_EndPoint", [self], [true, true])
+        SpatialNamedFunction.new("ST_EndPoint", [self], [true, true])
       end
 
       def st_isclosed
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_IsClosed", [self], [false, true])
+        SpatialNamedFunction.new("ST_IsClosed", [self], [false, true])
       end
 
       def st_isring
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_IsRing", [self], [false, true])
+        SpatialNamedFunction.new("ST_IsRing", [self], [false, true])
       end
 
       def st_length(units = nil)
         args = [self]
         args << units.to_s if units
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Length", args, [false, true, false])
+        SpatialNamedFunction.new("ST_Length", args, [false, true, false])
       end
 
       #--
@@ -180,11 +180,11 @@ module RGeo
       #++
 
       def st_numpoints
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_NumPoints", [self], [false, true])
+        SpatialNamedFunction.new("ST_NumPoints", [self], [false, true])
       end
 
       def st_pointn(n)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_PointN", [self, n.to_i], [true, true, false])
+        SpatialNamedFunction.new("ST_PointN", [self, n.to_i], [true, true, false])
       end
 
       #--
@@ -194,15 +194,15 @@ module RGeo
       def st_area(units = nil)
         args = [self]
         args << units.to_s if units
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_StartPoint", args, [false, true, false])
+        SpatialNamedFunction.new("ST_StartPoint", args, [false, true, false])
       end
 
       def st_centroid
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_Centroid", [self], [true, true])
+        SpatialNamedFunction.new("ST_Centroid", [self], [true, true])
       end
 
       def st_pointonsurface
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_PointOnSurface", [self], [true, true])
+        SpatialNamedFunction.new("ST_PointOnSurface", [self], [true, true])
       end
 
       #--
@@ -210,17 +210,17 @@ module RGeo
       #++
 
       def st_exteriorring
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_ExteriorRing", [self], [true, true])
+        SpatialNamedFunction.new("ST_ExteriorRing", [self], [true, true])
       end
 
       def st_numinteriorrings
         # Note: the name difference is intentional. The standard
         # names this function incorrectly.
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_NumInteriorRing", [self], [false, true])
+        SpatialNamedFunction.new("ST_NumInteriorRing", [self], [false, true])
       end
 
       def st_interiorringn(n)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_InteriorRingN", [self, n.to_i], [true, true, false])
+        SpatialNamedFunction.new("ST_InteriorRingN", [self, n.to_i], [true, true, false])
       end
 
       #--
@@ -228,11 +228,11 @@ module RGeo
       #++
 
       def st_numgeometries
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_NumGeometries", [self], [false, true])
+        SpatialNamedFunction.new("ST_NumGeometries", [self], [false, true])
       end
 
       def st_geometryn(n)
-        ::RGeo::ActiveRecord::SpatialNamedFunction.new("ST_GeometryN", [self, n.to_i], [true, true, false])
+        SpatialNamedFunction.new("ST_GeometryN", [self, n.to_i], [true, true, false])
       end
     end
   end
@@ -241,7 +241,7 @@ end
 # Add tools to build spatial structures in the AST.
 
 # Allow chaining of spatial expressions from attributes
-::Arel::Attribute.send :include, ::RGeo::ActiveRecord::SpatialExpressions
+Arel::Attribute.send :include, RGeo::ActiveRecord::SpatialExpressions
 
 module Arel
   # Create a spatial constant node.
@@ -249,6 +249,6 @@ module Arel
   # string in WKT format). It supports chaining with the functions
   # defined by RGeo::ActiveRecord::SpatialExpressions.
   def self.spatial(arg)
-    ::RGeo::ActiveRecord::SpatialConstantNode.new(arg)
+    RGeo::ActiveRecord::SpatialConstantNode.new(arg)
   end
 end

data/lib/rgeo/active_record/spatial_factory_store.rb

@@ -33,9 +33,9 @@ module RGeo
 
       def default_for_attrs(attrs)
         if attrs[:sql_type] =~ /geography/
-          RGeo::Geographic.spherical_factory(to_factory_attrs(attrs))
+          Geographic.spherical_factory(to_factory_attrs(attrs))
         else
-          RGeo::Cartesian.preferred_factory(to_factory_attrs(attrs))
+          Cartesian.preferred_factory(to_factory_attrs(attrs))
         end
       end
 

data/lib/rgeo/active_record/version.rb

@@ -1,5 +1,5 @@
 module RGeo
   module ActiveRecord
-    VERSION = "4.0.1".freeze
+    VERSION = "4.0.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-activerecord
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Daniel Azuma, Tee Parham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -92,7 +92,6 @@ files:
 - LICENSE.txt
 - README.md
 - lib/rgeo-activerecord.rb
-- lib/rgeo/active_record.rb
 - lib/rgeo/active_record/arel_spatial_queries.rb
 - lib/rgeo/active_record/common_adapter_elements.rb
 - lib/rgeo/active_record/geometry_mixin.rb

data/lib/rgeo/active_record.rb

@@ -1,14 +0,0 @@
-# RGeo is a spatial data library for Ruby, provided by the "rgeo" gem.
-#
-# The optional RGeo::ActiveRecord module provides spatial extensions for
-# ActiveRecord, and a set of tools and helpers for writing RGeo-based
-# spatial connection adapters.
-
-require "rgeo"
-require "active_record"
-require "rgeo/active_record/version"
-require "rgeo/active_record/spatial_expressions"
-require "rgeo/active_record/spatial_factory_store"
-require "rgeo/active_record/arel_spatial_queries"
-require "rgeo/active_record/common_adapter_elements"
-require "rgeo/active_record/geometry_mixin"