directiverecord 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bfe5ca92925fd12668d8679e9a93f5db099f29f
-  data.tar.gz: b77c4c85e6ecd7ab12b3cf3dbb685ef29bb7f74e
+  metadata.gz: 8af004fe8d656116a9a968b0ceea0a5c558685cc
+  data.tar.gz: 3835a1b1137052e19f2994688fb48ab8412963ba
 SHA512:
-  metadata.gz: 7dd096afe893a680a35ebe1132f046cf6bee6c5f335a83f43c844ebe0c7a5b699dc1672615f1c7f264e31ca6f11ca1eeeeb67627cd2f11f9672b9d2d2476edae
-  data.tar.gz: c215ece54c252766a1ef0163bca6d135549752947bbbb2dd8f66df5f96b84592f2c0f8ab73a0c260959b7dc2d71c547f2468defca5c87283f99a3a6605d56f07
+  metadata.gz: 72a42dd40f987a4467f51a2dfb79964fd4e2b90b7d2c38cfd36acf31ee48f0ed97a343ed950e41d95695c8a272803b7f425060f10c8ecb674ab9948985e88e80
+  data.tar.gz: eb544e7122a967db1e3929398070b8a0a85eca0bd4a5cc1e3a6ce207e47f1a879996e421ae063dcbe1f24a4d6dde2b1cd76d307b390a6766eabf4fc6bf05d19e

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.30 (August 26, 2015)
+
+* Made the :group_by, :having and :order_by option correction more strict
+* Respecting optionally passed :where option when invoking #(to_)qry on a relation scope
+* Improved distinguishing WHERE from HAVING statements
+
 == Version 0.1.29 (August 17, 2015)
 
 * Not normalizing select option again after having encountered new calculated columns in the GROUP BY statement, instead just register the alias

data/VERSION

@@ -1 +1 @@
-0.1.29
+0.1.30

data/lib/directive_record/query/big_query.rb

@@ -48,7 +48,7 @@ module DirectiveRecord
           keys.each do |key|
             if value = options[key]
               value = value.join delimiter
-              aliases.each{|pattern, replacement| value.gsub! pattern, replacement}
+              aliases.each{|pattern, replacement| value.gsub! /(?=\b|\s)#{Regexp.escape pattern}(?=\b|\s)/, replacement}
               options[key] = value
             end
           end

data/lib/directive_record/query/mysql.rb

@@ -24,7 +24,7 @@ module DirectiveRecord
         [:group_by, :having, :order_by].each do |key|
           if value = options[key]
             value = value.join ", "
-            aliases.each{|pattern, replacement| value.gsub! pattern, replacement}
+            aliases.each{|pattern, replacement| value.gsub! /(?=\b|\s)#{Regexp.escape pattern}(?=\b|\s)/, replacement}
             options[key] = value
           end
         end

data/lib/directive_record/query/sql.rb

@@ -253,7 +253,7 @@ SQL
       end
 
       def normalize_where!(options)
-        regexp, aliases = /^\S+/, options[:aliases].invert
+        regexp, aliases = /^\S+/, options[:aliases].to_a.flatten.uniq.sort
 
         where, having = (options[:where] || []).partition do |statement|
           !options[:aggregated].keys.include?(statement.strip.match(regexp).to_s) &&

data/lib/directive_record/relation.rb

@@ -13,7 +13,7 @@ module DirectiveRecord
       options.merge(
         {
           :select => (select.blank? ? ".*" : select),
-          :where => where_values.collect{|x| sql_aliases_to_paths(x)},
+          :where => where_values.collect{|x| sql_aliases_to_paths(x)} + [options[:where]].flatten.compact,
           :group_by => group_values.collect{|x| sql_aliases_to_paths(x)},
           :order_by => order_values.collect{|x| sql_aliases_to_paths(x)},
           :limit => limit_value,

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 29
+  TINY  = 30
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord