Permalink
Browse files

bundle update (rails 3.2.2 => 3.2.6)

  • Loading branch information...
1 parent b6eb081 commit e6c1b2ff7f27ee6f7f3676461eff126b6ba66db4 @ambtus committed Jun 21, 2012
Showing with 75 additions and 72 deletions.
  1. +1 −1 Gemfile
  2. +69 −69 Gemfile.lock
  3. +2 −1 app/controllers/pages_controller.rb
  4. +2 −0 app/models/page.rb
  5. +1 −1 extras/scrub.rb
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'bundler', '~>1.0.0'
+gem 'bundler', '~>1.1.0'
gem 'rails', '~>3.2.0'
gem 'mysql2', '~>0.3.0'
View
@@ -1,34 +1,34 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.2.2)
- actionpack (= 3.2.2)
- mail (~> 2.4.0)
- actionpack (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ actionmailer (3.2.6)
+ actionpack (= 3.2.6)
+ mail (~> 2.4.4)
+ actionpack (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.1)
rack (~> 1.4.0)
- rack-cache (~> 1.1)
+ rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.2)
- activemodel (3.2.2)
- activesupport (= 3.2.2)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.6)
+ activesupport (= 3.2.6)
builder (~> 3.0.0)
- activerecord (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
+ activerecord (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.2)
- activemodel (= 3.2.2)
- activesupport (= 3.2.2)
- activesupport (3.2.2)
+ activeresource (3.2.6)
+ activemodel (= 3.2.6)
+ activesupport (= 3.2.6)
+ activesupport (3.2.6)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.7)
+ addressable (2.2.8)
archive-tar-minitar (0.5.2)
arel (3.0.2)
bcrypt-ruby (3.0.1)
@@ -40,56 +40,57 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.3.1)
+ childprocess (0.3.2)
ffi (~> 1.0.6)
columnize (0.3.6)
- cucumber (1.1.9)
+ cucumber (1.2.1)
builder (>= 2.1.2)
- diff-lcs (>= 1.1.2)
- gherkin (~> 2.9.0)
+ diff-lcs (>= 1.1.3)
+ gherkin (~> 2.11.0)
json (>= 1.4.6)
- term-ansicolor (>= 1.0.6)
cucumber-rails (1.3.0)
capybara (>= 1.1.2)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
- database_cleaner (0.7.1)
+ database_cleaner (0.8.0)
diff-lcs (1.1.3)
- domain_name (0.5.2)
+ domain_name (0.5.3)
unf (~> 0.0.3)
erubis (2.7.0)
escape_utils (0.2.4)
ffi (1.0.11)
- gherkin (2.9.0)
+ gherkin (2.11.0)
json (>= 1.4.6)
- haml (3.1.4)
+ haml (3.1.6)
hike (1.2.1)
i18n (0.6.0)
- journey (1.0.3)
- json (1.6.5)
- kgio (2.7.2)
- launchy (2.0.5)
+ journey (1.0.4)
+ json (1.7.3)
+ kgio (2.7.4)
+ launchy (2.1.0)
addressable (~> 2.2.6)
+ libwebsocket (0.1.3)
+ addressable
linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mechanize (2.3)
+ mechanize (2.5.1)
domain_name (~> 0.5, >= 0.5.1)
mime-types (~> 1.17, >= 1.17.2)
net-http-digest_auth (~> 1.1, >= 1.1.1)
net-http-persistent (~> 2.5, >= 2.5.2)
nokogiri (~> 1.4)
ntlm-http (~> 0.1, >= 0.1.1)
webrobots (~> 0.0, >= 0.0.9)
- mime-types (1.17.2)
- multi_json (1.1.0)
+ mime-types (1.19)
+ multi_json (1.3.6)
mysql2 (0.3.11)
- net-http-digest_auth (1.2)
- net-http-persistent (2.5.2)
- nokogiri (1.5.2)
+ net-http-digest_auth (1.2.1)
+ net-http-persistent (2.7)
+ nokogiri (1.5.4)
ntlm-http (0.1.1)
pickle (0.4.10)
cucumber (>= 0.8)
@@ -102,38 +103,38 @@ GEM
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.2.2)
- actionmailer (= 3.2.2)
- actionpack (= 3.2.2)
- activerecord (= 3.2.2)
- activeresource (= 3.2.2)
- activesupport (= 3.2.2)
+ rails (3.2.6)
+ actionmailer (= 3.2.6)
+ actionpack (= 3.2.6)
+ activerecord (= 3.2.6)
+ activeresource (= 3.2.6)
+ activesupport (= 3.2.6)
bundler (~> 1.0)
- railties (= 3.2.2)
- railties (3.2.2)
- actionpack (= 3.2.2)
- activesupport (= 3.2.2)
+ railties (= 3.2.6)
+ railties (3.2.6)
+ actionpack (= 3.2.6)
+ activesupport (= 3.2.6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
- raindrops (0.8.0)
+ thor (>= 0.14.6, < 2.0)
+ raindrops (0.10.0)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.8.0)
- rspec-rails (2.8.1)
+ rspec (2.10.0)
+ rspec-core (~> 2.10.0)
+ rspec-expectations (~> 2.10.0)
+ rspec-mocks (~> 2.10.0)
+ rspec-core (2.10.1)
+ rspec-expectations (2.10.0)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.10.1)
+ rspec-rails (2.10.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.8.0)
+ rspec (~> 2.10.0)
ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
@@ -144,29 +145,28 @@ GEM
ruby-debug-base19 (>= 0.11.19)
ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
- rubyzip (0.9.6.1)
+ rubyzip (0.9.9)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
- selenium-webdriver (2.20.0)
+ selenium-webdriver (2.24.0)
childprocess (>= 0.2.5)
- ffi (~> 1.0)
+ libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- sprockets (2.1.2)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- term-ansicolor (1.0.7)
- thor (0.14.6)
+ thor (0.15.3)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.32)
+ tzinfo (0.3.33)
unf (0.0.5)
unf_ext
- unf_ext (0.0.4)
- unicorn (4.2.0)
+ unf_ext (0.0.5)
+ unicorn (4.3.1)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
@@ -179,7 +179,7 @@ PLATFORMS
DEPENDENCIES
bcrypt-ruby
- bundler (~> 1.0.0)
+ bundler (~> 1.1.0)
capybara
cucumber
cucumber-rails
@@ -33,7 +33,8 @@ def create
build_route[:unread] = params[:unread] unless (params[:unread].blank? || params[:unread] == "either")
if params[:page]
build_route[:title] = params[:page][:title] unless params[:page][:title] == "Title"
- build_route[:notes] = params[:page][:notes] unless params[:page][:notes] == "Notes"
+ # during testing Notes gets "\n" prepended
+ build_route[:notes] = params[:page][:notes] unless params[:page][:notes].match(/Notes$/)
build_route[:url] = params[:page][:url] unless params[:page][:url] == "URL"
end
redirect_to(build_route) and return
View
@@ -575,6 +575,8 @@ def remove_placeholders
self.url = self.url == "URL" ? nil : self.url.try(:strip)
self.title = nil if self.title == "Title" unless (self.url && self.url.match('archiveofourown'))
self.notes = nil if self.notes == "Notes"
+ # during testing Notes gets "\n" prepended
+ self.notes = nil if self.notes == "\nNotes"
self.base_url = nil if self.base_url == BASE_URL_PLACEHOLDER
self.url_substitutions = nil if self.url_substitutions == URL_SUBSTITUTIONS_PLACEHOLDER
self.urls = nil if self.urls == URLS_PLACEHOLDER
View
@@ -112,7 +112,7 @@ def self.fetch(url)
return if url.blank?
agent = Mechanize.new { |a| a.log = Logger.new("#{Rails.root}/log/mechanize.log") }
auth = MyWebsites.getpwd(url)
- agent.auth(auth[:username], auth[:password]) if auth
+ agent.add_auth(url, auth[:username], auth[:password]) if auth
content = agent.get(MyWebsites.geturl(url))
if content.forms.first.try(:button).try(:name) == "adult_check"
form = content.forms.first

0 comments on commit e6c1b2f

Please sign in to comment.