active_record_calculator 0.1.0 → 0.2.0

data/README

@@ -45,17 +45,14 @@ Example:
 
 You can use statement to see the sql created
 
-The calculator can be used for fast direct sql updates.  A calculator needs to be created where all the operations have aliases
-that have a respective column name in the update table:
-
-  calculator = Purchases.calculator(:conditions => "created_at > '2011-07-01'", :group => "user_id")
-  calculator.count :id, "total_purchases"
-  calculator.cnt :id, "expensive_purchases", "price > 100"
-  calculator.sum :price, "cheap_spending", "price < 100"
-  calculator.avg :price, "cheap_average", "price < 100"
-  calculator.min :price, "least_purchase"
-  calculator.max :price, "most_purchase"
-  
-  calculator.update(:purchase_history, :user_id) #the tables are joined by the second argument and the first grouping column
+The updater can be used for fast direct sql updates.  An updater needs to be created where all the operations have aliases that have a respective column name in the update table.  The first two arguments are the update table and the key to join.  The key is joined with the first group column which is also required.
+
+  updater = Purchases.updater(:purchase_history, :user_id, :conditions => "created_at > '2011-07-01'", :group => "user_id")
+  updater.count :id, "total_purchases"
+  updater.cnt :id, "expensive_purchases", "price > 100"
+  updater.sum :price, "cheap_spending", "price < 100"
+  updater.avg :price, "cheap_average", "price < 100"
+  updater.min :price, "least_purchase"
+  updater.max :price, "most_purchase"
   
-Update only works with mysql adapters currently
+Update should work with all ActiveRecord supported databases except sqlite

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')
+
+# If you want to make this the default task
+task :default => :spec

data/lib/active_record_calculator/calculator_proxy.rb

@@ -37,7 +37,7 @@ module ActiveRecordCalculator
     end
     alias :minimum :min
     
-    def table_name
+    def table
       @klass.table_name
     end
     
@@ -75,14 +75,6 @@ module ActiveRecordCalculator
       connection.select_all(query)
     end
     
-    def update(table, foreign_key)
-      unless connection.adapter_name =~ /^mysql/i
-        raise UnsupportedAdapterError, "Updates with the database adapter is not supported."
-      end
-      updater = UpdaterProxy.new(table, foreign_key, self)
-      updater
-    end
-    
     def find(finder_options = {})
       finder_options.symbolize_keys!
       @finder_options = finder_options.except(:select, :include, :from, :readonly, :lock)
@@ -90,7 +82,7 @@ module ActiveRecordCalculator
     
     def statement
       add_group_operations
-      sql = @klass.send(:construct_finder_sql, @finder_options.except(:update_key))
+      sql = @klass.send(:construct_finder_sql, @finder_options)
       sql.gsub(/^SELECT\s+\*/i, select)
     end
     

data/lib/active_record_calculator/column.rb

@@ -11,11 +11,11 @@ module ActiveRecordCalculator
     end
     
     def inspect
-      @name
+      @name.to_s
     end
     
     def alias_name
-      @as
+      @as.to_s
     end
   end
 end

data/lib/active_record_calculator/group_operation.rb

@@ -11,11 +11,11 @@ module ActiveRecordCalculator
     end
     
     def inspect
-      @column
+      @column.to_s
     end
     
     def name
-      @as
+      @as.to_s
     end
   end
 end

data/lib/active_record_calculator/operation.rb

@@ -28,7 +28,11 @@ module ActiveRecordCalculator
     end
     
     def name
-      @as
+      @as.to_s
+    end
+    
+    def op
+      @op
     end
     
     private

data/lib/active_record_calculator/updater_proxy.rb

@@ -9,18 +9,73 @@ module ActiveRecordCalculator
     end
     
     def statement
-      start = %{UPDATE #{table}
+      case connection.adapter_name
+      when /mysql/i then mysql_statement
+      when /postgresql/i then psql_statement
+      else abstract_statement
+      end
+    end
+    
+    def update
+      connection.update(statement)
+    end
+    
+    def col(column_name, as = nil)
+      calculator.col(column_name, as)
+    end
+    alias :column :col
+    
+    def cnt(column_name, as, options = {})
+      calculator.count(column_name, as, options)
+    end
+    alias :count :cnt
+    
+    def sum(column_name, as, options = {})
+      calculator.sum(column_name, as, options)
+    end
+    
+    def avg(column_name, as, options = {})
+      calculator.avg(column_name, as, options)
+    end
+    alias :average :avg
+    
+    def max(column_name, as, options = {})
+      calculator.max(column_name, as, options)
+    end
+    alias :maximum :max
+    
+    def min(column_name, as, options = {})
+      calculator.min(column_name, as, options)
+    end
+    alias :minimum :min
+    
+    private
+    
+    def mysql_statement
+      sql = %{UPDATE #{table}
       INNER JOIN
       (#{calculator.statement}
       ) AS sub_#{subquery_table} ON sub_#{subquery_table}.group_column_1 = #{table}.#{key}
       SET\n}
-      start += calculation_columns.collect do |col|
+      sql += calculation_columns.collect do |col|
         "#{table}.#{col} = sub_#{subquery_table}.#{col}"
       end.join(",\n")
-      start
+      sql
     end
     
-    private
+    def psql_statement
+      abstract_statement.gsub(/^UPDATE/, "UPDATE ONLY")
+    end
+    
+    def abstract_statement
+      sql = "UPDATE #{table} SET\n"
+      sql += calculation_columns.collect do |col|
+        "#{table}.#{col} = sub_#{subquery_table}.#{col}"
+      end.join(",\n")
+      sql += "\nFROM #{table}, (#{calculator.statement}) AS sub_#{subquery_table}\n"
+      sql += "WHERE sub_#{subquery_table}.group_column_1 = #{table}.#{key}"
+      sql
+    end
     
     def connection
       calculator.connection
@@ -44,7 +99,7 @@ module ActiveRecordCalculator
     end
     
     def subquery_table
-      calculator.table_name
+      calculator.table
     end
     
     def update_columns
@@ -68,7 +123,7 @@ module ActiveRecordCalculator
     end
     
     def valid_columns?
-      raise InvalidColumnError, "Can not resolve update column(s) #{invalid_columns.to_sentence} for table #{update_table}" unless invalid_columns.empty?
+      raise InvalidColumnError, "Can not resolve update column(s) #{invalid_columns.to_sentence} for table #{table}" unless invalid_columns.empty?
       true
     end
     

data/lib/active_record_calculator/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordCalculator
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/active_record_calculator.rb

@@ -19,6 +19,15 @@ module ActiveRecordCalculator
       yield c if blk
       c
     end
+    
+    def updater(table, key, options = {}, &blk)
+      if connection.adapter_name =~ /^sqlite/i
+        raise UnsupportedAdapterError, "Updates with the database adapter is not supported."
+      end
+      c = CalculatorProxy.new(self, options)
+      yield c if blk
+      UpdaterProxy.new(table, key, c)
+    end
   end
 end
 

data/spec/calculator_proxy_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe ActiveRecordCalculator::CalculatorProxy, "#new" do
+  it "should return a ActiveRecordCalculator::CalculatorProxy instance" do
+    instance = ActiveRecordCalculator::CalculatorProxy.new(FakeClass)
+    instance.class.to_s.should eq('ActiveRecordCalculator::CalculatorProxy')
+  end
+end
+
+describe ActiveRecordCalculator::CalculatorProxy, "#col, #column" do
+  it "should add a ActiveRecordCalculator::Column instance to columns" do
+    instance = ActiveRecordCalculator::CalculatorProxy.new(FakeClass)
+    instance.col(:id)
+    instance.column(:id)
+    instance.columns.length.should eq(2)
+    instance.columns.first.class.should eq(ActiveRecordCalculator::Column)
+  end
+end
+
+describe ActiveRecordCalculator::CalculatorProxy, "#count, #cnt" do
+  it "should add a ActiveRecordCalculator::Operation instance to operations" do
+    instance = ActiveRecordCalculator::CalculatorProxy.new(FakeClass)
+    instance.count(:id, 'counter')
+    instance.cnt(:id, 'counter2')
+    instance.operations.length.should eq(2)
+    instance.operations.first.op.should eq(:count)
+    instance.operations.first.class.should eq(ActiveRecordCalculator::Operation)
+  end
+end
+
+describe ActiveRecordCalculator::CalculatorProxy, "#max, #maximum" do
+  it "should add a ActiveRecordCalculator::Operation instance to operations" do
+    instance = ActiveRecordCalculator::CalculatorProxy.new(FakeClass)
+    instance.max(:id, 'counter')
+    instance.maximum(:id, 'counter2')
+    instance.operations.length.should eq(2)
+    instance.operations.first.op.should eq(:max)
+    instance.operations.first.class.should eq(ActiveRecordCalculator::Operation)
+  end
+end
+
+describe ActiveRecordCalculator::CalculatorProxy, "#min, #minimum" do
+  it "should add a ActiveRecordCalculator::Operation instance to operations" do
+    instance = ActiveRecordCalculator::CalculatorProxy.new(FakeClass)
+    instance.min(:id, 'counter')
+    instance.minimum(:id, 'counter2')
+    instance.operations.length.should eq(2)
+    instance.operations.first.op.should eq(:min)
+    instance.operations.first.class.should eq(ActiveRecordCalculator::Operation)
+  end
+end
+
+describe ActiveRecordCalculator::CalculatorProxy, "#avg, #average" do
+  it "should add a ActiveRecordCalculator::Operation instance to operations" do
+    instance = ActiveRecordCalculator::CalculatorProxy.new(FakeClass)
+    instance.avg(:id, 'counter')
+    instance.average(:id, 'counter2')
+    instance.operations.length.should eq(2)
+    instance.operations.first.op.should eq(:avg)
+    instance.operations.first.class.should eq(ActiveRecordCalculator::Operation)
+  end
+end
+
+describe ActiveRecordCalculator::CalculatorProxy, "#sum" do
+  it "should add a ActiveRecordCalculator::Operation instance to operations" do
+    instance = ActiveRecordCalculator::CalculatorProxy.new(FakeClass)
+    instance.sum(:id, 'counter')
+    instance.operations.length.should eq(1)
+    instance.operations.first.op.should eq(:sum)
+    instance.operations.first.class.should eq(ActiveRecordCalculator::Operation)
+  end
+end

data/spec/column_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe ActiveRecordCalculator::Column, "#new" do
+  it "should return a ActiveRecordCalculator::Column instance" do
+    instance = ActiveRecordCalculator::Column.new('a_column', nil)
+    instance.class.should eq(ActiveRecordCalculator::Column)
+  end
+end
+
+describe ActiveRecordCalculator::Column, "#inpsect" do
+  it "should return a column name" do
+    instance = ActiveRecordCalculator::Column.new('a_column', nil)
+    instance.inspect.should eq('a_column')
+  end
+end
+
+describe ActiveRecordCalculator::Column, "#alias" do
+  it "should return given alias" do
+    instance = ActiveRecordCalculator::Column.new('a_column', 'an_alias')
+    instance.alias_name.should eq('an_alias')
+  end
+end
+
+describe ActiveRecordCalculator::Column, "#build_select" do
+  it "should return correct name/alias" do
+    instance = ActiveRecordCalculator::Column.new('a_column', 'an_alias')
+    instance.build_select.should eq('a_column AS an_alias')
+  end
+  
+  it "should return correct name/name when no alias given" do
+    instance = ActiveRecordCalculator::Column.new('a_column', nil)
+    instance.build_select.should eq('a_column AS a_column')
+  end
+end

data/spec/group_operation_spec.rb

@@ -0,0 +1 @@
+require 'spec_helper'

data/spec/operation_spec.rb

@@ -0,0 +1 @@
+require 'spec_helper'

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'active_record_calculator'
+
+class FakeConnection
+end
+
+class FakeClass
+  
+  def table_name
+    "some_records"
+  end
+  
+end
+
+RSpec.configure do |config|
+  # some (optional) config here
+end

data/spec/updater_proxy_spec.rb

@@ -0,0 +1 @@
+require 'spec_helper'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_record_calculator
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Grady Griffin
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 -05:00
-default_executable: 
+date: 2012-02-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -69,7 +68,12 @@ files:
 - lib/active_record_calculator/operation.rb
 - lib/active_record_calculator/updater_proxy.rb
 - lib/active_record_calculator/version.rb
-has_rdoc: true
+- spec/calculator_proxy_spec.rb
+- spec/column_spec.rb
+- spec/group_operation_spec.rb
+- spec/operation_spec.rb
+- spec/spec_helper.rb
+- spec/updater_proxy_spec.rb
 homepage: ""
 licenses: []
 
@@ -99,9 +103,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: active_record_calculator
-rubygems_version: 1.4.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: ActiveRecord Calculations done faster
-test_files: []
-
+test_files: 
+- spec/calculator_proxy_spec.rb
+- spec/column_spec.rb
+- spec/group_operation_spec.rb
+- spec/operation_spec.rb
+- spec/spec_helper.rb
+- spec/updater_proxy_spec.rb