7digital 0.1.2 → 0.1.5

data/lib/sevendigital/model/locker.rb

@@ -1,5 +1,5 @@
-module Sevendigital
-  class Locker < SevendigitalObject
-    attr_accessor :locker_releases
-  end
+module Sevendigital
+  class Locker < SevendigitalObject
+    attr_accessor :locker_releases
+  end
 end

data/lib/sevendigital/model/locker_release.rb

@@ -1,9 +1,9 @@
-module Sevendigital
-
-  class LockerRelease < SevendigitalObject
-
-    attr_accessor :release, :locker_tracks
-    
-  end
-
-end
+module Sevendigital
+
+  class LockerRelease < SevendigitalObject
+
+    attr_accessor :release, :locker_tracks
+    
+  end
+
+end

data/lib/sevendigital/model/locker_track.rb

@@ -1,9 +1,9 @@
-module Sevendigital
-
-  class LockerTrack < SevendigitalObject
-
-    attr_accessor :track, :download_urls, :remaining_downloads, :purchase_date
-    
-  end
-
-end
+module Sevendigital
+
+  class LockerTrack < SevendigitalObject
+
+    attr_accessor :track, :download_urls, :remaining_downloads, :purchase_date
+    
+  end
+
+end

data/lib/sevendigital/model/price.rb

@@ -1,9 +1,9 @@
-module Sevendigital
-
-  class Price
-
-    attr_accessor :currency_code, :currency_symbol, :value, :formatted_price, :rrp, :formatted_rrp, :on_sale
-
-  end
-
-end
+module Sevendigital
+
+  class Price
+
+    attr_accessor :currency_code, :currency_symbol, :value, :formatted_price, :rrp, :formatted_rrp, :on_sale
+
+  end
+
+end

data/lib/sevendigital/model/release.rb

@@ -1,58 +1,58 @@
-module Sevendigital
-
-  class Release < SevendigitalObject
-
-    attr_accessor :id, :title
-
-    sevendigital_basic_property  :version, :type, :artist, :image, :url, :release_date,
-                      :added_date, :barcode, :year, :explicit_content, :formats, :label
-                         
-    sevendigital_extended_property :tracks
-    sevendigital_extended_property :recommendations
-    sevendigital_extended_property :tags
-
-    def get_details(options={})
-      release_with_details = @api_client.release.get_details(@id, options)
-      copy_basic_properties_from(release_with_details)
-      @price = release_with_details.instance_variable_get("@price")
-      release_with_details
-    end
-
-    def image(image_size = nil)
-      return @image.gsub(/_\d+\.jpg/, "_#{image_size}.jpg") if image_size
-      @image
-    end
-    
-    def get_tracks(options={})
-      @api_client.release.get_tracks(@id, options)
-    end
-
-    def get_recommendations(options={})
-      @api_client.release.get_recommendations(@id, options)
-    end
-
-    def get_tags(options={})
-      @api_client.release.get_tags(@id, options)
-     end
-
-    def demand_price(options={})
-      get_details(options) if @price.nil? || @price.value.nil?
-    end
-
-    def price(options={})
-      begin
-        demand_price(options) if @api_client.configuration.lazy_load
-      rescue Sevendigital::SevendigitalError => error
-        @api_client.log(:verbose) { "Release: Error while lazyloading price - #{error.error_code} #{error.error_message}" }
-        raise error if !@api_client.configuration.ignorant_lazy_load
-      end
-      @price
-    end
-
-    def price=(value)
-      @price = value
-    end
-
-  end
-  
+module Sevendigital
+
+  class Release < SevendigitalObject
+
+    attr_accessor :id, :title
+
+    sevendigital_basic_property  :version, :type, :artist, :image, :url, :release_date,
+                      :added_date, :barcode, :year, :explicit_content, :formats, :label
+                         
+    sevendigital_extended_property :tracks
+    sevendigital_extended_property :recommendations
+    sevendigital_extended_property :tags
+
+    def get_details(options={})
+      release_with_details = @api_client.release.get_details(@id, options)
+      copy_basic_properties_from(release_with_details)
+      @price = release_with_details.instance_variable_get("@price")
+      release_with_details
+    end
+
+    def image(image_size = nil)
+      return @image.gsub(/_\d+\.jpg/, "_#{image_size}.jpg") if image_size
+      @image
+    end
+    
+    def get_tracks(options={})
+      @api_client.release.get_tracks(@id, options)
+    end
+
+    def get_recommendations(options={})
+      @api_client.release.get_recommendations(@id, options)
+    end
+
+    def get_tags(options={})
+      @api_client.release.get_tags(@id, options)
+     end
+
+    def demand_price(options={})
+      get_details(options) if @price.nil? || @price.value.nil?
+    end
+
+    def price(options={})
+      begin
+        demand_price(options) if @api_client.configuration.lazy_load
+      rescue Sevendigital::SevendigitalError => error
+        @api_client.log(:verbose) { "Release: Error while lazyloading price - #{error.error_code} #{error.error_message}" }
+        raise error if !@api_client.configuration.ignorant_lazy_load
+      end
+      @price
+    end
+
+    def price=(value)
+      @price = value
+    end
+
+  end
+  
 end

data/lib/sevendigital/model/sevendigital_error.rb

@@ -1,11 +1,11 @@
-module Sevendigital
-  class SevendigitalError < StandardError;
-    attr_accessor :error_code, :error_message
-
-    def initialize(error_code = 10000, error_message=nil)
-      @error_code = error_code
-      @error_message = error_message
-    end
-
-  end
-end
+module Sevendigital
+  class SevendigitalError < StandardError;
+    attr_accessor :error_code, :error_message
+
+    def initialize(error_code = 10000, error_message=nil)
+      @error_code = error_code
+      @error_message = error_message
+    end
+
+  end
+end

data/lib/sevendigital/model/sevendigital_object.rb

@@ -1,57 +1,57 @@
-#@private
-class Class # :nodoc:
-
-  def sevendigital_basic_property(*properties)
-    @basic_properties ||= []
-    properties.each do |property|
-      @basic_properties << "@#{property}".to_sym
-      sevendigital_extended_property property, :get_details
-    end
-  end
-
-  def sevendigital_extended_property(accessor, get_method = nil)
-
-    get_method ||= "get_#{accessor.to_s}".to_sym
-    demand_method = "demand_#{accessor.to_s}".to_sym
-
-    define_method(demand_method) do |*options|
-      if instance_variable_get("@#{accessor}").nil?  then
-        value = send(get_method, *options)
-        instance_variable_set("@#{accessor}", value) if get_method != :get_details
-      end
-    end
-
-    define_method("#{accessor}") do |*options|
-      begin
-        send(demand_method, *options) if instance_variable_get("@#{accessor}").nil? && @api_client.configuration.lazy_load
-      rescue Sevendigital::SevendigitalError => error
-        @api_client.log(:verbose) { "Class: Error whilse lazyloading #{accessor} - #{error.error_code} #{error.error_message}" }
-        raise error if !@api_client.configuration.ignorant_lazy_load
-      end
-      instance_variable_get("@#{accessor}")
-    end
-
-     define_method("#{accessor}=") do |val|
-       instance_variable_set("@#{accessor}",val)
-     end
- end
-end
-
-module Sevendigital
-
-  class SevendigitalObject
-
-    def initialize(api_client)
-      @api_client = api_client
-    end
-
-    def copy_basic_properties_from(other_object)
-      self.class.instance_variable_get(:@basic_properties).each do |property|
-        instance_variable_set(property, other_object.instance_variable_get(property))
-      end
-    end
-
-  end
-
-end
-
+#@private
+class Class # :nodoc:
+
+  def sevendigital_basic_property(*properties)
+    @basic_properties ||= []
+    properties.each do |property|
+      @basic_properties << "@#{property}".to_sym
+      sevendigital_extended_property property, :get_details
+    end
+  end
+
+  def sevendigital_extended_property(accessor, get_method = nil)
+
+    get_method ||= "get_#{accessor.to_s}".to_sym
+    demand_method = "demand_#{accessor.to_s}".to_sym
+
+    define_method(demand_method) do |*options|
+      if instance_variable_get("@#{accessor}").nil?  then
+        value = send(get_method, *options)
+        instance_variable_set("@#{accessor}", value) if get_method != :get_details
+      end
+    end
+
+    define_method("#{accessor}") do |*options|
+      begin
+        send(demand_method, *options) if instance_variable_get("@#{accessor}").nil? && @api_client.configuration.lazy_load
+      rescue Sevendigital::SevendigitalError => error
+        @api_client.log(:verbose) { "Class: Error while lazyloading #{accessor} - #{error.error_code} #{error.error_message}" }
+        raise error if !@api_client.configuration.ignorant_lazy_load
+      end
+      instance_variable_get("@#{accessor}")
+    end
+
+     define_method("#{accessor}=") do |val|
+       instance_variable_set("@#{accessor}",val)
+     end
+ end
+end
+
+module Sevendigital
+
+  class SevendigitalObject
+
+    def initialize(api_client)
+      @api_client = api_client
+    end
+
+    def copy_basic_properties_from(other_object)
+      self.class.instance_variable_get(:@basic_properties).each do |property|
+        instance_variable_set(property, other_object.instance_variable_get(property))
+      end
+    end
+
+  end
+
+end
+

data/lib/sevendigital/model/tag.rb

@@ -1,7 +1,7 @@
-module Sevendigital
-
-  class Tag
-    attr_accessor :id, :text, :url, :count
-  end
-
-end
+module Sevendigital
+
+  class Tag
+    attr_accessor :id, :text, :url, :count
+  end
+
+end

data/lib/sevendigital/model/track.rb

@@ -1,84 +1,88 @@
-module Sevendigital 
-
-  class Track < SevendigitalObject
-
-    #track id
-    #@return [Integer]
-    attr_accessor :id
-
-    #title of the track
-    #@return [String]
-    attr_accessor :title
-
-    #version of the track (e.g. remix, radio edit)
-    #@return [String]
-    attr_accessor :version
-
-    #release the track appears on
-    #@return [Release]
-    attr_accessor :release
-
-    #Artist of the track
-    #@return [Artist]
-    attr_accessor :artist
-                  
-    #Number of the track as it appears on the release
-    #@return [Integer]
-    sevendigital_basic_property :track_number
-
-    #The length of the track in seconds
-    #@return [Integer]
-    sevendigital_basic_property :duration
-
-    #parental advisory - explicit content tag
-    #@return [Boolean]
-    sevendigital_basic_property :explicit_content
-
-    #ISRC code
-    #@return [String]
-    sevendigital_basic_property :isrc
-
-    #URL link to 7digital page where this track can be purchased
-    #@return [String]
-    sevendigital_basic_property :url
-
-    #Pricing information of the track
-    #@return [Price]
-    sevendigital_basic_property :price
-
-    #Retrieves and populates all track properties
-    #
-    #useful with lazy loading turned off
-    #@param [Hash] options optional hash of additional API parameters, e.g. image_size => 75, etc
-    #@return [Track]
-    def get_details(options={})
-      track_with_details = @api_client.track.get_details_from_release(@id, @release.id, options)
-      copy_basic_properties_from(track_with_details)
-      self
-    end
-
-    #Title of the track stripped out of any version information if it's included the title of the track rather than version property
-    #e.g. if title is "Some Song (Radio Edit)" it will return "Some Song"
-    #@return [String]
-    def short_title
-  #   return title.gsub(/\s+[\(\[](album|lp|single|short|edit|radio)\s+version[\)\]]/ , "")
-      return title.gsub(/\s+\(.*\s?(version|mix|remix|edit|edition|live|feat|explicit|original|remaster)\s?.*\)/i, "")
-    end
-
-    #Compares 2 songs whether they're just different versions of the same song by the same artist
-    #e.g. track "Some Song (Radio Edit)" is alternate version of "Some Song (Remastered)"
-    #returns true also if the 2 songs are the same
-    #@return [Boolean]
-    def alternate_version_of?(another_track)
-      return another_track && short_title.downcase == another_track.short_title.downcase \
-            && another_track.artist && artist.name.downcase == another_track.artist.name.downcase
-    end
-
-    #URL of mp3 preview for this track
-    #@return [String]
-    def preview_url(options={})
-      @api_client.track.build_preview_url(@id, options)
-    end
-
-  end
+module Sevendigital 
+
+  class Track < SevendigitalObject
+
+    #track id
+    #@return [Integer]
+    attr_accessor :id
+
+    #title of the track
+    #@return [String]
+    attr_accessor :title
+
+    #version of the track (e.g. remix, radio edit)
+    #@return [String]
+    attr_accessor :version
+
+    #release the track appears on
+    #@return [Release]
+    attr_accessor :release
+
+    #Artist of the track
+    #@return [Artist]
+    attr_accessor :artist
+                  
+    #Number of the track as it appears on the release
+    #@return [Integer]
+    sevendigital_basic_property :track_number
+
+    #The length of the track in seconds
+    #@return [Integer]
+    sevendigital_basic_property :duration
+
+    #parental advisory - explicit content tag
+    #@return [Boolean]
+    sevendigital_basic_property :explicit_content
+
+    #ISRC code
+    #@return [String]
+    sevendigital_basic_property :isrc
+
+    #URL link to 7digital page where this track can be purchased
+    #@return [String]
+    sevendigital_basic_property :url
+
+    #Pricing information of the track
+    #@return [Price]
+    sevendigital_basic_property :price
+
+    #Track type, e.g. :audio, :video, :pdf, etc
+    #@return [String]
+    sevendigital_basic_property :type
+
+    #Retrieves and populates all track properties
+    #
+    #useful with lazy loading turned off
+    #@param [Hash] options optional hash of additional API parameters, e.g. image_size => 75, etc
+    #@return [Track]
+    def get_details(options={})
+      track_with_details = @api_client.track.get_details_from_release(@id, @release.id, options)
+      copy_basic_properties_from(track_with_details)
+      self
+    end
+
+    #Title of the track stripped out of any version information if it's included the title of the track rather than version property
+    #e.g. if title is "Some Song (Radio Edit)" it will return "Some Song"
+    #@return [String]
+    def short_title
+  #   return title.gsub(/\s+[\(\[](album|lp|single|short|edit|radio)\s+version[\)\]]/ , "")
+      return title.gsub(/\s+\(.*\s?(version|mix|remix|edit|edition|live|feat|explicit|original|remaster)\s?.*\)/i, "")
+    end
+
+    #Compares 2 songs whether they're just different versions of the same song by the same artist
+    #e.g. track "Some Song (Radio Edit)" is alternate version of "Some Song (Remastered)"
+    #returns true also if the 2 songs are the same
+    #@return [Boolean]
+    def alternate_version_of?(another_track)
+      return another_track && short_title.downcase == another_track.short_title.downcase \
+            && another_track.artist && artist.name.downcase == another_track.artist.name.downcase
+    end
+
+    #URL of mp3 preview for this track
+    #@return [String]
+    def preview_url(options={})
+      @api_client.track.build_preview_url(@id, options)
+    end
+
+  end
 end