rgviz-rails 0.7 → 0.8

data/lib/rgviz_rails/executor.rb

@@ -8,14 +8,16 @@ module Rgviz
       @joins = {}
     end
     
-    def execute
+    def execute(options = {})
       @table = Table.new
+      @extra_conditions = options[:conditions]
       
       generate_columns
       generate_conditions
       generate_group
       generate_order
       generate_rows
+      
       @table
     end
     
@@ -64,9 +66,22 @@ module Rgviz
     end
     
     def generate_rows
+      conditions = @conditions
+      if @extra_conditions
+        if conditions
+          if @extra_conditions.kind_of? String
+            conditions = "(#{conditions}) AND #{@extra_conditions}"
+          elsif @extra_conditions.kind_of? Array
+            conditions = ["(#{conditions}) AND #{@extra_conditions[0]}", *@extra_conditions[1 .. -1]] 
+          end
+        else
+          conditions = @extra_conditions
+        end
+      end
+    
       results = @model_class.send :all, 
         :select => @selects.join(','),
-        :conditions => @conditions,
+        :conditions => conditions,
         :group => @group,
         :order => @order,
         :limit => @query.limit,

data/rails/init.rb

@@ -8,6 +8,7 @@ config.after_initialize do
         when nil then original_render *args, &block
         else
           model = hash[:rgviz]
+          conditions = hash[:conditions]
           query = params[:tq]
           tqx = params[:tqx] || ''
           pieces = tqx.split ';'
@@ -30,7 +31,9 @@ config.after_initialize do
           
           begin
             executor = Rgviz::Executor.new model, Rgviz::Parser.new(query).parse
-            table = executor.execute
+            options = {}
+            options[:conditions] = conditions if conditions
+            table = executor.execute options
             original_render :text => "#{responseHandler}({reqId:'#{reqId}',status:'ok',version:'#{version}',table:#{table.to_json}});" 
           rescue ParseException => e
             msg = e.message.gsub("'", "\\'")

data/spec/rgviz/executor_spec.rb

@@ -12,9 +12,9 @@ describe Executor do
     Parser.new(string).parse
   end
   
-  def exec(query)
+  def exec(query, options = {})
     exec = Executor.new Person, (parse query)
-    exec.execute
+    exec.execute options
   end
   
   def format_datetime(date)
@@ -182,4 +182,52 @@ describe Executor do
     Person.make :city => City.make(:country => Country.make(:name => 'Argentina')) 
   end
   
+  it "processes with conditions as string" do
+    Person.make :age => 1
+    Person.make :age => 2
+    Person.make :age => 3
+  
+    table = exec 'select age', :conditions => 'age = 2'
+    
+    table.rows.length.should == 1
+    table.rows[0].c.length.should == 1
+    table.rows[0].c[0].v.should == 2
+  end
+  
+  it "processes with conditions as string and another filter" do
+    Person.make :age => 1
+    Person.make :age => 2
+    Person.make :age => 3
+  
+    table = exec 'select age where age > 1', :conditions => 'age < 3'
+    
+    table.rows.length.should == 1
+    table.rows[0].c.length.should == 1
+    table.rows[0].c[0].v.should == 2
+  end
+  
+  it "processes with conditions as array" do
+    Person.make :age => 1
+    Person.make :age => 2
+    Person.make :age => 3
+  
+    table = exec 'select age', :conditions => ['age = ?', 2]
+    
+    table.rows.length.should == 1
+    table.rows[0].c.length.should == 1
+    table.rows[0].c[0].v.should == 2
+  end
+  
+  it "processes with conditions as array and another filter" do
+    Person.make :age => 1
+    Person.make :age => 2
+    Person.make :age => 3
+  
+    table = exec 'select age where age > 1', :conditions => ['age < ?', 3]
+    
+    table.rows.length.should == 1
+    table.rows[0].c.length.should == 1
+    table.rows[0].c[0].v.should == 2
+  end
+  
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz-rails
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 7
-  version: "0.7"
+  - 8
+  version: "0.8"
 platform: ruby
 authors: 
 - Ary Borenszweig