arel_extensions 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9a9fe5819def3759928d0cea4cdcda31f3a4dbd
-  data.tar.gz: 2f0585e04bbb88128e291061160db906baa15028
+  metadata.gz: 2aee321fcafb1aa18404760b6ea01de96837b0bf
+  data.tar.gz: 008c6af57efc1775384616d797c96eb2895481b2
 SHA512:
-  metadata.gz: 556c4302bdb962dc5a6aaa1f6cfd625b42ae30c4df3a24c0283dbb62f1f380c0feff557fe941fefe84021f9be4ccb40b92adc1ceac2aaabc0d96a1f9ad472da6
-  data.tar.gz: cf19efa4600c4b88dc061a28cc9c39b25452e159e9d871a896b1d25d0c8c3b8e4d6fa7578f55a44ea496c47b615e4b231dfdc6be9acc5434553c41119a2d6f02
+  metadata.gz: daa6d2206846f0eb7d28de5a4392888630d3120a2913b572cb4250609617574983cb708dfc38b1e8a28c39e72aaeaddb18826e379e4b9bc3098c2904d1ad48e6
+  data.tar.gz: 09080c3f2ae5800ee9722804630450274b61887c5816a52bf42d2580e94e332843607958e6830f35cf30724bf36ca5680dce5cdc6b91a7a91b081e2329e2a02e

data/.travis.yml

@@ -1,6 +1,9 @@
 language: ruby
 sudo: required
-cache: bundler
+cache:
+  bundler: true
+  directories:
+  - $ORACLE_DOWNLOAD_DIR
 before_install:
 - chmod +x .travis/oracle/download.sh
 - chmod +x .travis/oracle/install.sh

data/.travis/oracle/download.js

@@ -89,7 +89,7 @@ Phantom.createAsync({ parameters: { 'ssl-protocol': 'tlsv1' } }).then(function (
             '--cookie-jar', env['COOKIES'],
             '--data', '@-',
             '--location',
-            '--output', require('path').basename(env['ORACLE_FILE']),
+            '--output', env['ORACLE_DOWNLOAD_FILE'],
             '--user-agent', env['USER_AGENT'],
             form.action
           ]];

data/.travis/oracle/download.sh

@@ -1,12 +1,25 @@
 #!/bin/sh -e
+# vim: set et sw=2 ts=2:
 
 [ -n "$ORACLE_COOKIE" ] || { echo "Missing ORACLE_COOKIE environment variable!"; exit 1; }
 [ -n "$ORACLE_FILE" ] || { echo "Missing ORACLE_FILE environment variable!"; exit 1; }
 
+ORACLE_DOWNLOAD_FILE="$(basename "$ORACLE_FILE")"
+
+if [ -n "$ORACLE_DOWNLOAD_DIR" ]; then
+  mkdir -p "$ORACLE_DOWNLOAD_DIR"
+  ORACLE_DOWNLOAD_FILE="$(readlink -f "$ORACLE_DOWNLOAD_DIR")/$ORACLE_DOWNLOAD_FILE"
+fi
+
+if [ "${*#*--unless-exists}" != "$*" ] && [ -f "$ORACLE_DOWNLOAD_FILE" ]; then
+  exit 0
+fi
+
 cd "$(dirname "$(readlink -f "$0")")"
 
 npm install bluebird node-phantom-simple
 
+export ORACLE_DOWNLOAD_FILE
 export COOKIES='cookies.txt'
 export USER_AGENT='Mozilla/5.0'
 

data/.travis/oracle/install.sh

@@ -1,9 +1,11 @@
 #!/bin/sh -e
+# vim: set et sw=2 ts=2:
 
+[ -z "$ORACLE_DOWNLOAD_DIR" ] || ORACLE_DOWNLOAD_DIR="$(readlink -f "$ORACLE_DOWNLOAD_DIR")/"
 [ -n "$ORACLE_FILE" ] || { echo "Missing ORACLE_FILE environment variable!"; exit 1; }
 [ -n "$ORACLE_HOME" ] || { echo "Missing ORACLE_HOME environment variable!"; exit 1; }
 
-ORACLE_RPM="$(basename $ORACLE_FILE .zip)"
+ORACLE_RPM="$(basename "$ORACLE_FILE" .zip)"
 
 cd "$(dirname "$(readlink -f "$0")")"
 
@@ -18,7 +20,7 @@ test -f /sbin/chkconfig ||
 
 test -d /var/lock/subsys || sudo mkdir /var/lock/subsys
 
-unzip -j "$(basename $ORACLE_FILE)" "*/$ORACLE_RPM"
+unzip -j "${ORACLE_DOWNLOAD_DIR}$(basename "$ORACLE_FILE")" "*/$ORACLE_RPM"
 sudo rpm --install --nodeps --nopre "$ORACLE_RPM"
 
 echo 'OS_AUTHENT_PREFIX=""' | sudo tee -a "$ORACLE_HOME/config/scripts/init.ora" > /dev/null

data/lib/arel_extensions/nodes/blank.rb

@@ -8,5 +8,14 @@ module ArelExtensions
         	super expr
     	end
     end
+
+    class NotBlank < Function
+    	@@return_type = :boolean
+
+    	def initialize expr
+        	super expr
+    	end
+    end
+
   end
 end

data/lib/arel_extensions/string_functions.rb

@@ -83,5 +83,9 @@ module ArelExtensions
       ArelExtensions::Nodes::Blank.new [self]
     end
 
+    def not_blank
+      ArelExtensions::Nodes::NotBlank.new [self]
+    end
+
   end
 end

data/lib/arel_extensions/version.rb

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

data/lib/arel_extensions/visitors/mssql.rb

@@ -168,6 +168,13 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_NotBlank o, collector
+        collector << 'CASE WHEN LEN(LTRIM(RTRIM(ISNULL('
+        collector = visit o.left, collector
+        collector << ", '')))) = 0 THEN 0 ELSE 1 END"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_Format o, collector
         f = o.iso_format.dup
         Arel::Visitors::MSSQL::DATE_FORMAT_DIRECTIVES.each { |d, r| f.gsub!(d, r) }

data/lib/arel_extensions/visitors/oracle.rb

@@ -126,7 +126,7 @@ module ArelExtensions
 
       def visit_ArelExtensions_Nodes_Rand o, collector
         collector << "DBMS_RANDOM.VALUE("
-        if(o.left != nil && o.right != nil)
+        if o.left && o.right
           collector = visit o.left, collector
           collector << Arel::Visitors::Oracle::COMMA
           collector = visit o.right, collector
@@ -208,6 +208,13 @@ module ArelExtensions
         collector
       end
 
+      def visit_ArelExtensions_Nodes_NotBlank o, collector
+        collector << '(CASE WHEN ('
+        collector = visit o.left, collector
+        collector << " = '') THEN 0 ELSE 1 END)"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_DateAdd o, collector
         collector << '('
         collector = visit o.left, collector

data/lib/arel_extensions/visitors/to_sql.rb

@@ -161,6 +161,16 @@ module ArelExtensions
         collector
       end
 
+
+      def visit_ArelExtensions_Nodes_NotBlank o, collector
+        collector << 'LENGTH(TRIM(COALESCE('
+        collector = visit o.left, collector
+        collector << Arel::Visitors::ToSql::COMMA
+        collector = visit Arel::Nodes.build_quoted(''), collector
+        collector << "))) > 0"
+        collector
+      end
+
       def visit_ArelExtensions_Nodes_Format o, collector
         case o.col_type
         when :date, :datetime

data/test/with_ar/all_agnostic_test.rb

@@ -245,8 +245,10 @@ module ArelExtensions
       def test_blank
         if @env_db == 'postgresql'
           assert_includes [false, 'f'], t(@myung, @name.blank) # depends of adapter
+          assert_includes [true, 't'], t(@myung, @name.not_blank) # depends of adapter
         else
           assert_equal 0, t(@myung, @name.blank)
+          assert_equal 1, t(@myung, @name.not_blank)
         end
         skip "Oracle requires cast for CLOB" if @env_db == 'oracle' # comments is CLOB, CHAR expected
         if @env_db == 'postgresql'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arel_extensions
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Yann Azoury
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-10 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arel