From c768154dc40d463a409763da6d2be6b23c138a7c Mon Sep 17 00:00:00 2001 From: Geoff Harcourt Date: Fri, 16 Mar 2012 19:10:38 -0400 Subject: [PATCH] Starting to move to pathnames rather than pure strings for local folders. --- lib/greenmonster.rb | 5 +++-- lib/greenmonster/spider.rb | 5 +++-- test/test_greenmonster.rb | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/greenmonster.rb b/lib/greenmonster.rb index 8a157c3..7a0c495 100644 --- a/lib/greenmonster.rb +++ b/lib/greenmonster.rb @@ -3,6 +3,7 @@ require 'httparty' require 'nokogiri' +require 'pathname' require 'fileutils' module Greenmonster @@ -21,7 +22,7 @@ module Greenmonster # def self.set_games_folder(location) - @@games_folder = location + @@games_folder = Pathname.new(location) end ## @@ -30,7 +31,7 @@ def self.set_games_folder(location) # Example: # >> Greenmonster.set_games_folder("/Users/geoff/game_data") # >> Greenmonster.games_folder - # => "/Users/geoff/game_data" + # => # def self.games_folder @@games_folder diff --git a/lib/greenmonster/spider.rb b/lib/greenmonster/spider.rb index f759f16..539af88 100644 --- a/lib/greenmonster/spider.rb +++ b/lib/greenmonster/spider.rb @@ -19,13 +19,14 @@ def self.pull_game(game_id,args = {}) :print_games => true, :games_folder => Greenmonster.games_folder }.merge(args) + args[:games_folder] = Pathname.new(args[:games_folder]) puts game_id if args[:print_games] raise "Games folder location required." if args[:games_folder].nil? paths = { - :localGameFolder => "#{args[:games_folder]}/#{args[:sport_code]}/#{format_date_as_folder(args[:date])}/#{game_id}/", + :localGameFolder => args[:games_folder] + args[:sport_code] + format_date_as_folder(args[:date]) + game_id, :mlbGameFolder => "#{gameday_league_and_date_url(args)}/#{game_id}/" } @@ -170,4 +171,4 @@ def self.copy_gameday_xml (file_name,paths) def self.format_date_as_folder(date) date.strftime("year_%Y/month_%m/day_%d") end -end \ No newline at end of file +end diff --git a/test/test_greenmonster.rb b/test/test_greenmonster.rb index 1656ce5..84f0034 100644 --- a/test/test_greenmonster.rb +++ b/test/test_greenmonster.rb @@ -7,7 +7,7 @@ def setup def test_set_games_folder_location Greenmonster.set_games_folder('./test_greenmonster_folder') - assert_equal './test_greenmonster_folder', Greenmonster.games_folder + assert_equal './test_greenmonster_folder', Greenmonster.games_folder.to_s end def teardown