muzak 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809d9fd5e4afee2f04affc8214c4f7c5a7980aa7
-  data.tar.gz: bacfe904636a5b9614082341d7a3d6b7358c691e
+  metadata.gz: 77d8a106e1b6479194813a854372b1623f3bac7b
+  data.tar.gz: 4eb72201a9378ba5ee92c43668009ab314c1e1ff
 SHA512:
-  metadata.gz: 4afbbbf920fb553fbdd6cc19dc443a02c2425b5d919e735c7f8bd6988f9a2f9630fe5cf7f049e1f361633020b9e7c2864107d1b9dc5f474c7f0b0ea3e334d515
-  data.tar.gz: e99922aa6b052e5aa4799040b1f58cab6fc76617e5b199931f2983b06510a2c6d16ffd1823884a1cc5cf22d950bc5bcee54aea31c803ec9ecc72e8c1a8e1abc9
+  metadata.gz: e94f921353d774220411452b8ecd4a49003792d0f0a7a3a96d8cbda3d6d92518e6b50a2c46d1afaf8a7050136ffadc0a069c08857ee0e717bc589e9613262f5d
+  data.tar.gz: 8bb4da0e3c69ad6e319b46db29a21031aec4d55ce6aef2b4ae33dca91dd4d44c7ec488f151b382485a29da7cdfa1e7be96fb1dca5135c5602c0412e3d6a397c9

data/lib/muzak.rb

@@ -12,5 +12,5 @@ require_relative "muzak/instance"
 # The primary namespace for muzak.
 module Muzak
   # Muzak's current version
-  VERSION = "0.3.6".freeze
+  VERSION = "0.3.7".freeze
 end

data/lib/muzak/index.rb

@@ -23,6 +23,15 @@ module Muzak
       debug "loading index from '#{Config::INDEX_FILE}'..."
 
       @hash = Marshal.load(File.read file)
+
+      # create some frequently accessed collections
+      @all_albums = @hash["artists"].map { |_, a| a["albums"] }.flatten
+
+      if deep?
+        @all_deep_songs = @all_albums.map { |aa| aa.map { |_, a| a["deep-songs"] } }.flatten
+      else
+        @all_songs = @all_albums.map { |aa| aa.map { |_, a| a["songs"] } }.flatten
+      end
     end
 
     # @return [Boolean] whether or not the current index is deep
@@ -61,6 +70,17 @@ module Muzak
       end
     end
 
+    # @return [Array<Song>] a list of all Song objects in the index
+    # @note This method **requires** a deep index.
+    def songs
+      unless deep?
+        danger "tried to call a deep-index-only method with a shallow index"
+        return []
+      end
+
+      @all_deep_songs
+    end
+
     # @return [Array<String>] a list of all albums in the index
     # @note albums with the same name will appear, but can't be disambiguated
     #   from here
@@ -90,13 +110,9 @@ module Muzak
     # @param count [Integer] the number of random songs to return
     # @return [Array<Song>] an array of randomly chosen songs
     def jukebox(count = 50)
-      @all_albums ||= @hash["artists"].map { |_, a| a["albums"] }.flatten
-
       if deep?
-        @all_deep_songs ||= @all_albums.map { |aa| aa.map { |_, a| a["deep-songs"] } }.flatten
         @all_deep_songs.sample(count)
       else
-        @all_songs ||= @all_albums.map { |aa| aa.map { |_, a| a["songs"] } }.flatten
         @all_songs.sample(count).map { |s| Song.new(s) }
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: muzak
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - William Woodruff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-29 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: taglib-ruby