devlin 0.0.1 → 0.0.2

data/README.md

@@ -58,12 +58,22 @@ can look like this:
       - earnings
     conditions:
       year: 2012
+      month.geq: 1
+      month.leq: 3
     group:
       - manufacturer
       - month
 
-The generated query returns a sum of earnings for each manufacturer and
-each month in the year 2012.
+The generated query returns a sum of earnings for each manufacturer 
+in the year 2012 and the months of January, February and Mach.
+
+Possible modifiers for conditions are
+
+    g   # > ...
+    geq # >= ...
+    l   # < ...
+    leq # <= ...
+    in  # IN (...)
 
 ## Todo
 

data/lib/devlin/query.rb

@@ -17,7 +17,21 @@ module Devlin
       res = @scope.relation
       res = res.select(self.select.map { |c| @scope.column(c).select_definition })
       @conditions.each do |col, val|
-        res = res.where(["#{@scope.column(col).definition}=?", val.to_s])
+        col, op = col.split('.')
+        res = case op
+        when 'g'
+          res.where(["#{@scope.column(col).definition}>?", val])
+        when 'geq'
+          res.where(["#{@scope.column(col).definition}>=?", val])
+        when 'l'
+          res.where(["#{@scope.column(col).definition}<?", val])
+        when 'leq'
+          res.where(["#{@scope.column(col).definition}<=?", val])
+        when 'in'
+          res.where(["#{@scope.column(col).definition} IN (?)", val])
+        else
+          res.where(["#{@scope.column(col).definition}=?", val])
+        end
       end
       res = res.group(self.group.map { |c| @scope.column(c).definition })
       res

data/lib/devlin/version.rb

@@ -1,3 +1,3 @@
 module Devlin
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/query_spec.rb

@@ -14,6 +14,8 @@ describe TestReport do
         - earnings
       conditions:
         year: 2012
+        month.geq: 8
+        month.leq: 10
       group:
         - manufacturer
         - month
@@ -25,7 +27,7 @@ describe TestReport do
       rep = TestReport.new user_id: 1
       rep.query(@q).scope.should eq(rep.scope(:transaction))
       rep.query(@q).select.should eq(['month', 'manufacturer', 'earnings'])
-      rep.query(@q).conditions.should eq('year' => 2012)
+      rep.query(@q).conditions.should eq('year' => 2012, 'month.geq' => 8, 'month.leq' => 10)
       rep.query(@q).group.should eq(['manufacturer', 'month'])
     end
 
@@ -34,6 +36,13 @@ describe TestReport do
         rep = TestReport.new user_id: 1
         rep.query(@q).result.first.attributes.keys.map(&:to_sym).should eq([:month, :manufacturer, :earnings])
       end
+
+      it 'should contain only results with months between 1 and 3' do
+        rep = TestReport.new user_id: 1
+        rep.query(@q).result.each do |r|
+          r.month.to_i.should be_between(8, 10)
+        end
+      end
     end
   end
 end

data/spec/setup_spec.rb

@@ -23,7 +23,7 @@ describe TestReport do
         rep = TestReport.new(user_id: 1)
         scope = rep.scope(:transaction)
         scope.column(:manufacturer).select_definition.should eq('manufacturer AS manufacturer')
-        scope.column(:year).select_definition.should eq("strftime('%Y', date) AS year")
+        scope.column(:year).select_definition.should eq("CAST(strftime('%Y', date) AS INTEGER) AS year")
       end
 
       it 'should return the column value as is, if no getter is defined' do

data/spec/spec_helper.rb

@@ -29,8 +29,8 @@ class TestReport < Devlin::Base
     relation Transaction.where(user_id: scope.params[:user_id]).scoped
     
     column :manufacturer, "manufacturer"
-    column :year, "strftime('%Y', date)"
-    column :month, "strftime('%m', date)" do |value|
+    column :year, "CAST(strftime('%Y', date) AS INTEGER)"
+    column :month, "CAST(strftime('%m', date) AS INTEGER)" do |value|
       months = %W(~ Jan Feb Mar Apr May Jun Jul Aug Sep Okt Nov Dec)
       months[value]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devlin
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord