arel_extensions 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d0b1c534a245cecea4ec121f0ab0744a8f2efdb
-  data.tar.gz: d1ee62f0e19d702485656fd16ec3ed99b8608fc2
+  metadata.gz: e8d7cc16253e73e976d81b8beb558c2041c2915f
+  data.tar.gz: 7ff4c6640d063ef79b6ada768ae7b57cb9bf4dd4
 SHA512:
-  metadata.gz: 152b5eafbeea38f4216436656d6e02a099bdeeed44b7f217ea9369ecf412ea32bcf130f577c1f0fcb5d37b6c267877a33b23963a1b9479c2faf2c4b67c7e5504
-  data.tar.gz: d7d5ce6cffcd349cfd6033fc2b2d11d349f5081cdde32b514e884e900a1a0dc25cd89373f42baefa9a7cf1a1d3a91d6573b13153af2804847f2a5b9d3c269179
+  metadata.gz: 2b2748e84a31a944bc2a835036ff81be4528d3a85940ea34ee6d65389bf86c5c67230ec7dea7c726375395733da138cfd80920463475a54c4e97abc024f3cd76
+  data.tar.gz: 7779b7ef80ab54c3f08e1bf3016d0e9311393576f18be74d5795d7e86d8fc1390afaf12f6d9271cb47e0a5a6e57e947eafb204d9a06ddae5ae9dae04bf278c9f

data/Gemfile

@@ -3,13 +3,18 @@ source "https://rubygems.org"
 gemspec
 
 group :test do
-	gem "sqlite3", :platforms => [:ruby, :mswin, :mingw]
-	gem "mysql2", :platforms => [:ruby, :mswin, :mingw]
+	gem "sqlite3", :platforms => [:mri, :mswin, :mingw, :x64_mingw]
+	gem "mysql2", :platforms => [:mri, :mswin, :mingw, :x64_mingw]
+    gem "pg", :platforms => [:mri, :mingw, :x64_mingw]
+
 	gem "jdbc-sqlite3", :platforms => :jruby
 	gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
 	gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
 	gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
 
+    gem "tiny_tds", :platforms => [:mri, :mingw, :x64_mingw]
+    gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]
+
 	gem 'activesupport', '~> 4.0'
   	gem 'activemodel', '~> 4.0'
   	gem 'activerecord', '~> 4.0'

data/README.md

@@ -1,7 +1,10 @@
 # Arel Extensions
 
 [![Build Status](https://secure.travis-ci.org/Faveod/arel-extensions.svg)](http://travis-ci.org/Faveod/arel-extensions)
-
+[![Latest Release](https://img.shields.io/gem/v/arel_extensions.svg)](https://rubygems.org/gems/arel_extensions)
+![](http://img.shields.io/badge/license-MIT-brightgreen.svg)
+![](https://ruby-gem-downloads-badge.herokuapp.com/arel_extensions?type=total)
+![](https://ruby-gem-downloads-badge.herokuapp.com/arel_extensions?label=downloads-current-version)
 
 Arel Extensions adds shortcuts, fixes and new ORM mappings (ruby to SQL) to Arel.
 It aims to ensure pure ruby syntax for the biggest number of usual cases.
@@ -29,6 +32,9 @@ t is an Arel::Table for table my_table
 # => my_table.nb > 42
 ```
 
+Other operators : <, >=, <=, =~
+
+
 ## Maths
 
 Currently in Arel:
@@ -57,8 +63,11 @@ Other functions : ABS, RAND, ROUND, FLOOR, CEIL, FORMAT
 (t[:name] + ' append').to_sql
 # => CONCAT(my_table.name, ' append')
 
-(t[:name].if_null('default')).to_sql
-# => ISNULL(my_table.name, 'default')
+(t[:name].coalesce('default')).to_sql
+# => COALESCE(my_table.name, 'default')
+
+(t[:name].blank).to_sql
+# => TRIM(TRIM(TRIM(COALESCE(my_table.name, '')), '\t'), '\n') = ''
 
 (t[:name] =~ /\A[a-d_]+/).to_sql
 # => my_table.name REGEXP '\^[a-d_]+'
@@ -96,6 +105,9 @@ t[:birthdate].month.to_sql
 
 t[:birthdate].year.to_sql
 # => YEAR(my_table.birthdate)
+
+t[:birthdate].format('%Y-%m-%d').to_sql
+# => DATE_FORMAT(my_table.birthdate, '%Y-%m-%d')
 ```
 
 ## Unions (in next version)

data/TODO

@@ -0,0 +1,26 @@
+Code quality:
+- codeclimate.com
+- coveralls.io
+- gemnasium
+- inch-ci.org
+- appveyor.com (windows)
+- hakiri.io
+
+[![Gem Version](https://img.shields.io/gem/v/arel_extensions.svg)][gem]
+[![Build Status](https://img.shields.io/travis/faveod/arel_extensions.svg)][travis]
+[![Dependency Status](https://img.shields.io/gemnasium/faveod/arel_extensions.svg)][https://gemnasium.com/faveod/arel_extensions]
+[![Code Climate](https://img.shields.io/codeclimate/github/faveod/arel_extensions.svg)][https://codeclimate.com/github/faveod/arel_extensions]
+[![Coverage Status](https://img.shields.io/coveralls/faveod/arel_extensions.svg)][https://coveralls.io/r/faveod/arel_extensions]
+[![Inline docs](http://inch-ci.org/github/faveod/arel_extensions.svg)][https://inch-ci.org/github/faveod/https://gemnasium.com/faveod/arel_extensions]
+[![security](https://hakiri.io/github/faveod/arel_extensions/master.svg)](https://hakiri.io/github/faveod/arel_extensions/master)
+[![codebeat](https://codebeat.co/badges/<change>)](https://codebeat.co/projects/github-com-faveod-arel_extensions)
+
+
+New features:
+- POSIX format numbers (%.2f)
+- easy unions
+- cast
+
+Tests improvements:
+- SQL Server
+- DB2

data/appveyor.yml

@@ -0,0 +1,43 @@
+version: "{build}"
+
+cache:
+  - vendor/bundle
+
+branches:
+  only:
+    - master
+
+services:
+  - mssql2014
+
+
+install:
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle config --local path vendor/bundle
+  - bundle install
+
+# Disable normal Windows builds in favor of our test script.
+build: off
+
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - ruby --version
+  - gem --version
+  - bundler --version
+  - bundle exec rake test
+  - ps: Start-Service 'MSSQL$SQL2014'
+  - timeout /t 4 /nobreak > NUL
+  - bundle exec rake test:mssql
+
+environment:
+  matrix:
+    - RUBY_VERSION: 200
+    - RUBY_VERSION: 21
+    - RUBY_VERSION: 22
+    - RUBY_VERSION: 23
+    - RUBY_VERSION: "23-x64"

data/arel_extensions.gemspec

@@ -4,7 +4,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "arel_extensions"
-  s.version     = '0.8.6'
+  s.version     = '0.8.7'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Yann Azoury", "Mathilde Pechdimaldjian", "Félix Bellanger"]
   s.email       = ["yann.azoury@faveod.com", "mathilde.pechdimaldjian@gmail.com", "felix.bellanger@faveod.com"]
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency('arel', '>= 6.0')
+  s.add_dependency('arel', '~> 6.0')
 
   s.add_development_dependency('minitest', '~> 5.9')
   s.add_development_dependency('rdoc', '~> 4.0')

data/gemfiles/rails4.gemfile

@@ -7,11 +7,14 @@ group :development, :test do
 	gem 'activemodel', '~> 4.0'
 	gem 'activerecord', '~> 4.0'
 
-	gem "sqlite3", :platforms => [:ruby, :mswin, :mingw]
-	gem "mysql2", :platforms => [:ruby, :mswin, :mingw]
-	gem "pg", :platforms => [:ruby, :mswin, :mingw]
+	gem "sqlite3", :platforms => [:mri, :mswin, :mingw, :x64_mingw]
+	gem "mysql2", :platforms => [:mri, :mswin, :mingw, :x64_mingw]
+    gem "pg", :platforms => [:mri, :mingw, :x64_mingw]
 
-	gem 'ruby-oci8', :platforms => [:ruby, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+    gem "tiny_tds", :platforms => [:mri, :mingw, :x64_mingw]
+    gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]
+
+	gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
 	gem 'activerecord-oracle_enhanced-adapter', '~> 1.6.0' if ENV.has_key? 'ORACLE_HOME'
 
 	# for JRuby

data/gemfiles/rails5.gemfile

@@ -7,11 +7,14 @@ group :development, :test do
 	gem 'activemodel', '~> 5'
 	gem 'activerecord', '~> 5'
 
-	gem "sqlite3", :platforms => [:ruby, :mswin, :mingw]
-	gem "mysql2", :platforms => [:ruby, :mswin, :mingw]
-	gem "pg", :platforms => [:ruby, :mswin, :mingw]
+	gem "sqlite3", :platforms => [:mri, :mswin, :mingw, :x64_mingw]
+	gem "mysql2", :platforms => [:mri, :mswin, :mingw, :x64_mingw]
+    gem "pg", :platforms => [:mri, :mingw, :x64_mingw]
 
-	gem 'ruby-oci8', :platforms => [:ruby, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
+    gem "tiny_tds", :platforms => [:mri, :mingw, :x64_mingw]
+#    gem "activerecord-sqlserver-adapter", :platforms => [:mri, :mingw, :x64_mingw]
+
+	gem 'ruby-oci8', :platforms => [:mri, :mswin, :mingw] if ENV.has_key? 'ORACLE_HOME'
 	gem 'activerecord-oracle_enhanced-adapter', '~> 1.7.0' if ENV.has_key? 'ORACLE_HOME'
 
 	# for JRuby

data/lib/arel_extensions/nodes/blank.rb

@@ -0,0 +1,11 @@
+module ArelExtensions
+  module Nodes
+    class Blank < Function
+    	@@return_type = :boolean
+
+    	def initialize expr
+        	super [expr.first.coalesce('').trim.trim("\t").trim("\n")]
+    	end
+    end
+  end
+end

data/lib/arel_extensions/nodes/trim.rb

@@ -15,5 +15,12 @@ module ArelExtensions
       end
 
     end
+
+    class Ltrim < Trim
+    end
+
+    class Rtrim < Trim
+    end
+
   end
 end

data/lib/arel_extensions/string_functions.rb

@@ -6,8 +6,7 @@ require 'arel_extensions/nodes/find_in_set'
 require 'arel_extensions/nodes/replace'
 require 'arel_extensions/nodes/soundex'
 require 'arel_extensions/nodes/trim'
-require 'arel_extensions/nodes/ltrim'
-require 'arel_extensions/nodes/rtrim'
+require 'arel_extensions/nodes/blank'
 require 'arel_extensions/nodes/format'
 
 module ArelExtensions
@@ -68,17 +67,21 @@ module ArelExtensions
     end
 
     #Function returns a string after removing left, right or the both prefixes or suffixes int argument
-    def trim other
+    def trim other = ' '
       ArelExtensions::Nodes::Trim.new [self, other]
     end
 
-    def ltrim other
+    def ltrim other = ' '
       ArelExtensions::Nodes::Ltrim.new [self, other]
     end
 
-    def rtrim other
+    def rtrim other = ' '
       ArelExtensions::Nodes::Rtrim.new [self, other]
     end
 
+    def blank
+      ArelExtensions::Nodes::Blank.new [self]
+    end
+
   end
 end

data/lib/arel_extensions/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module ArelExtensions
-  VERSION = "0.8.6".freeze
+  VERSION = "0.8.7".freeze
 end

data/lib/arel_extensions/visitors/mssql.rb

@@ -30,7 +30,7 @@ module ArelExtensions
         else
           collector = visit o.left, collector
           collector << " + '"
-          collector << "#{o.right}'"
+          collector = visit o.right, collector
           collector
         end
       end
@@ -38,13 +38,8 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_DateDiff o, collector
         collector << "DATEDIFF(day,"
         collector = visit o.left, collector
-        collector<< ","
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-          collector = visit o.right, collector
-        else
-          collector<< "'#{o.right}'"
-
-        end
+        collector << Arel::Visitors::MSSQL::COMMA
+        collector = visit o.right, collector
         collector << ")"
         collector
       end
@@ -62,11 +57,7 @@ module ArelExtensions
           collector << "YEAR("
         end
         #visit right
-        if(o.right.is_a?(Arel::Attributes::Attribute))
-          collector = visit o.right, collector
-        else
-          collector << "'#{o.right}'"
-        end
+        collector = visit o.right, collector
         collector << ")"
         collector
       end
@@ -82,10 +73,10 @@ module ArelExtensions
       def visit_ArelExtensions_Nodes_Locate o, collector
         collector << "CHARINDEX("
         collector = visit o.val, collector
-       collector << ","
-       collector = visit o.expr, collector
-       collector << ")"
-       collector
+        collector << Arel::Visitors::MSSQL::COMMA
+        collector = visit o.expr, collector
+        collector << ")"
+        collector
       end
 
       def visit_ArelExtensions_Nodes_Format o, collector
@@ -116,22 +107,15 @@ module ArelExtensions
       end
 
       def visit_ArelExtensions_Nodes_Replace o, collector
-         collector << "REPLACE("
-         collector = visit o.expr,collector
-         collector << ","
-         if(o.left.is_a?(Arel::Attributes::Attribute))
-           collector = visit o.left, collector
-         else
-           collector << "'#{o.left}'"
-         end
-         collector << ","
-         if(o.right.is_a?(Arel::Attributes::Attribute))
-           collector = visit o.right, collector
-         else
-           collector << "'#{o.right}'"
-         end
-         collector << ")"
-         collector
+        collector << "REPLACE("
+        collector = visit o.expr,collector
+        collector << Arel::Visitors::MSSQL::COMMA
+        collector = visit o.left, collector
+ 
+        collector << Arel::Visitors::MSSQL::COMMA
+        collector = visit o.right, collector
+        collector << ")"
+        collector
       end
 
 

data/lib/arel_extensions/visitors/oracle.rb

@@ -138,13 +138,6 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Soundex o, collector
-        collector << "SOUNDEX("
-        collector = visit o.expr, collector
-        collector << ")"
-        collector
-      end
-
       def visit_ArelExtensions_Nodes_Locate o, collector
         collector << "INSTR("
         o.expressions.each_with_index { |arg, i|
@@ -155,11 +148,22 @@ module ArelExtensions
         collector
       end
 
-      def visit_ArelExtensions_Nodes_Trim o , collector
+      def visit_ArelExtensions_Nodes_Trim o, collector
         collector << 'TRIM(' # BOTH
-        collector = visit o.right, collector
+        case o.right.expr
+        when "\t"
+          collector << 'CHR(9)'
+        when "\n"
+          collector << 'CHR(10)'
+        when "\r"
+          collector << 'CHR(13)'
+        else
+          collector = visit o.right, collector
+        end
         collector << ' FROM '
+        collector << '(' if o.left.is_a? ArelExtensions::Nodes::Trim
         collector = visit o.left, collector
+        collector << ')' if o.left.is_a? ArelExtensions::Nodes::Trim
         collector << ")"
         collector
       end
@@ -182,6 +186,13 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Blank o, collector
+        collector << '(CASE WHEN ('
+        collector = visit o.left, collector
+        collector << " = '') THEN 1 ELSE 0 END)"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector << '('
         collector = visit o.left, collector
@@ -196,7 +207,7 @@ module ArelExtensions
         collector = visit o.left, collector
         collector << Arel::Visitors::Oracle::COMMA
 
-        f = o.iso_format.dup
+        f = o.iso_format.gsub(/\ (\w+)/, ' "\1"')
         Arel::Visitors::Oracle::DATE_FORMAT_DIRECTIVES.each { |d, r| f.gsub!(d, r) }
         collector = visit Arel::Nodes.build_quoted(f), collector
 

data/lib/arel_extensions/visitors/to_sql.rb

@@ -152,6 +152,13 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_Blank o, collector
+        collector << '('
+        collector = visit o.left, collector
+        collector << " = '')"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_Format o, collector
         case o.col_type
         when :date, :datetime

data/test/database.yml

@@ -37,4 +37,11 @@ jdbc-oracle:
 ibm_db:
   adapter:  ibm_db
   username: travis
-  database: arext_test
+  database: arext_test
+mssql:
+  adapter: sqlserver
+  host: localhost
+  dataserver: localhost\SQL2014
+  database: master
+  username: sa
+  password: Password12!

data/test/with_ar/all_agnostic_test.rb

@@ -212,13 +212,29 @@ module ArelExtensions
       end
 
       def test_trim
+        assert_equal "Myung", t(@myung, @name.trim)
         assert_equal "Myun", t(@myung, @name.rtrim("g"))
         assert_equal "yung", t(@myung, @name.ltrim("M"))
+        assert_equal "Myung", t(@myung, @name.trim.ltrim.rtrim)
         assert_equal "yung", t(@myung, (@name + "M").trim("M"))
         skip "Oracle does not accept multi char trim" if @env_db == 'oracle'
         assert_equal "", t(@myung, @name.rtrim(@name))
       end
 
+      def test_blank
+        if @env_db == 'postgresql'
+          assert_includes [false, 'f'], t(@myung, @name.blank) # depends of adapter
+        else
+          assert_equal 0, t(@myung, @name.blank)
+        end
+        skip "Oracle requires cast for CLOB" if @env_db == 'oracle' # comments is CLOB, CHAR expected
+        if @env_db == 'postgresql'
+          assert_includes [true, 't'], t(@myung, @comments.blank) # depends of adapter
+        else
+          assert_equal 1, t(@myung, @comments.blank)
+        end
+      end
+
       def test_format
         assert_equal '2016-05-23', t(@lucas, @created_at.format('%Y-%m-%d'))
         assert_equal '2014/03/03 12:42:00', t(@lucas, @updated_at.format('%Y/%m/%d %H:%M:%S'))
@@ -311,7 +327,7 @@ module ArelExtensions
 
       def test_wday
         d = Date.new(2016, 6, 26)
-        assert_equal (@env_db == 'oracle' ? 2 : 1), t(@myung, @created_at.wday).to_i # monday
+        assert_equal(@env_db == 'oracle' ? 2 : 1, t(@myung, @created_at.wday).to_i) # monday
         assert_equal 0, User.select(d.wday).as("res").first.to_i
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,20 +10,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-17 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -90,6 +90,8 @@ files:
 - MIT-LICENSE.txt
 - README.md
 - Rakefile
+- TODO
+- appveyor.yml
 - arel_extensions.gemspec
 - functions.html
 - gemfiles/rails3.gemfile
@@ -110,6 +112,7 @@ files:
 - lib/arel_extensions/math_functions.rb
 - lib/arel_extensions/nodes.rb
 - lib/arel_extensions/nodes/abs.rb
+- lib/arel_extensions/nodes/blank.rb
 - lib/arel_extensions/nodes/ceil.rb
 - lib/arel_extensions/nodes/coalesce.rb
 - lib/arel_extensions/nodes/concat.rb
@@ -122,12 +125,10 @@ files:
 - lib/arel_extensions/nodes/is_null.rb
 - lib/arel_extensions/nodes/length.rb
 - lib/arel_extensions/nodes/locate.rb
-- lib/arel_extensions/nodes/ltrim.rb
 - lib/arel_extensions/nodes/matches.rb
 - lib/arel_extensions/nodes/rand.rb
 - lib/arel_extensions/nodes/replace.rb
 - lib/arel_extensions/nodes/round.rb
-- lib/arel_extensions/nodes/rtrim.rb
 - lib/arel_extensions/nodes/soundex.rb
 - lib/arel_extensions/nodes/trim.rb
 - lib/arel_extensions/nodes/wday.rb

data/lib/arel_extensions/nodes/ltrim.rb

@@ -1,18 +0,0 @@
-module ArelExtensions
-  module Nodes
-    class Ltrim < Function
-
-      def initialize expr
-        tab = expr.map { |arg|
-          convert_to_node(arg)
-        }
-        return super(tab)
-      end
-
-      def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
-      end
-
-    end
-  end
-end

data/lib/arel_extensions/nodes/rtrim.rb

@@ -1,18 +0,0 @@
-module ArelExtensions
-  module Nodes
-    class Rtrim < Function
-
-      def initialize expr
-        tab = expr.map { |arg|
-          convert_to_node(arg)
-        }
-        return super(tab)
-      end
-
-      def +(other)
-        return ArelExtensions::Nodes::Concat.new(self.expressions + [other]) 
-      end
-
-    end
-  end
-end