Refactor further, getting rid of the concern

Author: s2t2

lib/us_news_rankings/annual_list.rb

@@ -2,13 +2,16 @@
 
 module UsNewsRankings
   class AnnualList
-    attr_reader :category, :year
+    attr_reader :year
 
-    def initialize(category:, year:)
-      @category = category
+    def initialize(year)
       @year = year
     end
 
+    def category
+      self.class.name.gsub("AnnualList","Category").constantize.new
+    end
+
     def html_dir
       File.join("./web/#{category.namespace_path}", year.to_s)
     end

lib/us_news_rankings/category_awareness.rb

@@ -3,7 +3,6 @@ module Education
     module GraduateSchools
       module Law
         class AnnualList < UsNewsRankings::AnnualList
-          include CategoryAwareness
         end
       end
     end

lib/us_news_rankings/education/graduate_schools/law/annual_list.rb

@@ -3,7 +3,6 @@ module Education
     module GraduateSchools
       module LawClinical
         class AnnualList < UsNewsRankings::AnnualList
-          include CategoryAwareness
         end
       end
     end

lib/us_news_rankings/education/graduate_schools/law_clinical/annual_list.rb

@@ -3,7 +3,6 @@ module Education
     module GraduateSchools
       module LawPartTime
         class AnnualList < UsNewsRankings::AnnualList
-          include CategoryAwareness
         end
       end
     end

lib/us_news_rankings/education/graduate_schools/law_part_time/annual_list.rb

@@ -1,18 +1,20 @@
 RSpec.describe UsNewsRankings::AnnualList do
+  let(:category){ UsNewsRankings::Education::GraduateSchools::LawClinical::Category.new }
   let(:annual_list){ UsNewsRankings::Education::GraduateSchools::LawClinical::AnnualList.new(2017) }
 
   describe "#source_urls" do
     before(:each) do
-      allow(annual_list.category).to receive(:source_urls).and_return(
+      allow(category).to receive(:source_urls).and_return(
         {
-          2017=>["www.google.com/2017"],
-          2016=>["www.google.com/2016"]
+          2017=>["www.google.com/2017", "www.google.com/2017?page=2", "www.google.com/2017?page=3"],
+          2016=>["www.google.com/2016", "www.google.com/2016?page=2"]
         }
       )
+      allow(annual_list).to receive(:category).and_return(category)
     end
 
     it "should return an array of urls for the given year" do
-      expect(annual_list.source_urls).to eql(["www.google.com/2017"])
+      expect(annual_list.source_urls).to match_array(["www.google.com/2017", "www.google.com/2017?page=2", "www.google.com/2017?page=3"])
     end
   end