Skip to content
Browse files

upgrade and patching some stuf

  • Loading branch information...
1 parent a560782 commit 3d961ae17e91beacc1ac56678cf11e7872971788 Brett Buddin committed Oct 13, 2011
View
4 Gemfile
@@ -1,8 +1,8 @@
source 'http://rubygems.org'
-gem 'rails', '3.0.5'
+gem 'rails', '3.1.1'
-gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'sqlite3'
group :production do
gem 'mysql', '2.8.1'
View
124 Gemfile.lock
@@ -1,77 +1,91 @@
GEM
remote: http://rubygems.org/
specs:
- abstract (1.0.0)
- actionmailer (3.0.5)
- actionpack (= 3.0.5)
- mail (~> 2.2.15)
- actionpack (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- builder (~> 2.1.2)
- erubis (~> 2.6.6)
- i18n (~> 0.4)
- rack (~> 1.2.1)
- rack-mount (~> 0.6.13)
- rack-test (~> 0.5.7)
- tzinfo (~> 0.3.23)
- activemodel (3.0.5)
- activesupport (= 3.0.5)
- builder (~> 2.1.2)
- i18n (~> 0.4)
- activerecord (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- arel (~> 2.0.2)
- tzinfo (~> 0.3.23)
- activeresource (3.0.5)
- activemodel (= 3.0.5)
- activesupport (= 3.0.5)
- activesupport (3.0.5)
- arel (2.0.9)
- builder (2.1.2)
- erubis (2.6.6)
- abstract (>= 1.0.0)
- i18n (0.5.0)
- mail (2.2.15)
- activesupport (>= 2.3.6)
+ actionmailer (3.1.1)
+ actionpack (= 3.1.1)
+ mail (~> 2.3.0)
+ actionpack (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
+ builder (~> 3.0.0)
+ erubis (~> 2.7.0)
+ i18n (~> 0.6)
+ rack (~> 1.3.2)
+ rack-cache (~> 1.1)
+ rack-mount (~> 0.8.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.0.2)
+ activemodel (3.1.1)
+ activesupport (= 3.1.1)
+ builder (~> 3.0.0)
+ i18n (~> 0.6)
+ activerecord (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
+ arel (~> 2.2.1)
+ tzinfo (~> 0.3.29)
+ activeresource (3.1.1)
+ activemodel (= 3.1.1)
+ activesupport (= 3.1.1)
+ activesupport (3.1.1)
+ multi_json (~> 1.0)
+ arel (2.2.1)
+ builder (3.0.0)
+ erubis (2.7.0)
+ hike (1.2.1)
+ i18n (0.6.0)
+ mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
+ multi_json (1.0.3)
mysql (2.8.1)
- polyglot (0.3.1)
- rack (1.2.2)
- rack-mount (0.6.13)
+ polyglot (0.3.2)
+ rack (1.3.2)
+ rack-cache (1.1)
+ rack (>= 0.4)
+ rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-test (0.5.7)
+ rack-ssl (1.3.2)
+ rack
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.0.5)
- actionmailer (= 3.0.5)
- actionpack (= 3.0.5)
- activerecord (= 3.0.5)
- activeresource (= 3.0.5)
- activesupport (= 3.0.5)
+ rails (3.1.1)
+ actionmailer (= 3.1.1)
+ actionpack (= 3.1.1)
+ activerecord (= 3.1.1)
+ activeresource (= 3.1.1)
+ activesupport (= 3.1.1)
bundler (~> 1.0)
- railties (= 3.0.5)
- railties (3.0.5)
- actionpack (= 3.0.5)
- activesupport (= 3.0.5)
+ railties (= 3.1.1)
+ railties (3.1.1)
+ actionpack (= 3.1.1)
+ activesupport (= 3.1.1)
+ rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
- thor (~> 0.14.4)
- rake (0.8.7)
+ rdoc (~> 3.4)
+ thor (~> 0.14.6)
+ rake (0.9.2)
+ rdoc (3.9.2)
shoulda (2.11.3)
- sqlite3-ruby (1.3.1)
+ sprockets (2.0.2)
+ hike (~> 1.2)
+ rack (~> 1.0)
+ tilt (!= 1.3.0, ~> 1.1)
+ sqlite3 (1.3.4)
thor (0.14.6)
- treetop (1.4.9)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.25)
+ tzinfo (0.3.29)
PLATFORMS
ruby
DEPENDENCIES
mysql (= 2.8.1)
- rails (= 3.0.5)
+ rails (= 3.1.1)
shoulda
- sqlite3-ruby
+ sqlite3
View
4 Rakefile
@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
# Add your own tasks in files placed in lib/tasks ending in .rake,
# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
require File.expand_path('../config/application', __FILE__)
-require 'rake'
-Rails::Application.load_tasks
+Comics::Application.load_tasks
View
2 app/models/comics/cyanide_and_happiness.rb
@@ -16,7 +16,7 @@ def map_routine(xml)
content = ''
open(self.permalink) { |s| content = s.read }
- img_url = content.match(/http:\/\/www\.explosm\.net\/db\/files\/Comics\/[^\/]+\/[^\/]+\.png/)
+ img_url = content.match(/http:\/\/www\.explosm\.net\/db\/files\/[^\/]+\.png/)
self.image_url = img_url[0]
end
end
View
2 app/models/comics/pictures_for_sad_children.rb
@@ -9,7 +9,7 @@ def map_routine(xml)
if latest
self.description = latest.title
self.posted_on = Date.parse(latest.pubDate.to_s)
- self.image_url = latest.description.match(/http:\/\/www\.picturesforsadchildren\.com\/comics\/[0-9]+\.png/).to_s
+ self.image_url = latest.description.match(/http:\/\/www\.picturesforsadchildren\.com\/comics\/[0-9]+\.(png|jpg|gif)/).to_s
self.permalink = latest.link
end
end
View
2 config/environments/test.rb
@@ -29,4 +29,6 @@
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql
+
+ config.active_support.deprecation = :stderr
end
View
2 config/routes.rb
@@ -1,4 +1,4 @@
-Comics::Application.routes.draw do |map|
+Comics::Application.routes.draw do
root :to => "comics#index"
resources :comics
View
1 db/schema.rb
@@ -1,3 +1,4 @@
+# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
View
2 test/unit/comic_test.rb
@@ -2,8 +2,6 @@
class ComicTest < ActiveSupport::TestCase
context "A Comic instance" do
- should_validate_presence_of :posted_on, :image_url, :permalink
-
should "define DSL for setting site name" do
assert subject.class.respond_to?(:site_name)
end

0 comments on commit 3d961ae

Please sign in to comment.
Something went wrong with that request. Please try again.