arel_extensions 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5142c37a719ede88896bbdcfa06b0690ddc4b75
-  data.tar.gz: 9da10d459cb7e1fa8a52305d12f1fb0ca945a537
+  metadata.gz: 8fb8d8ac5e42220d4b332dc7cee83a9c433990a8
+  data.tar.gz: 415ccf89692668308acf7a126388fff77dd8b559
 SHA512:
-  metadata.gz: 61d6268f8785ffd105d29b1fead496f0e7e35bfd1f660174e6fd922df197341449c2cb4379d4de37d91c62de24f48bfcb3be5aba83178f139c98d15189302e69
-  data.tar.gz: cd7c81aeedf284bcb67501ea045d82dce9cd2ff8d52f622262b7f3f0633f0c3681613de4977ef3c62aeca0f43d60d201a5fbb1f7f5f8ca5a4df36e17f7ca0073
+  metadata.gz: 5ecb5d555985e025765b3287c5a5aaefe28f5bb6ebce3e04d719aef43b232f51f821308181a360857768f963bd323daf5407c8720fdf09f9157e2bc56cbd1f4c
+  data.tar.gz: 15db9820090448c55de632f7bc524aa86e3954efe8d904e03f2fcf3291d962d4f3705d52b896a7b0fe85459602b432a1db334e7d1ec7fe09fefac375106f424e

data/gemfiles/rails5.gemfile

@@ -18,7 +18,7 @@ group :development, :test do
 	gem 'activerecord-oracle_enhanced-adapter', '~> 1.8' if ENV.has_key? 'ORACLE_HOME'
 
 	# for JRuby
-	gem 'activerecord-jdbc-adapter', :platforms => :jruby
+	gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v51.0', :platforms => :jruby
 	gem "jdbc-sqlite3", :platforms => :jruby
 	gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 	gem "activerecord-jdbcmysql-adapter", :platforms => :jruby

data/gemfiles/rails5_0.gemfile

@@ -18,7 +18,7 @@ group :development, :test do
 	gem 'activerecord-oracle_enhanced-adapter', '~> 1.7' if ENV.has_key? 'ORACLE_HOME'
 
 	# for JRuby
-	gem 'activerecord-jdbc-adapter', :platforms => :jruby
+	gem 'activerecord-jdbc-adapter', :github => 'jruby/activerecord-jdbc-adapter', :tag => 'v50.0', :platforms => :jruby
 	gem "jdbc-sqlite3", :platforms => :jruby
 	gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 	gem "activerecord-jdbcmysql-adapter", :platforms => :jruby

data/lib/arel_extensions.rb

@@ -39,6 +39,7 @@ require 'arel_extensions/boolean_functions'
 require 'arel_extensions/math'
 require 'arel_extensions/math_functions'
 require 'arel_extensions/string_functions'
+require 'arel_extensions/set_functions'
 
 require 'arel_extensions/insert_manager'
 
@@ -98,17 +99,17 @@ Arel::InsertManager.class_eval do
 end
 
 Arel::SelectManager.class_eval do
-  include ArelExtensions::Math
+  include ArelExtensions::SetFunctions
   include ArelExtensions::Nodes
 end
 
 Arel::Nodes::Union.class_eval do	
-  include ArelExtensions::Math
+  include ArelExtensions::SetFunctions
   include ArelExtensions::Nodes
 end
 
 Arel::Nodes::UnionAll.class_eval do	
-  include ArelExtensions::Math
+  include ArelExtensions::SetFunctions
   include ArelExtensions::Nodes
 end
 

data/lib/arel_extensions/math.rb

@@ -13,59 +13,58 @@ module ArelExtensions
     #String and others (convert in string)  allows you to concatenate 2 or more strings together.
     #Date and integer adds or subtracts a specified time interval from a date.
     def +(other)
-	  return ArelExtensions::Nodes::Union.new self, other if self.is_a?(Arel::SelectManager) || self.is_a?(Arel::Nodes::Union)
-      return ArelExtensions::Nodes::Concat.new [self, other] if self.is_a?(Arel::Nodes::Quoted)
-      if self.is_a?(Arel::Nodes::Grouping)
-        if self.expr.left.is_a?(String) || self.expr.right.is_a?(String)
-          return ArelExtensions::Nodes::Concat.new [self, other]
-        else
-          return Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
-        end
-      end
-      return case self.class.return_type
-      when :string, :text
-        ArelExtensions::Nodes::Concat.new [self, other]
-      when :integer, :decimal, :float, :number
-        Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
-      when :date, :datetime
-        ArelExtensions::Nodes::DateAdd.new [self, other]
-      else
-        ArelExtensions::Nodes::Concat.new [self, other]
-      end if self.is_a?(ArelExtensions::Nodes::Function)
-      col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
-      if (!col) #if the column doesn't exist in the database
+	  return ArelExtensions::Nodes::Concat.new [self, other] if self.is_a?(Arel::Nodes::Quoted)
+	  if self.is_a?(Arel::Nodes::Grouping)
+		if self.expr.left.is_a?(String) || self.expr.right.is_a?(String)
+		  return ArelExtensions::Nodes::Concat.new [self, other]
+		else
+		  return Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+		end
+	  end
+	  return case self.class.return_type
+	  when :string, :text
+		ArelExtensions::Nodes::Concat.new [self, other]
+	  when :integer, :decimal, :float, :number
+		Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+	  when :date, :datetime
+		ArelExtensions::Nodes::DateAdd.new [self, other]
+	  else
+		ArelExtensions::Nodes::Concat.new [self, other]
+	  end if self.is_a?(ArelExtensions::Nodes::Function)
+	  col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
+	  if (!col) #if the column doesn't exist in the database
 		Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new(self, other))
 	  else
 		arg = col.type
-        if arg == :integer || (!arg)
-          other = other.to_i if other.is_a?(String)
-          Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
-        elsif arg == :decimal || arg == :float
-          other = Arel.sql(other) if other.is_a?(String) # Arel should accept Float & BigDecimal!
-          Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
-        elsif arg == :datetime || arg == :date
-          ArelExtensions::Nodes::DateAdd.new [self, other]
-        elsif arg == :string || arg == :text
-          ArelExtensions::Nodes::Concat.new [self, other]
-        end        
-      end
+		if arg == :integer || (!arg)
+		  other = other.to_i if other.is_a?(String)
+		  Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+		elsif arg == :decimal || arg == :float
+		  other = Arel.sql(other) if other.is_a?(String) # Arel should accept Float & BigDecimal!
+		  Arel::Nodes::Grouping.new(Arel::Nodes::Addition.new self, other)
+		elsif arg == :datetime || arg == :date
+		  ArelExtensions::Nodes::DateAdd.new [self, other]
+		elsif arg == :string || arg == :text
+		  ArelExtensions::Nodes::Concat.new [self, other]
+		end        
+	  end
     end
 
     #function returns the time between two dates
     #function returns the substraction between two ints
     def -(other)
-      return case self.class.return_type
-      when :string, :text # ???
-        Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other)) # ??
-      when :integer, :decimal, :float, :number
-        Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
-      when :date, :datetime
-        ArelExtensions::Nodes::DateSub.new [self, other]
-      else
-        Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
-      end if self.is_a?(ArelExtensions::Nodes::Function)
-      col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
-      if (!col) #if the column doesn't exist in the database
+	  return case self.class.return_type
+	  when :string, :text # ???
+		Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other)) # ??
+	  when :integer, :decimal, :float, :number
+		Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+	  when :date, :datetime
+		ArelExtensions::Nodes::DateSub.new [self, other]
+	  else
+		Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
+	  end if self.is_a?(ArelExtensions::Nodes::Function)
+	  col = Arel::Table.engine.connection.schema_cache.columns_hash(self.relation.table_name)[self.name.to_s]
+	  if (!col) #if the column doesn't exist in the database
 		return Arel::Nodes::Grouping.new(Arel::Nodes::Subtraction.new(self, other))
 	  else
 		arg = col.type
@@ -77,11 +76,11 @@ module ArelExtensions
 				ArelExtensions::Nodes::DateSub.new [self, other]
 			  else
 				arg2 = col2.type
-			    if arg2 == :date || arg2 == :datetime
-			  	  ArelExtensions::Nodes::DateDiff.new [self, other]
-			    else
+				if arg2 == :date || arg2 == :datetime
+				  ArelExtensions::Nodes::DateDiff.new [self, other]
+				else
 				  ArelExtensions::Nodes::DateSub.new [self, other]
-			    end
+				end
 			  end  
 			when Arel::Nodes::Node, DateTime, Time, String, Date
 			  ArelExtensions::Nodes::DateDiff.new [self, other]
@@ -100,22 +99,6 @@ module ArelExtensions
 		end
 	  end
     end
-        
-    #def *(other)
-	  #if self.is_a?(Arel::SelectManager) || self.is_a?(Arel::Nodes::UnionAll) || self.is_a?(Arel::Nodes::Union)
-			#return ArelExtensions::Nodes::UnionAll.new self, other 
-		#else
-			#return super(other)
-	  #end
-    #end 
-    
-	  def union(other)
-		return ArelExtensions::Nodes::Union.new(self,other) 
-	  end
-	  
-	  def union_all(other)
-		return ArelExtensions::Nodes::UnionAll.new(self,other) 
-	  end
      
   end
 end

data/lib/arel_extensions/set_functions.rb

@@ -0,0 +1,29 @@
+require 'arel_extensions/nodes/union'
+require 'arel_extensions/nodes/union_all'
+
+module ArelExtensions
+	module SetFunctions
+
+		def +(other)
+			ArelExtensions::Nodes::Union.new(self,other)
+		end		
+
+		def union(other)
+			ArelExtensions::Nodes::Union.new(self,other)
+		end		
+
+		def union_all(other)
+			ArelExtensions::Nodes::UnionAll.new(self,other)
+		end
+
+
+	end
+end
+
+Arel::Nodes::Union.class_eval do
+  include ArelExtensions::SetFunctions
+end
+
+Arel::Nodes::UnionAll.class_eval do
+  include ArelExtensions::SetFunctions
+end

data/lib/arel_extensions/version.rb

@@ -1,3 +1,3 @@
 module ArelExtensions
-  VERSION = "1.0".freeze
+  VERSION = "1.0.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
@@ -147,6 +147,7 @@ files:
 - lib/arel_extensions/nodes/wday.rb
 - lib/arel_extensions/null_functions.rb
 - lib/arel_extensions/railtie.rb
+- lib/arel_extensions/set_functions.rb
 - lib/arel_extensions/string_functions.rb
 - lib/arel_extensions/tasks.rb
 - lib/arel_extensions/version.rb