@@ -25,8 +25,8 @@ def authenticate?; $config[:tumblr][:authenticate] || false; end # Connect to database $config[:database] = YAML.load_file( File.dirname(__FILE__)+'/config/database.yml') -ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__)+'/database.log') -ActiveRecord::Base.colorize_logging = true +#ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__)+'/database.log') +#ActiveRecord::Base.colorize_logging = true ActiveRecord::Base.establish_connection($config[:database][ (ENV['MERB_ENV'] || :development).to_sym]) # TODO: put in or get from a lib, like extlib, or the future merbified ActiveSupport @@ -67,7 +67,7 @@ end def save(data) tumblelog_url = /(http:\/\/[^\/]*)(\/.*)/.match(data[:url])[1] - puts "#{data[:type]}, URL = #{data[:url]}, author = #{tumblelog_url}" + # puts "#{data[:type]}, URL = #{data[:url]}, author = #{tumblelog_url}" # Find/create the user (tumblelog) who owns this post user = User.find_or_initialize_by_url(tumblelog_url) @@ -82,7 +82,7 @@ def save(data) # Descend to the page and capture reblogging info (if we're logged in & reblogging stuff) obj.reblog_link = post_info_for(data[:url])[:reblog_link] if authenticate? - puts "> reblog link: #{obj.reblog_link}" + # puts "> reblog link: #{obj.reblog_link}" reblog_post(obj) if authenticate? && !obj.reblog_link.blank? obj.save! rescue @@ -109,7 +109,7 @@ end # post to tumblr (by reblogging it to your specified group) def reblog_post(post) - # puts "> reblogging: #{post.attributes['type']}, #{post.url}, reblog_link => #{post.reblog_link}" + puts "> reblogging: #{post.attributes['type']}, #{post.url}, reblog_link => #{post.reblog_link}" raise RuntimeError, "Can't post w/o a reblog link" if post.reblog_link.nil? or post.reblog_link.empty? or post.reblog_link == '/' type = post.attributes['type'] # FIXME: stupid not-overriding-STI hackthrough nonsense @@ -127,7 +127,7 @@ def reblog_post(post) # ....and submit the form page = $agent.submit(form) - puts "> done; #{page.body.length} bytes on resulting page." + # puts "> done; #{page.body.length} bytes on resulting page." rescue STDERR.puts "Error submitting reblog: #{$!}" end runner.rb @@ -7,6 +7,6 @@ I only have <%= time_ago_in_words(Post.find(:first).created_at) %> worth of data <ol id="leaderboard"> <% @users.group_by { |g| g.post_count }.sort_by { |post_count,users| post_count.to_i }.reverse.each { |post_count, users| -%> <li><strong><%= post_count %> <%= post_count.to_i > 1 ? 'posts' : 'post' %></strong> <% if users.length > 1 %><%= users.length %> people <% end %> - <%= users.collect { |u| "<a href=\"#{u.url}\">#{u.name}</a>" }.join(', ') %> <span class="post-count"></span</li> + <%= users.collect { |u| "<a href=\"#{u.url}\">#{u.name || u.url.gsub('http://','')}</a>" }.join(', ') %> <span class="post-count"></span</li> <% } -%> </ol> <!-- #leaderboard --> views/leaderboard.html.erb 4b5fd274b44072045c3d9be96373dda3426e4f32 90f9db7e7782a0169bb6d847114962bffd5a1dba Jamie Wilkinson jamie@tramchase.com http://github.com/jamiew/tumblr-radarchive/commit/a74143c7ed3e84f248eed9eedc8260aac01cfd8e a74143c7ed3e84f248eed9eedc8260aac01cfd8e 2009-01-22T16:51:13-08:00 2009-01-22T16:51:13-08:00 Merge branch 'master' of git@github.com:jamiew/tumblr-radarchive 806c70804ded6d4ca0bea83a7e5a5a1349095fff Jamie Wilkinson jamie@tramchase.com