effective_resources 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0fa62c577020ee87d607427cf4910492d2437db
-  data.tar.gz: 710ec9d60171463f8e153d2525cdf66698ae9847
+  metadata.gz: adee85d1da92d005ebe0329f1b977aab11944ee0
+  data.tar.gz: d2f0a66e76368a937d7a7d57690635177b63ed50
 SHA512:
-  metadata.gz: c5d6c31a8f02deb548467e65dfaacbdc107216f33f4a63d2d71e2f415bc8c9d9c1f7674e63dfe651da7ece1e43a8871296fa760fc682190485ade203b2e4b06f
-  data.tar.gz: 404375d92f1b6675c61540856eb2ec0b210a076e2d1444085d081e9abe6ac0f87bc7ec8e6fca6d19a956e3d88b59b0966b9404b5953a47a3d51f67c027dbef97
+  metadata.gz: e2fcab634cdafa892b22bbe8e7a86f5ad982d20a8a8548a364226362de5a80dab216e26ad392c0ff600ce3a43fb085d759f0d4d8e10f9790fc86857cb1703b9d
+  data.tar.gz: d2ddcb29d2dff7a536f4c83d978afbadc69d2ae839fee7826371e59f247f0c8f3be50d460e839c0d116cf910844c4ae666564445f4ab52d56c2f1d55eed03901

data/app/models/effective/resources/init.rb

@@ -36,7 +36,8 @@ module Effective
 
         0.upto(names.length-1) do |index|
           class_name = (names[index..-1].map { |name| name.classify } * '::')
-          klass = (class_name.safe_constantize rescue nil)
+
+          klass = class_name.safe_constantize
 
           if klass.present?
             @namespaces = names[0...index]

data/app/models/effective/resources/relation.rb

@@ -21,7 +21,7 @@ module Effective
         case sql_type
         when :belongs_to
           relation
-            .order(postgres? ? "#{sql_column} IS NULL ASC" : "ISNULL(#{sql_column}) ASC")
+            .order("#{is_null(sql_column)} ASC")
             .order(order_by_associated_conditions(association, sort: sort, direction: direction))
         when :belongs_to_polymorphic
           relation
@@ -39,10 +39,10 @@ module Effective
           relation.order("#{sql_column(:roles_mask)} #{sql_direction}")
         when :string, :text
           relation
-            .order((("ISNULL(#{sql_column}}), ") if mysql?).to_s + "#{sql_column}='' ASC, #{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?))
+            .order(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column}='' ASC, #{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s)
         else
           relation
-            .order((("ISNULL(#{sql_column}}), ") if mysql?).to_s + "#{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?))
+            .order(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s)
         end
       end
 
@@ -63,7 +63,7 @@ module Effective
 
         # term == 'nil' rescue false is a Rails 4.1 fix, where you can't compare a TimeWithZone to 'nil'
         if (term == 'nil' rescue false) && ![:has_and_belongs_to_many, :has_many, :has_one, :belongs_to_polymorphic, :effective_roles].include?(sql_type)
-          return relation.where("#{sql_column} IS NULL")
+          return relation.where(is_null(sql_column))
         end
 
         case sql_type

data/app/models/effective/resources/sql.rb

@@ -96,6 +96,10 @@ module Effective
         @ilike ||= (postgres? ? 'ILIKE' : 'LIKE')  # Only Postgres supports ILIKE, Mysql and Sqlite3 use LIKE
       end
 
+      def is_null(sql_column)
+        mysql? == true ? "ISNULL(#{sql_column})" : "#{sql_column} IS NULL"
+      end
+
     end
   end
 end

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.3.9'.freeze
+  VERSION = '0.3.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails