musk 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f0adaae714ee1cae505776968e98e731e9d505b
-  data.tar.gz: 46c6906ba26318a60a629af3546024974ee28c08
+  metadata.gz: 6d3cfe8d2f4b025504f856f58912b4dbb2dc806b
+  data.tar.gz: fef5e17b70ea89e296e4734dab2ed4c1c22833e1
 SHA512:
-  metadata.gz: 0e26c7088e208a31dfac5954d301cbc41e83e3afba7a560a063817d72c5211f31db8c4269ebd8875ff315529a79a0ecbcd72e278febb1e12950c35ef6b02c8e9
-  data.tar.gz: 089ba815b88791687069a5c3f7475bbd13fe408f4fec1af15abb20c7f6b6ea97480c7d622134ab66663db7838401e0375c3df29d27a4f1c8753ce78cb63a3e24
+  metadata.gz: 06954d894d0a0c26b3b7db4bd502e9ec458e4d431ca8fbc90302123afd60e0348af85a98c6fc6e1d82fd91b4e57b7352069ee68b05a2038e6566d01dc8bb44fe
+  data.tar.gz: ba57a7874101c727a5ecc5195fcfc2f6cc94556f4931aa272bdffb235134e937f2fda3727299aad4741c451555c832e721f6eb116bb46d2764af92448162d1d5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    musk (0.1.7)
+    musk (0.1.8)
       gli (~> 2.9)
       taglib-ruby (~> 0.6)
 

data/lib/musk.rb

@@ -3,6 +3,7 @@ require "musk/formatter/base"
 require "musk/formatter/csv"
 require "musk/formatter/pretty"
 require "musk/track"
+require "musk/track_adapter"
 require "musk/track_loader"
 require "musk/track_printer"
 require "musk/version"

data/lib/musk/track.rb

@@ -15,14 +15,12 @@ module Musk
 
     attr_accessor *ATTRIBUTES
 
-    def attributes
-      Hash[ATTRIBUTES.map { |a| [a, send("#{a}")] }]
+    def initialize(attributes = {})
+      attributes.each { |k, v| send("#{k}=", v) if respond_to?("#{k}=") }
     end
 
-    def attributes=(hash)
-      hash.each do |key, value|
-        send("#{key}=", value) if respond_to?("#{key}=")
-      end
+    def attributes
+      Hash[ATTRIBUTES.map { |a| [a, send("#{a}")] }]
     end
   end
 end

data/lib/musk/track_adapter.rb

@@ -0,0 +1,56 @@
+module Musk
+  class TrackAdapter
+    def self.adapt(tag)
+      new(tag).adapt
+    end
+
+    def initialize(tag)
+      @tag = tag
+    end
+
+    def adapt
+      Musk::Track.new(attributes)
+    end
+
+    private
+
+    def attributes
+      Musk::Track::ATTRIBUTES.inject({}) do |hash, attribute|
+        hash[attribute] = send(attribute) if respond_to?(attribute, true)
+        hash
+      end
+    end
+
+    def number
+      @tag.frame_list("TRCK").first.to_s.split("/").first
+    end
+
+    def number_of
+      @tag.frame_list("TRCK").first.to_s.split("/").last
+    end
+
+    def title
+      @tag.title
+    end
+
+    def artist
+      @tag.artist
+    end
+
+    def release
+      @tag.album
+    end
+
+    def genre
+      @tag.genre
+    end
+
+    def year
+      @tag.year.to_s
+    end
+
+    def comment
+      @tag.comment
+    end
+  end
+end

data/lib/musk/track_loader.rb

@@ -31,45 +31,31 @@ module Musk
       end
     end
 
-    def fullpath
-      @fullpath ||= File.expand_path(@path)
+    def create_tracks
+      Dir[deeppath].map do |filepath|
+        TagLib::MPEG::File.open(filepath) do |file|
+          Musk::TrackAdapter.adapt(file.id3v2_tag).tap do |track|
+            track.loadpath = loadpath
+            track.fullpath = filepath
+          end
+        end
+      end
     end
 
-    def basepath
-      @basepath ||= File.dirname(fullpath)
+    def deeppath
+      @deeppath ||= File.file?(fullpath) ? fullpath : File.join(fullpath, "**", "*.mp3")
     end
 
     def loadpath
       @loadpath ||= "#{File.file?(fullpath) ? basepath : fullpath}#{File::SEPARATOR}"
     end
 
-    def deeppath
-      @deeppath ||= File.file?(fullpath) ? fullpath : File.join(fullpath, "**", "*.mp3")
-    end
-
-    def create_tracks
-      Dir[deeppath].map do |filepath|
-        TagLib::MPEG::File.open(filepath) do |file|
-          create_track(filepath, file.id3v2_tag)
-        end
-      end
+    def basepath
+      @basepath ||= File.dirname(fullpath)
     end
 
-    def create_track(filepath, tag)
-      Musk::Track.new.tap do |track|
-        track.attributes = {
-          loadpath:  loadpath,
-          fullpath:  filepath,
-          number:    tag.frame_list("TRCK").first.to_s.split("/").first,
-          number_of: tag.frame_list("TRCK").first.to_s.split("/").last,
-          title:     tag.title,
-          artist:    tag.artist,
-          release:   tag.album,
-          genre:     tag.genre,
-          year:      tag.year.to_s,
-          comment:   tag.comment,
-        }
-      end
+    def fullpath
+      @fullpath ||= File.expand_path(@path)
     end
   end
 end

data/lib/musk/version.rb

@@ -1,3 +1,3 @@
 module Musk
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musk
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Eugene Pempel
@@ -59,6 +59,7 @@ files:
 - lib/musk/formatter/csv.rb
 - lib/musk/formatter/pretty.rb
 - lib/musk/track.rb
+- lib/musk/track_adapter.rb
 - lib/musk/track_loader.rb
 - lib/musk/track_printer.rb
 - lib/musk/version.rb