horsefield 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25c4f86615ff4493cff3794f4f7ae579c1fdff6b717aa3820e62c20172803626
-  data.tar.gz: 9e3e914aea1596f11c98cd55df4830c1de0122517d775533109b11f192afa29a
+  metadata.gz: 361f824eedceebb4366e8d2a8041b15e9344424c801993059e435af201449442
+  data.tar.gz: 6bce024ad4503a6dbca19e3f5ca58ba6ae3cb4216c151ed3177e0eeb0cc3c028
 SHA512:
-  metadata.gz: 140cadaec1faf5a27e397d01aae6fe9e9aac384dca31ff787d0fb12da08da9cba7b91db450fd21fe31761c7bd41970648b7ae1350be5f3a67a58068e3ba7c601
-  data.tar.gz: 419aebfe36976502cbb247fa01ee2e6f5d4f433b6486e667d94ce85992885e4cdcd43392d3a5f1eb8c653a39800c4db2a1c45d7a09bfa7c7f5e11b0ccfc07f3c
+  metadata.gz: e966a5d390b4928ab479077fa31efd4a4df4471c8b1cb75fc4ea2e22054f6ae0792c01bc6033824022cea5d12d6e12094327e5cc4bb9046808364a896f17e19e
+  data.tar.gz: eee3aedbfa542d46573952aac4ea4a986901c2640bcc2fc7961d4de20fc1764f59d925df94139654479c2abc952758d24d11ddce36c8736d899486fa3b3fafcb

data/horsefield.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'nokogiri'
 
   spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "pry"

data/lib/horsefield/diggable.rb

@@ -24,7 +24,20 @@ module Horsefield
       raise MissingSelectorError, "Couldn't find required selector (#{selector})" if lookup == :required && !doc
       return fields if lookup == :presence && !doc
 
-      fields.merge!(Hash[[[name, doc && doc.with_fresh_fields.instance_eval(&processor(&block))]]])
+      if block
+        # Process the sub-document
+        sub_doc = doc && doc.with_fresh_fields
+        
+        # Run the block to populate fields and get its return value
+        return_value = sub_doc && sub_doc.instance_eval(&block)
+        
+        # Use fields if they were populated, otherwise use the block's return value
+        value = (sub_doc && !sub_doc.fields.empty?) ? sub_doc.fields : return_value
+        
+        fields.merge!(Hash[[[name, value]]])
+      else
+        fields.merge!(Hash[[[name, doc && doc.text.strip]]])
+      end
     end
 
     def many!(name, selector, &block)

data/lib/horsefield/version.rb

@@ -1,3 +1,3 @@
 module Horsefield
-  VERSION = "0.6.0"
+  VERSION = "0.7.1"
 end

data/test/horsefield/test_scraper.rb

@@ -1,9 +1,19 @@
-require 'test_helper'
+require_relative '../test_helper'
 require 'pry'
 
 class RedditScraper
   include Horsefield::Scraper
 
+  one :meta do
+    [:keywords].each do |name|
+      one name, ".//meta[@name='#{name}']/@content"
+    end
+  end
+
+  one :static do
+    "test"
+  end
+
   many :posts, '#siteTable .thing' do
     one :title, 'a.title'
     one :tagline, 'p.tagline' do
@@ -24,6 +34,8 @@ class TestScraper < Minitest::Test
 
   def test_scraper
     reddit = RedditScraper.new(@reddit_html).scrape
-    p reddit[:posts].first[:tagline]
+    assert_equal "reddit, reddit.com, vote, comment, submit", reddit[:meta][:keywords]
+    assert_equal "Chris Pratt, homeless, living in this van, holding the script to his first acting job", reddit[:posts][0][:title]
+    assert_equal "test", reddit[:static]
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: horsefield
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Erik Strömberg
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-24 00:00:00.000000000 Z
+date: 2025-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -42,16 +42,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - erik.stromberg@gmail.com
 executables: []
@@ -124,7 +124,7 @@ homepage: http://github.com/apa512/horsefield
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,9 +139,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: It's a scraper
 test_files: