From 7f11fb458355501cf96654e2c6ebdf12e09b3480 Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 19 Feb 2013 21:41:35 -0500 Subject: [PATCH] fix for artist search --- app/logical/sources/strategies/nico_seiga.rb | 2 +- app/models/artist.rb | 2 +- test/unit/sources/nico_seiga_test.rb | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/logical/sources/strategies/nico_seiga.rb b/app/logical/sources/strategies/nico_seiga.rb index 965ce3e72..2a504cdfd 100644 --- a/app/logical/sources/strategies/nico_seiga.rb +++ b/app/logical/sources/strategies/nico_seiga.rb @@ -60,7 +60,7 @@ module Sources @agent ||= begin mech = Mechanize.new - mech.get("http://seiga.nicovideo.jp/login/redirect?next_url=") do |page| + mech.get("https://secure.nicovideo.jp/secure/login_form") do |page| page.form_with do |form| form["mail"] = Danbooru.config.nico_seiga_login form["password"] = Danbooru.config.nico_seiga_password diff --git a/app/models/artist.rb b/app/models/artist.rb index fb6b8dd34..ee52d018e 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -230,7 +230,7 @@ class Artist < ActiveRecord::Base q = active return q if params.blank? - case params[:name].present? + case params[:name] when /^http/ q = q.url_matches(params[:name]) diff --git a/test/unit/sources/nico_seiga_test.rb b/test/unit/sources/nico_seiga_test.rb index 414f3abf0..2d83f1ce4 100644 --- a/test/unit/sources/nico_seiga_test.rb +++ b/test/unit/sources/nico_seiga_test.rb @@ -6,6 +6,7 @@ module Sources class NicoSeigaTest < ActiveSupport::TestCase context "The source site for nico seiga" do setup do + # Sources::Strategies::NicoSeiga.new("http://lohas.nicoseiga.jp/priv/2853566?e=1361296671&h=794b3686b02edfd64c22ed2f99a4c55650371854") @site = Sources::Site.new("http://seiga.nicovideo.jp/seiga/im1464351?track=ranking") @site.get end