chronicle-spotify 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 230610bca1ab6354681e21b3702832d04ac8e2b134e940acd7535da96f1466d5
-  data.tar.gz: b8cab459d2173718113607ef4bb051c6eea6a21eb39df849e13ce95a3f5d4ab7
+  metadata.gz: 05a2aa0279eb07b82642feb0b1a13b0e1d7e696325bc80316bef77ed5a44e6fd
+  data.tar.gz: 5dee1d598b949ca4c5d916005123b859d7bf00eb4d046fb40b0d2bfe74336357
 SHA512:
-  metadata.gz: 8bc73fad90e5ae81719fd657949716095cbb2dce117dabb5106879c2b480969b772a5b4290220a59b969a596c7f1af989b0919eec6bdc443456b3386da5560f8
-  data.tar.gz: bd1034b1496925f9ca1db1d06de634d4738e447bb051eacffc730fa8469adfbbb654640d6aa75275629981dd7243266f6004f631a19d80b2bc5a8aadd69efe6c
+  metadata.gz: 2c2833de89d8ed0698ff984e724c1f47be7f714553811b6bd14247d2fb6e3962cce7745ba478ce4d6ddf8d992144bcd9db23dc4ab52d0c49d13376da80f59b00
+  data.tar.gz: faa9603a26db4d4a2ea0cdaed98d164cb3fec7fe6e13139b045fb7cfd492771b7b0956c6934d0327dd69a8140e93ccb10640f1580ce2f4caa1dbd4cfc0f8e8ba

data/.gitignore

@@ -7,4 +7,6 @@
 /spec/reports/
 /tmp/
 
+Gemfile.lock
+
 .DS_Store

data/.rubocop.yml

@@ -1,44 +1,2 @@
-AllCops:
-  EnabledByDefault: true
-  TargetRubyVersion: 2.7
-
-Style/FrozenStringLiteralComment:
-  SafeAutoCorrect: true
-
-Style/StringLiterals:
-  Enabled: false
-
-Layout/MultilineAssignmentLayout:
-  Enabled: false
-
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-
-Layout/RedundantLineBreak:
-  Enabled: false
-
-Style/MethodCallWithArgsParentheses:
-  Enabled: false
-
-Style/MethodCalledOnDoEndBlock:
-  Exclude:
-    - 'spec/**/*'
-
-Style/OpenStructUse:
-  Enabled: false
-
-Style/Copyright:
-  Enabled: false
-
-Style/MissingElse:
-  Enabled: false
-
-Style/SymbolArray:
-  EnforcedStyle: brackets
-
-Style/WordArray:
-  EnforcedStyle: brackets
-
-Lint/ConstantResolution:
-  Enabled: false
-
+inherit_gem:
+  chronicle-core: .rubocop-plugin.yml

data/Gemfile

@@ -1,8 +1,6 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in chronicle-spotify.gemspec
 gemspec
 
-gem "rake", "~> 13.0"
+gem 'rake', '~> 13.0'

data/README.md

@@ -36,15 +36,18 @@ This will open a browser window to authorize on spotify.com. When the flow is co
 ### 4. Use the the plugin
 ```sh
 # Extract recent limits
-$ chronicle-etl --extractor spotify:listens --limit 10
+$ chronicle-etl --extractor spotify:listen --limit 10
 
 # Extract liked tracks from the last week
-$ chronicle-etl --extractor spotify:liked-tracks --since 1w
+$ chronicle-etl --extractor spotify:like --since 1w
 # Transform as Chronicle Schema
-$ chronicle-etl --extractor spotify:liked-tracks --since 1w --transformer chronicle:like --loader json
+$ chronicle-etl --extractor spotify:like --since 1w --schema chronicle
 
 # Extract saved albums
-$ chronicle-etl --extractor spotify:saved-albums --limit 10
+$ chronicle-etl --extractor spotify:saved-album --limit 10
+
+# Display a table of album names you've liked in last week
+$ chronicle-etl --extractor spotify:saved-album --since 1w --schema chronicle --loader table --fields end_time object.name
 ```
 
 ## Available Connectors
@@ -52,26 +55,16 @@ $ chronicle-etl --extractor spotify:saved-albums --limit 10
 
 All the extractors expect `uid`, `access_token` and `refresh_token` to be available in your Chronicle secrets. After doing the authorization flow, you can verify that they exist using: `$ chronicle-etl secrets:list spotify`
 
-#### `liked-tracks`
+#### `like`
 
 Extractor for your Spotify liked tracks
 
-#### `saved-albums`
+#### `saved-album`
 
 Extractor for your Spotify saved albums
-#### `listens`
-
-Extractor for your recent listens. Due to API limitations, only your 50 most recent 
-
-### Transformers
-
-#### `like`
-
-Transform a like (either from `saved-albums` or `liked-tracks`) into Chronicle Schema
-
 #### `listen`
 
-Transforms a listen (from `listens`) into Chronicle Schema
+Extractor for your recent listens. Due to API limitations, only your 50 most recent 
 
 ## Roadmap
 - extractor for playlist activity ([#3](https://github.com/chronicle-app/chronicle-spotify/issues/3))

data/Rakefile

@@ -1,4 +1,2 @@
-# frozen_string_literal: true
-
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 task default: %i[]

data/bin/console

@@ -1,15 +1,7 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
-require "bundler/setup"
-require "chronicle/spotify"
+require 'bundler/setup'
+require 'chronicle/spotify'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
+require 'pry'
 Pry.start
-
-# require "irb"
-# IRB.start(__FILE__)

data/chronicle-spotify.gemspec

@@ -1,47 +1,48 @@
-# frozen_string_literal: true
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "chronicle/spotify/version"
+require 'chronicle/spotify/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "chronicle-spotify"
+  spec.name          = 'chronicle-spotify'
   spec.version       = Chronicle::Spotify::VERSION
-  spec.authors       = ["Andrew Louis"]
-  spec.email         = ["andrew@hyfen.net"]
+  spec.authors       = ['Andrew Louis']
+  spec.email         = ['andrew@hyfen.net']
 
-  spec.summary       = "Spotify importer for Chronicle"
-  spec.description   = "Spotify connectors"
-  spec.homepage      = "https://github.com/chronicle-app/chronicle-spotify"
+  spec.summary       = 'Spotify importer for Chronicle'
+  spec.description   = 'Spotify connectors'
+  spec.homepage      = 'https://github.com/chronicle-app/chronicle-spotify'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
   if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = "https://rubygems.org"
+    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
-    spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = "https://github.com/chronicle-app/chronicle-spotify"
-    spec.metadata["changelog_uri"] = "https://github.com/chronicle-app/chronicle-spotify"
+    spec.metadata['homepage_uri'] = spec.homepage
+    spec.metadata['source_code_uri'] = 'https://github.com/chronicle-app/chronicle-spotify'
+    spec.metadata['changelog_uri'] = 'https://github.com/chronicle-app/chronicle-spotify'
   else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
+    raise 'RubyGems 2.0 or newer is required to protect against ' \
+          'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-  spec.add_dependency "chronicle-etl", "~> 0.5"
-  spec.add_dependency "omniauth-spotify"
-  spec.add_dependency "rspotify", "~> 2.11"
-
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "bundler", "~> 2.3"
-  spec.add_development_dependency "rake", "~> 13.0.6"
-  spec.add_development_dependency "pry-byebug", "~> 3.9"
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 3.1'
+  spec.metadata['rubygems_mfa_required'] = 'true'
+
+  spec.add_dependency 'chronicle-core', '~> 0.3'
+  spec.add_dependency 'chronicle-etl', '~> 0.6'
+  spec.add_dependency 'omniauth-spotify'
+  spec.add_dependency 'rspotify', '~> 2.11'
+
+  spec.add_development_dependency 'bundler', '~> 2.3'
+  spec.add_development_dependency 'pry-byebug', '~> 3.10'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rubocop', '~> 1.63'
 end

data/lib/chronicle/spotify/authorizer.rb

@@ -5,13 +5,20 @@ module Chronicle
     class Authorizer < Chronicle::ETL::OauthAuthorizer
       provider :spotify
       omniauth_strategy :spotify
-      scope 'user-read-recently-played playlist-read-private playlist-read-collaborative user-read-private user-read-email user-library-read'
-      pluck_secrets({ 
-        access_token: [:credentials, :token],
-        refresh_token: [:credentials, :refresh_token],
+      scope %w[
+        user-read-recently-played
+        playlist-read-private
+        playlist-read-collaborative
+        user-read-private
+        user-read-email
+        user-library-read
+      ].join(' ')
+      pluck_secrets({
+        access_token: %i[credentials token],
+        refresh_token: %i[credentials refresh_token],
         uid: [:uid],
-        name: [:info, :name],
-        email: [:info, :email],
+        name: %i[info name],
+        email: %i[info email]
       })
     end
   end

data/lib/chronicle/spotify/builders.rb

@@ -1,95 +1,73 @@
+require 'chronicle/models'
+
 module Chronicle
   module Spotify
     module Builders
-      def build_listen(track:, timestamp:, actor:)
-        record = ::Chronicle::ETL::Models::Activity.new({
-          verb: 'listened',
-          provider: 'spotify',
-          end_at: timestamp
-        })
-        record.dedupe_on << [:provider, :verb, :end_at]
-        record.actor = build_actor(actor)
-        record.involved = build_track(track)
-        record
+      def build_listen(record:, agent:)
+        Chronicle::Models::ListenAction.new do |r|
+          r.end_time = record[:played_at]
+          r.object = build_track(record[:track])
+          r.agent = build_agent(agent)
+          r.source = 'spotify'
+          r.dedupe_on << %i[type source end_time]
+        end
       end
 
-      def build_liked(object:, timestamp:, actor:)
-        record = ::Chronicle::ETL::Models::Activity.new({
-          verb: 'liked',
-          provider: 'spotify',
-          end_at: timestamp
-        })
-        record.dedupe_on << [:provider, :verb, :end_at]
-        record.actor = build_actor(actor)
+      def build_like(record:, agent:)
+        Chronicle::Models::LikeAction.new do |r|
+          r.end_time = record[:added_at]
 
-        record.involved = if object[:album_type]
-          build_album(object)
-        else
-          build_track(object)
-        end
+          r.object = if record[:album]
+                       build_album(record[:album])
+                     elsif record[:track]
+                       build_track(record[:track])
+                     end
 
-        record
+          r.agent = build_agent(agent)
+          r.source = 'spotify'
+          r.dedupe_on << %i[type source end_time]
+        end
       end
 
       def build_track(track)
-        record = ::Chronicle::ETL::Models::Entity.new({
-          represents: 'song',
-          provider: 'spotify',
-          provider_id: track[:id],
-          title: track[:name],
-        })
-
-        record.creators = track[:artists].map{ |creator| build_creator(creator) }
-        record.containers = build_album(track[:album])
-        record.dedupe_on << [:provider, :provider_id, :represents]
-        record
+        Chronicle::Models::MusicRecording.new do |r|
+          r.name = track[:name]
+          r.in_album = [build_album(track[:album])]
+          r.by_artist = track[:artists].map { |artist| build_artist(artist) }
+          r.duration = "PT#{track[:duration_ms] / 1000.0}S"
+          r.source = 'spotify'
+          r.source_id = track[:id]
+          r.dedupe_on = [[:url], %i[source_id source type]]
+        end
       end
 
-      def build_creator(artist)
-        record = ::Chronicle::ETL::Models::Entity.new({
-          represents: 'musicartist',
-          provider: 'spotify',
-          provider_id: artist[:id],
-          provider_url: artist[:external_urls][:spotify],
-          title: artist[:name],
-        })
-        record.dedupe_on << [:provider_url]
-        record.dedupe_on << [:provider, :provider_id, :represents]
-        record
+      def build_artist(artist)
+        Chronicle::Models::MusicGroup.new do |r|
+          r.name = artist[:name]
+          r.url =  artist[:external_urls][:spotify]
+          r.source = 'spotify'
+          r.source_id = artist[:id]
+        end
       end
 
       def build_album(album)
-        record = ::Chronicle::ETL::Models::Entity.new({
-          represents: 'album',
-          provider: 'spotify',
-          provider_id: album[:id],
-          provider_url: album[:external_urls][:spotify],
-          title: album[:name],
-        })
-        record.attachments = build_image(album[:images].first[:url])
-        record.dedupe_on << [:provider_url]
-        record.dedupe_on << [:provider, :provider_id, :represents]
-        record
-      end
-
-      def build_image(image_url)
-        ::Chronicle::ETL::Models::Attachment.new({
-          url_original: image_url
-        })
+        Chronicle::Models::MusicAlbum.new do |r|
+          r.name = album[:name]
+          r.source = 'spotify'
+          r.source_id = album[:id]
+          r.image = album[:images].first[:url]
+          r.url = album[:external_urls][:spotify]
+        end
       end
 
-      def build_actor(actor)
-        record = ::Chronicle::ETL::Models::Entity.new({
-          represents: 'identity',
-          provider: 'spotify',
-          provider_id: actor[:id],
-          provider_url: actor[:external_urls][:spotify],
-          slug: actor[:id],
-          title: actor[:display_name]
-        })
-        record.dedupe_on << [:provider_url]
-        record.dedupe_on << [:provider, :provider_id, :represents]
-        record
+      def build_agent(agent)
+        Chronicle::Models::Person.new do |r|
+          r.name = agent[:display_name]
+          r.url = agent[:external_urls][:spotify]
+          r.source = 'spotify'
+          r.slug = agent[:id]
+          r.source_id = agent[:id]
+        end
       end
     end
   end

data/lib/chronicle/spotify/like_transformer.rb

@@ -4,31 +4,16 @@ module Chronicle
       include Chronicle::Spotify::Builders
 
       register_connector do |r|
-        r.provider = 'spotify'
-        r.description = 'a spotify track'
-        r.identifier = 'like'
+        r.source = :spotify
+        r.type = :like
+        r.strategy = :api
+        r.description = 'a like'
+        r.from_schema = :extraction
+        r.to_schema = :chronicle
       end
 
-      def transform
-        build_liked(
-          timestamp: timestamp,
-          object: object,
-          actor: @extraction.meta[:actor]
-        )
-      end
-
-      def id
-        object[:id]
-      end
-
-      def timestamp
-        Time.parse(@extraction.data[:added_at])
-      end
-
-      private
-
-      def object
-        @object = @extraction.data[:track] || @extraction.data[:album]
+      def transform(record)
+        build_like(record: record.data, agent: record.extraction.meta[:agent])
       end
     end
   end

data/lib/chronicle/spotify/liked_tracks_extractor.rb

@@ -2,14 +2,15 @@ module Chronicle
   module Spotify
     class SavedTracksExtractor < Chronicle::Spotify::SpotifyExtractor
       register_connector do |r|
-        r.provider = 'spotify'
+        r.source = :spotify
+        r.type = :like
+        r.strategy = :api
         r.description = 'liked tracks'
-        r.identifier = 'liked-tracks'
       end
 
       def extract
         @proxy.saved_tracks(after: @config.since, limit: @config.limit) do |item|
-          yield Chronicle::ETL::Extraction.new(data: item, meta: { actor: @actor })
+          yield build_extraction(data: item, meta: { agent: @agent })
         end
       end
     end

data/lib/chronicle/spotify/listen_transformer.rb

@@ -4,25 +4,16 @@ module Chronicle
       include Chronicle::Spotify::Builders
 
       register_connector do |r|
-        r.provider = 'spotify'
-        r.description = 'a spotify listen'
-        r.identifier = 'listen'
+        r.source = :spotify
+        r.type = :listen
+        r.strategy = :api
+        r.description = 'a listen'
+        r.from_schema = :extraction
+        r.to_schema = :chronicle
       end
 
-      def transform
-        build_listen(
-          timestamp: timestamp,
-          track: @extraction.data[:track],
-          actor: @extraction.meta[:actor]
-        )
-      end
-
-      def id
-        @extraction.data[:track][:id]
-      end
-
-      def timestamp
-        Time.parse(@extraction.data[:played_at])
+      def transform(record)
+        build_listen(record: record.data, agent: record.extraction.meta[:agent])
       end
     end
   end

data/lib/chronicle/spotify/listens_extractor.rb

@@ -2,14 +2,15 @@ module Chronicle
   module Spotify
     class ListenedExtractor < Chronicle::Spotify::SpotifyExtractor
       register_connector do |r|
-        r.provider = 'spotify'
-        r.description = 'listened tracks'
-        r.identifier = 'listens'
+        r.source = :spotify
+        r.type = :listen
+        r.strategy = :api
+        r.description = 'listens'
       end
 
       def extract
         @proxy.recently_played(after: @config.since, limit: @config.limit, before: @config.until) do |item|
-          yield Chronicle::ETL::Extraction.new(data: item, meta: { actor: @actor })
+          yield build_extraction(data: item, meta: { agent: @agent })
         end
       end
     end

data/lib/chronicle/spotify/proxy.rb

@@ -22,28 +22,28 @@ module Chronicle
         JSON.parse(RSpotify::User.find(@authenticated_user.id), symbolize_names: true)
       end
 
-      def saved_albums(after: nil, limit:, &block)
-        retrieve_all(method: :saved_albums, after: after, limit: limit, &block)
+      def saved_albums(limit:, after: nil, &block)
+        retrieve_all(method: :saved_albums, after:, limit:, &block)
       end
 
-      def saved_tracks(after: nil, limit:, &block)
-        retrieve_all(method: :saved_tracks, after: after, limit: limit, &block)
+      def saved_tracks(limit:, after: nil, &block)
+        retrieve_all(method: :saved_tracks, after:, limit:, &block)
       end
 
       def recently_played(before: nil, after: nil, limit: nil, &block)
         before = before&.to_i&.*(1000)
-        retrieve_all(method: :recently_played, before: before, after: after, limit: limit, &block)
+        retrieve_all(method: :recently_played, before:, after:, limit:, &block)
       end
 
       private
 
-      def retrieve_all(method:, before: nil, after: nil, limit: nil)
+      def retrieve_all(method:, before: nil, after: nil, limit: nil, &block)
         has_more = true
         count = 0
-        offset = 0 if method != :recently_played  # FIXME: hacky
+        offset = 0 if method != :recently_played # FIXME: hacky
 
         while has_more
-          response = retrieve_page(method: method, before: before, offset: offset)
+          response = retrieve_page(method:, before:, offset:)
 
           records = response[:items]
           records = records.first(limit - count) if limit
@@ -51,9 +51,7 @@ module Chronicle
 
           break unless records.any?
 
-          records.each do |track|
-            yield track
-          end
+          records.each(&block)
 
           count += records.count
           has_more = response[:next]
@@ -65,9 +63,9 @@ module Chronicle
 
       def retrieve_page(method:, before: nil, offset: nil)
         options = {
-          offset: offset,
+          offset:,
           limit: PER_PAGE,
-          before: before
+          before:
         }.compact
 
         JSON.parse(@authenticated_user.send(method, **options), symbolize_names: true)

data/lib/chronicle/spotify/saved_album_extractor.rb

@@ -0,0 +1,18 @@
+module Chronicle
+  module Spotify
+    class SavedAlbumExtractor < Chronicle::Spotify::SpotifyExtractor
+      register_connector do |r|
+        r.source = :spotify
+        r.type = :saved_album
+        r.strategy = :api
+        r.description = 'saved_albums'
+      end
+
+      def extract
+        @proxy.saved_albums(after: @config.since, limit: @config.limit) do |item|
+          yield build_extraction(data: item, meta: { agent: @agent })
+        end
+      end
+    end
+  end
+end

data/lib/chronicle/spotify/saved_album_transformer.rb

@@ -0,0 +1,20 @@
+module Chronicle
+  module Spotify
+    class SavedAlbumTransformer < Chronicle::ETL::Transformer
+      include Chronicle::Spotify::Builders
+
+      register_connector do |r|
+        r.source = :spotify
+        r.type = :saved_album
+        r.strategy = :api
+        r.description = 'a saved album'
+        r.from_schema = :extraction
+        r.to_schema = :chronicle
+      end
+
+      def transform(record)
+        build_like(record: record.data, agent: record.extraction.meta[:agent])
+      end
+    end
+  end
+end

data/lib/chronicle/spotify/spotify_extractor.rb

@@ -15,7 +15,7 @@ module Chronicle
           client_id: @config.client_id,
           client_secret: @config.client_secret
         )
-        @actor = @proxy.user
+        @agent = @proxy.user
       end
     end
   end

data/lib/chronicle/spotify/version.rb

@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module Chronicle
   module Spotify
-    VERSION = "0.1.0"
+    VERSION = '0.2.0'.freeze
   end
 end

data/lib/chronicle/spotify.rb

@@ -1,20 +1,19 @@
-# frozen_string_literal: true
-
 require 'chronicle/etl'
 
-require_relative "spotify/version"
+require_relative 'spotify/version'
 
-require_relative "spotify/authorizer"
-require_relative "spotify/proxy"
-require_relative "spotify/builders"
+require_relative 'spotify/authorizer'
+require_relative 'spotify/proxy'
+require_relative 'spotify/builders'
 
-require_relative "spotify/spotify_extractor"
-require_relative "spotify/listens_extractor"
-require_relative "spotify/liked_tracks_extractor"
-require_relative "spotify/saved_albums_extractor"
+require_relative 'spotify/spotify_extractor'
+require_relative 'spotify/listens_extractor'
+require_relative 'spotify/liked_tracks_extractor'
+require_relative 'spotify/saved_album_extractor'
+require_relative 'spotify/saved_album_transformer'
 
-require_relative "spotify/like_transformer"
-require_relative "spotify/listen_transformer"
+require_relative 'spotify/like_transformer'
+require_relative 'spotify/listen_transformer'
 module Chronicle
   module Spotify
   end

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: chronicle-spotify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Louis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-24 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: chronicle-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: chronicle-etl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: omniauth-spotify
   requirement: !ruby/object:Gem::Requirement
@@ -53,61 +67,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.6
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '1.63'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '1.63'
 description: Spotify connectors
 email:
 - andrew@hyfen.net
@@ -119,7 +133,6 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
@@ -133,7 +146,8 @@ files:
 - lib/chronicle/spotify/listen_transformer.rb
 - lib/chronicle/spotify/listens_extractor.rb
 - lib/chronicle/spotify/proxy.rb
-- lib/chronicle/spotify/saved_albums_extractor.rb
+- lib/chronicle/spotify/saved_album_extractor.rb
+- lib/chronicle/spotify/saved_album_transformer.rb
 - lib/chronicle/spotify/spotify_extractor.rb
 - lib/chronicle/spotify/version.rb
 homepage: https://github.com/chronicle-app/chronicle-spotify
@@ -143,6 +157,7 @@ metadata:
   homepage_uri: https://github.com/chronicle-app/chronicle-spotify
   source_code_uri: https://github.com/chronicle-app/chronicle-spotify
   changelog_uri: https://github.com/chronicle-app/chronicle-spotify
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -151,14 +166,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Spotify importer for Chronicle

data/Gemfile.lock

@@ -1,190 +0,0 @@
-PATH
-  remote: .
-  specs:
-    chronicle-spotify (0.1.0)
-      chronicle-etl (~> 0.5)
-      omniauth-spotify
-      rspotify (~> 2.11)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (7.0.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.2)
-    byebug (11.1.3)
-    chronic_duration (0.10.6)
-      numerizer (~> 0.1.1)
-    chronicle-etl (0.5.3)
-      activesupport (~> 7.0)
-      chronic_duration (~> 0.10.6)
-      colorize (~> 0.8.1)
-      launchy
-      marcel (~> 1.0.2)
-      mini_exiftool (~> 2.10)
-      nokogiri (~> 1.13)
-      omniauth (~> 2)
-      sequel (~> 5.35)
-      sinatra (~> 2)
-      sqlite3 (~> 1.4)
-      thor (~> 1.2)
-      thor-hollaback (~> 0.2)
-      tty-progressbar (~> 0.17)
-      tty-prompt (~> 0.23)
-      tty-spinner
-      tty-table (~> 0.11)
-      xdg (>= 4.0)
-    coderay (1.1.3)
-    colorize (0.8.1)
-    concurrent-ruby (1.1.10)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    faraday (2.2.0)
-      faraday-net_http (~> 2.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.2)
-    hashie (5.0.0)
-    hollaback (0.1.1)
-    http-cookie (1.0.4)
-      domain_name (~> 0.5)
-    i18n (1.10.0)
-      concurrent-ruby (~> 1.0)
-    jwt (2.3.0)
-    launchy (2.5.0)
-      addressable (~> 2.7)
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    mini_exiftool (2.10.2)
-    minitest (5.15.0)
-    multi_json (1.15.0)
-    multi_xml (0.6.0)
-    mustermann (1.1.1)
-      ruby2_keywords (~> 0.0.1)
-    netrc (0.11.0)
-    nokogiri (1.13.4-arm64-darwin)
-      racc (~> 1.4)
-    numerizer (0.1.1)
-    oauth2 (1.4.9)
-      faraday (>= 0.17.3, < 3.0)
-      jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (2.1.0)
-      hashie (>= 3.4.6)
-      rack (>= 2.2.3)
-      rack-protection
-    omniauth-oauth2 (1.7.2)
-      oauth2 (~> 1.4)
-      omniauth (>= 1.9, < 3)
-    omniauth-spotify (0.0.13)
-      omniauth-oauth2 (~> 1.1)
-    parallel (1.22.1)
-    parser (3.1.2.0)
-      ast (~> 2.4.1)
-    pastel (0.8.0)
-      tty-color (~> 0.5)
-    pry (0.13.1)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    public_suffix (4.0.7)
-    racc (1.6.0)
-    rack (2.2.3)
-    rack-protection (2.2.0)
-      rack
-    rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.3.0)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    rexml (3.2.5)
-    rspotify (2.11.1)
-      addressable (~> 2.8.0)
-      omniauth-oauth2 (>= 1.6)
-      rest-client (~> 2.0.2)
-    rubocop (1.27.0)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.17.0)
-      parser (>= 3.1.1.0)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.5)
-    sequel (5.55.0)
-    sinatra (2.2.0)
-      mustermann (~> 1.0)
-      rack (~> 2.2)
-      rack-protection (= 2.2.0)
-      tilt (~> 2.0)
-    sqlite3 (1.4.2)
-    strings (0.2.1)
-      strings-ansi (~> 0.2)
-      unicode-display_width (>= 1.5, < 3.0)
-      unicode_utils (~> 1.4)
-    strings-ansi (0.2.0)
-    thor (1.2.1)
-    thor-hollaback (0.2.1)
-      hollaback (~> 0.1)
-      thor (>= 0.19.1)
-    tilt (2.0.10)
-    tty-color (0.6.0)
-    tty-cursor (0.7.1)
-    tty-progressbar (0.18.2)
-      strings-ansi (~> 0.2)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      unicode-display_width (>= 1.6, < 3.0)
-    tty-prompt (0.23.1)
-      pastel (~> 0.8)
-      tty-reader (~> 0.8)
-    tty-reader (0.9.0)
-      tty-cursor (~> 0.7)
-      tty-screen (~> 0.8)
-      wisper (~> 2.0)
-    tty-screen (0.8.1)
-    tty-spinner (0.9.3)
-      tty-cursor (~> 0.7)
-    tty-table (0.12.0)
-      pastel (~> 0.8)
-      strings (~> 0.2.0)
-      tty-screen (~> 0.8)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.1)
-    unicode-display_width (2.1.0)
-    unicode_utils (1.4.0)
-    wisper (2.0.1)
-    xdg (6.3.2)
-
-PLATFORMS
-  arm64-darwin-20
-
-DEPENDENCIES
-  bundler (~> 2.3)
-  chronicle-spotify!
-  pry-byebug (~> 3.9)
-  rake (~> 13.0)
-  rubocop
-
-BUNDLED WITH
-   2.3.8

data/lib/chronicle/spotify/saved_albums_extractor.rb

@@ -1,17 +0,0 @@
-module Chronicle
-  module Spotify
-    class SavedAlbumsExtractor < Chronicle::Spotify::SpotifyExtractor
-      register_connector do |r|
-        r.provider = 'spotify'
-        r.description = 'saved albums'
-        r.identifier = 'saved-albums'
-      end
-
-      def extract
-        @proxy.saved_albums(after: @config.since, limit: @config.limit) do |item|
-          yield Chronicle::ETL::Extraction.new(data: item, meta: { actor: @actor })
-        end
-      end
-    end
-  end
-end