arel-haversine 0.0.1 → 0.0.2

data/arel-haversine.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'arel'
+  spec.add_dependency 'arel-trigonometry'
 
   spec.add_development_dependency 'activerecord', '>= 3'
   spec.add_development_dependency 'bundler', '~> 1.3'

data/lib/arel/haversine/version.rb

@@ -1,5 +1,5 @@
 module Arel
   module Haversine
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/lib/arel/nodes/haversine.rb

@@ -1,10 +1,12 @@
+require 'arel/trigonometry'
+
 module Arel
   module Nodes
     class Haversine < Function
       def initialize lat1, lng1, lat2, lng2, options = nil
         super Multiplication.new(
           Arcsine.new(
-            Sqrt.new(
+            SquareRoot.new(
               Addition.new(
                 Pow.new(Sine.new(Division.new(Radians.new(lat1 - lat2), 2)), 2),
                 Multiplication.new(
@@ -26,56 +28,9 @@ module Arel
         (options || {})[:unit] == :mi ? 7917.5 : 12742
       end
     end
-
-    %w[
-      Arcsine
-      Cosine
-      Radians
-      Sine
-      Sqrt
-    ].each do |name|
-      const_set name, Class.new(Unary)
-    end
-    Pow = Class.new(Binary)
   end
 
   module Visitors
-    module CommonMathVisitors
-      private
-
-      def visit_Arel_Nodes_Arcsine o
-        "ASIN(#{visit o.expr})"
-      end
-
-      def visit_Arel_Nodes_Cosine o
-        "COS(#{visit o.expr})"
-      end
-
-      def visit_Arel_Nodes_Pow o
-        "POW(#{visit o.left}, #{visit o.right})"
-      end
-
-      def visit_Arel_Nodes_Radians o
-        "RADIANS(#{visit o.expr})"
-      end
-
-      def visit_Arel_Nodes_Sine o
-        "SIN(#{visit o.expr})"
-      end
-
-      def visit_Arel_Nodes_Sqrt o
-        "SQRT(#{visit o.expr})"
-      end
-    end
-
-    class MySQL
-      include CommonMathVisitors
-    end
-
-    class PostgreSQL
-      include CommonMathVisitors
-    end
-
     class ToSql
       private
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel-haversine
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: arel-trigonometry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement