spidy 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ec3edbf4c149d0864909d8fc60422b692a445eaaf7f7339a31b023c33a637bb
-  data.tar.gz: 7490a91a9dcd0a92372ad7076af1b4469e66dc5cc67c33f57b74d4897e4b9432
+  metadata.gz: 852dafe41733d275fc34bcfe31b9623bcf6f67ec92dfe898f7dd6db1455cc0c3
+  data.tar.gz: 14522d53123dfb645464e940fd9bed74d15db241c0342a6e01051a49440736a8
 SHA512:
-  metadata.gz: fbc181d7d029bfe9b2d883b85f5fd098ab8b59a9f4bd9b01610ededfd53f7b3708aa9b1f81f1a993e90a960dc47511b2239655b3dee15fc2df50b6de527cebc3
-  data.tar.gz: 2ac8b46aded198558d9122a4a8e2f647c431a15e2b85254bebb9ccfd3b7eb21c209ae12d8549dd1c2e7e3def317e07bc4d9b718db902f65ae7fce5182fd26537
+  metadata.gz: c8abcb886421775f5f66ed0da707085aa3363e2472c3bc94a66817a6a245d12efe5573c8287d73f5f086bd53b9b270aed1240ce9d3599482b9fe6ac8cc9400cf
+  data.tar.gz: a4c670bea4af22828edb815d1b48ed7292934fcf11eaeeeda3e4b4e594aae6f2e95be743544cac027c56c80b509ae86a85bc18286f0a3a6f580e3ab5f0aaa7e7

data/Gemfile.lock

@@ -1,22 +1,20 @@
 PATH
   remote: .
   specs:
-    spidy (0.0.8)
-      activemodel (~> 5.2)
-      activesupport (~> 5.2)
+    spidy (0.0.11)
+      activesupport
       mechanize
       pry
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     connection_pool (2.2.2)
@@ -41,7 +39,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0904)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.12.0)
     net-http-digest_auth (1.4.1)
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
@@ -72,6 +70,7 @@ GEM
       unf_ext
     unf_ext (0.0.7.6)
     webrobots (0.1.2)
+    zeitwerk (2.1.10)
 
 PLATFORMS
   ruby

data/lib/spidy/binder/json.rb

@@ -9,10 +9,10 @@ module Spidy::Binder::Json
   #
   class Resource
     class_attribute :names, default: []
-    attr_reader :resource
+    attr_reader :json
 
-    def initialize(resource)
-      @resource = resource
+    def initialize(json)
+      @json = json
     end
 
     def to_s
@@ -26,7 +26,7 @@ module Spidy::Binder::Json
     def self.let(name, *query, &block)
       names << name
       define_method(name) do
-        result = resource.dig(*query) if query.present?
+        result = json.dig(*query) if query.present?
         return result if block.nil?
 
         instance_exec(result, &block)

data/lib/spidy/binder/xml.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+#
+# 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
+
+    def initialize(xml)
+      @xml = xml
+    end
+
+    def to_s
+      to_h.to_json
+    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.search(query), &block)
+      rescue NoMethodError => e
+        raise "#{xml} ##{name} => #{e.message}"
+      end
+    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/binder.rb

@@ -7,6 +7,7 @@ module Spidy::Binder
   extend ActiveSupport::Autoload
   autoload :Json
   autoload :Html
+  autoload :Xml
 
   def self.get(value)
     return const_get(value.to_s.classify) if name.is_a?(String) || name.is_a?(Symbol)

data/lib/spidy/connector/json.rb

@@ -5,6 +5,6 @@
 #
 module Spidy::Connector::Json
   def self.call(url, &yielder)
-    OpenURI.open_uri(url) { |body| yielder.call(JSON.parse(body.read)) }
+    OpenURI.open_uri(url) { |body| yielder.call(JSON.parse(body.read, symbolize_names: true)) }
   end
 end

data/lib/spidy/connector/xml.rb

@@ -3,29 +3,11 @@
 #
 # xml
 #
-class Spidy::Connector::Xml
-  class_attribute :field, default: (lambda { |object, query, optional: false, &block|
-    return object.instance_exec(object.resource, &block) if query.nil?
-
-    node = object.resource.search(query)
-    return if optional && node.empty?
-
-    fail "Could not be located #{query}" if node.empty?
-    return node.first.text if block.nil?
-
-    object.instance_exec(node, &block)
-  })
-
-  def initialize(start_url: nil, encoding: nil)
-    @start_url = start_url
-    @encoding = encoding
-  end
-
-  def call(url = @start_url)
+module Spidy::Connector::Xml
+  def self.call(url)
     fail 'URL is undefined' if url.blank?
 
-    xml =
-      Nokogiri::XML(OpenURI.open_uri(url).read.gsub(/[\x00-\x09\x0B\x0C\x0E-\x1F\x7F]/, ''))
-    yield xml
+    xml = OpenURI.open_uri(url).read.gsub(/[\x00-\x09\x0B\x0C\x0E-\x1F\x7F]/, '')
+    yield Nokogiri::XML(xml, url)
   end
 end

data/lib/spidy/connector.rb

@@ -7,6 +7,7 @@ module Spidy::Connector
   extend ActiveSupport::Autoload
   autoload :Html
   autoload :Json
+  autoload :Xml
 
   def self.get(value)
     return const_get(value.to_s.classify) if value.is_a?(String) || value.is_a?(Symbol)

data/lib/spidy/version.rb

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

data/lib/spidy.rb

@@ -2,9 +2,7 @@
 
 require 'spidy/version'
 require 'active_support/all'
-require 'active_model'
 require 'mechanize'
-require 'csv'
 require 'open-uri'
 
 #

data/spidy.gemspec

@@ -29,8 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 
-  spec.add_runtime_dependency 'activemodel', '~> 5.2'
-  spec.add_runtime_dependency 'activesupport', '~> 5.2'
+  spec.add_runtime_dependency 'activesupport'
   spec.add_runtime_dependency 'mechanize'
   spec.add_runtime_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spidy
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - aileron
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,34 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +136,7 @@ files:
 - lib/spidy/binder.rb
 - lib/spidy/binder/html.rb
 - lib/spidy/binder/json.rb
+- lib/spidy/binder/xml.rb
 - lib/spidy/connector.rb
 - lib/spidy/connector/html.rb
 - lib/spidy/connector/json.rb