botz 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f954d590343d6a8b8d94dddb90e405105fd1574f97c7b6b781248401e5694d45
-  data.tar.gz: d6757990b3ba7c9a1c57e3ea2537924dbf0df15132f8abda5041a507470be2d0
+  metadata.gz: e8f0f5bd0c1efc41fefee5be1ad905144c6c2af0e20c7163ec1ddac75b59b03c
+  data.tar.gz: d1fd0bf8a10ae82a5ca51a81993143964ff20911573785a8cb5d1f3e8facbed5
 SHA512:
-  metadata.gz: 21b3758166a2a16069ea8c408a906390f650bc1a9cbd063cd298ea68c5566d6c598af1642a64872e6051bc90025e4cd850b3a8cd4375cbb45513d117121cb78e
-  data.tar.gz: 6f12d1277d08d6d2bc3b9f18f69e18f608d669bfab90a77eecf9edb1da3ebd1ce20a5a2d722c106f670378bea05eba3bfc9a461d6f2110f97b3dd63c224d2c1a
+  metadata.gz: 582acc3d2f94b021943d517ab62c77d42f759d8c197c4728e2a49ce4c4127f105ce0cbcb3a822e5fb7aefe8d90e8d6234d682e855cff5209d1c12d8f78f31d8d
+  data.tar.gz: 43efe75756b292eb80b8acce890fd37f15845cc9868cca6c46946ab0008d947afe9abbbef23bc71256fb9c4c87ff79a809d81f8f6fcd178ee0add6117fa9290f

data/exe/botz

@@ -2,16 +2,9 @@
 # frozen_string_literal: true
 
 require 'botz'
-crawler = Botz.open(ARGV[0])
-if ARGV[1]
-  crawler.call(ARGV[1], ARGV[2])
-else
-  print <<~SHELL
-    function spider() {
-      botz #{ARGV[0]} spider $1
-    }
-    function scraper() {
-      botz #{ARGV[0]} scraper $1
-    }
-  SHELL
+shell = Botz.open(ARGV[0]).shell
+case ARGV[1]&.to_sym
+when :spider then shell.spider(ARGV[2])
+when :scraper then shell.scraper(ARGV[2])
+when :shell then shell.function
 end

data/lib/botz/command.rb

@@ -1,45 +1,11 @@
 # frozen_string_literal: true
 
-#
-# Class representing a website defined by DSL
-#
 class Botz::Command
-  class_attribute :definition
+  attr_reader :definition
+  attr_reader :shell
 
-  class << self
-    delegate :domain, :spiders, :scrapers, to: :definition
-
-    def call(category, name)
-      case category.to_sym
-      when :spider then spider(name)
-      when :scraper then scraper(name)
-      end
-    end
-
-    # rubocop:disable Lint/AssignmentInCondition, Style/RescueStandardError
-    def scraper(name)
-      command = scrapers[name.to_sym]
-      while line = STDIN.gets
-        url = line.strip
-        begin
-          command.call(url)
-        rescue
-          STDERR.puts "ERROR #{command} #{url}"
-        end
-      end
-    end
-    # rubocop:enable Lint/AssignmentInCondition, Style/RescueStandardError
-
-    def spider(name)
-      command = spiders[name.to_sym]
-      if File.pipe?(STDIN)
-        STDIN.each_line do |line|
-          start_url = line.strip
-          command.call(start_url) { |url| puts url }
-        end
-      else
-        command.call { |url| puts url }
-      end
-    end
+  def initialize(definition)
+    @definition = definition
+    @shell = Botz::Shell.new(definition: definition)
   end
 end

data/lib/botz/macro.rb

@@ -3,12 +3,11 @@
 #
 # Class representing a website defined by DSL
 #
-class Botz::Macro
+class Botz::Definition
   Output = ->(result) { STDOUT.puts(result.to_json) }
 
   class_attribute :name
   class_attribute :domain
-  class_attribute :command
   class_attribute :spiders, default: {}
   class_attribute :scrapers, default: {}
 

data/lib/botz/shell.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+#
+# botz shell access interface
+#
+class Botz::Shell
+  include ActiveModel::Model
+  include ActiveModel::Attributes
+
+  attribute :filepath
+  attribute :definition
+  delegate :domain, :spiders, :scrapers, to: :definition
+
+  # rubocop:disable Lint/AssignmentInCondition, Style/RescueStandardError
+  def scraper(name)
+    command = scrapers[name.to_sym]
+    while line = STDIN.gets
+      url = line.strip
+      begin
+        command.call(url)
+      rescue
+        STDERR.puts "ERROR #{command} #{url}"
+      end
+    end
+  end
+  # rubocop:enable Lint/AssignmentInCondition, Style/RescueStandardError
+
+  def spider(name)
+    command = spiders[name.to_sym]
+    if File.pipe?(STDIN)
+      STDIN.each_line do |line|
+        start_url = line.strip
+        command.call(start_url) { |url| puts url }
+      end
+    else
+      command.call { |url| puts url }
+    end
+  end
+
+  def function
+    print <<~SHELL
+      function spider() {
+        botz #{filepath} spider $1
+      }
+      function scraper() {
+        botz #{filepath} scraper $1
+      }
+    SHELL
+  end
+end

data/lib/botz/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Botz
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/botz.rb

@@ -10,8 +10,9 @@ require 'mechanize'
 #
 module Botz
   extend ActiveSupport::Autoload
+  autoload :Shell
   autoload :Command
-  autoload :Macro
+  autoload :Definition
   autoload :Spider
   autoload :Downloader
   autoload :HtmlScraperMacro
@@ -19,20 +20,18 @@ module Botz
   def self.open(filepath)
     remove_const(:Crawler) if const_defined?(:Crawler)
     const_set(:Crawler, Module.new)
+
     # rubocop:disable Security/Eval
-    eval(File.open(filepath).read)
+    definition = eval(File.open(filepath).read)
     # rubocop:enable Security/Eval
+
+    Botz::Command.new(filepath: filepath, definition: definition)
   end
 
   def self.define(name, domain:, &block)
-    crawler_definition = Class.new(Botz::Macro, &block)
+    crawler_definition = Class.new(Botz::Definition, &block)
     crawler_definition.domain = domain
-
-    command_class = Class.new(Botz::Command)
-    command_class.definition = crawler_definition
-    crawler_definition.command = command_class
-
     Crawler.const_set(name.to_s.camelize, crawler_definition)
-    command_class
+    crawler_definition
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: botz
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - aileron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,6 +138,7 @@ files:
 - lib/botz/downloader.rb
 - lib/botz/html_scraper_macro.rb
 - lib/botz/macro.rb
+- lib/botz/shell.rb
 - lib/botz/spider.rb
 - lib/botz/version.rb
 homepage: https://github.com/aileron-inc/botz