directiverecord 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ca244266a160abe5e8397beb0e9cb92def53a747
-  data.tar.gz: b419b9776bdb3aeda8cfed589f8ceca8662b91b9
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTRiYmVkOTVmOWQwNjg0NGNlYjllYjdkZWFmNDI2ZjU0N2FkYjE4ZA==
+  data.tar.gz: !binary |-
+    NmU5MWY1NzM2OTI1ZTM4ZWIwNjEzZjJhNTg0YzJmMjc1ODJhMDAwNQ==
 SHA512:
-  metadata.gz: 96eff97742fac7acc0f37a93c86322eae178753425ecfc0172ea690a2af9fccb107a9a8c8c205af04c09a8389083abadd8ebc72ca50ed109d21dd2b65e688056
-  data.tar.gz: 931f0ccd6eba753d5bb70b223571b9d99c89a4e33bda225cb9a34d07372acf7b8b755bf7828742f86792da342977394479eb9cf137ffe7045a3a3b993d64a66b
+  metadata.gz: !binary |-
+    ZjdlZWY4NDg0NTRmMTRiYjViNWY5M2E4NTZkMWNkYjFiNmJkYTY2ZTU2YWNj
+    YjZlZDkzY2NhYzE4NTM5NDU1MjY3ZmNkZjBkNGE2NGIyN2M4YjJhM2M0Mjdk
+    YzYwZjRhZDc0NDQyMWZjNDdkOTBhYzY5MGM1YWFmMGM5YzAzOTA=
+  data.tar.gz: !binary |-
+    YTI5NjE0NGJiMGVlNzVmZGM5OThkODQwMGNlOTE1NGJhNWQxZTNlMDU1NzQ1
+    YmUzMzQxMjBmN2NiZDczZTE3ZjQ3ZjA5ZDQ1OGM1MzU0MDc4ZWUwNmEwN2U5
+    MzMxMjJhZDQ0MjEwNjFkYjEwMzczYWRhYzZhNjY0ZDNkZWY4ZmQ=

data/CHANGELOG.rdoc

@@ -1,5 +1,11 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.15 (March 10, 2015)
+
+* Being able to include / exclude subselect options
+* Being able to join with a subselect
+* Also auto-applying aggregate method for paths within conditions
+
 == Version 0.1.14 (March 9, 2015)
 
 * Corrected normalize_select!

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/lib/directive_record/query/sql.rb

@@ -167,24 +167,41 @@ SQL
       end
 
       def normalize_subselect!(options, original_options)
-        options[:subselect] = options[:subselect].collect do |name, (klass, opts)|
-          qry_options = original_options.deep_dup.reject!{|k, v| [:subselect, :numerize_aliases, :limit, :offset, :group_by, :order_by].include?(k)}
+        options[:subselect] = options[:subselect].sort_by{|name, (klass, opts)| opts[:join] ? 0 : 1}.collect do |name, (klass, opts)|
+          qry_options = original_options.deep_dup.reject!{|k, v| [:subselect, :numerize_aliases, :limit, :offset, :order_by].include?(k)}
 
           opts.each do |key, value|
             value = [value].flatten
             if key == :select
               qry_options[key] = value
-            elsif key.to_s.match(/ignore_(\w+)/)
-              qry_options[$1.to_sym].reject!{|x| value.any?{|y| x.include?(y)}}
+            elsif key == :join
+              # do nothing
+            elsif key.to_s.match(/include_(\w+)/)
+              (qry_options[$1.to_sym] || []).select!{|x| value.any?{|y| x.include?(y)}}
+            elsif key.to_s.match(/exclude_(\w+)/)
+              (qry_options[$1.to_sym] || []).reject!{|x| value.any?{|y| x.include?(y)}}
             else
               qry_options[key].concat value
             end
           end
 
           base_alias = quote_alias(klass.table_name.split("_").collect{|x| x[0]}.join(""))
-          query = klass.to_qry(qry_options).gsub("\n", " ").gsub(/#{base_alias}[\s\.]/, "")
+          query_alias = quote_alias(name)
+
+          if opts[:join] && !qry_options[:group_by].blank?
+            joins = qry_options[:group_by].collect do |path|
+              qry_options[:select].unshift(column = path.gsub(/\.\w+$/, "_id").strip)
+              "#{query_alias}.#{column} = #{base_alias}.#{column}"
+            end
+            prefix = "LEFT JOIN\n   "
+            postfix = " ON #{joins.join(" AND ")}"
+          else
+            prefix = " , "
+          end
+
+          query = klass.to_qry(qry_options).gsub(/\n\s*/, " ").gsub(/#{base_alias}[\s\.]/, "")
+          "#{prefix}(#{query}) #{query_alias}#{postfix}"
 
-          " , (#{query}) #{quote_alias(name)}"
         end if options[:subselect]
       end
 
@@ -196,12 +213,13 @@ SQL
         regexp, aliases = /^\S+/, options[:aliases].invert
 
         where, having = (options[:where] || []).partition do |statement|
+          !options[:aggregated].keys.include?(statement.strip.match(regexp).to_s) &&
           statement.gsub(/((?<![\\])['"])((?:.(?!(?<![\\])\1))*.?)\1/, " ")
                    .split(/\b(and|or)\b/i).reject{|sql| %w(and or).include? sql.downcase}
                    .collect{|sql| sql = sql.strip; (sql[0] == "(" && sql[-1] == ")" ? sql[1..-1] : sql)}
                    .all? do |sql|
             sql.match /(.*)\s*(=|<=>|>=|>|<=|<|<>|!=|is|like|rlike|regexp|in|between|not|sounds|soundex)(\b|\s|$)/i
-            path = $1.strip rescue binding.pry
+            path = $1.strip
             !(aliases[path] || path).match(/\b(count|sum|min|max|avg)\(/i)
           end
         end

data/lib/directive_record/version.rb

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

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A layer on top of ActiveRecord for using paths within queries without
@@ -143,7 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.rdoc
 - Gemfile
 - MIT-LICENSE
@@ -195,17 +195,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A layer on top of ActiveRecord for using paths within queries without thinking