metal-archives 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/metal-archives.rb

@@ -5,19 +5,20 @@ module MetalArchives
 
   class Agent
     # An agent accesses the website and holds the HTML source.
-    def initialize
+    def initialize(year=Time.now.year)
       begin
         @agent = Mechanize.new
       rescue Exception => e
         puts "\nError accessing metal-archives.com on initialization: #{e}"
         return nil
       end
+      @year = year
     end
 
     # Goes straight to the search results page for the given year.
-    def search_by_year(year=Time.now.year)
+    def search_by_year
       begin
-        @agent.get("#{SITE_URL}/advanced.php?release_year=#{year}&p=1")
+        @agent.get("#{SITE_URL}/advanced.php?release_year=#{@year}&p=1")
       rescue Exception => e
         puts "\nError accessing metal-archives.com's search results page: #{e}"
         return nil
@@ -25,11 +26,11 @@ module MetalArchives
     end
 
     # Finds all the links to the search results pages as they are paginated.
-    def paginated_result_links(year=Time.now.year)
+    def paginated_result_links
       # need the first page because it's not a link
-      links = ["/advanced.php?release_year=#{year}&p=1"]
+      links = ["/advanced.php?release_year=#{@year}&p=1"]
       begin
-        search_by_year(year).search('body table:nth-child(2n) tr:first-child a').each do |link|
+        search_by_year.search('body table:nth-child(2n) tr:first-child a').each do |link|
           links << link['href']
         end
       rescue Exception => e
@@ -86,6 +87,16 @@ module MetalArchives
       }
     end
 
+    def total_albums
+      page = search_by_year
+      album_total = page.search('body table:nth-child(2n) tr:first-child b').first.content.match(/\sof\s(\d+)/)
+      if album_total.nil?
+        0
+      else
+        album_total[1].to_i
+      end
+    end
+
     private
 
     # The band and and album fields are together, so we need to split them apart.

data/metal-archives.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{metal-archives}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danny Olson"]

data/spec/metal-archives_spec.rb

@@ -2,8 +2,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "MetalArchives" do
-  context "has an Agent" do
-    context "searching by year" do
+  context "with an agent" do
+    context "that searches by year" do
       before do
         search_results_html = File.open(File.dirname(__FILE__) + '/html/search_results.html')
         @search_results = Nokogiri::HTML(search_results_html)
@@ -11,29 +11,34 @@ describe "MetalArchives" do
         Mechanize.stub!(:new).and_return(@mechanize)
       end
 
-      it "should GET the results page" do
+      it "should find the total number of albums" do
         @mechanize.stub!(:get).and_return(@search_results)
-        agent = MetalArchives::Agent.new
+        agent = MetalArchives::Agent.new(2011)
+
+        agent.total_albums.should == 757
+      end
+
+      it "should get the results page" do
+        @mechanize.stub!(:get).and_return(@search_results)
+        agent = MetalArchives::Agent.new(2011)
 
         agent.search_by_year.should == @search_results
       end
 
       context "with a results page" do
         it "should find the paginated result links" do
-          agent = MetalArchives::Agent.new
+          agent = MetalArchives::Agent.new(2011)
           agent.stub!(:search_by_year).and_return(@search_results)
 
-          #links = ['/advanced.php?release_year=2011']
-          links = []
-          (1..16).each do |i|
-            links << "/advanced.php?release_year=2011&p=#{i}"
+          links = (1..16).collect do |i|
+            "/advanced.php?release_year=2011&p=#{i}"
           end
           agent.paginated_result_links.should == links
         end
 
         it "should find the album links" do
           @mechanize.stub!(:get).and_return(@search_results)
-          agent = MetalArchives::Agent.new
+          agent = MetalArchives::Agent.new(2011)
           agent.stub!(:search_by_year).and_return(@search_results)
 
           links = [
@@ -61,7 +66,7 @@ describe "MetalArchives" do
           @mechanize = stub('Mechanize')
           Mechanize.stub!(:new).and_return(@mechanize)
           @mechanize.stub!(:get).and_return(@search_results)
-          agent = MetalArchives::Agent.new
+          agent = MetalArchives::Agent.new(2011)
           album_link_from_url = "release.php?id=000001"
 
           agent.album_from_url(album_link_from_url).should == {
@@ -82,7 +87,7 @@ describe "MetalArchives" do
           @mechanize = stub('Mechanize')
           Mechanize.stub!(:new).and_return(@mechanize)
           @mechanize.stub!(:get).and_return(@search_results)
-          agent = MetalArchives::Agent.new
+          agent = MetalArchives::Agent.new(2011)
           album_link_from_url = "release.php?id=000001"
 
           agent.album_from_url(album_link_from_url).should == {
@@ -103,7 +108,7 @@ describe "MetalArchives" do
           @mechanize = stub('Mechanize')
           Mechanize.stub!(:new).and_return(@mechanize)
           @mechanize.stub!(:get).and_return(@search_results)
-          agent = MetalArchives::Agent.new
+          agent = MetalArchives::Agent.new(2011)
           album_link_from_url = "release.php?id=000001"
 
           agent.album_from_url(album_link_from_url).should == {

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Danny Olson
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 983492277413699028
+      hash: 834701885390149642
       segments: 
       - 0
       version: "0"