rom-sql 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5df789d515ed4a587a6e320675b552b87f656e
-  data.tar.gz: e450e586c6bb7e47760bf3a714277aa1fafa62c4
+  metadata.gz: bf05af538889499fb9fc1d4cb73ca842fae74482
+  data.tar.gz: '07441291fd839e047161b70cb9f20c88ebb240f9'
 SHA512:
-  metadata.gz: 271a9fb3be58c1e78bd9b1cefd4fc503924a8685519006ef5f88fc8ed08979a42acf3011a2fc4fd4d3603308de9910f2872860404d3a573bafc35c61cb7a326a
-  data.tar.gz: 41289e5734f4350c9b268248ced4d68ecd6dd33fbc5489f6d802fcfb2736d291d00bedf7164787b7e0629e101af895ece5bf6d6b84352ca5e963b0af1ae84522
+  metadata.gz: 447330e1514ca0aea9127434f02f2a81792e7702155f29c9a6c534938f1f88209ebc31328ef23cd7b368972854cb9e245916162ac05c981e59533c111c59ea54
+  data.tar.gz: 35a04cc320ec2d246c58fddb5b95aeb3787af7f055f27395596d84cd56013572999648e514d9beeafc15b9f87d879cf29753f3cd3715a8df5e05fe44d2dc061a

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.1.2 2017-03-02
+
+### Fixed
+
+* Fix grouping by a function in the block DSL (flash-gordon)
+
+[Compare v1.1.1...v1.1.2](https://github.com/rom-rb/rom-sql/compare/v1.1.1...v1.1.2)
+
 ## v1.1.1 2017-03-01
 
 ### Fixed

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Piotr Solnica
+Copyright (c) 2014-2017 Piotr Solnica
 
 MIT License
 

data/lib/rom/sql/group_dsl.rb

@@ -11,7 +11,7 @@ module ROM
         if schema.key?(meth)
           schema[meth].canonical
         else
-          ::Sequel::VIRTUAL_ROW.__send__(meth.to_s.upcase, *args, &block)
+          ::Sequel::VIRTUAL_ROW.__send__(meth.to_s, *args, &block)
         end
       end
     end

data/lib/rom/sql/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module SQL
-    VERSION = '1.1.1'.freeze
+    VERSION = '1.1.2'.freeze
   end
 end

data/spec/unit/relation/group_spec.rb

@@ -1,6 +1,7 @@
 RSpec.describe ROM::Relation, '#group' do
   subject(:relation) { relations[:users] }
 
+  let(:notes) { relations[:notes] }
   let(:tasks) { relations[:tasks] }
 
   include_context 'users and tasks'
@@ -36,6 +37,8 @@ RSpec.describe ROM::Relation, '#group' do
   end
 
   with_adapters :postgres do
+    include_context 'notes'
+
     it 'groups by provided attribute name in and attributes from a block' do
       grouped = relation.
                   qualified.
@@ -44,5 +47,16 @@ RSpec.describe ROM::Relation, '#group' do
 
       expect(grouped.to_a).to eql([{ id: 1, name: 'Jane' }, { id: 2, name: 'Joe'}])
     end
+
+    it 'groups by a function' do
+      notes.insert user_id: 1, text: 'Foo', created_at: Time.now, updated_at: Time.now
+
+      grouped = notes
+                  .select { [int::count(id), time::date_trunc('day', created_at).as(:date)] }
+                  .group { date_trunc('day', created_at) }
+                  .order(nil)
+
+      expect(grouped.to_a).to eql([ count: 1, date: Date.today.to_time ])
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rom-sql
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-01 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -345,7 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: SQL databases support for ROM