spidy 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4427faef517a9c71fe0a3f9ffe05b14e6a72a3d57e91ddec45eb7e318dc0d2e7
-  data.tar.gz: d65983416eb555e3b7ef4ea856aca6ac2fd3f25240280d2cf44f0fc78e874666
+  metadata.gz: 1fba139432757faa60a168a7d46de3db3bbbdee015b3b3fc35f4853196fd64da
+  data.tar.gz: '0154038bda8b133877c7f2dd8828dc8371d0563e4a7ff41c647a9a85a9655300'
 SHA512:
-  metadata.gz: 1f2e652105f9f9e2e407107d5044e45f3a40d512b72b4b9c47bbc921cbf0744cd54f97535f07493ef6b5b21f31a9219c2a1c801c323c904541c213c59cce7a2e
-  data.tar.gz: b5386fea58c59d2a76200ea73d902b65e7376a09563efe5d8c256867bffaaec6278d31d7d440de0a477248bfcfb132f02b790e6f59002ddd1ec46f63830048ba
+  metadata.gz: ae4a08546ff539c544768f2dc8bc4450acd66e9104ca3678d387c4b42fb67d13727700aa6b91fe6a2cb714114927bee1735b6a86b2a126ae35052f54dc4ae209
+  data.tar.gz: 89606fe1dcf46fe64f2b2e8b360f62a54c17b0dadf3788124a47eb5d3652262eea0532e6828558dbad81b37fa2a85cefefcc741b2f73f1f105e22ef7f2dae860

data/lib/spidy/binder.rb

@@ -9,8 +9,26 @@ module Spidy::Binder
   autoload :Html
   autoload :Xml
 
+  module Base
+    def self.call(html, url: nil, define: nil)
+      binder = Class.new(const_get(:Resource)) { instance_exec(&define) }
+      yield binder.new(html, url: url)
+    end
+  end
+
+  class Caller
+    def initialize(binder)
+      @binder = binder
+    end
+
+    def call(source, url: nil, define: nil)
+      binder = Class.new(@binder) { instance_exec(&define) }
+      yield binder.new(source, url: url)
+    end
+  end
+
   def self.get(value)
-    return const_get(value.to_s.classify) if name.is_a?(String) || name.is_a?(Symbol)
+    return Caller.new(const_get(value.to_s.classify)) if name.is_a?(String) || name.is_a?(Symbol)
 
     value
   end

data/lib/spidy/binder/html.rb

@@ -3,46 +3,33 @@
 #
 # Bind html and convert to object
 #
-module Spidy::Binder::Html
-  #
-  # Describe the definition to get the necessary elements from the resource object
-  #
-  class Resource
-    class_attribute :names, default: []
-    attr_reader :html, :source
-
-    def initialize(html)
-      @html = html
-      @source = html.body
-    end
-
-    def to_s
-      to_h.to_json
-    end
+class Spidy::Binder::Html
+  class_attribute :names, default: []
+  attr_reader :html, :source, :url
+
+  def initialize(html, url: nil)
+    @html = html
+    @url = url
+    @source = html.body
+  end
 
-    def url
-      html.uri.to_s
-    end
+  def to_s
+    to_h.to_json
+  end
 
-    def to_h
-      names.map { |name| [name, send(name)] }.to_h
-    end
+  def to_h
+    names.map { |name| [name, send(name)] }.to_h
+  end
 
-    def self.let(name, query = nil, &block)
-      names << name
-      define_method(name) do
-        return html.at(query)&.text if block.nil?
-        return instance_exec(&block) if query.blank?
+  def self.let(name, query = nil, &block)
+    names << name
+    define_method(name) do
+      return html.at(query)&.text if block.nil?
+      return instance_exec(&block) if query.blank?
 
-        instance_exec(html.search(query), &block)
-      rescue NoMethodError => e
-        raise "#{html.uri} ##{name} => #{e.message}"
-      end
+      instance_exec(html.search(query), &block)
+    rescue NoMethodError => e
+      raise "#{html.uri} ##{name} => #{e.message}"
     end
   end
-
-  def self.call(html, define_block)
-    binder = Class.new(Resource) { instance_exec(&define_block) }
-    yield binder.new(html)
-  end
 end

data/lib/spidy/binder/json.rb

@@ -3,40 +3,31 @@
 #
 # Bind json and convert to object
 #
-module Spidy::Binder::Json
-  #
-  # Describe the definition to get the necessary elements from the resource object
-  #
-  class Resource
-    class_attribute :names, default: []
-    attr_reader :json
+class Spidy::Binder::Json
+  class_attribute :names, default: []
+  attr_reader :json, :source, :url
 
-    def initialize(json)
-      @json = json
-      @source = json
-    end
+  def initialize(json, url: nil)
+    @json = json
+    @url = url
+    @source = json
+  end
 
-    def to_s
-      to_h.to_json
-    end
+  def to_s
+    to_h.to_json
+  end
 
-    def to_h
-      names.map { |name| [name, send(name)] }.to_h
-    end
+  def to_h
+    names.map { |name| [name, send(name)] }.to_h
+  end
 
-    def self.let(name, *query, &block)
-      names << name
-      define_method(name) do
-        result = json.dig(*query) if query.present?
-        return result if block.nil?
+  def self.let(name, *query, &block)
+    names << name
+    define_method(name) do
+      result = json.dig(*query) if query.present?
+      return result if block.nil?
 
-        instance_exec(result, &block)
-      end
+      instance_exec(result, &block)
     end
   end
-
-  def self.call(resource, define_block)
-    binder = Class.new(Resource) { instance_exec(&define_block) }
-    yield binder.new(resource)
-  end
 end

data/lib/spidy/binder/xml.rb

@@ -3,46 +3,33 @@
 #
 # Bind xml and convert to object
 #
-module Spidy::Binder::Xml
-  #
-  # Describe the definition to get the necessary elements from the resource object
-  #
-  class Resource
-    class_attribute :names, default: []
-    attr_reader :xml, :source
-
-    def initialize(xml)
-      @xml = xml
-      @source = xml.to_s
-    end
-
-    def to_s
-      to_h.to_json
-    end
+class Spidy::Binder::Xml
+  class_attribute :names, default: []
+  attr_reader :xml, :source, :url
+
+  def initialize(xml, url: nil)
+    @xml = xml
+    @url = url
+    @source = xml.to_s
+  end
 
-    def url
-      xml.uri.to_s
-    end
+  def to_s
+    to_h.to_json
+  end
 
-    def to_h
-      names.map { |name| [name, send(name)] }.to_h
-    end
+  def to_h
+    names.map { |name| [name, send(name)] }.to_h
+  end
 
-    def self.let(name, query = nil, &block)
-      names << name
-      define_method(name) do
-        return xml.at(query)&.text if block.nil?
-        return instance_exec(&block) if query.blank?
+  def self.let(name, query = nil, &block)
+    names << name
+    define_method(name) do
+      return xml.at(query)&.text if block.nil?
+      return instance_exec(&block) if query.blank?
 
-        instance_exec(xml.search(query), &block)
-      rescue NoMethodError => e
-        raise "#{xml} ##{name} => #{e.message}"
-      end
+      instance_exec(xml.search(query), &block)
+    rescue NoMethodError => e
+      raise "#{xml} ##{name} => #{e.message}"
     end
   end
-
-  def self.call(xml, define_block)
-    binder = Class.new(Resource) { instance_exec(&define_block) }
-    yield binder.new(xml)
-  end
 end

data/lib/spidy/definition.rb

@@ -54,7 +54,7 @@ module Spidy::Definition
       fail 'block is not specified' if yielder.nil?
 
       connection_yielder = lambda do |resource|
-        binder.call(resource, define_block) { |object| yielder.call(object) }
+        binder.call(resource, url: url, define: define_block) { |object| yielder.call(object) }
       end
       connector.call(url, &connection_yielder)
     end

data/lib/spidy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spidy
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - aileron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler