devlin 0.0.2 → 0.0.3

data/.gitignore

@@ -14,4 +14,5 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
+spec/*.sqlite3
 tmp

data/lib/devlin/column.rb

@@ -1,8 +1,9 @@
 module Devlin
   class Column
-    def initialize(name, config)
+    def initialize(name, config, *args)
       @name = name
       @config = config
+      @arguments = args.extract_options!
     end
 
     def select_definition
@@ -20,5 +21,9 @@ module Devlin
         value
       end
     end
+
+    def arguments
+      @arguments
+    end
   end
 end

data/lib/devlin/query.rb

@@ -1,6 +1,6 @@
 module Devlin
   class Query
-    attr_reader :query, :scope, :select, :conditions, :group
+    attr_reader :query, :scope
 
     def initialize(parent, q)
       @parent = parent
@@ -9,6 +9,7 @@ module Devlin
       @select = query['select']
       @conditions = query['conditions']
       @group = query['group']
+      @order = query['order']
     end
 
     # This method returns the resulting relation to calculate the given
@@ -16,7 +17,7 @@ module Devlin
     def result
       res = @scope.relation
       res = res.select(self.select.map { |c| @scope.column(c).select_definition })
-      @conditions.each do |col, val|
+      self.conditions.each do |col, val|
         col, op = col.split('.')
         res = case op
         when 'g'
@@ -34,6 +35,34 @@ module Devlin
         end
       end
       res = res.group(self.group.map { |c| @scope.column(c).definition })
+      self.order.each do |col, val|
+        res = res.order("#{@scope.column(col).definition} #{val}")
+      end
+      res
+    end # def result
+
+    def select
+      @select or raise "No selection columns given"
+    end # def select
+
+    def conditions
+      @conditions || {}
+    end # def conditions
+
+    def group
+      @group || []
+    end # def group
+
+    def order
+      res = {}
+      (@order || {}).each do |key, value|
+        res[key] = case value.to_s.downcase
+                   when 'desc'
+                     'DESC'
+                   else
+                     'ASC'
+                   end
+      end
       res
     end
   end

data/lib/devlin/scope.rb

@@ -14,8 +14,8 @@ module Devlin
         @scope.relation = rel  
       end
 
-      def column(name, definition, &block)
-        @scope.add_column(name, definition, &block)
+      def column(name, definition, *args, &block)
+        @scope.add_column(name, definition, *args, &block)
       end
     end
 
@@ -26,12 +26,12 @@ module Devlin
     end
 
     # add a column definition to the scope
-    def add_column(name, definition, &block)
+    def add_column(name, definition, *args, &block)
       @columns ||= {}
-      @columns[name.to_sym] = Column.new name, {
+      @columns[name.to_sym] = Column.new(name, {
         definition: definition,
         getter: block
-      }
+      }, *args)
     end
 
     def columns

data/lib/devlin/version.rb

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

data/spec/query_spec.rb

@@ -19,6 +19,9 @@ describe TestReport do
       group:
         - manufacturer
         - month
+      order:
+        month: asc
+        manufacturer: desc
     EOF
   end
 
@@ -29,20 +32,46 @@ describe TestReport do
       rep.query(@q).select.should eq(['month', 'manufacturer', 'earnings'])
       rep.query(@q).conditions.should eq('year' => 2012, 'month.geq' => 8, 'month.leq' => 10)
       rep.query(@q).group.should eq(['manufacturer', 'month'])
+      rep.query(@q).order.should eq('month' => 'ASC', 'manufacturer' => 'DESC')
+    end # it
+
+    it 'should return an exception if no selections are given' do
+      rep = TestReport.new user_id: 1
+      expect {
+        rep.query('scope: transaction').select
+      }.should raise_error
+    end
+
+    it 'should return an empty hash if no conditions are given' do
+      rep = TestReport.new user_id: 1
+      rep.query('scope: transaction').conditions.should be_a(Hash)
+      rep.query('scope: transaction').conditions.should be_empty
+    end
+    
+    it 'should return an empty hash if no conditions are given' do
+      rep = TestReport.new user_id: 1
+      rep.query('scope: transaction').group.should be_an(Array)
+      rep.query('scope: transaction').group.should be_empty
+    end
+    
+    it 'should return an empty hash if no order is given' do
+      rep = TestReport.new user_id: 1
+      rep.query('scope: transaction').order.should be_a(Hash)
+      rep.query('scope: transaction').order.should be_empty
     end
 
     describe 'result' do
       it 'should only contain the selected columns' do
         rep = TestReport.new user_id: 1
         rep.query(@q).result.first.attributes.keys.map(&:to_sym).should eq([:month, :manufacturer, :earnings])
-      end
+      end # it
 
       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 # it
+    end # describe 'result'
+  end # describe 'query'
 end

data/spec/setup_spec.rb

@@ -37,6 +37,12 @@ describe TestReport do
         scope = rep.scope(:transaction)
         scope.column(:month).value(2).should eq('Feb')
       end
+
+      it 'should contain the given additional arguments' do
+        rep = TestReport.new(user_id: 1)
+        scope = rep.scope(:transaction)
+        scope.column(:month).arguments.should eq({ :hallo => 'Welt' })
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -30,7 +30,7 @@ class TestReport < Devlin::Base
     
     column :manufacturer, "manufacturer"
     column :year, "CAST(strftime('%Y', date) AS INTEGER)"
-    column :month, "CAST(strftime('%m', date) AS INTEGER)" do |value|
+    column :month, "CAST(strftime('%m', date) AS INTEGER)", :hallo => 'Welt' 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.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -66,7 +66,6 @@ files:
 - spec/query_spec.rb
 - spec/setup_spec.rb
 - spec/spec_helper.rb
-- spec/test.sqlite3
 homepage: https://github.com/spieker/devlin
 licenses: []
 post_install_message: 
@@ -98,5 +97,4 @@ test_files:
 - spec/query_spec.rb
 - spec/setup_spec.rb
 - spec/spec_helper.rb
-- spec/test.sqlite3
 has_rdoc: