cdb-crawlr 0.1.1 → 0.2.0

data/bin/cdb

@@ -14,7 +14,6 @@ end
 
 @global = OptionParser.new do |opts|
   opts.banner = "Usage: cdb [-h|--help] [-v|--version] <command> [<args>]"
-
   opts.on("-h", "--help", "Display this screen"){ print_help }
   opts.on("-v", "--version", "Show version information") do
     puts "cdb #{CDB::VERSION}"; exit
@@ -22,20 +21,13 @@ end
 end
 
 @search = OptionParser.new do |opts|
-  opts.banner = "Usage: cdb search [-h|--help] [-s|--scope=<type>] <query>"
-
+  opts.banner = "Usage: cdb search [-h|--help] <type> <query>"
   opts.on("-h", "--help", "Display this screen"){ print_help opts }
-  opts.on("-s", "--scope=<type>", "Specify type of search. Default: all") do |v|
-    begin
-      $cli[:scope] = v
-    rescue
-      print_help opts, "invalid scope: #{v}"
-    end
-  end
 end
 
 @command_opts = {
-  'search' => @search
+  'search' => @search,
+  'show' => nil # stub
 }
 
 # Parse global flags
@@ -62,7 +54,16 @@ rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
   print_help command_opt, e
 end
 
-# Pop and verify args
+# Pop and verify type
+begin
+  type = ARGV.shift
+  $cli[:type] = type
+rescue
+  error = "invalid type: #{type}" unless type.to_s.empty?
+  print_help command_opt, error
+end
+
+# Verify args
 begin
   $cli[:args] = ARGV.join(' ')
 rescue => e

data/lib/cdb-crawlr.rb

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

data/lib/cdb/cli.rb

@@ -3,7 +3,7 @@ require 'pp'
 module CDB
   class CLI
     COMMANDS = %w[search]
-    SCOPES = %w[all series issue]
+    TYPES = %w[series issue issues]
 
     def initialize(options={})
       @options = options
@@ -19,9 +19,9 @@ module CDB
       when :command
         v = v.downcase
         raise unless COMMANDS.include?(v)
-      when :scope
+      when :type
         v = v.downcase.gsub(/^=/, '')
-        raise unless SCOPES.include?(v)
+        raise unless TYPES.include?(v)
       when :args
         if self[:command] == 'search'
           raise "invalid search query" if v.empty?
@@ -37,15 +37,10 @@ module CDB
   private
 
     def search
-      case self[:scope] || 'all'
-      when 'all'
-        CDB.search(self[:args]).each do |key, res|
-          puts key.to_s.capitalize+':'
-          res.each{|r| puts '  '+r.to_json}
-        end
+      case self[:type]
       when 'series'
         CDB::Series.search(self[:args]).each{|r| puts r.to_json}
-      when 'issue'
+      when 'issue', 'issues'
         CDB::Issue.search(self[:args]).each{|r| puts r.to_json}
       end
     end

data/lib/cdb/struct.rb

@@ -10,6 +10,7 @@ module CDB
 
     def as_json(*)
       members.inject({}){|map, m|
+        next map unless self[m]
         map[m] = self[m]; map
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdb-crawlr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.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: &16210350 !ruby/object:Gem::Requirement
+  requirement: &18869830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16210350
+  version_requirements: *18869830
 description: cdb-crawlr is a Ruby gem and command-line tool for querying ComicBookDB.com
 email:
 - sgt.floydpepper@gmail.com