@@ -1,27 +1,25 @@ class Array def add(a) raise(ArgumentError, "the two arrays must have the same size") if self.size != a.size - (0..a.size-1).map do |i| - self[i] + a[i] - end + (0..a.size-1).map {|i| self[i] + a[i] } end # used to merge all the types in one row # I think need some refactor def group_by_types - array=[]; final_array=[]; + array, final_array = [], []; self.each do |i| array << self.map { |j| j if i[:day] == j[:day] and i[:month] == j[:month] and i[:year] == j[:year] }.compact.map {|s| s[:type] }.flatten end - i=0; + i = 0; self.map do |j| - j[:type]=array[i] - found_final_array=false + j[:type] = array[i] + found_final_array = false final_array.each { |a| found_final_array = true if a == j } final_array << j unless found_final_array - i+=1 + i+= 1 end final_array end lib/stats_for_all/array.rb @@ -1,20 +1,18 @@ require 'yaml' module StatsForAll CONFIGURATION = {} - RAILS_ENV = Rails.env rescue "test" - # RAILS_ROOT = def self.load_configuration() app_config_file = File.expand_path(File.dirname(__FILE__) + "../../../../../../config/stats_for_all.yml") # file config only loaded for the test environment app_config_file = File.expand_path(File.dirname(__FILE__) + "../../../test/stats_for_all.yml") if RAILS_ENV == "test" - if File.exist?(app_config_file) CONFIGURATION.merge!(YAML.load(File.read(app_config_file))["all"] || {}) CONFIGURATION.merge!(YAML.load(File.read(app_config_file))[RAILS_ENV || "test"] || {}) end + end end lib/stats_for_all/config_load.rb @@ -14,14 +14,9 @@ # created_at :datetime # updated_at :datetime # - class Stat < ActiveRecord::Base TYPE = StatsForAll::CONFIGURATION["types"] - - StatsForAll::CONFIGURATION["model"].each do | model | - self.class_eval("belongs_to :#{model.downcase.singularize} , :polymorphic => true") - end - + named_scope :is_like, lambda { |*args| {:conditions => { :stat_type => args.first.stat_type, :model_type => args.first.model_type, :model_id => args.first.model_id } } } lib/stats_for_all/stat.rb @@ -1,4 +1,6 @@ require 'drb' +require 'ruby-debug' + module StatsForAll module Client @@ -7,9 +9,11 @@ module StatsForAll end module ClassMethods - def stats_for_me(options={}) + def stats_for_me(types = {}) has_many :stats, :dependent => :destroy, :as => :model - + + Stat.class_eval("belongs_to :#{self.class.name.downcase.singularize} , :polymorphic => true") + include StatsForAll::Client::InstanceMethods end end @@ -17,9 +21,9 @@ module StatsForAll module InstanceMethods # Cool syntax stats retrieve supported!, like: - # @object.stat :type=> Stat::TYPE[:click], :day => 21..24, :month =>10..12, :year => 2007..2009 - # @object.stat :type=> Stat::TYPE[:click], :day => 21, :month =>10, :year => 2008 - # @object.stat :type=> Stat::TYPE[:click], :month =>10, :year => 2008 + # @object.stat :type=> Stat::TYPE[:click], :day => 21..24, :month => 10..12, :year => 2007..2009 + # @object.stat :type=> Stat::TYPE[:click], :day => 21, :month => 10, :year => 2008 + # @object.stat :type=> Stat::TYPE[:click], :month => 10, :year => 2008 # @object.stat :type=> Stat::TYPE[:click], :year => 2008 def stat(arg={}) @@ -35,7 +39,7 @@ module StatsForAll def save_stats(type, hour=Time.now.hour) case StatsForAll::CONFIGURATION["increment_type"] when "direct" - direct_save(type, hour) + direct_save(type, hour) when "starling" starling_save(type, hour) when "drb" @@ -199,7 +203,7 @@ module StatsForAll DRb.stop_service value end - + def get_stats_server_connection stats_server = DRbObject.new(nil, "druby://#{StatsForAll::CONFIGURATION["server_host"]}:#{StatsForAll::CONFIGURATION["server_port"]}") begin @@ -210,7 +214,7 @@ module StatsForAll get_stats_server_connection end end - - end + + end end end lib/stats_for_all/stats_for_all_client.rb @@ -1,10 +1,9 @@ require 'rubygems' -require 'active_record' require 'yaml' +require 'active_record' require 'drb' require File.expand_path(File.dirname(__FILE__) + '/stats_for_all') - class StatsForAllRunner def start print "Starting SuperStat drb server...." lib/stats_for_all_runner.rb @@ -1,8 +1,8 @@ require 'rubygems' -require 'daemons' require 'active_record' require 'drb' require 'yaml' +require 'daemons' module StatsForAll RAILS_ENV = ARGV.pop lib/stats_for_all_server_demonized.rb @@ -11,7 +11,7 @@ class CreateStatsForAll < ActiveRecord::Migration add_index :stats, [:day], :name =>"idx_stats_day" add_index :stats, [:month], :name =>"idx_stats_month" add_index :stats, [:year], :name =>"idx_stats_year" - add_index :stats, [:stat_type], :name =>"idx_stats_stat_type" + add_index :stats, [:stat_type], :name =>"idx_stats_stat_type" end def self.down templates/create_stats_for_all.rb @@ -1,7 +1,5 @@ -all: - model: [ ] # example: [ banner, photo, car ] - - types: { click: 0, hit: 1} +all: + types: { click: 0, hit: 1 } # no need if you work in "direct mode" only server_host: localhost templates/stats_for_all.yml @@ -1,6 +1,4 @@ all: - model: [ banner ] - types: { click: 0, hit: 1 } # require for increment_type: drb and starling only test/stats_for_all.yml @@ -1,4 +1,5 @@ require File.expand_path(File.dirname(__FILE__) + '/stats_for_all_test_helper') +require 'ruby-debug' class BannerTest < Test::Unit::TestCase def setup @@ -19,6 +20,10 @@ class BannerTest < Test::Unit::TestCase should "have the correct general stat" do assert_equal 3, @art.click_counter end + + should "have denfined correctly the relation" do + assert_equal Banner, @stat1.model.class + end end context "A stats_for_all_client" do @@ -46,12 +51,10 @@ class BannerTest < Test::Unit::TestCase assert_equal Time.days_in_month(Time.now.month), @art.clicks(:month => Time.now.month, :year => Time.now.year).size assert_equal 4, @art.clicks( :month => Time.now.month, :year => Time.now.year).sum - assert_equal 12, @art.clicks(:year => Time.now.year).size assert_equal 4, @art.clicks( :year => Time.now.year).sum - assert_equal 12, @art.clicks.size - + assert_equal 12, @art.clicks.size end @@ -92,7 +95,7 @@ class BannerTest < Test::Unit::TestCase @art2_result = [{:type=>["hit"], :day=>Time.now.day, :month=>Time.now.month, :year=>Time.now.year}] @art2.stats.first.update_all_stats - StatsForAll::CONFIGURATION["increment_type"]="direct" + StatsForAll::CONFIGURATION["increment_type"] = "direct" end should "have the correct available months, days and years in the correct format" do test/stats_for_all_client_test.rb @@ -8,7 +8,7 @@ require 'shoulda/rails' require 'factory_girl' module StatsForAll - RAILS_ENV = 'test' + RAILS_ENV = 'test' end require File.expand_path(File.dirname(__FILE__) + '/../lib/stats_for_all') @@ -17,6 +17,7 @@ ActiveRecord::Base.establish_connection(YAML.load_file(File.expand_path(File.dir ActiveRecord::Base.send(:include, StatsForAll::Client) + def setup_db ActiveRecord::Schema.define(:version => 1) do create_table "banners", :force => true do |t| @@ -53,7 +54,7 @@ def teardown_db end class Banner < ActiveRecord::Base - stats_for_me + stats_for_me click: 3, a: 0, hit: 1, end Factory.define :banner do |b| test/stats_for_all_test_helper.rb 03b3a1dedfcd6c17c7e10155249482bc6e766f41 Felipe Talavera felipe.talavera@gmail.com http://github.com/flype/stats_for_all/commit/6e4dc3f19472adb07038933322d21ea7a2f1d675 6e4dc3f19472adb07038933322d21ea7a2f1d675 2009-10-17T14:34:08-07:00 2009-10-17T14:34:08-07:00 now the model config it's not necesary cff8035c69fc9a814a686f7f3ae5313952098ad9 Felipe Talavera felipe.talavera@gmail.com