qiita_trend 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9430a869aefef938378e0c222578100dbd2b0d741e9dc72456785a9af315233d
-  data.tar.gz: 3f338bddc0525275dc6238a16ff33cf872f732afe11a1b945ab7f0618149317a
+  metadata.gz: 3cf7e7382a8f459992a654a95bdc666c79fe7bff6379e6e3961d7d2e626c9896
+  data.tar.gz: 3ffc14309f8af1ff9a18f3036d354ff38a80ee6c94c2d74502a82ee71b521c5c
 SHA512:
-  metadata.gz: 642c8ebfc58b9816b694d18ce5d32cd4c37c390c2fde42b559eb20cd732c262f7cb9b7c3caee82e3924a87bfe1d5ebef08383befa88bd61ca533f70137a28205
-  data.tar.gz: 35415ff58aa1923a2a2cfbde6607b0e2a9dafa21a1ccfcf70977f709d109574b677ff1ca5632dbc543fa6114b77859b611efc4fe7ad2bf8846681830af22e911
+  metadata.gz: 2419645c6a853799de3391d7e7c56a912eaa836869a99334d82dd3a9667d0732a4e9a191d71459d9c4b88d6d3cdda6c72ab39974a0c181f7fe8d4b51141fb3e0
+  data.tar.gz: 5d221ad820a123c3e18caec9c2a1a40fcc35a10837a61dbce3dc8d9efbcd8133b23829847e3aa11bf3e7f93a60e1b3c57c6258d3028dafd19f02f10722856a6d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qiita_trend (0.2.7)
+    qiita_trend (0.2.8)
       mechanize
       nokogiri (~> 1.9)
 

data/lib/qiita_trend/cache.rb

@@ -33,12 +33,5 @@ module QiitaTrend
     def cached?
       File.exist?(@full_path)
     end
-
-    # キャッシュファイルをクリアする
-    def clear_cache
-      File.delete(@full_path) if cached?
-    rescue StandardError => e
-      raise e.class, 'キャッシュファイルの削除に失敗しました'
-    end
   end
 end

data/lib/qiita_trend/error/login_failure_error.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module QiitaTrend
+  module Error
+    class LoginFailureError < ::QiitaTrend::Error::SyntaxError
+      def message
+        "Login failed, Please confilm user_name and password(user:#{user_name},password:#{password})"
+      end
+
+      def user_name
+        QiitaTrend.configuration.user_name
+      end
+
+      def password
+        QiitaTrend.configuration.password
+      end
+    end
+  end
+end

data/lib/qiita_trend/error/not_exists_cache_error.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module QiitaTrend
+  module Error
+    class NotExistsCacheError < ::QiitaTrend::Error::SyntaxError
+      attr_reader :cache
+
+      def initialize(cache)
+        @cache = cache
+      end
+
+      def message
+        "Does not exist cache file #{@cache.full_path}"
+      end
+    end
+  end
+end

data/lib/qiita_trend/error/syntax_error.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module QiitaTrend
+  module Error
+    class SyntaxError < ::StandardError
+    end
+  end
+end

data/lib/qiita_trend/page.rb

@@ -16,7 +16,7 @@ module QiitaTrend
 
       # 指定されたキャッシュファイルが存在しない場合は処理を終了
       unless date.nil?
-        raise StandardError, '指定されたキャッシュファイルが存在しません' unless @cache.cached?
+        raise Error::NotExistsCacheError, @cache unless @cache.cached?
       end
 
       # キャッシュが存在する場合はキャッシュから取得
@@ -31,17 +31,18 @@ module QiitaTrend
     def create_html(target)
       agent = Mechanize.new
       agent.user_agent_alias = 'Mac Safari'
+      login_qiita(agent) if target.need_login
+      agent.get(target.url).body
+    end
 
-      # ログイン処理
-      if target.need_login
-        form = agent.get(QIITA_LOGIN_URI).forms.first
-        form['identity'] = QiitaTrend.configuration.user_name
-        form['password'] = QiitaTrend.configuration.password
-        logged_page = form.submit
-        raise StandardError, 'ログインに失敗しました（ユーザー名とパスワードでログインできることを確認してください）' if logged_page.title.include?('Login')
-      end
+    def login_qiita(agent)
+      form = agent.get(QIITA_LOGIN_URI).forms.first
+      form['identity'] = QiitaTrend.configuration.user_name
+      form['password'] = QiitaTrend.configuration.password
+      logged_page = form.submit
 
-      agent.get(target.url).body
+      # ページのタイトルにLoginが含まれていたらログイン失敗とする
+      raise Error::LoginFailureError if logged_page.title.include?('Login')
     end
   end
 end

data/lib/qiita_trend/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module QiitaTrend
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

data/lib/qiita_trend.rb

@@ -7,6 +7,9 @@ require 'qiita_trend/cache'
 require 'qiita_trend/configuration'
 require 'qiita_trend/trend_type'
 require 'qiita_trend/target'
+require 'qiita_trend/error/syntax_error'
+require 'qiita_trend/error/login_failure_error'
+require 'qiita_trend/error/not_exists_cache_error'
 
 module QiitaTrend
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qiita_trend
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - dodonki1223
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -186,6 +186,9 @@ files:
 - lib/qiita_trend.rb
 - lib/qiita_trend/cache.rb
 - lib/qiita_trend/configuration.rb
+- lib/qiita_trend/error/login_failure_error.rb
+- lib/qiita_trend/error/not_exists_cache_error.rb
+- lib/qiita_trend/error/syntax_error.rb
 - lib/qiita_trend/page.rb
 - lib/qiita_trend/target.rb
 - lib/qiita_trend/trend.rb