spidy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8027a668da137f729aebe8b67e3053fc1631e723580ba7126f5b6983bb234471
-  data.tar.gz: 764df48ccba3dc32db8a022bb16576e9e5177a0835a84f25eee4294a745840ab
+  metadata.gz: 0c032c78b7580bada781db301697b264b337d7c829bc5df4c3810a95770f56ee
+  data.tar.gz: 4b282b06cc91b3fcdef8187381ded42d01a689720ebfede4fb135b1639d47f11
 SHA512:
-  metadata.gz: 7c640710ee7cd4f439c831c763d531d5c855992c0381fbf6be22a86689d90e3036837c6c93e4525f7efca87a36f18987f7473473a48729416d73412ad4e28c7d
-  data.tar.gz: e971c17e48e4693310c48392346c9d259a79a8f8d2284f3e4bc05a5c7bad584d187192713a88923ef88023732129284c28781f4d8e438062708d038d621f04d9
+  metadata.gz: de20181e766b5b8d9189e657bfa20f4a4720e2c0a0adb7ece522309433ef5d93325d98d63a1b31304bd9a2575391318c3330c01f66356ae4110b7005c6560253
+  data.tar.gz: 5cf49000bb2f234c111216f9a554267df18a360c4b0511685c000b8e22312feaf3ba5b0b53b56612f0653157cd51e1da46e6140d7e4902b8a4a062894256b1d1

data/lib/spidy/binder.rb

@@ -9,17 +9,48 @@ module Spidy::Binder
   autoload :Html
   autoload :Xml
 
+  class Error < StandardError
+  end
+
   class Caller
     def initialize(spidy, binder)
       @spidy = spidy
       @binder = binder
     end
 
-    def call(source, url: nil, define: nil)
-      yield Class.new(@binder, &define).new(@spidy, source, url)
+    def call(source, url: nil, define: nil, define_name: nil)
+      yield Class.new(@binder, &define).new(define_name, @spidy, source, url)
+    end
+  end
+
+  class Base
+    class << self
+      attr_reader :attribute_names
+    end
+
+    attr_reader :resource, :url
+
+    def initialize(define_name, spidy, resource, url)
+      @define_name = define_name
+      @spidy = spidy
+      @resource = resource
+      @url = url
+    end
+
+    def scraper(name, source)
+      lambda { |&block| @spidy.call(source, name: name, &block) }
+    end
+
+    def to_s
+      to_h.to_json
+    end
+
+    def to_h
+      self.class.attribute_names.map { |name| [name, send(name)] }.to_h
     end
   end
 
+
   def self.get(spidy, value)
     return Caller.new(spidy, const_get(value.to_s.classify)) if name.is_a?(String) || name.is_a?(Symbol)
 

data/lib/spidy/binder/html.rb

@@ -3,40 +3,23 @@
 #
 # Bind html and convert to object
 #
-class Spidy::Binder::Html
-  class << self
-    attr_reader :attribute_names
+class Spidy::Binder::Html < Spidy::Binder::Base
+  def self.let(name, query = nil, &block)
+    @attribute_names ||= []
+    @attribute_names << name
 
-    def let(name, query = nil, &block)
-      @attribute_names ||= []
-      @attribute_names << name
-      define_method(name) do
-        return html.at(query)&.text if block.nil?
-        return instance_exec(&block) if query.blank?
+    return define_method(name) { html.at(query)&.text } if block.nil?
 
+    define_method(name) do
+      if query.present?
         instance_exec(html.at(query), &block)
+      else
+        instance_exec(&block)
       end
+    rescue StandardError => e
+      fail Spidy::Binder::Error, "spidy(#{@define_name})##{name} => #{e.message}"
     end
   end
 
-  attr_reader :html, :url
-  alias_method :resource, :html
-
-  def initialize(spidy, html, url)
-    @spidy = spidy
-    @url = url
-    @html = html
-  end
-
-  def scraper(name, source)
-    lambda { |&block| @spidy.call(source, name: name, &block) }
-  end
-
-  def to_s
-    to_h.to_json
-  end
-
-  def to_h
-    self.class.attribute_names.map { |name| [name, send(name)] }.to_h
-  end
+  alias_method :html, :resource
 end

data/lib/spidy/binder/json.rb

@@ -3,40 +3,23 @@
 #
 # Bind json and convert to object
 #
-class Spidy::Binder::Json
-  class << self
-    attr_reader :attribute_names
-
-    def let(name, *query, &block)
-      @attribute_names ||= []
-      @attribute_names << name
-      define_method(name) do
-        result = json.dig(*query) if query.present?
-        return result if block.nil?
-
-        instance_exec(result, &block)
+class Spidy::Binder::Json < Spidy::Binder::Base
+  def self.let(name, *query, &block)
+    @attribute_names ||= []
+    @attribute_names << name
+
+    return define_method(name) { json.dig(*query) } if block.nil?
+
+    define_method(name) do
+      if query.present?
+        instance_exec(json.dig(*query), &block)
+      else
+        instance_exec(&block)
       end
+    rescue StandardError => e
+      fail Spidy::Binder::Error, "spidy(#{@define_name})##{name} => #{e.message}"
     end
   end
 
-  attr_reader :json, :url
-  alias_method :resource, :json
-
-  def initialize(spidy, json, url)
-    @spidy = spidy
-    @json = json
-    @url = url
-  end
-
-  def scraper(name, source)
-    lambda { |&block| @spidy.call(source, name: name, &block) }
-  end
-
-  def to_s
-    to_h.to_json
-  end
-
-  def to_h
-    self.class.attribute_names.map { |name| [name, send(name)] }.to_h
-  end
+  alias_method :json, :resource
 end

data/lib/spidy/binder/xml.rb

@@ -3,40 +3,23 @@
 #
 # Bind xml and convert to object
 #
-class Spidy::Binder::Xml
-  class << self
-    attr_reader :attribute_names
+class Spidy::Binder::Xml < Spidy::Binder::Base
+  def self.let(name, query = nil, &block)
+    @attribute_names ||= []
+    @attribute_names << name
 
-    def let(name, query = nil, &block)
-      @attribute_names ||= []
-      @attribute_names << name
-      define_method(name) do
-        return xml.at(query)&.text if block.nil?
-        return instance_exec(&block) if query.blank?
+    return define_method(name) { xml.at(query)&.text } if block.nil?
 
+    define_method(name) do
+      if query.present?
         instance_exec(xml.at(query), &block)
+      else
+        instance_exec(&block)
       end
+    rescue StandardError => e
+      fail Spidy::Binder::Error, "spidy(#{@define_name})##{name} => #{e.message}"
     end
   end
 
-  attr_reader :xml, :url
-  alias_method :resource, :xml
-
-  def initialize(spidy, xml, url)
-    @spidy = spidy
-    @xml = xml
-    @url = url
-  end
-
-  def scraper(name, source)
-    lambda { |&block| @spidy.call(source, name: name, &block) }
-  end
-
-  def to_s
-    to_h.to_json
-  end
-
-  def to_h
-    self.class.attribute_names.map { |name| [name, send(name)] }.to_h
-  end
+  alias_method :xml, :resource
 end

data/lib/spidy/definition.rb

@@ -36,16 +36,16 @@ module Spidy::Definition
     @namespace ||= {}
     connector = Spidy::Connector.get(connector || as)
     binder = Spidy::Binder.get(self, binder || as)
-    @namespace[:"#{name}_scraper"] = define_proc(connector, binder, define_block)
+    @namespace[:"#{name}_scraper"] = define_proc(name, connector, binder, define_block)
   end
 
   private
 
-  def define_proc(connector, binder, define_block)
+  def define_proc(name, connector, binder, define_block)
     proc do |source, &yielder|
       yielder = lambda { |result| break result } if yielder.nil?
       connection_yielder = lambda do |page|
-        binder.call(page, url: source, define: define_block) { |object| yielder.call(object) }
+        binder.call(page, url: source, define: define_block, define_name: name) { |object| yielder.call(object) }
       end
       connector.call(source, &connection_yielder)
     end

data/lib/spidy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spidy
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spidy
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - aileron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler