mixcloud 0.0.3 → 1.0.0

data/lib/mixcloud.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 require 'rest_client'
 require 'json'
-require 'rspec'
 
 require 'mixcloud/popular_new_hot'
 require 'mixcloud/url_helper'
@@ -14,3 +13,4 @@ require 'mixcloud/tag'
 require 'mixcloud/track'
 require 'mixcloud/user'
 require 'mixcloud/search'
+require 'mixcloud/error'

data/lib/mixcloud/category.rb

@@ -20,7 +20,7 @@ module Mixcloud
 
     ['userpick_users', 'userpick_cloudcasts', 'users', 'cloudcasts' ].each do | connection |
       define_method "#{connection}_url" do
-        UrlHelper.turn_www_to_api(@public_url).concat "#{connection.gsub("_", "-")}/"
+        turn_www_to_api(@public_url).concat "#{connection.gsub("_", "-")}/"
       end
     end
   end

data/lib/mixcloud/cloudcast.rb

@@ -30,7 +30,7 @@ module Mixcloud
 
    ['listeners', 'similar', 'favorites', 'comments'].each do | connection |
       define_method "#{connection}_url" do
-        UrlHelper.turn_www_to_api(@public_url) + "#{connection.gsub("_", "-")}/?metadata=1"
+        turn_www_to_api(@public_url) + "#{connection.gsub("_", "-")}/?metadata=1"
       end
     end
 
@@ -38,21 +38,26 @@ module Mixcloud
       convert_hash_data_into_array_of('sections')
     end
 
-    def tag_urls
+    def tags
       convert_hash_data_into_array_of('tags')
     end
+    
+    def tag_urls
+      tags.map(&:api_url)
+    end
 
     #######################################################################
     private
     def convert_hash_data_into_array_of(type)
-      raise 'I only take sections of tags, dude' unless ['sections', 'tags'].include?(type)
+      raise Mixcloud::Error.new("type should be 'sections' or 'tags', but you provided '#{type}'") unless ['sections', 'tags'].include?(type)
       elements_hash = JSON.parse(RestClient.get @api_url)[type]
       objects_array = []
       elements_hash.each do | element |
         if type == 'sections'
-          objects_array << Mixcloud::Section.new(UrlHelper.turn_www_to_api(element['track']['url']), element['position'], element['start_type'], element['section_type'] )
+          objects_array << Mixcloud::Section.new(turn_www_to_api(element['track']['url'] + "?metadata=1"), 
+                                                 element['position'], element['start_time'], element['section_type'])
         elsif type == 'tags'
-          objects_array << UrlHelper.turn_www_to_api(element['url']).concat('?metadata=1')
+          objects_array << Mixcloud::Tag.new(turn_www_to_api(element['url']).concat('?metadata=1'))
         end
       end
       objects_array

data/lib/mixcloud/error.rb

@@ -0,0 +1,7 @@
+module Mixcloud
+  class Error < StandardError
+    def initialize(message)
+      super(message)
+    end
+  end
+end

data/lib/mixcloud/popular_new_hot.rb

@@ -1,15 +1,19 @@
 module Mixcloud
   module PopularNewHot
+    def self.included(base)
+      base.class_eval{include UrlHelper} unless base.include?(UrlHelper)
+    end
+    
     def popular_url
-      UrlHelper.turn_www_to_api(@public_url).concat 'popular/'
+      turn_www_to_api(@public_url).concat 'popular/'
     end
 
     def new_url
-      UrlHelper.turn_www_to_api(@public_url).concat 'new/'
+      turn_www_to_api(@public_url).concat 'new/'
     end
 
     def hot_url
-      UrlHelper.turn_www_to_api(@public_url).concat 'hot/'
+      turn_www_to_api(@public_url).concat 'hot/'
     end
   end
 end

data/lib/mixcloud/resource.rb

@@ -1,11 +1,12 @@
 module Mixcloud
   class Resource
 
+    include UrlHelper
     def initialize(url)
-      UrlHelper.validate_mixcloud_url(url)
-      url_with_metadata = UrlHelper.concat_with_metadata(url)
-      data_hash = JSON.parse RestClient.get(url_with_metadata)
-      klass =  Mixcloud.const_get(data_hash['type'].capitalize)
+      validate_mixcloud_url(url)
+      url_with_metadata = concat_with_metadata(url)
+      data_hash = grab_data_from_mixcloud(url_with_metadata)
+      klass = determine_class_by_mixcloud_data(data_hash)
       prevent_url_and_class_mismatch(klass)
       map_to_resource_attributes(data_hash)
     end
@@ -14,9 +15,26 @@ module Mixcloud
     ###########################################
     private
 
+    def grab_data_from_mixcloud(url_with_metadata)
+      begin
+        JSON.parse RestClient.get(url_with_metadata)
+      rescue => e
+        e.message.concat(". Are you sure you have connection with Mixcloud at the moment?")
+        raise e
+      end
+    end
+
+    def determine_class_by_mixcloud_data(data_hash)
+      begin
+        Mixcloud.const_get(data_hash['type'].capitalize) # it would take a change of Mixcloud API to get this line to fail
+      rescue => e
+        e.message.concat(". We can't find the key 'type'. Could it be that Mixcloud has changed its API?")
+      end
+    end
+
     def prevent_url_and_class_mismatch(klass)
       if klass != self.class
-        raise "You tried to create an object of #{self.class} with an URL of object type #{klass}"
+        raise Mixcloud::Error.new("You tried to create an object of #{self.class} with an URL of object type #{klass}")
       end
     end
 
@@ -38,14 +56,15 @@ module Mixcloud
 
     def set_public_and_api_urls(url_string)
       send("public_url=", url_string)
-      send("api_url=", UrlHelper.turn_www_to_api(url_string)).concat('?metadata=1')
+      send("api_url=", turn_www_to_api(url_string)).concat('?metadata=1')
     end
 
     def set_associated_object_urls(key, value)
       variable_name = key + "_url"
-      object_url = UrlHelper.turn_www_to_api(value['url']).concat('?metadata=1')
+      object_url = turn_www_to_api(value['url']).concat('?metadata=1')
       [ variable_name, object_url ]
     end
+
     ############################################
   end
 end

data/lib/mixcloud/search.rb

@@ -1,5 +1,6 @@
 module Mixcloud
   class Search
+    extend UrlHelper
 
     # The codeblock below defines the following class methods:
     # Mixcloud::Search.find_artist 
@@ -25,7 +26,7 @@ module Mixcloud
     def self.turn_data_into_mixcloud_resources(results, klass)
       search_results = []
       results.each do |result|
-        resource_api_url = UrlHelper.turn_www_to_api result['url']
+        resource_api_url = turn_www_to_api result['url']
         resource = klass.new(resource_api_url)
         search_results << resource
       end

data/lib/mixcloud/url_helper.rb

@@ -1,38 +1,35 @@
 module Mixcloud
-  class UrlHelper
 
-    class << self
-      ##################################
-      public
-      def validate_mixcloud_url(url)
-        raise "You provided an invalid Mixcloud-API url. It must start with http://api.mixcloud.com/" unless url =~ /\Ahttp:\/\/api.mixcloud.com\//
-      end
-
-      def concat_with_metadata(url)
-        return url if ends_with_metadata?(url)
-        return url.chop if ends_with_metadata_slash?(url)
-        url.concat('/') unless ends_with_slash?(url)
-        url.concat('?metadata=1')
-      end
+  module UrlHelper
+  ##################################
+    public
+    def validate_mixcloud_url(url)
+      raise Mixcloud::Error.new("You provided an invalid Mixcloud-API url. It must start with http://api.mixcloud.com/") unless url =~ /\Ahttp:\/\/api.mixcloud.com\//
+    end
 
-      def turn_www_to_api(url)
-        url.strip.sub('http://www.', 'http://api.' ) if url.strip =~ /\Ahttp:\/\/www./
-      end
-      ##################################
-      private 
-      def ends_with_metadata?(url)
-        true if url =~ /\?metadata=1$/
-      end
+    def concat_with_metadata(url)
+      return url if ends_with_metadata?(url)
+      return url.chop if ends_with_metadata_slash?(url)
+      url.concat('/') unless ends_with_slash?(url)
+      url.concat('?metadata=1')
+    end
 
-      def ends_with_metadata_slash?(url)
-        true if url =~ /\?metadata=1\/$/
-      end
+    def turn_www_to_api(url)
+      url.strip.sub('http://www.', 'http://api.' ) if url.strip =~ /\Ahttp:\/\/www./
+    end
+  ##################################
+    private 
+    def ends_with_metadata?(url)
+      true if url =~ /\?metadata=1$/
+    end
 
-      def ends_with_slash?(url)
-        url =~ /\/\z/
-      end
-      ##################################
+    def ends_with_metadata_slash?(url)
+      true if url =~ /\?metadata=1\/$/
     end
 
+    def ends_with_slash?(url)
+      url =~ /\/\z/
+    end
+  ##################################
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixcloud
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,41 +9,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2161429600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *2161429600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.7
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2161429080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2161429080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161428580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.7.0
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *2161428580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: Ruby wrapper of the Mixcloud API. Visit http://www.mixcloud.com/developers/documentation/
   for more info
 email: actfong@gmail.com
@@ -55,6 +86,7 @@ files:
 - lib/mixcloud/artist.rb
 - lib/mixcloud/category.rb
 - lib/mixcloud/cloudcast.rb
+- lib/mixcloud/error.rb
 - lib/mixcloud/popular_new_hot.rb
 - lib/mixcloud/resource.rb
 - lib/mixcloud/search.rb
@@ -83,10 +115,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper of the Mixcloud API. It allows you to builld Mixcloud resources
   as Ruby objects and provides search functionality
 test_files: []
-has_rdoc: