directiverecord 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: df721b5ec99c98a868667e250aea31187c079bea
-  data.tar.gz: f7ef75ed7fb5f252622ad38f7def0e17a44aba60
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjEzM2Q5ODIxZTczOTIzYzkxNTI0OTUyNGM2OTU0ZWFhNjAyNWY0YQ==
+  data.tar.gz: !binary |-
+    NjU3MGM2NjE2OTE0NjU5ZjQ1ZDdmNzM2NWRmNDI3ZjcwNTczMTYwYg==
 SHA512:
-  metadata.gz: 732c2dfe564ef73a4ede1fc6a5d710570a232eae2815fdc125fae9bd65310f8a75f7453279a00139367e54f29ef809acd029971fa2d31a8ae219d22ec476aa61
-  data.tar.gz: b7a5ec354819ec0c0cf68e5591c621e5f2457356858d63702fc68ed723ff77a08be74e3d993ee4b66a647986edd91ce9842042583ef4de3351b0a2f9dc49d68c
+  metadata.gz: !binary |-
+    NjdhOTBjYTE2ZTVhMGViOTE3NjU3ODNiMDZlM2M0MzIyNDUzNTAxNzFmYTVm
+    ODNkMTBiMjI2YzQxMmYxMDI1MmJkYTEyN2Q1ZDI2MWFlN2JlOThjNTY0ZTRm
+    YTg1OWYxYTM2M2JjZWYyNzhjNDFiYjYxNzA0OWNjODc1YjVjZGM=
+  data.tar.gz: !binary |-
+    NzgxNTNmYWY0NTFlN2Y4ZTlhOTA2ZDhkNWJiNTcxY2ZlZDNhMDdjMGFmYTY3
+    ZjY5ZWYzNWQ3MWQ1NzhlMDYwMTg2ZjAxNDE2Yzk4OGUxMGMyMjg0ZDEwOWJh
+    YzgyMThmMWVmYjY4OGZlODhhZDJiZWM2OWM5NzVkM2RhMGE0MzM=

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.13 (March 9, 2015)
+
+* Separating SELECT statement in lines when containing more than three columns
+* Supporting subselects
+
 == Version 0.1.12 (March 8, 2015)
 
 * Being able to specify calculated :group_by option

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/lib/directive_record/query/sql.rb

@@ -10,11 +10,12 @@ module DirectiveRecord
         options = to_options(args)
         validate_options! options
 
+        original_options = options.deep_dup.reject!{|k, v| v.nil?}
         check_path_delimiter! options
         optimize_query! options
 
         prepare_options! options
-        normalize_options! options
+        normalize_options! options, original_options
 
         parse_joins! options
 
@@ -84,7 +85,7 @@ SQL
       end
 
       def validate_options!(options)
-        options.assert_valid_keys :connection, :select, :where, :group_by, :order_by, :limit, :offset, :aggregates, :numerize_aliases, :period, :optimize
+        options.assert_valid_keys :connection, :select, :subselect, :where, :ignore_where, :group_by, :order_by, :limit, :offset, :aggregates, :numerize_aliases, :period, :optimize
       end
 
       def optimize_query!(options)
@@ -113,8 +114,9 @@ SQL
 
       def prepare_options!(options); end
 
-      def normalize_options!(options)
+      def normalize_options!(options, original_options)
         normalize_select!(options)
+        normalize_subselect!(options, original_options)
         normalize_from!(options)
         normalize_where!(options)
         normalize_group_by!(options)
@@ -156,6 +158,7 @@ SQL
             sql_alias = $2
           end
 
+          sql.gsub!(/sub:(\w+)\./) { "#{quote_alias($1)}." }
           options[:aliases][sql] = sql_alias if sql_alias
 
           array << [sql, sql_alias].compact.join(" AS ")
@@ -163,6 +166,28 @@ SQL
         end
       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)}
+
+          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)}}
+            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}) #{quote_alias(name)}"
+        end if options[:subselect]
+      end
+
       def normalize_from!(options)
         options[:from] = "#{base.table_name} #{base_alias}"
       end
@@ -285,7 +310,7 @@ SQL
         [:select, :where, :group_by, :having, :order_by].inject([]) do |paths, key|
           if value = options[key]
             value = value.join " " if value.is_a?(Array)
-            paths.concat value.gsub(/((?<![\\])['"])((?:.(?!(?<![\\])\1))*.?)\1/, " ").scan(/[a-zA-Z_]+\.[a-zA-Z_\.]+/).collect{|x| x.split(".")[0..-2].join "."}
+            paths.concat value.gsub(/((?<![\\])['"])((?:.(?!(?<![\\])\1))*.?)\1/, " ").gsub(/sub:[a-zA-Z_]+\.[a-zA-Z_\.]+/, " ").scan(/[a-zA-Z_]+\.[a-zA-Z_\.]+/).collect{|x| x.split(".")[0..-2].join "."}
           else
             paths
           end
@@ -320,7 +345,13 @@ SQL
       def finalize_options!(options); end
 
       def flatten_options!(options)
-        [:select, :group_by, :order_by].each do |key|
+        options[:select] = if options[:select].size <= 3
+          " " + options[:select].join(", ")
+        else
+          "\n  " + options[:select].join(",\n  ")
+        end
+
+        [:group_by, :order_by].each do |key|
           if value = options[key]
             options[key] = value.join(", ") if value.is_a?(Array)
           end
@@ -334,7 +365,7 @@ SQL
       end
 
       def compose_sql(options)
-        sql = ["SELECT #{options[:select]}", "FROM #{options[:from]}", options[:joins]].compact
+        sql = ["SELECT#{options[:select]}", "FROM #{options[:from]}", options[:joins], options[:subselect]].compact
 
         [:where, :group_by, :having, :order_by, :limit, :offset].each do |key|
           unless (value = options[key]).blank?

data/lib/directive_record/version.rb

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

data/test/test_helper.rb

@@ -13,5 +13,7 @@ def project_file(path)
 end
 
 def strip(sql)
-  sql.strip.gsub(/^\s+/m, "")
+  sql.match(/^\n?(\s+)/)
+  size = $1.to_s.size
+  sql.gsub(/\n\s{#{size}}/, "\n").strip
 end

data/test/unit/query/test_mysql.rb

@@ -55,7 +55,11 @@ module Unit
           assert_equal(
             strip(
               %Q{
-                SELECT `c`.id, `c`.name, COUNT(`orders`.id) AS order_count, GROUP_CONCAT(DISTINCT `tags`.name) AS tags
+                SELECT
+                  `c`.id,
+                  `c`.name,
+                  COUNT(`orders`.id) AS order_count,
+                  GROUP_CONCAT(DISTINCT `tags`.name) AS tags
                 FROM customers `c`
                 LEFT JOIN orders `orders` ON `orders`.customer_id = `c`.id
                 LEFT JOIN customers_tags `tags_bridge_table` ON `tags_bridge_table`.customer_id = `c`.id

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-09 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