caddie 0.2.3 → 0.2.4

data/test/models/caddie/crest_price_history_last_day_timestamp_test.rb

@@ -0,0 +1,102 @@
+require 'test_helper'
+
+module Caddie
+  class CrestPriceHistoryLastDayTimestampTest < ActiveSupport::TestCase
+
+    def setup
+      Caddie::CrestPriceHistoryUpdate.stubs( :get_multipage_data ).returns( [ [ { 'date' => Time.now.to_s } ], 5 ] )
+    end
+
+    def teardown
+      Caddie::CrestPriceHistoryUpdate.unstub( :get_multipage_data )
+    end
+
+    test 'Should create a CrestPriceHistoryLastDayTimestamp record and an history object when there is no day timestamp and no history record' do
+      create( :crest_price_history_update )
+
+      assert_difference 'CrestPriceHistory.count', 1 do
+        assert_difference 'Caddie::CrestPriceHistoryLastDayTimestamp.count', 1 do
+          Caddie::CrestPriceHistoryUpdate.feed_price_histories
+        end
+      end
+    end
+
+    test 'Should create new histories objects but no new last day timestamps object' do
+      create( :crest_price_history_update )
+
+      Caddie::CrestPriceHistoryUpdate.unstub( :get_multipage_data )
+      Caddie::CrestPriceHistoryUpdate.stubs( :get_multipage_data ).returns( [ [ { 'date' => ( Time.now - 24 * 60 * 60 ).to_s } ], 5 ] )
+      Caddie::CrestPriceHistoryUpdate.feed_price_histories
+
+      Caddie::CrestPriceHistoryUpdate.unstub( :get_multipage_data )
+      Caddie::CrestPriceHistoryUpdate.stubs( :get_multipage_data ).returns( [ [ { 'date' => Time.now.to_s } ], 5 ] )
+
+      assert_difference 'CrestPriceHistory.count', 1 do
+        assert_no_difference 'Caddie::CrestPriceHistoryLastDayTimestamp.count' do
+          Caddie::CrestPriceHistoryUpdate.feed_price_histories
+        end
+      end
+    end
+
+    test 'Should update the CrestPriceHistoryLastDayTimestamp object' do
+      cphldt = create( :crest_price_history_last_day_timestamp, day_timestamp: Time.new( 0 ) )
+
+      assert_no_difference 'Caddie::CrestPriceHistoryLastDayTimestamp.count' do
+        cphldt = Caddie::CrestPriceHistoryLastDayTimestamp.create_or_update_last_day_timestamp(
+          cphldt, Time.now, nil, nil )
+      end
+      assert_equal Time.now.strftime( '%D' ), cphldt.day_timestamp.strftime( '%D' )
+    end
+
+    test 'Should create a new CrestPriceHistoryLastDayTimestamp as there is none' do
+      cph = create( :crest_price_history )
+      cphldt = nil
+
+      assert_difference 'Caddie::CrestPriceHistoryLastDayTimestamp.count' do
+        cphldt = Caddie::CrestPriceHistoryLastDayTimestamp.create_or_update_last_day_timestamp(
+          nil, Time.now, cph.region_id, cph.eve_item_id )
+      end
+      assert_equal Time.now.strftime( '%D' ), cphldt.day_timestamp.strftime( '%D' )
+    end
+
+    test 'Should return an update date of Time.new( 0 ) and a null last record because there is no history object' do
+      last_update_date, last_update_record = Caddie::CrestPriceHistoryLastDayTimestamp
+        .find_or_create_last_day_timestamp( -1, -1 )
+
+      assert_equal Time.new( 0 ), last_update_date
+      refute last_update_record
+    end
+
+    test 'Should return an update date equal to the created history object and no last record' do
+      cph = create( :crest_price_history )
+
+      last_update_date, last_update_record = Caddie::CrestPriceHistoryLastDayTimestamp
+        .find_or_create_last_day_timestamp( cph.region_id, cph.eve_item_id )
+
+      assert_equal cph.history_date.strftime( '%D' ), last_update_date.strftime( '%D' )
+      refute last_update_record
+    end
+
+    test 'Should return an update date equal to the latest created history object and no last record' do
+      cph1 = create( :crest_price_history, history_date: Time.now - 24*60*60 )
+      cph2 = create( :crest_price_history, region_id: cph1.region_id, eve_item_id: cph1.eve_item_id )
+
+      last_update_date, last_update_record = Caddie::CrestPriceHistoryLastDayTimestamp
+        .find_or_create_last_day_timestamp( cph1.region_id, cph1.eve_item_id )
+
+      assert_equal cph2.history_date.strftime( '%D' ), last_update_date.strftime( '%D' )
+      assert cph1.history_date < last_update_date
+      refute last_update_record
+    end
+
+    test 'Should return an update date and a last record' do
+      cphldt = create( :crest_price_history_last_day_timestamp )
+
+      last_update_date, last_update_record = Caddie::CrestPriceHistoryLastDayTimestamp
+        .find_or_create_last_day_timestamp( cphldt.region_id, cphldt.eve_item_id )
+
+      assert_equal cphldt.day_timestamp.strftime( '%D' ), last_update_date.strftime( '%D' )
+      assert last_update_record
+    end
+  end
+end

data/test/models/caddie/crest_price_history_update_log_test.rb

@@ -2,8 +2,20 @@ require 'test_helper'
 
 module Caddie
   class CrestPriceHistoryUpdateLogTest < ActiveSupport::TestCase
-    # test "the truth" do
-    #   assert true
-    # end
+
+    test 'Should create a new log entry' do
+      assert_difference 'Caddie::CrestPriceHistoryUpdateLog.count' do
+        Caddie::CrestPriceHistoryUpdateLog.store_log_data( Time.now.to_date, 10, 10, 50, 50, 100 )
+      end
+    end
+
+    test 'Should update the log entry' do
+      log = nil
+      Caddie::CrestPriceHistoryUpdateLog.store_log_data( Time.now.to_date, 10, 10, 50, 50, 100 )
+      assert_no_difference 'Caddie::CrestPriceHistoryUpdateLog.count' do
+        log = Caddie::CrestPriceHistoryUpdateLog.store_log_data( Time.now.to_date, 10, 10, 1000, 50, 100 )
+      end
+      assert_equal 1000, log.total_inserts
+    end
   end
 end

data/test/models/caddie/crest_price_history_update_test.rb

@@ -1,24 +1,46 @@
 require 'test_helper'
-require 'minitest/mock'
 
 module Caddie
   class CrestPriceHistoryUpdateTest < ActiveSupport::TestCase
 
     def setup
-      @region = create( :caddie_heimatar )
-      next_process_date = Time.now.to_date
-      1.upto( 53 ).each do
-        item = create( :caddie_eve_item )
-        create( :crest_price_history_update, region: @region, eve_item: item, next_process_date: next_process_date )
+      cph = create( :crest_price_history )
+      @cphu = create( :crest_price_history_update, region_id: cph.region_id, eve_item_id: cph.eve_item_id )
+      Caddie::CrestPriceHistoryUpdate.stubs( :get_multipage_data ).returns( [ [], 5 ] )
+      # raise 'daily_operation_list = 0. You may recreate fixtures for today by running "RAILS_ENV=test ruby caddie_create_test_fixtures.rb"' if Caddie::CrestPriceHistoryUpdate.daily_operations_list.count == 0
+    end
+
+    def teardown
+      Caddie::CrestPriceHistoryUpdate.unstub(:get_multipage_data)
+    end
+
+    test 'test update for new item' do
+      @cphu.destroy
+      assert_difference 'Caddie::CrestPriceHistoryUpdate.count' do
+        Caddie::CrestPriceHistoryUpdate.update
       end
-      Caddie::CrestPriceHistoryUpdate.stubs( :get_markets ).returns( [ [], 5 ] )
+      assert_equal 1, Caddie::CrestPriceHistoryUpdate.daily_operations_list.count
+    end
 
+    test 'test update for existing item' do
+      Caddie::CrestPriceHistoryUpdate.update
+      assert_no_difference 'Caddie::CrestPriceHistoryUpdate.count' do
+        Caddie::CrestPriceHistoryUpdate.update
+      end
+      assert_equal 1, Caddie::CrestPriceHistoryUpdate.daily_operations_list.count
     end
 
-    test 'feed_price_histories' do
+    test 'feed_price_histories single threaded' do
       result = Caddie::CrestPriceHistoryUpdate.feed_price_histories
-      assert_equal 265, result[1]
+      assert_equal 5, result[1]
     end
 
+    # Deactivated. Waiting for a better solution : the fixture solution sucks
+    # test 'feed_price_histories multi threaded' do
+    #   th = Caddie::MThreadedUpdater.new( Caddie::CrestPriceHistoryUpdate::NB_THREADS, Caddie::CrestPriceHistoryUpdate.daily_operations_list )
+    #   result = th.feed_price_histories_threaded
+    #   assert_equal 265, result[1]
+    # end
+
   end
 end

data/test/models/caddie/m_threaded_updater_test.rb

@@ -1,26 +1,14 @@
-#
-# I keep this because it is a very good example of fixture creation code
-# 
-# @region = create( :heimatar )
-# next_process_date = Time.now.to_date
-# objs = []
-# 1.upto( 53 ).each do
-#   item = create( :eve_item )
-#
-#   obj = create( :crest_price_history_update, region: @region, eve_item: item, next_process_date: next_process_date )
-#   objs << obj
-#
-# end
+require 'test_helper'
 
-# increment = 1
-# File.open( 'test/fixtures/caddie/crest_price_history_updates.yml', 'w') do |f|
-#   objs.each do |obj|
-#     attrs = obj.attributes
-#     attrs.delete_if{|k,v| v.blank?}
-#
-#     output = { 'r_' + increment.to_s => attrs}
-#     f << output.to_yaml.gsub(/^--- \n/,'') + "\n"
-#
-#     increment += 1
-#   end
-# end
+module Caddie
+  class MThreadedUpdaterTest < ActiveSupport::TestCase
+
+    test 'Col / seconds should be a max and not a sum' do
+      Caddie::CrestPriceHistoryUpdate.stubs( :feed_price_histories ).returns( [ 10, 15, 20, 25 ] )
+      runner = Caddie::MThreadedUpdater.new( 4, Caddie::CrestPriceHistoryUpdate.daily_operations_list )
+      result = runner.feed_price_histories_threaded
+      assert_equal [ 10*4, 15*4, 20, 25*4 ], result
+    end
+
+  end
+end

data/test/test_helper.rb

@@ -1,6 +1,12 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
+require 'simplecov'
+SimpleCov.start do
+  add_filter 'dummy'
+  add_filter 'factories'
+end
+
 require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
 ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate', __FILE__)
@@ -27,5 +33,4 @@ end
 ENGINE_RAILS_ROOT=File.join(File.dirname(__FILE__), '../')
 Dir[File.join(ENGINE_RAILS_ROOT, "test/factories/**/*.rb")].each {|f| require f }
 
-require 'minitest/unit'
-require 'mocha/mini_test'
+require 'mocha/test_unit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caddie
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Zuger Cédric
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,20 +50,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.18.4
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A rails engine that allow to download CREST market data (designed to
   be plugged into a custom application)
 email:
@@ -79,11 +65,11 @@ files:
 - app/controllers/caddie/application_controller.rb
 - app/helpers/caddie/application_helper.rb
 - app/models/caddie/crest_data_retriever.rb
+- app/models/caddie/crest_price_history_last_day_timestamp.rb
 - app/models/caddie/crest_price_history_update.rb
 - app/models/caddie/crest_price_history_update_log.rb
 - app/models/caddie/m_threaded_updater.rb
 - app/models/caddie/update_table.sql
-- app/models/crest_price_history.rb
 - app/views/layouts/caddie/application.html.erb
 - config/routes.rb
 - db/migrate/20160524122651_create_caddie_crest_price_history_updates.rb
@@ -92,11 +78,11 @@ files:
 - db/migrate/20160710163612_add_total_inserts_to_crest_price_history_update_log.rb
 - db/migrate/20160710163641_add_co_seconds_to_crest_price_history_update_log.rb
 - db/migrate/20160725091214_add_indexes_to_crest_price_history_update.rb
+- db/migrate/20160803094530_create_caddie_crest_price_history_last_day_timestamps.rb
 - lib/caddie.rb
 - lib/caddie/engine.rb
 - lib/caddie/version.rb
 - lib/tasks/caddie_tasks.rake
-- lib/tasks/m_threaded_updater_test.no_rake
 - test/caddie_test.rb
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
@@ -104,6 +90,7 @@ files:
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/crest_price_history.rb
 - test/dummy/app/models/eve_item.rb
 - test/dummy/app/models/region.rb
 - test/dummy/app/views/layouts/application.html.erb
@@ -134,21 +121,26 @@ files:
 - test/dummy/db/migrate/20150414095303_add_name_lowcase_to_eve_item.rb
 - test/dummy/db/migrate/20150416154256_rename_eve_item_id.rb
 - test/dummy/db/migrate/20150417135716_add_cost_to_eve_item.rb
+- test/dummy/db/migrate/20150815033941_add_epic_blueprint_to_eve_item.rb
 - test/dummy/db/migrate/20150906171550_add_cpp_market_group_id_to_eve_item.rb
 - test/dummy/db/migrate/20150909162142_add_involved_in_blueprint_to_eve_item.rb
 - test/dummy/db/migrate/20150910074544_create_regions.rb
 - test/dummy/db/migrate/20150910080646_create_crest_price_histories.rb
+- test/dummy/db/migrate/20150916052729_add_market_group_ref_to_eve_item.rb
+- test/dummy/db/migrate/20160803143148_crest_price_history_index_rework_and_others.rb
 - test/dummy/db/schema.rb
-- test/dummy/log/development.log
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
+- test/factories/caddie/crest_price_history.rb
+- test/factories/caddie/crest_price_history_last_day_timestamp.rb
 - test/factories/caddie/crest_price_history_updates.rb
 - test/factories/caddie/eve_items.rb
 - test/factories/caddie/regions.rb
 - test/integration/navigation_test.rb
+- test/models/caddie/crest_data_retriever_test.rb
+- test/models/caddie/crest_price_history_last_day_timestamp_test.rb
 - test/models/caddie/crest_price_history_update_log_test.rb
 - test/models/caddie/crest_price_history_update_test.rb
 - test/models/caddie/m_threaded_updater_test.rb
@@ -173,64 +165,70 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Crest mArket DownloaD engInE
 test_files:
-- test/integration/navigation_test.rb
-- test/caddie_test.rb
-- test/factories/caddie/eve_items.rb
-- test/factories/caddie/regions.rb
-- test/factories/caddie/crest_price_history_updates.rb
-- test/test_helper.rb
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/log/test.log
-- test/dummy/log/development.log
-- test/dummy/db/migrate/20150417135716_add_cost_to_eve_item.rb
-- test/dummy/db/migrate/20150416154256_rename_eve_item_id.rb
-- test/dummy/db/migrate/20150910080646_create_crest_price_histories.rb
-- test/dummy/db/migrate/20150910074544_create_regions.rb
-- test/dummy/db/migrate/20150906171550_add_cpp_market_group_id_to_eve_item.rb
-- test/dummy/db/migrate/20150909162142_add_involved_in_blueprint_to_eve_item.rb
-- test/dummy/db/migrate/20150414095303_add_name_lowcase_to_eve_item.rb
-- test/dummy/db/migrate/20150410082132_create_eve_items.rb
-- test/dummy/db/schema.rb
-- test/dummy/config.ru
-- test/dummy/config/database.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/secrets.yml
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/application.rb
 - test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/assets.rb
-- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
-- test/dummy/config/initializers/cookies_serializer.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/initializers/inflections.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/application.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/models/region.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/secrets.yml
+- test/dummy/config/database.yml
+- test/dummy/config.ru
+- test/dummy/bin/rails
+- test/dummy/bin/setup
+- test/dummy/bin/bundle
+- test/dummy/bin/rake
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/db/schema.rb
+- test/dummy/db/migrate/20150909162142_add_involved_in_blueprint_to_eve_item.rb
+- test/dummy/db/migrate/20150414095303_add_name_lowcase_to_eve_item.rb
+- test/dummy/db/migrate/20160803143148_crest_price_history_index_rework_and_others.rb
+- test/dummy/db/migrate/20150906171550_add_cpp_market_group_id_to_eve_item.rb
+- test/dummy/db/migrate/20150910080646_create_crest_price_histories.rb
+- test/dummy/db/migrate/20150410082132_create_eve_items.rb
+- test/dummy/db/migrate/20150916052729_add_market_group_ref_to_eve_item.rb
+- test/dummy/db/migrate/20150416154256_rename_eve_item_id.rb
+- test/dummy/db/migrate/20150417135716_add_cost_to_eve_item.rb
+- test/dummy/db/migrate/20150910074544_create_regions.rb
+- test/dummy/db/migrate/20150815033941_add_epic_blueprint_to_eve_item.rb
+- test/dummy/README.rdoc
 - test/dummy/app/models/eve_item.rb
+- test/dummy/app/models/region.rb
+- test/dummy/app/models/crest_price_history.rb
 - test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/app/assets/javascripts/application.js
-- test/dummy/bin/rake
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/setup
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/Rakefile
+- test/models/caddie/crest_data_retriever_test.rb
 - test/models/caddie/crest_price_history_update_log_test.rb
-- test/models/caddie/crest_price_history_update_test.rb
 - test/models/caddie/m_threaded_updater_test.rb
+- test/models/caddie/crest_price_history_last_day_timestamp_test.rb
+- test/models/caddie/crest_price_history_update_test.rb
+- test/caddie_test.rb
+- test/integration/navigation_test.rb
+- test/factories/caddie/eve_items.rb
+- test/factories/caddie/crest_price_history_last_day_timestamp.rb
+- test/factories/caddie/crest_price_history_updates.rb
+- test/factories/caddie/regions.rb
+- test/factories/caddie/crest_price_history.rb
+- test/test_helper.rb

data/lib/tasks/m_threaded_updater_test.no_rake

@@ -1,53 +0,0 @@
-require 'mocha/api'
-require 'minitest'
-
-include Mocha::API
-include FactoryGirl::Syntax::Methods
-
-require_relative '../../test/dummy/app/models/eve_item'
-require_relative '../../test/dummy/app/models/region'
-require_relative '../../test/factories/caddie/eve_items'
-require_relative '../../test/factories/caddie/regions'
-require_relative '../../app/models/caddie/crest_data_retriever'
-require_relative '../../app/models/caddie/crest_price_history_update'
-require_relative '../../test/factories/caddie/crest_price_history_updates'
-
-# Regular test unit does not commit between insertions, this algo rely on database to split work between threads
-# So we have to fake a test outside the test unit
-namespace :test do
-
-  desc "M threaded uptader test"
-  task :m_threaded_uptader_test=> :environment do
-    if (ENV['RAILS_ENV'] == "test") # protect against execution in dev mode
-
-      Caddie::CrestPriceHistoryUpdate.stubs( :get_multipage_data ).returns( [ [], 5 ] )
-
-      Region.delete_all
-      EveItem.delete_all
-      Caddie::CrestPriceHistoryUpdate.delete_all
-
-      next_process_date = Time.now.to_date
-      region = create( :caddie_heimatar )
-      1.upto( 53 ).each do
-        item = create( :caddie_eve_item )
-        create( :crest_price_history_update, region: region, eve_item: item, next_process_date: next_process_date )
-      end
-
-      th = Caddie::MThreadedUpdater.new( 4, Caddie::CrestPriceHistoryUpdate.daily_operations_list )
-      th.split_work_for_threads
-      timings = th.feed_price_histories_threaded
-      # pp timings
-      unless 53 == timings[1]/5
-        "Test failed : #{timings[1]/5} != 53"
-      else
-        puts 'Test passed'
-      end
-    else
-      puts 'Can be only executed in test env'
-    end
-
-    Region.delete_all
-    EveItem.delete_all
-    Caddie::CrestPriceHistoryUpdate.delete_all
-  end
-end