bbc 0.0.1 → 0.0.2

data/lib/bbc.rb

@@ -1,12 +1,18 @@
 require 'rubygems'
 require 'json'
+require 'json/add/core'
 require 'restclient'
 
-require 'bbc/radio1'
+require 'bbc/client'
+require 'bbc/music'
 
 require 'bbc/extensions/array'
 
 module BBC
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
   API_HOST = 'http://www.bbc.co.uk'
+  CLIENT = BBC::Client.new
+
+  class NoDataReturnedError < StandardError ; end
+  class ApiHostError < StandardError ; end
 end

data/lib/bbc/client.rb

@@ -0,0 +1,27 @@
+module BBC
+  class Client
+
+    def artists(gid)
+      request(:get, "http://www.bbc.co.uk/music/artists/#{gid}.json")['artist']
+    end
+
+    def now_playing
+      Array.wrap(request(:get, "http://www.bbc.co.uk/radio1/nowplaying/latest.json")['nowplaying'])
+    end
+
+    private
+
+    def parse_json_from(response)
+      JSON.parse(response)
+    rescue
+      raise BBC::ApiHostError
+    end
+
+    def request(method, url)
+      parse_json_from RestClient.send(method, url)
+    rescue RestClient::ResourceNotFound
+      raise BBC::ApiHostError
+    end
+
+  end
+end

data/lib/bbc/music.rb

@@ -0,0 +1,8 @@
+require 'bbc/music/song'
+require 'bbc/music/artist'
+require 'bbc/music/release'
+require 'bbc/music/link'
+require 'bbc/music/review'
+
+module Music
+end

data/lib/bbc/music/artist.rb

@@ -0,0 +1,54 @@
+module BBC
+  module Music
+    class Artist
+
+      CLIENT = BBC::Client.new
+
+      attr_reader :name, :description, :id, :releases, :links, :reviews, :image_url, :related_artists
+
+      def self.find(id)
+        new(CLIENT.artists(id))
+      end
+
+      def initialize(params)
+        populate_from params
+      end
+
+      def get_details
+        unless @details_retreived
+          populate_from CLIENT.artists(id)
+          @details_retreived = true
+        end
+      end
+
+      def to_h
+        {
+          :id => id,
+          :name => name,
+          :description => description,
+          :releases => releases,
+          :reviews => reviews,
+          :links => links,
+          :image_url => image_url,
+          :related_artists => related_artists
+        }
+      end
+
+      def to_json(options={})
+        JSON.generate(to_h)
+      end
+
+      private
+
+      def populate_from(params)
+        @name = params['name']
+        @id = params['gid']
+        @releases = Array.wrap(params['releases']).map { |release| BBC::Music::Release.new(release) }
+        @links = Array.wrap(params['links']).map { |link| BBC::Music::Link.new(link) }
+        @related_artists = Array.wrap(params['related_artists']).map { |artist| BBC::Music::Artist.new(artist['artist'])}
+        @image_url = params['image'] ? params['image']['src'] : nil
+        @description = params['wikipedia_article'] ? params['wikipedia_article']['content'] : nil
+      end
+    end
+  end
+end

data/lib/bbc/{radio1 → music}/link.rb

@@ -1,5 +1,5 @@
 module BBC
-  module Radio1
+  module Music
     class Link
 
       attr_reader :name, :url, :type
@@ -9,6 +9,18 @@ module BBC
         @url = params['url']
         @type = params['type']
       end
+
+      def to_h
+        {
+          :name => name,
+          :url => url,
+          :type => type
+        }
+      end
+
+      def to_json(options={})
+        JSON.generate(to_h)
+      end
     end
   end
 end

data/lib/bbc/{radio1 → music}/release.rb

@@ -1,5 +1,5 @@
 module BBC
-  module Radio1
+  module Music
     class Release
 
       attr_reader :name, :year, :type, :status
@@ -10,6 +10,19 @@ module BBC
         @type = params['release_type']
         @status = params['official']
       end
+
+      def to_h
+        {
+          :name => name,
+          :year => year,
+          :type => type,
+          :status => status
+        }
+      end
+
+      def to_json(options={})
+        JSON.generate(to_h)
+      end
     end
   end
 end

data/lib/bbc/{radio1 → music}/review.rb

@@ -1,5 +1,5 @@
 module BBC
-  module Radio1
+  module Music
     class Review
       def initialize(params)
         

data/lib/bbc/music/song.rb

@@ -0,0 +1,45 @@
+module BBC
+  module Music
+    class Song
+
+      CLIENT = BBC::Client.new
+
+      attr_reader :artist_gid, :artist_name, :title
+
+      def self.playing_now
+        new(CLIENT.now_playing.first)
+      end
+
+      def self.played_recently
+        Array.wrap(CLIENT.now_playing.slice(1, 6)).map { |song| new(song) }
+      end
+
+      def initialize(params)
+        if params
+          @artist_gid = params['artist_gid']
+          @artist_name = params['artist']
+          @title = params['title']
+        else
+          raise BBC::NoDataReturnedError
+        end
+      end
+
+      def artist
+        @artist ||= BBC::Music::Artist.find(artist_gid)
+      end
+
+      def to_h
+        {
+          :artist_gid => @artist_gid,
+          :artist_name => @artist_name,
+          :title => @title
+        }
+      end
+
+      def to_json(options={})
+        JSON.generate(to_h)
+      end
+
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Oliver Nightingale
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +01:00
+date: 2010-08-16 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,13 +75,14 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/bbc/client.rb
 - lib/bbc/extensions/array.rb
-- lib/bbc/radio1/artist.rb
-- lib/bbc/radio1/link.rb
-- lib/bbc/radio1/release.rb
-- lib/bbc/radio1/review.rb
-- lib/bbc/radio1/song.rb
-- lib/bbc/radio1.rb
+- lib/bbc/music/artist.rb
+- lib/bbc/music/link.rb
+- lib/bbc/music/release.rb
+- lib/bbc/music/review.rb
+- lib/bbc/music/song.rb
+- lib/bbc/music.rb
 - lib/bbc.rb
 - LICENSE
 - README.md

data/lib/bbc/radio1.rb

@@ -1,8 +0,0 @@
-require 'bbc/radio1/song'
-require 'bbc/radio1/artist'
-require 'bbc/radio1/release'
-require 'bbc/radio1/link'
-require 'bbc/radio1/review'
-
-module Radio1
-end

data/lib/bbc/radio1/artist.rb

@@ -1,40 +0,0 @@
-module BBC
-  module Radio1
-    class Artist
-
-      attr_reader :name, :id, :releases, :links, :reviews, :image_url, :related_artists
-
-      def self.find(id)
-        RestClient.get("http://www.bbc.co.uk/music/artists/#{id}.json") do |r|
-          response = JSON.parse(r)
-          new(response['artist'])
-        end
-      end
-
-      def initialize(params)
-        populate_from params
-      end
-
-      def get_details
-        unless @details_retreived
-          RestClient.get("http://www.bbc.co.uk/music/artists/#{id}.json") do |r|
-            response = JSON.parse(r)
-            populate_from response['artist']
-            @details_retreived = true
-          end
-        end
-      end
-
-      private
-
-      def populate_from(params)
-        @name = params['name']
-        @id = params['gid']
-        @releases = Array.wrap(params['releases']).map { |release| BBC::Radio1::Release.new(release) }
-        @links = Array.wrap(params['links']).map { |link| BBC::Radio1::Link.new(link) }
-        @related_artists = Array.wrap(params['related_artists']).map { |artist| BBC::Radio1::Artist.new(artist['artist'])}
-        @image_url = params['image'] ? params['image']['src'] : nil
-      end
-    end
-  end
-end

data/lib/bbc/radio1/song.rb

@@ -1,29 +0,0 @@
-module BBC
-  module Radio1
-    class Song
-
-      NOW_PLAYING_API = "http://www.bbc.co.uk/radio1/nowplaying/latest.json"
-
-      attr_reader :artist_gid, :artist, :title
-
-      def self.playing_now
-        RestClient.get(NOW_PLAYING_API) do |response|
-          new(JSON.parse(response)['nowplaying'].first)
-        end
-      end
-
-      def self.played_recently
-        RestClient.get(NOW_PLAYING_API) do |response|
-          JSON.parse(response)['nowplaying'].slice(1, 6).map { |song| new(song) }
-        end
-      end
-
-      def initialize(params)
-        @artist_gid = params['artist_gid']
-        @artist = params['artist']
-        @title = params['title']
-      end
-
-    end
-  end
-end