dirble 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df8ae2244e7353f53e1dbf4a22458fc928a2eed
-  data.tar.gz: e39e36b0dba25becdc8734376011e7dc1791f5dd
+  metadata.gz: 82ef9a0c07145dbd999b978246356b8f1a78f7c9
+  data.tar.gz: e8f1bd32e24512eb536ad4c84ea471a199db4e12
 SHA512:
-  metadata.gz: fc4d75608532f9b29290a6d9b8717cdacfb078e3c02ecfe23d671e232f863813e10b18675a66df560d4183fd2a9b717a87241e704b7418d106dbaace13080eb0
-  data.tar.gz: 76643a5a4a09deb653fdaacded4ee8f611e7d7a04e83a36c490d2a247238cd6495e61833e3c61e59196e02c7fbc331bea6e65cfae021c60a16dc18cf013918fe
+  metadata.gz: c85dc75870a0af17d63cbf686575fccfa356c520053e604f8a80efafbbece5c4b4183e22a40d6937b36bec0f2a92f5a762713e35ce08005eb9378375bb06a8a4
+  data.tar.gz: 09b713c00e04417542efc12a4afa07428cdb7732f61fb02a36636e72b9da1aaa4eef19f3138b5f519004bd4896013bef3ce698fad1f9c2a42ae57e8470587a76

data/dirble.gemspec

@@ -24,10 +24,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "pry-rescue"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency 'pry-nav'
   spec.add_development_dependency "sinatra"
   spec.add_development_dependency "sinatra-contrib"
-  spec.add_development_dependency "activesupport"
-  spec.add_development_dependency "faraday"
-  spec.add_development_dependency "typhoeus"
+  spec.add_runtime_dependency "activesupport"
+  spec.add_runtime_dependency "faraday"
+  spec.add_runtime_dependency "typhoeus"
   spec.add_development_dependency "coveralls"
 end

data/lib/dirble.rb

@@ -5,6 +5,7 @@ require 'dirble/configurable'
 require 'dirble/connection'
 require 'dirble/category'
 require 'dirble/primary_category'
+require 'dirble/song'
 require 'dirble/station'
 
 require 'dirble/version'

data/lib/dirble/song.rb

@@ -1,8 +1,61 @@
 module Dirble
   class Song
-    attr_accessor :id, :image_url, :name, :title, :spotify_url, :played_on
+    attr_accessor :id, :image_url, :name, :title, :spotify_url, :played_on, :raw
 
-    def initialize(args)
+    def info
+      Hash(raw.fetch('info'))
+    end
+
+    def fetch_id
+      raw.fetch('_id', {}).fetch('$id', nil)
+    end
+
+    def fetch_image_url
+      info.fetch('image', nil)
+    end
+
+    def fetch_name
+      raw.fetch('name', nil)
+    end
+
+    def fetch_title
+      raw.fetch('title', nil)
+    end
+
+    def fetch_spotify_url
+      info.fetch('urls', {}).fetch('spotify', nil)
+    end
+
+    def date
+      raw.fetch('date', {})
+    end
+
+    def fetch_played_on
+      Time.at(date['sec'])
+    end
+
+    class << self
+      def factory(list_of_songs)
+        list_of_songs.map do |song|
+          build_song(song)
+        end
+      end
+
+      private
+
+      def build_song(song_params)
+        new_song = self.new
+        new_song.instance_eval do
+          self.raw = song_params
+          self.id = fetch_id
+          self.image_url = fetch_image_url
+          self.name = fetch_name
+          self.title = fetch_title
+          self.spotify_url = fetch_spotify_url
+          self.played_on = fetch_played_on
+        end
+        new_song
+      end
     end
   end
 end

data/lib/dirble/station.rb

@@ -5,7 +5,8 @@ module Dirble
     extend Dirble::SimpleApiModel
 
     attr_accessor :id, :name, :stream_url, :description, :website, :url_id,
-      :song_history, :categories, :country, :bitrate, :status
+      :categories, :country, :bitrate, :status
+    attr_reader :song_history
 
     def initialize(options)
       self.id = options[:id]
@@ -14,6 +15,13 @@ module Dirble
       self.country = options[:country]
       self.bitrate = options[:bitrate]
       self.status = options[:status]
+      self.song_history = Array(options[:songhistory])
+    end
+
+    private
+
+    def song_history=(list_of_songs)
+      @song_history ||= Dirble::Song.factory(list_of_songs)
     end
 
     class << self
@@ -27,6 +35,13 @@ module Dirble
         ).first
       end
 
+      def find(station_id)
+        call_api_with_results(
+          request_type: :get,
+          query: "station/apikey/{{api_key}}/id/#{station_id}"
+        ).first
+      end
+
       def search(keyword)
         call_api_with_results(
           request_type: :get,

data/lib/dirble/version.rb

@@ -1,3 +1,3 @@
 module Dirble
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/station_spec.rb

@@ -26,11 +26,17 @@ describe Dirble::Station do
     it 'gets individual station' do
 
     end
+
+    it 'owns song history' do
+      station = Dirble::Station.find(100)
+      #expect(station.song_history).to_not be_empty
+      expect(station.song_history.first.name).to eq('Blackfoot')
+    end
   end
 
   context 'create' do
     it 'creates station with status 1 when valid params' do
-      params_for_creation = { 
+      params_for_creation = {
         name: 'New station',
         website: 'www.new-station.com',
         directory: 'Pop'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dirble
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Przemek Mroczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2014-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-nav
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +143,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -143,7 +157,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -157,7 +171,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: