arel-extensions 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4847138fb20c8ca58e5bf419b595e1cf9e4dc809
-  data.tar.gz: 54565109b15574583361a153a2558bdb5deac376
+  metadata.gz: 3c79633129067dda19ceaeaf6f0241b23d57c804
+  data.tar.gz: 7f401572e73ed1e40cde5f094360d427bd7539c1
 SHA512:
-  metadata.gz: d934dc0afa953e09db3837747ebc919ae473901f6da32033a76635261eda113c75504a7ac98c861b48983993c2e0dace2f439f31d18542b62e01ce30b1d66d74
-  data.tar.gz: f568ff754c5f16fca13c73925353ffe9aae53fcd1cdfa8da74dafebabef5110c0308135375241c8c82e7bb2f420229da4ec41bdc3d9b99e055215d387a988ae6
+  metadata.gz: d306bc36f6b25224da947efc251686455e7353f67bc9af65ba7f81df704838ff640c0fe5f6d030f5a33cfffbc5e5f51885caba4c715231072463d24582b7a602
+  data.tar.gz: d802003762477a56fde5f2e7f7b08c4dbbdab73cc0f448d5915a953cdfe8ce5562bb1e7aa785876f8069eda3b1e8487461a8c3aa8488e16293c36cd9487cbd0f

data/arel-extensions.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name = 'arel-extensions'
-  gem.version = '1.0.0'
+  gem.version = '1.1.0'
   
   gem.authors       = ["Jon Bracy"]
   gem.email         = ["jonbracy@gmail.com"]

data/lib/arel/attributes/cast.rb

@@ -0,0 +1,14 @@
+module Arel
+  module Attributes
+    class Cast < Attribute
+      
+      def able_to_type_cast?
+        false
+      end
+      
+      def table_name
+        nil
+      end
+    end
+  end
+end

data/lib/arel/attributes/key.rb

@@ -1,6 +1,7 @@
 module Arel
   module Attributes
     class Key < Attribute
+      
       def able_to_type_cast?
         false
       end

data/lib/arel/extensions.rb

@@ -1,16 +1,27 @@
-require File.expand_path('../array_predications', __FILE__)
 require File.expand_path('../nodes/overlaps', __FILE__)
 require File.expand_path('../nodes/contains', __FILE__)
+require File.expand_path('../array_predications', __FILE__)
 Arel::Attributes::Attribute.include(Arel::ArrayPredications)
 
 
 require File.expand_path('../attributes/key', __FILE__)
+require File.expand_path('../attributes/cast', __FILE__)
 require File.expand_path('../nodes/has_any_key', __FILE__)
 require File.expand_path('../nodes/has_key', __FILE__)
 require File.expand_path('../nodes/has_keys', __FILE__)
 require File.expand_path('../json_predications', __FILE__)
 Arel::Attributes::Attribute.include(Arel::JSONPredications)
 
+require File.expand_path('../nodes/ts_vector', __FILE__)
+require File.expand_path('../nodes/ts_query', __FILE__)
+require File.expand_path('../nodes/ts_match', __FILE__)
+require File.expand_path('../ts_predications', __FILE__)
+Arel::Attributes::Attribute.include(Arel::TSPredications)
+
 if defined?(Arel::Visitors::PostgreSQL)
   require File.expand_path('../visitors/postgresql_extensions', __FILE__)
+end
+
+if defined?(Arel::Visitors::Sunstone)
+  require File.expand_path('../visitors/sunstone_extensions', __FILE__)
 end

data/lib/arel/json_predications.rb

@@ -19,5 +19,9 @@ module Arel
       Arel::Nodes::HasAnyKeys.new(self, keys)
     end
     
+    def cast_as(type)
+      Arel::Attributes::Cast.new(self, type)
+    end
+    
   end
 end

data/lib/arel/nodes/ts_match.rb

@@ -0,0 +1,6 @@
+module Arel
+  module Nodes
+    class TSMatch < Binary
+    end
+  end
+end

data/lib/arel/nodes/ts_query.rb

@@ -0,0 +1,14 @@
+module Arel
+  module Nodes
+    class TSQuery < Arel::Nodes::Node
+      
+      attr_reader :expression, :language
+      
+      def initialize(expression, language)
+        @expression = Arel::Nodes.build_quoted(expression)
+        @language = Arel::Nodes.build_quoted(language) if language
+      end
+
+    end
+  end
+end

data/lib/arel/nodes/ts_vector.rb

@@ -0,0 +1,14 @@
+module Arel
+  module Nodes
+    class TSVector < Arel::Nodes::Node
+      
+      attr_reader :attribute, :language
+      
+      def initialize(attribute, language)
+        @attribute = attribute
+        @language = Arel::Nodes.build_quoted(language) if language
+      end
+      
+    end
+  end
+end

data/lib/arel/ts_predications.rb

@@ -0,0 +1,12 @@
+module Arel
+  module TSPredications
+    
+    def ts_query(expression, language=nil)
+      vector = Arel::Nodes::TSVector.new(self, language)
+      query = Arel::Nodes::TSQuery.new(expression, language)
+      
+      Arel::Nodes::TSMatch.new(vector, query)
+    end
+    
+  end
+end

data/lib/arel/visitors/postgresql_extensions.rb

@@ -3,22 +3,30 @@ module Arel
     class PostgreSQL
       private
       
+      def column_for attr
+        return nil if attr.is_a?(Arel::Attributes::Key)
+        super
+      end
+      
       def visit_Arel_Nodes_Contains o, collector
         visit o.left, collector
         collector << ' @> '
         collector << quote(o.left.type_cast_for_database(o.right))
+        collector
       end
       
       def visit_Arel_Nodes_ContainedBy o, collector
         visit o.left, collector
         collector << ' <@ '
         collector << quote(o.left.type_cast_for_database(o.right))
+        collector
       end
 
       def visit_Arel_Nodes_Overlaps o, collector
         visit o.left, collector
         collector << ' && '
         collector << quote(o.left.type_cast_for_database(o.right))
+        collector
       end
       
       def visit_Arel_Attributes_Key(o, collector, last_key = true)
@@ -29,17 +37,61 @@ module Arel
             collector << "}'"
           else
             collector << o.name.to_s
-            collector << "."
+            collector << ","
           end
         else
           visit(o.relation, collector)
           collector << "\#>>'{" << o.name.to_s
-          if !last_key
-            collector << "."
-          end
+          collector << (last_key ? "}'" : ",")
+        end
+        collector
+      end
+
+      def visit_Arel_Nodes_HasKey(o, collector)
+        right = o.right
+        
+        collector = visit o.left, collector
+        
+        collector << " ? " << quote(right.to_s)
+        collector
+      end
+      
+      def visit_Arel_Attributes_Cast(o, collector)
+        collector << "("
+        visit(o.relation, collector)
+        collector << ")::#{o.name}"
+        collector
+      end
+      
+      def visit_Arel_Nodes_TSMatch(o, collector)
+        visit o.left, collector
+        collector << ' @@ '
+        visit o.right, collector
+        collector
+      end
+      
+      def visit_Arel_Nodes_TSVector(o, collector)
+        collector << 'to_tsvector('
+        if o.language
+          visit(o.language, collector) 
+          collector << ', '
         end
+        visit(o.attribute, collector) 
+        collector << ')'
+        collector
       end
       
+      def visit_Arel_Nodes_TSQuery(o, collector)
+        collector << 'to_tsquery('
+        if o.language
+          visit(o.language, collector) 
+          collector << ', '
+        end
+        visit(o.expression, collector) 
+        collector << ')'
+        collector
+      end
+
     end
   end
 end

data/lib/arel/visitors/sunstone_extensions.rb

@@ -0,0 +1,24 @@
+module Arel
+  module Visitors
+    class Sunstone
+      private
+      
+      def visit_Arel_Nodes_Contains o, collector
+        key = visit(o.left, collector)
+        value = { :contains => visit(o.right, collector) }
+        
+        if key.is_a?(Hash)
+          add_to_bottom_of_hash(key, value)
+        else
+          key = key.to_s.split('.')
+          hash = { key.pop => value }
+          while key.size > 0
+            hash = { key.pop => hash }
+          end
+          hash
+        end
+      end
+      
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-extensions
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -63,6 +63,7 @@ files:
 - README.md
 - arel-extensions.gemspec
 - lib/arel/array_predications.rb
+- lib/arel/attributes/cast.rb
 - lib/arel/attributes/key.rb
 - lib/arel/extensions.rb
 - lib/arel/json_predications.rb
@@ -71,7 +72,12 @@ files:
 - lib/arel/nodes/has_key.rb
 - lib/arel/nodes/has_keys.rb
 - lib/arel/nodes/overlaps.rb
+- lib/arel/nodes/ts_match.rb
+- lib/arel/nodes/ts_query.rb
+- lib/arel/nodes/ts_vector.rb
+- lib/arel/ts_predications.rb
 - lib/arel/visitors/postgresql_extensions.rb
+- lib/arel/visitors/sunstone_extensions.rb
 homepage: https://github.com/malomalo/arel-extensions
 licenses:
 - MIT
@@ -92,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Adds support for missing SQL operators and functions to Arel