cdb-crawlr 0.2.0 → 0.2.1

data/bin/cdb

@@ -7,27 +7,48 @@ require 'optparse'
 $cli = CDB::CLI.new
 
 def print_help(opt = @global, error=nil)
-  puts error if error
+  puts(error.to_s+"\n\n") if error
   puts opt
   exit 1
 end
 
 @global = OptionParser.new do |opts|
-  opts.banner = "Usage: cdb [-h|--help] [-v|--version] <command> [<args>]"
+  opts.banner = "Usage: cdb [-h|--help] [-v|--version] <COMMAND> <TYPE> [<ARGS>]"
+
   opts.on("-h", "--help", "Display this screen"){ print_help }
   opts.on("-v", "--version", "Show version information") do
     puts "cdb #{CDB::VERSION}"; exit
   end
+
+  opts.separator "\nCOMMANDS:"
+  opts.separator "    search      Search for entries of a given TYPE matching QUERY"
+  opts.separator "    show        Show details of an entry using a CDB_ID obtained from search"
 end
 
 @search = OptionParser.new do |opts|
-  opts.banner = "Usage: cdb search [-h|--help] <type> <query>"
+  opts.banner = "Search for entries of a given TYPE matching QUERY\n"+
+                "Usage: cdb search [-h|--help] <TYPE> <QUERY>"
+
   opts.on("-h", "--help", "Display this screen"){ print_help opts }
+
+  opts.separator "\nTYPES:"
+  opts.separator "    issue       Search comic issue names for given QUERY"
+  opts.separator "    series      Search comic series names for given QUERY"
+end
+
+@show = OptionParser.new do |opts|
+  opts.banner = "Show details of an entry using a CDB_ID obtained from search\n"+
+                "Usage: cdb show [-h|--help] <TYPE> <CDB_ID>"
+
+  opts.on("-h", "--help", "Display this screen"){ print_help opts }
+
+  opts.separator "\nTYPES:"
+  opts.separator "    series      Get all available details of a comic series"
 end
 
 @command_opts = {
   'search' => @search,
-  'show' => nil # stub
+  'show' => @show
 }
 
 # Parse global flags
@@ -43,7 +64,7 @@ begin
   $cli[:command] = command
   command_opt = @command_opts[$cli[:command]]
 rescue
-  error = "invalid_command: #{command}" unless command.to_s.empty?
+  error = "invalid COMMAND: #{command}" unless command.to_s.empty?
   print_help @global, error
 end
 
@@ -59,7 +80,7 @@ begin
   type = ARGV.shift
   $cli[:type] = type
 rescue
-  error = "invalid type: #{type}" unless type.to_s.empty?
+  error = "invalid TYPE: #{type}" unless type.to_s.empty?
   print_help command_opt, error
 end
 

data/lib/cdb-crawlr.rb

@@ -10,7 +10,7 @@ require 'cdb/issue'
 require 'cdb/series'
 
 module CDB
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 
   BASE_URL = 'http://www.comicbookdb.com'
   REQUEST_HEADERS = {'Connection' => 'keep-alive'}

data/lib/cdb/cli.rb

@@ -2,7 +2,7 @@ require 'pp'
 
 module CDB
   class CLI
-    COMMANDS = %w[search]
+    COMMANDS = %w[search show]
     TYPES = %w[series issue issues]
 
     def initialize(options={})
@@ -20,12 +20,15 @@ module CDB
         v = v.downcase
         raise unless COMMANDS.include?(v)
       when :type
-        v = v.downcase.gsub(/^=/, '')
-        raise unless TYPES.include?(v)
-      when :args
-        if self[:command] == 'search'
-          raise "invalid search query" if v.empty?
+        v = v.downcase
+        if self[:command] == 'show'
+          # remove when "show issue" is supported
+          raise unless v == 'series'
+        else
+          raise unless TYPES.include?(v)
         end
+      when :args
+        raise "invalid args" if v.empty?
       end
       @options[k] = v
     end
@@ -45,5 +48,14 @@ module CDB
       end
     end
 
+    def show
+      case self[:type]
+      when 'series'
+        res = CDB::Series.show(self[:args])
+        res.issues.each{|i| i.series=nil}
+        puts res.to_json(array_nl:"\n", object_nl:"\n", indent:'  ')
+      end
+    end
+
   end
 end

data/lib/cdb/series.rb

@@ -1,5 +1,5 @@
 module CDB
-  class Series < Struct.new(:cdb_id, :name, :issues, :publisher, :imprint, :start_date, :end_date, :country, :language)
+  class Series < Struct.new(:cdb_id, :name, :publisher, :imprint, :start_date, :end_date, :issues, :country, :language)
     FORM_SEARCHTYPE = 'Title'
     WEB_PATH = 'title.php'
 

data/lib/cdb/struct.rb

@@ -9,13 +9,19 @@ module CDB
     end
 
     def as_json(*)
-      members.inject({}){|map, m|
+      members.each_with_object({}){|m, map|
         next map unless self[m]
-        map[m] = self[m]; map
+        case self[m]
+        when Array
+          map[m] = self[m].collect(&:as_json)
+        else
+          map[m] = self[m]
+        end
       }
     end
 
-    def to_json(opts={})
+    def to_json(opts={}, depth=0)
+      opts = opts.to_h rescue opts
       opts = {space:' ', object_nl:' '}.merge(opts)
       self.as_json.to_json(opts)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdb-crawlr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-03 00:00:00.000000000Z
+date: 2012-11-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &18869830 !ruby/object:Gem::Requirement
+  requirement: &25288420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18869830
+  version_requirements: *25288420
 description: cdb-crawlr is a Ruby gem and command-line tool for querying ComicBookDB.com
 email:
 - sgt.floydpepper@gmail.com