✨ RSPec を qiita_trend 0.4.9 に対応させる

Author: dodonki1223

qiita_commands/command_line.rb

@@ -2,21 +2,22 @@
 
 require 'optparse'
 require 'qiita_trend'
+require 'highline/import'
 require_relative './errors/invalid_option'
 
 module QiitaCommands
   class CLI
     attr_accessor :options
 
     def initialize
-      @options = { target: 'daily', new: false }
+      @options = { target: 'normal', new: false }
       opts = OptionParser.new
 
-      opts.on('-d', '--daily', 'get daily qiita trend')         { @options[:target] = QiitaTrend::TrendType::DAILY }
-      opts.on('-p', '--personal', 'get personal qiita trend')   { @options[:target] = QiitaTrend::TrendType::PERSONAL }
-      opts.on('-n', '--new', 'get qiita trend for new article') { |v| @options[:new] = v }
+      opts.on('-n', '--normal', 'get normal qiita trend')     { @options[:target] = QiitaTrend::TrendType::NORMAL }
+      opts.on('-p', '--personal', 'get personal qiita trend') { @options[:target] = QiitaTrend::TrendType::PERSONAL }
+      opts.on('--new', 'get qiita trend for new article')     { |v| @options[:new] = v }
 
-      raise QiitaCommands::InvalidOption, 'Invalid option: Multiple daily and weekly and monthly cannot be specified.' unless valid_args?
+      raise QiitaCommands::InvalidOption, 'Invalid option: Multiple normal and personal cannot be specified.' unless valid_args?
 
       opts.parse!(ARGV)
     rescue OptionParser::InvalidOption => e
@@ -38,8 +39,8 @@ def get(name)
     private
 
     def valid_args?
-      # daily, personal の指定が複数あった場合は不正と判断する
-      return false if ARGV.grep(/\A(-d|-p|--daily|--personal|)\z/).length >= 2
+      # normal, personal の指定が複数あった場合は不正と判断する
+      return false if ARGV.grep(/\A(-n|-p|--normal|--personal|)\z/).length >= 2
 
       true
     end

qiita_commands/trend.rb

@@ -15,7 +15,7 @@ def initialize(type)
     end
 
     def normal?
-      type == QiitaTrend::TrendType::NOMARL
+      type == QiitaTrend::TrendType::NORMAL
     end
 
     def personal?

spec/command_line_spec.rb

@@ -22,14 +22,14 @@ module QiitaCommands
         include_examples 'system shutdown'
       end
 
-      context 'when multiple -d and -w and -m specified' do
-        let(:argv) { %w[-w -m] }
+      context 'when multiple -n and -p specified' do
+        let(:argv) { %w[-n -p] }
 
         include_examples 'system shutdown'
       end
 
-      context 'when multiple --daily and --weekly and --monthly specified' do
-        let(:argv) { %w[--weekly --monthly] }
+      context 'when multiple --normal and --personal specified' do
+        let(:argv) { %w[--normal --personal] }
 
         include_examples 'system shutdown'
       end
@@ -60,7 +60,7 @@ module QiitaCommands
         include_context 'when set command line args'
         let(:argv) { %w[] }
 
-        it { expect(cli.get(:target)).to eq('daily') }
+        it { expect(cli.get(:target)).to eq('normal') }
       end
 
       context 'when not exists key name' do

spec/trend_spec.rb

@@ -11,7 +11,7 @@ module QiitaCommands
 
       include_context 'when disable standard output'
 
-      let(:type) { QiitaTrend::TrendType::WEEKLY }
+      let(:type) { QiitaTrend::TrendType::PERSONAL }
 
       before { allow(QiitaTrend::Trend).to receive(:new).with(type).and_raise(QiitaTrend::Error::LoginFailureError) }
 
@@ -75,81 +75,43 @@ module QiitaCommands
         allow(QiitaTrend::Trend).to receive(:new).with(type).and_return(qiita_trend_mock)
       end
 
-      describe '#daily?' do
+      describe '#normal?' do
         let(:trend) { described_class.new(type) }
 
-        context 'when trend type is daily' do
-          let(:type) { QiitaTrend::TrendType::DAILY }
+        context 'when trend type is normal' do
+          let(:type) { QiitaTrend::TrendType::NORMAL }
 
-          it { expect(trend.daily?).to eq(true) }
+          it { expect(trend.normal?).to eq(true) }
         end
 
-        context 'when trend type is weekly' do
+        context 'when trend type is personal' do
           include_context 'when mocking config.yml'
-          let(:type) { QiitaTrend::TrendType::WEEKLY }
+          let(:type) { QiitaTrend::TrendType::PERSONAL }
 
-          it { expect(trend.daily?).to eq(false) }
-        end
-
-        context 'when trend type is monthly' do
-          include_context 'when mocking config.yml'
-          let(:type) { QiitaTrend::TrendType::MONTHLY }
-
-          it { expect(trend.daily?).to eq(false) }
-        end
-      end
-
-      describe '#weekly?' do
-        let(:trend) { described_class.new(type) }
-
-        context 'when trend type is daily' do
-          let(:type) { QiitaTrend::TrendType::DAILY }
-
-          it { expect(trend.weekly?).to eq(false) }
-        end
-
-        context 'when trend type is weekly' do
-          include_context 'when mocking config.yml'
-          let(:type) { QiitaTrend::TrendType::WEEKLY }
-
-          it { expect(trend.weekly?).to eq(true) }
-        end
-
-        context 'when trend type is monthly' do
-          include_context 'when mocking config.yml'
-          let(:type) { QiitaTrend::TrendType::MONTHLY }
-
-          it { expect(trend.weekly?).to eq(false) }
+          it { expect(trend.normal?).to eq(false) }
         end
       end
 
-      describe '#monthly?' do
+      describe '#personal?' do
         let(:trend) { described_class.new(type) }
 
-        context 'when trend type is daily' do
-          let(:type) { QiitaTrend::TrendType::DAILY }
-
-          it { expect(trend.monthly?).to eq(false) }
-        end
-
-        context 'when trend type is weekly' do
-          include_context 'when mocking config.yml'
-          let(:type) { QiitaTrend::TrendType::WEEKLY }
+        context 'when trend type is normal' do
+          let(:type) { QiitaTrend::TrendType::NORMAL }
 
-          it { expect(trend.monthly?).to eq(false) }
+          it { expect(trend.personal?).to eq(false) }
         end
 
-        context 'when trend type is monthly' do
+        context 'when trend type is personal' do
           include_context 'when mocking config.yml'
-          let(:type) { QiitaTrend::TrendType::MONTHLY }
+          let(:type) { QiitaTrend::TrendType::PERSONAL }
 
-          it { expect(trend.monthly?).to eq(true) }
+          it { expect(trend.personal?).to eq(true) }
         end
       end
 
       shared_examples 'contains title and laikes_count and article' do
         include_context 'when mocking config.yml'
-        let(:type) { QiitaTrend::TrendType::DAILY }
+        let(:type) { QiitaTrend::TrendType::NORMAL }
 
         it 'タイトル、いいね数、ページURLが含まれていること' do
           items.each_with_index do |item, index|