rgeo-ar 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6450384669367d1c94d13c408784df96c62f410
-  data.tar.gz: a569d6e0b7c8ed5f0bf2981e15d8df5c3877c353
+  metadata.gz: 07f4e76f082da2fd612d850b83cd7d30194755b9
+  data.tar.gz: d847ade0068d38b282b81775545d61431fffddcb
 SHA512:
-  metadata.gz: 8cb09d66ed6ffcc134563e065f95b0d1311cd672fe49cec0aa0e3bd57ad6ede7ad83ebb8b1301418dce2511dfa366306012c6c4c3127e6f0e1a0d413e2b25606
-  data.tar.gz: e6b2c1824c98ad1f8004d51c9fa4cab9ee1ce19b42ba089ad603b5e56b5ccac6a4b2ce50849e58cf6ff9ba8436cc5f385b824fb3fc60e5d2a37324bf814bc699
+  metadata.gz: 4ec86f237ef08314c084f795d55366fa0be9c345451a82352dce1d1ba4edd414d0da3ef29551e4ef98f21da97e08e5e5c0ead220093018e97fe44f9cbca3046a
+  data.tar.gz: 989f88e983a96cbc1fb615df1f2035580ec09606bc4c79d5bef533a7e279dd89171047996951600aef23f0bdd00537ac3a39fc1cf1db7b0c4d325d683d2d3c67

data/lib/rgeo-activerecord.rb

@@ -31,6 +31,5 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-;
 
 require 'rgeo/active_record'

data/lib/rgeo/active_record.rb

@@ -31,8 +31,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-;
-
 
 # Dependencies
 require 'rgeo'

data/lib/rgeo/active_record/adapter_test_helper.rb

@@ -31,8 +31,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-;
-
 
 require 'rgeo/active_record'
 require 'yaml'
@@ -150,12 +148,10 @@ module RGeo
 
         # Clear out any ActiveRecord caches that are present.
         # Different Rails versions use different types of caches.
-        has_schema_cache_ = false
         klass_.connection_pool.with_connection do |c_|
           if c_.respond_to?(:schema_cache)
             # 3.2.x and 4.0.x
             c_.schema_cache.clear!
-            has_schema_cache_ = true
           end
           if c_.respond_to?(:clear_cache!)
             # 3.1 and above
@@ -164,10 +160,6 @@ module RGeo
           # All 3.x and 4.0
           c_.clear_query_cache
         end
-        if !has_schema_cache_ && klass_.connection_pool.respond_to?(:clear_cache!)
-          # 3.1.x only
-          klass_.connection_pool.clear_cache!
-        end
       end
 
 

data/lib/rgeo/active_record/ar_factory_settings.rb

@@ -31,8 +31,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-;
-
 
 require 'active_record'
 

data/lib/rgeo/active_record/arel_spatial_queries.rb

@@ -31,14 +31,9 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-;
-
 
 module RGeo
-
   module ActiveRecord
-
-
     # A set of common Arel visitor hacks for spatial ToSql visitors.
     # Generally, a spatial ActiveRecord adapter should provide a custom
     # ToSql Arel visitor that includes and customizes this module.
@@ -47,7 +42,6 @@ module RGeo
 
     module SpatialToSql
 
-
       # Map a standard OGC SQL function name to the actual name used by
       # a particular database. This method should take a name and
       # return either the changed name or the original name.
@@ -56,7 +50,6 @@ module RGeo
         standard_name_
       end
 
-
       # Visit the SpatialNamedFunction node. This operates similarly to
       # the standard NamedFunction node, but it performs function name
       # mapping for the database, and it also uses the type information
@@ -71,11 +64,9 @@ module RGeo
         "#{name_}(#{node_.distinct ? 'DISTINCT ' : ''}#{exprs_.join(', ')})#{node_.alias ? " AS #{visit(node_.alias, *args)}" : ''}"
       end
 
-
       # Generates SQL for a spatial node.
       # The node must be a string (in which case it is treated as WKT),
       # an RGeo feature, or a spatial attribute.
-
       def visit_in_spatial_context(node_, *args)
         case node_
         when ::String
@@ -88,50 +79,24 @@ module RGeo
           visit(node_, *args)
         end
       end
-
-
     end
 
-
     # This node wraps an RGeo feature and gives it spatial expression
     # constructors.
-
     class SpatialConstantNode
-
       include ::RGeo::ActiveRecord::SpatialExpressions
 
-
       # The delegate should be the RGeo feature.
-
       def initialize(delegate_)
         @delegate = delegate_
       end
 
-
       # Return the RGeo feature
-
       attr_reader :delegate
-
-
     end
 
-
     # :stopdoc:
 
-
-    # Hack Arel Attributes dispatcher to recognize geometry columns.
-    # This is deprecated but necessary to support legacy Arel versions.
-
-    if ::Arel::Attributes.method_defined?(:for)
-      module ArelAttributesLegacyClassMethods
-        def for(column_)
-          column_.type == :spatial ? Attribute : super
-        end
-      end
-      ::Arel::Attributes.extend(ArelAttributesLegacyClassMethods)
-    end
-
-
     # Make sure the standard Arel visitors can handle RGeo feature objects
     # by default.
 
@@ -157,59 +122,36 @@ module RGeo
       alias :visit_RGeo_Cartesian_BoundingBox :visit_String
     end
 
-
     # Add tools to build spatial structures in the AST.
-    # This stuff requires Arel 2.1 or later.
 
-    if defined?(::Arel::Nodes::NamedFunction)
+    # Allow chaining of spatial expressions from attributes
+    ::Arel::Attribute.class_eval do
+      include ::RGeo::ActiveRecord::SpatialExpressions
+    end
 
-      # Allow chaining of predications from named functions
-      # (Some older versions of Arel didn't do this.)
-      ::Arel::Nodes::NamedFunction.class_eval do
-        include ::Arel::Predications unless include?(::Arel::Predications)
-      end
+    # A NamedFunction subclass that keeps track of the spatial-ness of
+    # 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
 
-      # Allow chaining of spatial expressions from attributes
-      ::Arel::Attribute.class_eval do
-        include ::RGeo::ActiveRecord::SpatialExpressions
+      def initialize(name_, expr_, spatial_flags_=[], aliaz_=nil)
+        super(name_, expr_, aliaz_)
+        @spatial_flags = spatial_flags_
       end
 
-
-      # A NamedFunction subclass that keeps track of the spatial-ness of
-      # 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
-
-        def initialize(name_, expr_, spatial_flags_=[], aliaz_=nil)
-          super(name_, expr_, aliaz_)
-          @spatial_flags = spatial_flags_
-        end
-
-        def spatial_result?
-          @spatial_flags.first
-        end
-
-        def spatial_argument?(index_)
-          @spatial_flags[index_+1]
-        end
-
+      def spatial_result?
+        @spatial_flags.first
       end
 
-    else
-
-      # A dummy SpatialNamedFunction for pre-2.1 versions of Arel.
-      class SpatialNamedFunction; end
+      def spatial_argument?(index_)
+        @spatial_flags[index_+1]
+      end
 
     end
 
-
     # :startdoc:
 
-
   end
-
 end

data/lib/rgeo/active_record/common_adapter_elements.rb

@@ -31,7 +31,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-;
 
 
 require 'active_support/core_ext/class' # Workaround for a missing require in ActiveRecord 3.2.1

data/lib/rgeo/active_record/geometry_mixin.rb

@@ -31,8 +31,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-;
-
 
 module RGeo
 

data/lib/rgeo/active_record/spatial_expressions.rb

@@ -31,8 +31,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-;
-
 
 module RGeo
 

data/lib/rgeo/active_record/task_hacker.rb

@@ -31,7 +31,6 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # -----------------------------------------------------------------------------
-;
 
 
 module RGeo

data/lib/rgeo/active_record/version.rb

@@ -34,6 +34,6 @@
 
 module RGeo
   module ActiveRecord
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.6.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-ar
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Daniel Azuma