New version docs and final adjustments

Author: Carlos Silva

README.md

@@ -19,7 +19,7 @@
 
 To install torque-postgresql you need to add the following to your Gemfile:
 ```ruby
-gem 'torque-postgresql', '~> 0.2'
+gem 'torque-postgresql', '~> 1.0'
 ```
 
 Also, run:
@@ -39,13 +39,26 @@ These are the currently available features:
 
 * [Configuring](https://github.com/crashtech/torque-postgresql/wiki/Configuring)
 
+## Core Extensions
+
+* [Range](https://github.com/crashtech/torque-postgresql/wiki/Range)
+
 ## Data types
 
 * [Enum](https://github.com/crashtech/torque-postgresql/wiki/Enum)
+* [EnumSet](https://github.com/crashtech/torque-postgresql/wiki/EnumSet)
 * [Interval](https://github.com/crashtech/torque-postgresql/wiki/Interval)
+* [Date/Time Range](https://github.com/crashtech/torque-postgresql/wiki/Date-Time-Range)
+* [Box](https://github.com/crashtech/torque-postgresql/wiki/Box)
+* [Circle](https://github.com/crashtech/torque-postgresql/wiki/Circle)
+* [Line](https://github.com/crashtech/torque-postgresql/wiki/Line)
+* [Segment](https://github.com/crashtech/torque-postgresql/wiki/Segment)
 
 ## Querying
 
+* [Arel](https://github.com/crashtech/torque-postgresql/wiki/Arel)
+* [Has Many](https://github.com/crashtech/torque-postgresql/wiki/Has-Many)
+* [Belongs to Many](https://github.com/crashtech/torque-postgresql/wiki/Belongs-to-Many)
 * [Dynamic Attributes](https://github.com/crashtech/torque-postgresql/wiki/Dynamic-Attributes)
 * [Distinct On](https://github.com/crashtech/torque-postgresql/wiki/Distinct-On)
 * [Auxiliary Statements](https://github.com/crashtech/torque-postgresql/wiki/Auxiliary-Statements)

lib/torque/postgresql/arel/nodes.rb

@@ -4,7 +4,11 @@ module Arel
       module Nodes
 
         class Cast < ::Arel::Nodes::Binary
+          include ::Arel::Expressions
           include ::Arel::Predications
+          include ::Arel::AliasPredication
+          include ::Arel::OrderPredications
+          include ::Arel::Math
 
           def initialize(left, right, array = false)
             right = right.to_s

lib/torque/postgresql/attributes/builder/period.rb

@@ -209,11 +209,13 @@ def build_singleton_methods
 
               klass.scope method_names[:containing], ->(value) do
                 value = arel_table[value] if value.is_a?(Symbol)
+                value = ::Arel.sql(connection.quote(value)) unless value.respond_to?(:cast)
                 where(builder.arel_attribute.contains(value))
               end
 
               klass.scope method_names[:not_containing], ->(value) do
                 value = arel_table[value] if value.is_a?(Symbol)
+                value = ::Arel.sql(connection.quote(value)) unless value.respond_to?(:cast)
                 where.not(builder.arel_attribute.contains(value))
               end
 
@@ -224,6 +226,8 @@ def build_singleton_methods
                   value = ::Arel.sql(connection.quote(value))
                   right = ::Arel.sql(connection.quote(right))
                   value = builder.arel_convert_to_type(value, right)
+                elsif !value.respond_to?(:cast)
+                  value = ::Arel.sql(connection.quote(value))
                 end
 
                 where(builder.arel_attribute.overlaps(value))
@@ -236,6 +240,8 @@ def build_singleton_methods
                   value = ::Arel.sql(connection.quote(value))
                   right = ::Arel.sql(connection.quote(right))
                   value = builder.arel_convert_to_type(value, right)
+                elsif !value.respond_to?(:cast)
+                  value = ::Arel.sql(connection.quote(value))
                 end
 
                 where.not(builder.arel_attribute.overlaps(value))
@@ -276,6 +282,7 @@ def build_singleton_methods
               if threshold.present?
                 klass.scope method_names[:real_containing], ->(value) do
                   value = arel_table[value] if value.is_a?(Symbol)
+                  value = ::Arel.sql(connection.quote(value)) unless value.respond_to?(:cast)
                   where(builder.real_arel_attribute.contains(value))
                 end
 
@@ -286,6 +293,8 @@ def build_singleton_methods
                     value = ::Arel.sql(connection.quote(value))
                     right = ::Arel.sql(connection.quote(right))
                     value = builder.arel_convert_to_type(value, right)
+                  elsif !value.respond_to?(:cast)
+                    value = ::Arel.sql(connection.quote(value))
                   end
 
                   where(builder.real_arel_attribute.overlaps(value))
@@ -327,11 +336,13 @@ def build_singleton_methods
               unless type.eql?(:daterange)
                 klass.scope method_names[:containing_date], ->(value) do
                   value = arel_table[value] if value.is_a?(Symbol)
+                  value = ::Arel.sql(connection.quote(value)) unless value.respond_to?(:cast)
                   where(builder.arel_daterange.contains(value))
                 end
 
                 klass.scope method_names[:not_containing_date], ->(value) do
                   value = arel_table[value] if value.is_a?(Symbol)
+                  value = ::Arel.sql(connection.quote(value)) unless value.respond_to?(:cast)
                   where.not(builder.arel_daterange.contains(value))
                 end
 
@@ -342,6 +353,8 @@ def build_singleton_methods
                     value = ::Arel.sql(connection.quote(value))
                     right = ::Arel.sql(connection.quote(right))
                     value = builder.arel_convert_to_type(value, right, :daterange)
+                  elsif !value.respond_to?(:cast)
+                    value = ::Arel.sql(connection.quote(value))
                   end
 
                   where(builder.arel_daterange.overlaps(value))
@@ -354,6 +367,8 @@ def build_singleton_methods
                     value = ::Arel.sql(connection.quote(value))
                     right = ::Arel.sql(connection.quote(right))
                     value = builder.arel_convert_to_type(value, right, :daterange)
+                  elsif !value.respond_to?(:cast)
+                    value = ::Arel.sql(connection.quote(value))
                   end
 
                   where.not(builder.arel_daterange.overlaps(value))

lib/torque/postgresql/attributes/enum_set.rb

@@ -9,7 +9,7 @@ class EnumSetError < Enum::EnumError; end
         class << self
           include Enumerable
 
-          delegate :each, :sample, to: :members
+          delegate :each, to: :members
           delegate :values, :members, :texts, :to_options, :valid?, :size,
             :length, :connection_specification_name, to: :enum_source
 
@@ -41,6 +41,11 @@ def enum_source
             const_get('EnumSource')
           end
 
+          # Use the power to get a sample of the value
+          def sample
+            new(rand(0..((2 ** size) - 1)))
+          end
+
           # Overpass new so blank values return only nil
           def new(*values)
             return Lazy.new(self, []) if values.compact.blank?

lib/torque/postgresql/config.rb

@@ -29,7 +29,8 @@ def config.irregular_models=(hash)
     # Configure associations features
     config.nested(:associations) do |assoc|
 
-      # Define if belongs to many associations are marked as required by default
+      # Define if +belongs_to_many+ associations are marked as required by
+      # default. False means that no validation will be performed
       assoc.belongs_to_many_required_by_default = false
 
     end
@@ -41,7 +42,8 @@ def config.irregular_models=(hash)
       # arguments to format string or send on a proc
       cte.send_arguments_key = :args
 
-      # Specify the namespace of each enum type of value
+      # Estipulate a class name (which may contain namespace) that expose the
+      # auxiliary statement in order to perform detached CTEs
       cte.exposed_class = 'TorqueCTE'
 
     end
@@ -90,14 +92,14 @@ def config.irregular_models=(hash)
       # it. Any class provided here must respond to 'x', and 'y'
       geometry.point_class = ActiveRecord::Point
 
-      # Define the class that will be handling Circle data types after decoding
-      # it. Any class provided here must respond to 'x', 'y', and 'r'
-      geometry.circle_class = nil
-
       # Define the class that will be handling Box data types after decoding it.
       # Any class provided here must respond to 'x1', 'y1', 'x2', and 'y2'
       geometry.box_class = nil
 
+      # Define the class that will be handling Circle data types after decoding
+      # it. Any class provided here must respond to 'x', 'y', and 'r'
+      geometry.circle_class = nil
+
       # Define the class that will be handling Line data types after decoding
       # it. Any class provided here must respond to 'a', 'b', and 'c'
       geometry.line_class = nil
@@ -172,6 +174,5 @@ def config.irregular_models=(hash)
       }
 
     end
-
   end
 end

lib/torque/postgresql/geometry_builder.rb

@@ -27,7 +27,7 @@ def cast(value)
         when ::Hash
           build_klass(*value.symbolize_keys.slice(*pieces).values)
         when ::Array
-          build_klass(*value)
+          build_klass(*(value.flatten))
         else
           value
         end
@@ -41,7 +41,7 @@ def serialize(value)
           when ::Hash
             value.symbolize_keys.slice(*pieces).values
           when ::Array
-            value
+            value.flatten
           end
 
         parts = parts&.compact&.flatten

spec/tests/enum_set_spec.rb

@@ -183,6 +183,11 @@
     it 'accepts values turn into an array of integer by index' do
       expect((subject.B | subject.C).map(&:to_i)).to be_eql([1, 2])
     end
+
+    it 'can return a sample for resting purposes' do
+      expect(subject).to receive(:new).with(Numeric)
+      subject.sample
+    end
   end
 
   context 'on OID' do

torque_postgresql.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email       = ['[email protected]']
   s.homepage    = 'https://github.com/crashtech/torque-postgresql'
   s.summary     = 'ActiveRecord extension to access PostgreSQL advanced resources'
-  s.description = 'Add support to complex resources of PostgreSQL, like data types, user-defined types and auxiliary statements (CTE)'
+  s.description = 'Add support to complex resources of PostgreSQL, like data types, array associations, and auxiliary statements (CTE)'
   s.license     = 'MIT'
 
   s.require_paths = ['lib']