musk 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6fbabb4893fc5a6bd0f19518e3a907315924c47
-  data.tar.gz: 9c3aa75d246f6631336e22d0fef746fd75fe1136
+  metadata.gz: b1609e780b7c7837ccd4b98100a6e350261f2ebd
+  data.tar.gz: d4cc00ca5b1fe8353cda02ade420cb22a0f0d9bb
 SHA512:
-  metadata.gz: e83faf0aefe688bbcd451aa9473e4c4a2f4d5b709db75a4207ecaa93d64d89d0d2cb7d4c9751ba9834af52da3266a7bd726d2b6e50ca01cf9f6429b900001ef7
-  data.tar.gz: d9f5db98079f587d2c5c39ba6132fc47f48d5fc14c2e59f05febd30112a6a2449a0b34627a62a90a5c818861d080c350edd2f0bb702677ecac31f12fd740d65b
+  metadata.gz: 53c425a51d2fde4f633dfbee9133a6754364d7025ee506a44803b75eed93b64ba2715f6078e361fa67d8e4128af1e1ecc059a86e4a02b7bd29163e96d4100ba1
+  data.tar.gz: 707e0862f0fa78c0e0c80452943578959a90eea99de746abd645a4ae3cbd5c8c06f301d6625ed8c37c83ed5e942cf78bd5faeb86688d735a11b4138a05dd24a1

data/Gemfile.lock

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

data/lib/musk/decorator/printable_track.rb

@@ -10,19 +10,39 @@ module Musk
       end
 
       def position
-        "#{position_number}/#{positions_count}"
+        "#{number}/#{number_of}"
       end
 
-      [:position_number, :positions_count, :year, :comment].each do |method|
-        define_method(method) do
-          [nil, 0, "0"].include?(@track.send(method)) ? "-" : @track.send(method)
-        end
+      def number
+        [nil, 0, "0"].include?(@track.number) ? "-" : @track.number
       end
 
-      [:title, :artist, :release, :genre].each do |method|
-        define_method(method) do
-          @track.send(method) or "-"
-        end
+      def number_of
+        [nil, 0, "0"].include?(@track.number_of) ? "-" : @track.number_of
+      end
+
+      def year
+        [nil, 0, "0"].include?(@track.year) ? "-" : @track.year
+      end
+
+      def comment
+        [nil, 0, "0"].include?(@track.comment) ? "-" : @track.comment
+      end
+
+      def title
+        @track.title or "-"
+      end
+
+      def artist
+        @track.artist or "-"
+      end
+
+      def release
+        @track.release or "-"
+      end
+
+      def genre
+        @track.genre or "-"
       end
     end
   end

data/lib/musk/track.rb

@@ -4,8 +4,8 @@ module Musk
       :loadpath,
       :fullpath,
       :title,
-      :position_number,
-      :positions_count,
+      :number,
+      :number_of,
       :artist,
       :release,
       :genre,

data/lib/musk/track_loader.rb

@@ -11,13 +11,13 @@ module Musk
     end
 
     def load!
-      verify_tracks!
-      create_tracks!
+      verify_path!
+      create_tracks
     end
 
     private
 
-    def verify_tracks!
+    def verify_path!
       unless @path and @path.length > 0
         raise "Undefined path to a file or files"
       end
@@ -31,29 +31,42 @@ module Musk
       end
     end
 
-    def create_tracks!
-      path = File.expand_path(@path)
-      loadpath = "#{File.file?(path) ? File.dirname(path) : path}#{File::SEPARATOR}"
-      deeppath = File.file?(path) ? path : File.join(path, "**", "*.mp3")
-      Dir[deeppath].map do |fullpath|
-        track = Musk::Track.new
-        track.loadpath = loadpath
-        track.fullpath = fullpath
-        TagLib::MPEG::File.open(fullpath) do |file|
-          tag = file.id3v2_tag
-          if tag.frame_list("TRCK").first
-            number, count = tag.frame_list("TRCK").first.to_s.split("/")
-            track.position_number = number.to_i
-            track.positions_count = count.to_i
-          end
-          track.title   = tag.title
-          track.artist  = tag.artist
-          track.release = tag.album
-          track.genre   = tag.genre
-          track.year    = tag.year
-          track.comment = tag.comment
+    def fullpath
+      @fullpath ||= File.expand_path(@path)
+    end
+
+    def basepath
+      @basepath ||= File.dirname(fullpath)
+    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
-        track
+      end
+    end
+
+    def create_track(filepath, tag)
+      Musk::Track.new.tap do |track|
+        track.loadpath  = loadpath
+        track.fullpath  = filepath
+        track.number    = tag.frame_list("TRCK").first.to_s.split("/").first
+        track.number_of = tag.frame_list("TRCK").first.to_s.split("/").last
+        track.title     = tag.title.to_s
+        track.artist    = tag.artist.to_s
+        track.release   = tag.album.to_s
+        track.genre     = tag.genre.to_s
+        track.year      = tag.year.to_s
+        track.comment   = tag.comment.to_s
       end
     end
   end

data/lib/musk/version.rb

@@ -1,3 +1,3 @@
 module Musk
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/lib/musk/decorator/printable_track_spec.rb

@@ -14,20 +14,20 @@ describe Musk::Decorator::PrintableTrack do
   end
 
   describe "#position" do
-    it "should return '{position_number}/{positions_count}'" do
+    it "should return '{number}/{number_of}'" do
       track = described_class.new(build(:track))
-      allow(track).to receive(:position_number).and_return(1)
-      allow(track).to receive(:positions_count).and_return(2)
+      allow(track).to receive(:number).and_return(1)
+      allow(track).to receive(:number_of).and_return(2)
       position = track.position
       position.should eq("1/2")
-      expect(track).to have_received(:position_number)
-      expect(track).to have_received(:positions_count)
+      expect(track).to have_received(:number)
+      expect(track).to have_received(:number_of)
     end
   end
 
   it_should_behave_like "the track decorator with zeroable attributes", [
-    :position_number,
-    :positions_count,
+    :number,
+    :number_of,
     :comment,
     :year,
   ]

data/spec/lib/musk/track_spec.rb

@@ -7,10 +7,10 @@ describe Musk::Track do
   it { should respond_to(:fullpath=) }
   it { should respond_to(:title) }
   it { should respond_to(:title=) }
-  it { should respond_to(:position_number) }
-  it { should respond_to(:position_number=) }
-  it { should respond_to(:positions_count) }
-  it { should respond_to(:positions_count=) }
+  it { should respond_to(:number) }
+  it { should respond_to(:number=) }
+  it { should respond_to(:number_of) }
+  it { should respond_to(:number_of=) }
   it { should respond_to(:artist) }
   it { should respond_to(:artist=) }
   it { should respond_to(:release) }

data/spec/support/factories/tracks.rb

@@ -6,12 +6,12 @@ FactoryGirl.define do
     loadpath ENV["MUSK_TRACKS_PATH"]
     fullpath File.join(ENV["MUSK_TRACKS_PATH"], "bonobo/jets.mp3")
     title "Jets"
-    position_number 6
-    positions_count 13
+    number "6"
+    number_of "13"
     artist "Bonobo"
     release "The North Borders"
     genre "Electronic"
-    year 2013
+    year "2013"
 
     trait :loaded do
       comment "0"
@@ -22,12 +22,12 @@ FactoryGirl.define do
     loadpath ENV["MUSK_TRACKS_PATH"]
     fullpath File.join(ENV["MUSK_TRACKS_PATH"], "emancipator/kamakura.mp3")
     title "Kamakura"
-    position_number 4
-    positions_count 14
+    number "4"
+    number_of "14"
     artist "Emancipator"
     release "Safe In The Steep Cliffs"
     genre "Electronic"
-    year 2010
+    year "2010"
 
     trait :loaded do
       comment "0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musk
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Eugene Pempel