spidy 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cf037c791411c37905e63faa8ed48c49f7735280d406846467ed0ed829e6a1e
-  data.tar.gz: a34996a3fb583b9066c67509696ab972f368bbde1c2900d8f7304d92ca4741df
+  metadata.gz: 11b932ab32a92fe7cca2a4c7fb91204098204d2b60d3226137fc41c783f50997
+  data.tar.gz: 34fcddd2519415792d0222bf0c8176dd06a734cc48db3025ccbadd6d10a80582
 SHA512:
-  metadata.gz: bfba65237f7975ebc995f52827dfd6cd975afaacdb01dbb6413c8ad07b88e8f3edb4a399ce505e10f0ce7c9acca39e7ccb2f3f5d1984a6b49b1a6de23058899c
-  data.tar.gz: 0b7fb9f8c095b5e1153617493a404accfe4764dee34a68c3b8ba6d489138c0c0b1b87687b5376c16e08edd183f2972a99b3986e02f69dbb4a8ebe2d3f490bf09
+  metadata.gz: 64fe7aa6a460a4c13d90749827f85904c1cf8ca14391cc2e12f22e2ec4b5b8a3fd7776ad282e178cadddaa6db197a83f49b5870b27aaa8356b79d20565992383
+  data.tar.gz: a8405babf239188f933a13b5213bbc67efe5610a7e7f68bfa49c646a755ecebba049cdab4dbe6b52b085c71f6a0ffd82609ea5aadf9ef355bd8bf6200bdfe5f0

data/lib/spidy/binder/html.rb

@@ -4,7 +4,23 @@
 # Bind html and convert to object
 #
 class Spidy::Binder::Html
-  class_attribute :names, default: []
+  class << self
+    attr_reader :names
+
+    @names = []
+    def 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.at(query), &block)
+      rescue NoMethodError => e
+        raise "#{html.uri} ##{name} => #{e.message}"
+      end
+    end
+  end
+
   attr_reader :html, :source, :url
 
   def initialize(html, url: nil)
@@ -18,18 +34,6 @@ class Spidy::Binder::Html
   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?
-
-      instance_exec(html.at(query), &block)
-    rescue NoMethodError => e
-      raise "#{html.uri} ##{name} => #{e.message}"
-    end
+    self.class.names.map { |name| [name, send(name)] }.to_h
   end
 end

data/lib/spidy/binder/json.rb

@@ -4,7 +4,22 @@
 # Bind json and convert to object
 #
 class Spidy::Binder::Json
-  class_attribute :names, default: []
+  class << self
+    attr_reader :names
+
+    @names = []
+
+    def 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
+    end
+  end
+
   attr_reader :json, :source, :url
 
   def initialize(json, url: nil)
@@ -18,16 +33,6 @@ class Spidy::Binder::Json
   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?
-
-      instance_exec(result, &block)
-    end
+    self.class.names.map { |name| [name, send(name)] }.to_h
   end
 end

data/lib/spidy/binder/xml.rb

@@ -4,7 +4,23 @@
 # Bind xml and convert to object
 #
 class Spidy::Binder::Xml
-  class_attribute :names, default: []
+  class << self
+    attr_reader :names
+    @names = []
+
+    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.at(query), &block)
+      rescue NoMethodError => e
+        raise "#{xml} ##{name} => #{e.message}"
+      end
+    end
+  end
+
   attr_reader :xml, :source, :url
 
   def initialize(xml, url: nil)
@@ -18,18 +34,6 @@ class Spidy::Binder::Xml
   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?
-
-      instance_exec(xml.at(query), &block)
-    rescue NoMethodError => e
-      raise "#{xml} ##{name} => #{e.message}"
-    end
+    self.class.names.map { |name| [name, send(name)] }.to_h
   end
 end

data/lib/spidy/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spidy
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - aileron