cdb-crawlr 0.0.4 → 0.1.0

data/lib/cdb-crawlr.rb

@@ -7,10 +7,10 @@ $:.unshift(File.dirname(__FILE__))
 require 'cdb/cli'
 require 'cdb/struct'
 require 'cdb/issue'
-require 'cdb/title'
+require 'cdb/series'
 
 module CDB
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 
   BASE_URL = 'http://www.comicbookdb.com'
   REQUEST_HEADERS = {'Connection' => 'keep-alive'}
@@ -27,7 +27,7 @@ module CDB
       doc = read_page(url)
       node = doc.css('h2:contains("Search Results")').first.parent
       {
-        :titles => CDB::Title.parse_results(node),
+        :series => CDB::Series.parse_results(node),
         :issues => CDB::Issue.parse_results(node)
       }
     end

data/lib/cdb/cli.rb

@@ -3,7 +3,7 @@ require 'pp'
 module CDB
   class CLI
     COMMANDS = %w[search]
-    SCOPES = %w[all title issue]
+    SCOPES = %w[all series issue]
 
     def initialize(options={})
       @options = options
@@ -20,7 +20,7 @@ module CDB
         v = v.downcase
         raise unless COMMANDS.include?(v)
       when :scope
-        v = v.downcase.gsub(/^=|s$/, '')
+        v = v.downcase.gsub(/^=/, '')
         raise unless SCOPES.include?(v)
       when :args
         if self[:command] == 'search'
@@ -43,8 +43,8 @@ module CDB
           puts key.to_s.capitalize+':'
           res.each{|r| puts '  '+r.to_json}
         end
-      when 'title'
-        CDB::Title.search(self[:args]).each{|r| puts r.to_json}
+      when 'series'
+        CDB::Series.search(self[:args]).each{|r| puts r.to_json}
       when 'issue'
         CDB::Issue.search(self[:args]).each{|r| puts r.to_json}
       end

data/lib/cdb/issue.rb

@@ -1,5 +1,5 @@
 module CDB
-  class Issue < Struct.new(:cdb_id, :title, :num, :name, :story_arc, :cover_date)
+  class Issue < Struct.new(:cdb_id, :series, :num, :name, :story_arc, :cover_date)
     FORM_SEARCHTYPE = 'IssueName'
     WEB_PATH = 'issue.php'
 
@@ -15,18 +15,18 @@ module CDB
           id = link.attr('href').split('=').last.to_i
           text = link.child.text.strip
           match = text.match(/^(.* \(\d{4}\)) (.*)$/)
-          title = match[1]
+          series = match[1]
           num = match[2].gsub(/^#/, '')
           name = link.next_sibling.text.strip.gsub(/^-\s*"|"$/, '').strip
-          new(:cdb_id => id, :title => title, :num => num, :name => name)
+          new(:cdb_id => id, :series => series, :num => num, :name => name)
         end.sort_by(&:cdb_id)
       end
 
-      def from_tr(node, title)
+      def from_tr(node, series)
         tds = node.css('td')
         link = tds[0].css("a[href^=\"#{WEB_PATH}\"]").first
-        new(:cdb_id => link['href'].split('=').last.strip,
-            :title => title,
+        new(:cdb_id => link['href'].split('=').last.strip.to_i,
+            :series => series,
             :num => link.text.strip,
             :name => tds[2].text.strip,
             :story_arc => tds[4].text.strip,

data/lib/cdb/{title.rb → series.rb}

@@ -1,5 +1,5 @@
 module CDB
-  class Title < Struct.new(:cdb_id, :name, :issues, :publisher, :imprint, :begin_date, :end_date, :country, :language)
+  class Series < Struct.new(:cdb_id, :name, :issues, :publisher, :imprint, :begin_date, :end_date, :country, :language)
     FORM_SEARCHTYPE = 'Title'
     WEB_PATH = 'title.php'
 
@@ -7,7 +7,7 @@ module CDB
 
       def search(query)
         results = CDB.search(query, FORM_SEARCHTYPE)
-        results[:titles]
+        results[:series]
       end
 
       def show(id)
@@ -29,21 +29,21 @@ module CDB
         dates = page.css('strong:contains("Publication Date: ")').first.next_sibling.text.strip
         start_d, end_d = dates.split('-').map(&:strip)
 
-        title = new(
+        series = new(
           :cdb_id => id,
           :name => page.css('.page_headline').first.text.strip,
           :publisher => page.css('a[href^="publisher.php"]').first.text.strip,
-          :imprint => page.css('a[href^="imprint.php"]').first.text.strip,
+          :imprint => (page.css('a[href^="imprint.php"]').first.text.strip rescue nil),
           :begin_date => start_d,
           :end_date => end_d,
           :country => page.css('strong:contains("Country: ")').first.next_sibling.text.strip,
           :language => page.css('strong:contains("Language: ")').first.next_sibling.text.strip
         )
-        title.issues = page.css("td[width='726'] a.page_link[href^=\"#{CDB::Issue::WEB_PATH}\"]").map do |link|
+        series.issues = page.css("td[width='726'] a.page_link[href^=\"#{CDB::Issue::WEB_PATH}\"]").map do |link|
           tr = link.parent.parent
-          CDB::Issue.from_tr(tr, title)
+          CDB::Issue.from_tr(tr, series)
         end
-        title
+        series
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdb-crawlr
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &23392700 !ruby/object:Gem::Requirement
+  requirement: &21186450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23392700
+  version_requirements: *21186450
 description: cdb-crawlr is a Ruby gem and command-line tool for querying ComicBookDB.com
 email:
 - sgt.floydpepper@gmail.com
@@ -32,8 +32,8 @@ extra_rdoc_files: []
 files:
 - lib/cdb/cli.rb
 - lib/cdb/issue.rb
+- lib/cdb/series.rb
 - lib/cdb/struct.rb
-- lib/cdb/title.rb
 - lib/cdb-crawlr.rb
 - bin/cdb
 homepage: https://github.com/sgtFloyd/cdb-crawlr