cdb-crawlr 0.0.2 → 0.0.3

data/bin/cdb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby
+
+require 'cdb-crawlr'
+# load 'lib/cdb-crawlr.rb'
+require 'optparse'
+
+$cli = CDB::CLI.new
+
+def print_help(opt = @global, error=nil)
+  puts error if error
+  puts opt
+  exit 1
+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
+  end
+end
+
+@search = OptionParser.new do |opts|
+  opts.banner = "Usage: cdb search [-h|--help] [-s|--scope=<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
+}
+
+# Parse global flags
+begin
+  @global.order!
+rescue OptionParser::InvalidOption => e
+  puts e; print_help
+end
+
+# Pop and verify command
+begin
+  command = ARGV.shift
+  $cli[:command] = command
+  command_opt = @command_opts[$cli[:command]]
+rescue
+  error = "invalid_command: #{command}" unless command.to_s.empty?
+  print_help @global, error
+end
+
+# Parse command flags
+begin
+  command_opt.order!
+rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
+  print_help command_opt, e
+end
+
+# Pop and verify args
+begin
+  $cli[:args] = ARGV.join(' ')
+rescue => e
+  print_help command_opt, e
+end
+
+$cli.execute

data/lib/cdb-crawlr.rb

@@ -1,14 +1,16 @@
+require 'json'
 require 'nokogiri'
 require 'open-uri'
 
 $:.unshift(File.dirname(__FILE__))
 
+require 'cdb/cli'
 require 'cdb/struct'
 require 'cdb/issue'
 require 'cdb/title'
 
 module CDB
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 
   BASE_URL = 'http://www.comicbookdb.com'
   REQUEST_HEADERS = {'Connection' => 'keep-alive'}

data/lib/cdb/cli.rb

@@ -0,0 +1,54 @@
+require 'pp'
+
+module CDB
+  class CLI
+    COMMANDS = %w[search]
+    SCOPES = %w[all title issue]
+
+    def initialize(options={})
+      @options = options
+    end
+
+    def [](k)
+      @options[k]
+    end
+
+    def []=(k, v)
+      case k
+      when :command
+        v = v.to_s.strip.downcase
+        raise unless COMMANDS.include?(v)
+      when :scope
+        v = v.to_s.strip.downcase.gsub(/^=|s$/, '')
+        raise unless SCOPES.include?(v)
+      when :args
+        v = v.to_s.strip
+        if self[:command] == 'search'
+          raise "invalid search query" if v.empty?
+        end
+      end
+      @options[k] = v
+    end
+
+    def execute
+      send self[:command]
+    end
+
+  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
+      when 'title'
+        CDB::Title.search(self[:args]).each{|r| puts r.to_json}
+      when 'issue'
+        CDB::Issue.search(self[:args]).each{|r| puts r.to_json}
+      end
+    end
+
+  end
+end

data/lib/cdb/issue.rb

@@ -12,13 +12,13 @@ module CDB
 
       def parse_results(node)
         node.css("a[href^=\"#{WEB_PATH}\"]").map do |link|
-          id = link.attr('href').split('=').last
+          id = link.attr('href').split('=').last.to_i
           text = link.child.text.strip
           match = text.match(/^(.* \(\d{4}\)) (.*)$/)
           title, num = match[1..2]
           name = link.next_sibling.text.strip.gsub(/^-\s*"|"$/, '').strip
           new(:cdb_id => id, :title => title, :num => num, :name => name)
-        end
+        end.sort_by(&:cdb_id)
       end
 
     end

data/lib/cdb/struct.rb

@@ -8,10 +8,15 @@ module CDB
       h.each{|k,v| send("#{k}=", v)}
     end
 
-    def to_json(*a)
+    def as_json
       members.inject({}){|map, m|
         map[m] = self[m]; map
-      }.to_json(*a)
+      }
+    end
+
+    def to_json(opts={})
+      opts = {space:' ', object_nl:' '}.merge(opts)
+      self.as_json.to_json(opts)
     end
 
   end

data/lib/cdb/title.rb

@@ -12,13 +12,13 @@ module CDB
 
       def parse_results(node)
         node.css("a[href^=\"#{WEB_PATH}\"]").map do |link|
-          id = link.attr('href').split('=').last
+          id = link.attr('href').split('=').last.to_i
           text = link.child.text.strip
           name = text.slice(0..-8)
           year = text.slice(-5..-2)
           pub = link.next_sibling.text.gsub(/^\s*\(|\)\s*$/, '')
           new(:cdb_id => id, :name => name, :publisher => pub, :begin_date => year)
-        end
+        end.sort_by(&:cdb_id)
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdb-crawlr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000Z
+date: 2012-11-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &4367990 !ruby/object:Gem::Requirement
+  requirement: &18435060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *4367990
+  version_requirements: *18435060
 description: cdb-crawlr is a Ruby gem and command-line tool for querying ComicBookDB.com
 email:
 - sgt.floydpepper@gmail.com
-executables: []
+executables:
+- cdb
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/cdb/cli.rb
 - lib/cdb/issue.rb
 - lib/cdb/struct.rb
 - lib/cdb/title.rb
 - lib/cdb-crawlr.rb
+- bin/cdb
 homepage: https://github.com/sgtFloyd/cdb-crawlr
 licenses: []
 post_install_message: