directiverecord 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2MxYzVmZWI5YjQxYWI0YjMwZTY2NDQzNWQwN2RiZTk4YzU4YjYxMQ==
+    MmViNTQwODFjYWQxNThmMzJjYzg0NzI1YjEwMzI3NmU1YzhiYjA1ZA==
   data.tar.gz: !binary |-
-    OGNkNWI1NTdiMDg4MGNkZWU1MjBkNTAwMDg5Zjg1OGUzOGE4NzI4ZQ==
+    ZTJjNzVlZDY1YzRmZTQ0NTc5M2VlZDkyYjQ5YWVlZWZlMjhmMGNjMg==
 SHA512:
   metadata.gz: !binary |-
-    NmI5MGE4ZDBhNDNkZDYzMmU2ZTkzNmZmNTA1NDZlZjhmMDg2OGY4OGQ0ODk4
-    YTA1NGE1NGNkYjExYTM5OTkzNTA2NmU2ZTYyODVhMmQ3MjhkMGUxNDUzNTJj
-    ZjUxYWE0ZmEyMzA3MzZhYjgyZWM5NThkMmQwZjlkYjMzYmE0ZDM=
+    ZDZjZjQ1NGFhMzUwNzUyMzJlMzU0MzQwNGQ3YTQzYTQ5NTQyYWE2ZWFhMDI4
+    NzZlNTgxYjE4OTAxMzJmZTZhN2UzOTRiZmIyODU3NWQwYzc4Y2M3YWM2MzA0
+    NzA3OTA0MjE3ZTVhOGFiNzM3ZTIwOTU1NzZmNDU3ZjNhYTkxNzk=
   data.tar.gz: !binary |-
-    Y2UwZGM3YTA2NDdmYTAzNTg5Yzk3Y2FmOTZiZTMzYzhlOTM0OTczZGM1ODg2
-    YTRiZThhODFiOTA4NDBmMWYyYzdhNDc2Mjg2NjRiODE3MDVmYmM1YjlkYzI3
-    NzQ2YmMyNDZmNDgzMjE5NGZjMjk4ZjJlN2U1NTFkYmRiZjYwYzI=
+    MWQwZWM4NDU1ZmFiZDlkYmE5NDY4ZTZiYmIwNTM2NTI1Mjk1NjhjNjIxNDZi
+    YjI2N2JjOGY5NDUyZDllZGZiMTMxMzI4ODc2Y2I2NGIwZDVmYzkyOGNkYzdl
+    ODYwOTY4Y2QzNDRhZTg1MmU1Mzk1NWQyNDI4MTAzODE1NzU2NGE=

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.5 (February 11, 2015)
+
+* Dropped :group_by => :all option
+* Locked Arel gem dependency to “< 6.0.0”
+
 == Version 0.1.4 (January 22, 2015)
 
 * Improved partitioning conditions to WHERE or HAVING which fixes conditions with non-aggregate functions (e.g. LOWER)

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/directiverecord.gemspec

@@ -14,8 +14,10 @@ Gem::Specification.new do |gem|
   gem.name          = "directiverecord"
   gem.require_paths = ["lib"]
   gem.version       = DirectiveRecord::VERSION
+  gem.licenses      = ["MIT"]
 
   gem.add_dependency "activerecord", ">= 3.2.13"
+  gem.add_dependency "arel", "< 6.0.0"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "yard"

data/lib/directive_record/query/big_query.rb

@@ -8,10 +8,6 @@ module DirectiveRecord
         "__"
       end
 
-      def group_by_all_sql
-        "all_rows"
-      end
-
       def normalize_from!(options)
         period = options[:period]
 

data/lib/directive_record/query/mysql.rb

@@ -12,10 +12,6 @@ module DirectiveRecord
         ":"
       end
 
-      def group_by_all_sql
-        "NULL"
-      end
-
       def quote_alias(sql_alias)
         "`#{sql_alias}`"
       end

data/lib/directive_record/query/sql.rb

@@ -50,10 +50,6 @@ SQL
         raise NotImplementedError
       end
 
-      def group_by_all_sql
-        raise NotImplementedError
-      end
-
       def select_aggregate_sql(method, path)
         "#{method.to_s.upcase}(#{path})"
       end
@@ -103,7 +99,6 @@ SQL
 
       def check_path_delimiter!(options)
         unless path_delimiter
-          normalize_group_by! options
           [:select, :where, :having, :group_by, :order_by].each do |key|
             if value = options[key]
               value.collect! do |val|
@@ -122,7 +117,6 @@ SQL
         normalize_select!(options)
         normalize_from!(options)
         normalize_where!(options)
-        normalize_group_by!(options)
         normalize_order_by!(options)
         options.reject!{|k, v| v.blank?}
       end
@@ -202,12 +196,6 @@ SQL
         end
       end
 
-      def normalize_group_by!(options)
-        if (group_by = options[:group_by]) == [:all]
-          group_by.replace [group_by_all_sql]
-        end
-      end
-
       def normalize_order_by!(options)
         options[:order_by] ||= (options[:group_by] || []).collect do |path|
           direction = "DESC" if path.to_s == "date"
@@ -220,18 +208,17 @@ SQL
           segments = x.split " "
           direction = segments.pop if %w(asc desc).include?(segments[-1].downcase)
           path = segments.join " "
+          scale = options[:scales][path]
 
-          if path != group_by_all_sql
-            scale = options[:scales][path]
-            select = begin
-              if aggregate_method = (options[:aggregates] || {})[path]
-                select_aggregate_sql(aggregate_method, path)
-              else
-                path
-              end
+          select = begin
+            if aggregate_method = (options[:aggregates] || {})[path]
+              select_aggregate_sql(aggregate_method, path)
+            else
+              path
             end
-            "#{scale ? "ROUND(#{select}, #{scale})" : select} #{direction.upcase if direction}".strip
           end
+
+          "#{scale ? "ROUND(#{select}, #{scale})" : select} #{direction.upcase if direction}".strip
         end
 
         options[:order_by].compact!

data/lib/directive_record/version.rb

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

data/test/unit/query/test_mysql.rb

@@ -153,10 +153,9 @@ module Unit
               %Q{
                 SELECT ROUND(SUM(`od`.price_each), 2) AS `sum:price_each`
                 FROM order_details `od`
-                GROUP BY NULL
               }
             ),
-            OrderDetail.to_qry("price_each", :aggregates => {"price_each" => :sum}, :group_by => :all)
+            OrderDetail.to_qry("price_each", :aggregates => {"price_each" => :sum})
           )
 
           assert_equal(

data/test/unit/query/test_sql.rb

@@ -29,14 +29,6 @@ module Unit
             end
           end
         end
-
-        describe "#group_by_all_sql" do
-          it "raises an NotImplementedError" do
-            assert_raises NotImplementedError do
-              @directive_query.send :group_by_all_sql
-            end
-          end
-        end
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - ! '>='
       - !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
@@ -172,7 +186,8 @@ files:
 - test/unit/test_query.rb
 - test/unit/test_relation.rb
 homepage: https://github.com/archan937/directiverecord
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []