songstats-api 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66741cd74c3ee019128ba6db6949579b1f53b952f3ddb4e10a50983611b9f42a
-  data.tar.gz: 908d890645fa89d1ef8cb44d79992ace241ffb8e6bb08b44ac982ef755d6c738
+  metadata.gz: 9d8df26fc2d79b94ae28d7c834c6d6d05faf8b48e7eeca5b66fb0c0c3916cab6
+  data.tar.gz: 0db44faaaea2e1738aaf0bb31a0c498ec840e2d9dca342aecc540807803f28ff
 SHA512:
-  metadata.gz: a35f5bb1e66c5d4f5a34f639023cb91d5d04f6d78218c1a698fbab51dea0f59fd4b94d02321b7560c7c9d5575d53a6e55d8c77e75fb24ab6f837541d5405de7c
-  data.tar.gz: e8d2da614c14d5fe10a5339ced1521ea1319bef67f26f708455c2e37bf50f96c3cb44a49bc5424bf28bbdbaa10f35971cd41850e993ac39b24040edb2787eca8
+  metadata.gz: 23ffaa30f77ef53d95556ce21a7f702f1c225c7d91b9a1dd217d2956b6a9efcf387bde7550ec3ba263605820c04c8081be63421686f36edd6176c367465cc9eb
+  data.tar.gz: 6613a579154f5b7e718909a0f417884619cd159dd6073644960056bcf0c522f89e31c45fed0c51a5c4c53f9b9604af344041868c7ee5b583b60a260c1c7fd83d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    songstats-api (1.0.0)
+    songstats-api (1.1.0)
       httparty
 
 GEM

data/README.md

@@ -1,5 +1,7 @@
 # Songstats::Api
 
+[![Ruby](https://github.com/songtradr/songstats-api/actions/workflows/main.yml/badge.svg)](https://github.com/songtradr/songstats-api/actions/workflows/main.yml)
+
 The Songstats API Gem is a lightweight tool for developers to interact with the Songstats REST API. With this gem, you can integrate Songstats' music data into your Ruby applications, making it easy to access information about tracks, artists, and more.
 
 To experiment with that code, run `bin/console` for an interactive prompt.

data/lib/songstats/api/artist.rb

@@ -62,10 +62,10 @@ module Songstats
         fetch path(id, "/artists/top_playlists", options)
       end
 
-      def search(id, query, options = {})
+      def search(query, options = {})
         # https://docs.songstats.com/docs/api/d761545339f09-search-artist
         options[:q] = query
-        fetch path(id, "/artists/search", options)
+        fetch path("", "/artists/search", options)
       end
 
       def add_link(id, link)

data/lib/songstats/api/base.rb

@@ -21,17 +21,28 @@ module Songstats
 
       private
 
+      def query_string(id)
+        return "isrc=#{id}" if id.size == ISRC_LENGTH
+
+        return "songstats_#{@type}_id=#{id}" if id.size == SONG_STATS_ID_LENGTH
+
+        return "" if id.size.zero?
+
+        "spotify_#{@type}_id=#{id}"
+      end
+
       def path(id, path, options = {})
-        path += case id.size
-                when ISRC_LENGTH
-                  "?isrc=#{id}"
-                when SONG_STATS_ID_LENGTH
-                  "?songstats_#{@type}_id=#{id}"
-                else
-                  "?spotify_#{@type}_id=#{id}"
-                end
-        options.each { |key, value| path += "&#{key}=#{value}" }
-        path
+        query_params = options.map { |key, value| "#{key}=#{value}" }.join("&")
+
+        query_string = query_string(id)
+
+        if query_string.empty?
+          "#{path}?#{query_params}"
+        else
+          return "#{path}?#{query_string}" if query_params.empty?
+
+          "#{path}?#{query_string}&#{query_params}"
+        end
       end
 
       def fetch(path)

data/lib/songstats/api/label.rb

@@ -7,10 +7,12 @@ module Songstats
       include Singleton
 
       # override because the label id is either songstats_label_id or beatport_label_id
-      def path(id, path, options = {})
-        path += id.size == SONG_STATS_ID_LENGTH ? "?songstats_label_id=#{id}" : "?beatport_label_id=#{id}"
-        options.each { |key, value| path += "&#{key}=#{value}" }
-        path
+      def query_string(id)
+        return "songstats_label_id=#{id}" if id.size == SONG_STATS_ID_LENGTH
+
+        return "" if id.size.zero?
+
+        "beatport_label_id=#{id}"
       end
 
       def info(id)
@@ -63,10 +65,10 @@ module Songstats
         fetch path(id, "/labels/top_playlists", options)
       end
 
-      def search(id, query, options = {})
+      def search(query, options = {})
         # https://docs.songstats.com/docs/api/c934a2909ba0f-search-label
         options[:q] = query
-        fetch path(id, "/labels/search", options)
+        fetch path("", "/labels/search", options)
       end
 
       def add_link(id, link)

data/lib/songstats/api/track.rb

@@ -34,10 +34,10 @@ module Songstats
         fetch path(id, "/tracks/historic_stats", options)
       end
 
-      def search(id, query, options = {})
+      def search(query, options = {})
         # https://docs.songstats.com/docs/api/1f2e4f9b3b1d1-search-track
         options[:q] = query
-        fetch path(id, "/tracks/search", options)
+        fetch path("", "/tracks/search", options)
       end
 
       def add_link(id, link)

data/lib/songstats/api/version.rb

@@ -2,6 +2,6 @@
 
 module Songstats
   module Api
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: songstats-api
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Daryl Findlay