bandcamp-discover 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d06bbc06b837c9d82502a0d9e9a61d3d2062af141f2a19e28ff0cb3e7e3fe5d
-  data.tar.gz: 2b2bbe5682ed207b8911f31a74e1a1a0b8bf471326509b35a3849527b39bcab7
+  metadata.gz: 0e4dc43f9146747097ff3c34b9a581e02e96ad6e3dc812b84e7c77f1dd459147
+  data.tar.gz: 208fdb4ae22424fb73d93722bbbb1158703a89c4626a4897dbfb79a5dffa32b1
 SHA512:
-  metadata.gz: 70c78eccc21549dd9c08fe183ec8ddf6a11060d79e913891ebca47de23f01248a07e7b73e27ea5fb45ba463ea93469d98f8be7f7fdcf5e99576600d5f2992c2a
-  data.tar.gz: d345ad2550cd0ea344d0310a2aa8bdf351a5a3b08b999a19395092e7669ba07b9d98d9ea18a96b7480c3e5d4e44774922db943d115c1ca066ab1592cc058ac6c
+  metadata.gz: 615dd28ade655b5c351249c4e98d1088102bb85d9ad002ca4e0396f49b60bd33c5fe058198f366dab1300f825e2e858a721e5ce715f866a77ce6a6f3afac8b32
+  data.tar.gz: 6cc60964b92fd4cbc56544c13606397632fd526b4871cd1ae28feaa3cfcde54b1cbf7c6483c9c613e10e09a876a582d42f9d7890575cb0fb097fd5e351cdd3ed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bandcamp-discover (0.6.0)
+    bandcamp-discover (0.7.0)
       async
       base64
       concurrent-ruby

data/README.rdoc

@@ -17,7 +17,9 @@ accepts demos. The model and both prompts can be set by the host app:
 Before the bio is asked, the /music grid is read: a page whose releases carry
 no artist credit other than the owner is an artist, not a label, and is
 rejected without a model call. The credits that remain are appended to the
-bio for the model and returned as +artists+ in the scrape result.
+bio for the model and returned as +artists+ in the scrape result; each
+entry in +albums+ carries its own credit as +artist+ (nil when the release
+is credited to the page owner).
 
 Without a token, +label?+ falls back to matching /label|platform|records/i
 and +accepts_demos?+ is always false.

data/lib/bandcamp-discover/analyzer.rb

@@ -25,8 +25,12 @@ module BandcampDiscover
 
     private
 
+    # open_router raises on a missing token rather than returning nil, which
+    # turned the documented regex fallback into an exception.
     def llm?
       defined?(OpenRouter) && !!OpenRouter.configuration.access_token
+    rescue OpenRouter::ConfigurationError
+      false
     end
 
     def ask(prompt)

data/lib/bandcamp-discover/scrapers/music.rb

@@ -31,7 +31,7 @@ module BandcampDiscover
           items.map do |item|
             {
               url: absolute(item.query_selector("a")[:href]),
-              credit: item.query_selector(".artist-override")&.inner_text
+              credit: item.query_selector(".artist-override")&.inner_text&.strip
             }
           end
         end
@@ -41,6 +41,9 @@ module BandcampDiscover
         Roster.new(band_name: band_name, credits: grid.map { _1[:credit] }, releases: grid.size)
       end
 
+      # Each album carries the credit its grid item showed: the artist's name,
+      # or nil when the release is credited to the page owner. The grid is the
+      # only place the credit appears without another page load.
       def albums(grid)
         guarded do
           semaphore = Async::Semaphore.new(@max_tasks)
@@ -53,12 +56,12 @@ module BandcampDiscover
 
               puts "done scraping #{item[:url]}"
 
-              album
+              [item, album]
             end
           end.map(&:wait)
 
-          albums.map! do |album_url, album_title, album_tags, album_player|
-            {url: album_url, title: album_title, tags: album_tags, player_url: album_player}
+          albums.map! do |item, (album_url, album_title, album_tags, album_player)|
+            {url: album_url, title: album_title, tags: album_tags, player_url: album_player, artist: item[:credit]}
           end
 
           [albums, normalize_tally(albums.map { _1[:tags] }.flatten.tally)]

data/lib/bandcamp-discover/version.rb

@@ -1,3 +1,3 @@
 module BandcampDiscover
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/test/analyzer_test.rb

@@ -4,7 +4,18 @@ require "bandcamp-discover/analyzer"
 # OpenRouter is the host app's dependency, not this gem's, so a stand-in that
 # records the request is enough to prove what the Analyzer sends.
 module OpenRouter
-  Configuration = Struct.new(:access_token)
+  class ConfigurationError < StandardError; end
+
+  # The real gem raises on a missing token instead of returning nil.
+  Configuration = Struct.new(:token) do
+    def access_token=(value)
+      self.token = value
+    end
+
+    def access_token
+      token or raise ConfigurationError, "OpenRouter access token missing!"
+    end
+  end
 
   def self.configuration
     @configuration ||= Configuration.new

data/test/music_test.rb

@@ -0,0 +1,46 @@
+require_relative "test_helper"
+require "bandcamp-discover/scrapers/music"
+
+# The album pages are stubbed; what is under test is how the grid's credits
+# travel into the album hashes.
+class MusicTest < Minitest::Test
+  Music = BandcampDiscover::Scrapers::Music
+
+  FakeBrowser = Struct.new(:pages) do
+    def new_page = nil
+  end
+
+  FakeAlbum = Struct.new(:url) do
+    def scrape = [url, "Title of #{url}", ["drone"], nil]
+  end
+
+  def setup
+    @music = Music.new(url: "https://kranky.bandcamp.com/music", browser: FakeBrowser.new, max_tasks: 2)
+  end
+
+  def test_each_album_carries_the_credit_from_its_grid_item
+    grid = [
+      {url: "https://kranky.bandcamp.com/album/one", credit: "Helen"},
+      {url: "https://kranky.bandcamp.com/album/two", credit: nil}
+    ]
+
+    albums, tags = BandcampDiscover::Scrapers::Album.stub(:new, ->(url:, **) { FakeAlbum.new(url) }) do
+      Sync { @music.albums(grid) }
+    end
+
+    assert_equal ["Helen", nil], albums.map { _1[:artist] }
+    assert_equal ["https://kranky.bandcamp.com/album/one", "https://kranky.bandcamp.com/album/two"], albums.map { _1[:url] }
+    assert_equal({"drone" => 1.0}, tags)
+  end
+
+  def test_a_timed_out_album_still_keeps_its_credit
+    grid = [{url: "https://kranky.bandcamp.com/album/gone", credit: "Helen"}]
+    timed_out = Struct.new(:url) { def scrape = nil }
+
+    albums, _tags = BandcampDiscover::Scrapers::Album.stub(:new, ->(url:, **) { timed_out.new(url) }) do
+      Sync { @music.albums(grid) }
+    end
+
+    assert_equal [{url: nil, title: nil, tags: nil, player_url: nil, artist: "Helen"}], albums
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bandcamp-discover
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Julian RUbisch
@@ -206,6 +206,7 @@ files:
 - test/analyzer_test.rb
 - test/default_test.rb
 - test/discover_test.rb
+- test/music_test.rb
 - test/roster_test.rb
 - test/test_helper.rb
 homepage: https://julianrubisch.at