fanart_api 0.0.2 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb1a89e7dd959723e7d8858d0c62adbb23adbd8a
-  data.tar.gz: c1024c52abcacb924cdcae44aefe3b45596f34d7
+  metadata.gz: ef2dba3cffc94ef7e4bed3436ff6e42f9c6bb728
+  data.tar.gz: 85b7c8f1c8ca861add36acc61353dd06a68aa5cd
 SHA512:
-  metadata.gz: 3bee85b645cf8cba13c2d1e63af1c9ef8e35ac358efdeb9619ef78071cfffdd7d253a0b6357afe8761c378add72b686493d9e5ed4096d4ab3d43ab3904d190f8
-  data.tar.gz: ba3e2106f429644761c2f7567b27dc4a649281d8a23df2a1802a361e6af0a6d9c8615152e7cf9cc9d26eb80e4c716888440c009ebe5f92c5edc542bc362788e1
+  metadata.gz: aec65185a5098923afa1aaf38571c337981ac23be9a5e44bff8310ecd4f0f47dc6df1b783f834a9748634a07ecbfb26b93af45e8b389e7dbda5b75893fa41b11
+  data.tar.gz: f223699e44968598e86ae6010a53cf8e8844405fb9dbddb91ecf315bbcdf91eef362d960383fd583deb30be2fcd92e5098dd6d1a7a997502ffde835e1c8ec205

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
-script: 'bundle exec rspec spec/fanart_api'
+script: 'bundle exec rspec spec/functionals'
 rvm:
+  - 1.9.3
   - 2.0.0
+  - 2.1.0

data/README.md

@@ -16,14 +16,6 @@ You can add it to your Gemfile with:
 gem 'fanart_api'
 ```
 
-Run the bundle command to install it.
-
-```console
-rails generate fanart_api:install
-```
-
-The generator will install an initializer where you must past your api_key.
-
 ## How to use
 
 There is one entry point, in initialize you can past hash with api_key value, or leave empty:
@@ -37,24 +29,24 @@ client = FanartApi::Client.new(api_key: 'API_KEY')
 Movie API
 
 ```ruby
-client.movie.find(id, type = 'all', sort = '1', limit = '2')
-client.movie.update(timestamp)
+client.movie.find(id: id, type: 'all', sort: '1', limit: '2')
+client.movie.update(timestamp: 1...)
 ```
 
 Music API
 
 ```ruby
-client.music.artist(id, type = 'all', sort = '1', limit = '2')
-client.music.album(id, type = 'all', sort = '1', limit = '2')
-client.music.label(id, type = 'all', sort = '1', limit = '2')
-client.music.update(timestamp)
+client.music.artist(id: id, type: 'all', sort: '1', limit: '2')
+client.music.album(id: id, type: 'all', sort: '1', limit: '2')
+client.music.label(id: id, type: 'all', sort: '1', limit: '2')
+client.music.update(timestamp: 1...)
 ```
 
 Tv API
 
 ```ruby
-client.tv.find(id, type = 'all', sort = '1', limit = '2')
-client.tv.update(timestamp)
+client.tv.find(id: id, type: 'all', sort: '1', limit: '2')
+client.tv.update(timestamp: 1...)
 ```
 
 ## Contributing

data/fanart_api.gemspec

@@ -18,9 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'confiture', '>= 0.1.4'
-  spec.add_runtime_dependency 'httparty', '>= 0.12.0'
-  spec.add_runtime_dependency 'uri_template', '~> 0.6.0'
+  spec.add_runtime_dependency 'service_api', '~> 0.0.4'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/fanart_api.rb

@@ -1,7 +1,6 @@
 module FanartApi; end
 
 require 'fanart_api/version'
-require 'fanart_api/configuration'
 require 'fanart_api/base'
 require 'fanart_api/movie'
 require 'fanart_api/music'

data/lib/fanart_api/base.rb

@@ -1,47 +1,43 @@
-require 'httparty'
-require 'uri_template'
+require 'service_api'
 
 class FanartApi::Base
-  include HTTParty
-  base_uri 'http://api.fanart.tv/webservice//'
+  include ServiceApi::BaseFaraday
 
-  def initialize(client)
-    @client = client
-    @params = {}
+  def api_key_options
+    { api_key: @client.options[:api_key] }
   end
 
-  def get(uri)
-    @uri_template = URITemplate.new(uri)
-
-    self
+  def path_with_params(path, options)
+    path(path).params(api_key_options.merge(options))
   end
 
-  def params(options)
-    @params = options
-
-    self
+  def find_path
+    ':kind/:api_key/:id/json/:type/:sort/:limit'
   end
 
-  def response
-    @uri_template ? self.class.get(uri, body: @options) : nil
+  def update_path
+    ':kind/:api_key/:timestamp'
   end
 
-  def prepare_uri
-    @uri_template ? @uri_template.expand(@params.merge(api_key: @client.api_key)) : nil
+  def default_options
+    {
+      type: 'all',
+      sort: 1,
+      limit: 2
+    }
   end
 
-  def uri
-    uri = prepare_uri
-    @params.reject!{ |param| restful_param_keys(uri).include?(param.to_s) }
+  private
 
-    uri
+  def uri_kind
+    :colon
   end
 
-  def restful_param_keys(uri_expanded)
-    @uri_template.extract(uri_expanded).keys
+  def base_url
+    'http://api.fanart.tv/webservice/'
   end
 
-  def shared_uri
-    '{api_key}/{id}/json/{type}/{sort}/{limit}'
-  end
+  # def shared_uri
+  #   '{api_key}/{id}/json/{type}/{sort}/{limit}'
+  # end
 end

data/lib/fanart_api/client.rb

@@ -1,10 +1,10 @@
-require 'httparty'
-
 class FanartApi::Client
-  attr_reader :api_key
+  attr_reader :options
 
   def initialize(options = {})
-    @api_key = options[:api_key] ? options[:api_key] : FanartApi::Configuration.api_key
+    @options = options
+
+    @options[:adapter] ||= :net_http
   end
 
   def movie

data/lib/fanart_api/movie.rb

@@ -1,10 +1,28 @@
 # documentation: http://fanart.tv/api-docs/movie-api
 class FanartApi::Movie < FanartApi::Base
-  def find(id, type = 'all', sort = '1', limit = '2')
-    get("movies/#{shared_uri}").params(id: id, type: type, sort: sort, limit: limit).response
+  def find(options = {})
+    find_path_with_params(options).get
   end
 
-  def update(timestamp = (Time.now - 172800).to_i)
-    get('newmovies/{api_key}/{timestamp}').params(timestamp: timestamp).response
+  def find_url(options = {})
+    find_path_with_params(options).url
   end
-end
+
+  def update(options = {})
+    update_path_with_params(options).get
+  end
+
+  def update_url(options = {})
+    update_path_with_params(options).url
+  end
+
+  private
+
+  def find_path_with_params(options)
+    path_with_params(find_path, default_options.merge(options.merge(kind: :movie)))
+  end
+
+  def update_path_with_params(options)
+    path_with_params(update_path, default_options.merge(options.merge(kind: :newmovies)))
+  end
+end

data/lib/fanart_api/music.rb

@@ -1,12 +1,52 @@
 # documentation: http://fanart.tv/api-docs/music-api
 class FanartApi::Music < FanartApi::Base
-  [:artist, :album, :label].each do |method_name|
-    define_method(method_name) do |id, type = 'all', sort = '1', limit = '2'|
-      get("#{method_name}/#{shared_uri}").params(id: id, type: type, sort: sort, limit: limit).response
-    end
+  def artist(options = {})
+    artist_path_with_params(options).get
   end
 
-  def update(timestamp = (Time.now - 172800).to_i)
-    get('newmusic/{api_key}/{timestamp}').params(timestamp: timestamp).response
+  def artist_url(options = {})
+    artist_path_with_params(options).url
+  end
+
+  def album(options = {})
+    album_path_with_params(options).get
+  end
+
+  def album_url(options = {})
+    album_path_with_params(options).url
+  end
+
+  def label(options = {})
+    label_path_with_params(options).get
+  end
+
+  def label_url(options = {})
+    label_path_with_params(options).url
+  end
+
+  def update(options = {})
+    update_path_with_params(options).get
+  end
+
+  def update_url(options = {})
+    update_path_with_params(options).url
+  end
+
+  private
+
+  def artist_path_with_params(options)
+    path_with_params(find_path, default_options.merge(options.merge(kind: :artist)))
+  end
+
+  def album_path_with_params(options)
+    path_with_params(find_path, default_options.merge(options.merge(kind: :album)))
+  end
+
+  def label_path_with_params(options)
+    path_with_params(find_path, default_options.merge(options.merge(kind: :label)))
+  end
+
+  def update_path_with_params(options)
+    path_with_params(update_path, default_options.merge(options.merge(kind: :newmusic)))
   end
 end

data/lib/fanart_api/tv.rb

@@ -1,10 +1,28 @@
 # documentation: http://fanart.tv/api-docs/tv-api
 class FanartApi::Tv < FanartApi::Base
-  def find(id, type = 'all', sort = '1', limit = '2')
-    get("series/#{shared_uri}").params(id: id, type: type, sort: sort, limit: limit).response
+  def find(options = {})
+    find_path_with_params(options).get
   end
 
-  def update(timestamp = (Time.now - 172800).to_i)
-    get('newtv/{api_key}/{timestamp}').params(timestamp: timestamp).response
+  def find_url(options = {})
+    find_path_with_params(options).url
+  end
+
+  def update(options = {})
+    update_path_with_params(options).get
+  end
+
+  def update_url(options = {})
+    update_path_with_params(options).url
+  end
+
+  private
+
+  def find_path_with_params(options)
+    path_with_params(find_path, default_options.merge(options.merge(kind: :series)))
+  end
+
+  def update_path_with_params(options)
+    path_with_params(update_path, default_options.merge(options.merge(kind: :newtv)))
   end
 end

data/lib/fanart_api/version.rb

@@ -1,3 +1,3 @@
 module FanartApi
-  VERSION = '0.0.2'
+  VERSION = '0.1.2'
 end

data/spec/fixtures/artist.json

@@ -0,0 +1,39 @@
+{
+  "Evanescence": {
+    "mbid_id": "f4a31f0a-51dd-4fa7-986d-3095c40c5ed9",
+    "artistbackground": [
+      {
+        "id": "9",
+        "url": "http://fanart.tv/fanart/music/f4a31f0a-51dd-4fa7-986d-3095c40c5ed9/artistbackground/9/evanescence-4dc719c5cc68f.jpg",
+        "likes": "1"
+      }
+    ],
+    "musiclogo": [
+      {
+        "id": "5239",
+        "url": "http://fanart.tv/fanart/music/f4a31f0a-51dd-4fa7-986d-3095c40c5ed9/musiclogo/5239/evanescence-4df6263dee3c6.png",
+        "likes": "1"
+      }
+    ],
+    "albums": {
+      "2187d248-1a3b-35d0-a4ec-bead586ff547": {
+        "albumcover": [
+          {
+            "id": "43",
+            "url": "http://fanart.tv/fanart/music/f4a31f0a-51dd-4fa7-986d-3095c40c5ed9/albumcover/43/fallen-4dc8683fa58fe.jpg",
+            "likes": "0"
+          }
+        ],
+        "cdart": [
+          {
+            "id": "17739",
+            "url": "http://fanart.tv/fanart/music/f4a31f0a-51dd-4fa7-986d-3095c40c5ed9/cdart/17739/fallen-4f133f8a16d25.png",
+            "likes": "0",
+            "disc": "1",
+            "size": "1000"
+          }
+        ]
+      }
+    }
+  }
+}

data/spec/fixtures/find_movies.json

@@ -0,0 +1,32 @@
+{
+  "The Lord of the Rings: The Fellowship of the Ring": {
+    "tmdb_id": "120",
+    "imdb_id": "tt0120737",
+    "moviedisc": [
+      {
+        "id": "101",
+        "url": "http://fanart.tv/fanart/movies/120/moviedisc/101/the-lord-of-the-rings-the-fellowship-of-the-ring-4eea008189187.png",
+        "lang": "en",
+        "likes": "0",
+        "disc": "1",
+        "disc_type": "bluray"
+      },
+      {
+        "id": "102",
+        "url": "http://fanart.tv/fanart/movies/120/moviedisc/102/the-lord-of-the-rings-the-fellowship-of-the-ring-4eea017193bf6.png",
+        "lang": "en",
+        "likes": "0",
+        "disc": "2",
+        "disc_type": "bluray"
+      }
+    ],
+    "movielogo": [
+      {
+        "id": "222",
+        "url": "http://fanart.tv/fanart/movies/120/movielogo/222/the-lord-of-the-rings-the-fellowship-of-the-ring-4ef23158be031.png",
+        "lang": "en",
+        "likes": "0"
+      }
+    ]
+  }
+}

data/spec/fixtures/find_series.json

@@ -0,0 +1,36 @@
+{
+  "series":"Bones",
+  "clearlogos":[
+    {
+      "id":"13571",
+      "url":"http:\/\/fanart.tv\/tv\/75682\/clearlogo\/bones-4e764b27c454d.png",
+      "lang":"ar",
+      "likes":"0"
+    }
+  ],
+  "cleararts":[
+    {
+      "id":"11780",
+      "url":"http:\/\/fanart.tv\/tv\/75682\/clearart\/bones-4df372a733e83.png",
+      "lang":"en",
+      "likes":"0"
+    }
+  ],
+  "tvthumbs":[
+    {
+      "id":"4321",
+      "url":"http:\/\/fanart.tv\/tv\/75682\/tvthumb\/B_75682.jpg",
+      "lang":"en",
+      "likes":"0"
+    }
+  ],
+  "seasonthumbs":[
+    {
+      "id":"4308",
+      "url":"http:\/\/fanart.tv\/tv\/75682\/seasonthumb\/Bones (7).jpg",
+      "lang":"en",
+      "likes":"0",
+      "season":"3"
+    }
+  ]
+}

data/spec/functionals/movie_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe FanartApi::Movie do
+  let(:client) { FanartApi::Client.new(api_key: '123456789', adapter: :test, adapter_options: faraday_stubs) }
+  let(:model) { client.movie }
+
+  let(:movies_data) { File.read('spec/fixtures/find_movies.json') }
+
+  let(:faraday_stubs) do
+    Faraday::Adapter::Test::Stubs.new do |stub|
+      stub.get('/webservice/movie/123456789/1234/json/all/1/2') { [200, { content_type: 'json' }, movies_data] }
+      stub.get('/webservice/newmovies/123456789/123') { [200, { content_type: 'json' }, {}] }
+    end
+  end
+
+  describe '.find' do
+    it 'should return Faraday::Response class' do
+      model.find(id: 1234, type: 'all', sort: '1', limit: 2).class.should == Faraday::Response
+    end
+
+    it 'should return Hash class for body reponse' do
+      model.find(id: 1234, type: 'all', sort: '1', limit: 2).body == Hash
+    end
+  end
+
+  describe '.find_url' do
+    it 'should return correct url' do
+      model.find_url(id: 1234, type: 'all', sort: '1', limit: 2).should == 'http://api.fanart.tv/webservice/movie/123456789/1234/json/all/1/2'
+    end
+  end
+
+  describe '.update' do
+    it 'should return Faraday::Response class' do
+      model.update(timestamp: 123).class.should == Faraday::Response
+    end
+
+    it 'should return Hash class for body reponse' do
+      model.update(timestamp: 123).body == Hash
+    end
+  end
+
+  describe '.update_url' do
+    it 'should return correct url' do
+      model.update_url(timestamp: 123).should == 'http://api.fanart.tv/webservice/newmovies/123456789/123'
+    end
+  end
+end

data/spec/functionals/music_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe FanartApi::Music do
+  let(:client) { FanartApi::Client.new(api_key: '123456789', adapter: :test, adapter_options: faraday_stubs) }
+  let(:model) { client.music }
+
+  let(:music_data) { File.read('spec/fixtures/artist.json') }
+
+  let(:faraday_stubs) do
+    Faraday::Adapter::Test::Stubs.new do |stub|
+      stub.get('/webservice/artist/123456789/1234/json/all/1/2') { [200, { content_type: 'json' }, music_data] }
+      stub.get('/webservice/album/123456789/1234/json/all/1/2') { [200, { content_type: 'json' }, music_data] }
+      stub.get('/webservice/label/123456789/1234/json/all/1/2') { [200, { content_type: 'json' }, music_data] }
+      stub.get('/webservice/newmusic/123456789/123') { [200, { content_type: 'json' }, {}] }
+    end
+  end
+
+  describe '.artist' do
+    it 'should return Faraday::Response class' do
+      model.artist(id: 1234, type: 'all', sort: '1', limit: 2).class.should == Faraday::Response
+    end
+
+    it 'should return Hash class for body reponse' do
+      model.artist(id: 1234, type: 'all', sort: '1', limit: 2).body == Hash
+    end
+  end
+
+  describe '.artist_url' do
+    it 'should return correct url' do
+      model.artist_url(id: 1234, type: 'all', sort: '1', limit: 2).should == 'http://api.fanart.tv/webservice/artist/123456789/1234/json/all/1/2'
+    end
+  end
+
+  describe '.album' do
+    it 'should return Faraday::Response class' do
+      model.album(id: 1234, type: 'all', sort: '1', limit: 2).class.should == Faraday::Response
+    end
+
+    it 'should return Hash class for body reponse' do
+      model.album(id: 1234, type: 'all', sort: '1', limit: 2).body == Hash
+    end
+  end
+
+  describe '.album_url' do
+    it 'should return correct url' do
+      model.album_url(id: 1234, type: 'all', sort: '1', limit: 2).should == 'http://api.fanart.tv/webservice/album/123456789/1234/json/all/1/2'
+    end
+  end
+
+  describe '.label' do
+    it 'should return Faraday::Response class' do
+      model.label(id: 1234, type: 'all', sort: '1', limit: 2).class.should == Faraday::Response
+    end
+
+    it 'should return Hash class for body reponse' do
+      model.label(id: 1234, type: 'all', sort: '1', limit: 2).body == Hash
+    end
+  end
+
+  describe '.label_url' do
+    it 'should return correct url' do
+      model.label_url(id: 1234, type: 'all', sort: '1', limit: 2).should == 'http://api.fanart.tv/webservice/label/123456789/1234/json/all/1/2'
+    end
+  end
+
+  describe '.update' do
+    it 'should return Faraday::Response class' do
+      model.update(timestamp: 123).class.should == Faraday::Response
+    end
+
+    it 'should return Hash class for body reponse' do
+      model.update(timestamp: 123).body == Hash
+    end
+  end
+
+  describe '.update_url' do
+    it 'should return correct url' do
+      model.update_url(timestamp: 123).should == 'http://api.fanart.tv/webservice/newmusic/123456789/123'
+    end
+  end
+end

data/spec/functionals/tv_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe FanartApi::Tv do
+  let(:client) { FanartApi::Client.new(api_key: '123456789', adapter: :test, adapter_options: faraday_stubs) }
+  let(:model) { client.tv }
+
+  let(:tv_data) { File.read('spec/fixtures/find_series.json') }
+
+  let(:faraday_stubs) do
+    Faraday::Adapter::Test::Stubs.new do |stub|
+      stub.get('/webservice/series/123456789/1234/json/all/1/2') { [200, { content_type: 'json' }, tv_data] }
+      stub.get('/webservice/newtv/123456789/123') { [200, { content_type: 'json' }, {}] }
+    end
+  end
+
+  describe '.find' do
+    it 'should return Faraday::Response class' do
+      model.find(id: 1234, type: 'all', sort: '1', limit: 2).class.should == Faraday::Response
+    end
+
+    it 'should return Hash class for body reponse' do
+      model.find(id: 1234, type: 'all', sort: '1', limit: 2).body == Hash
+    end
+  end
+
+  describe '.find_url' do
+    it 'should return correct url' do
+      model.find_url(id: 1234, type: 'all', sort: '1', limit: 2).should == 'http://api.fanart.tv/webservice/series/123456789/1234/json/all/1/2'
+    end
+  end
+
+  describe '.update' do
+    it 'should return Faraday::Response class' do
+      model.update(timestamp: 123).class.should == Faraday::Response
+    end
+
+    it 'should return Hash class for body reponse' do
+      model.update(timestamp: 123).body == Hash
+    end
+  end
+
+  describe '.update_url' do
+    it 'should return correct url' do
+      model.update_url(timestamp: 123).should == 'http://api.fanart.tv/webservice/newtv/123456789/123'
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,22 +5,5 @@ Coveralls.wear!
 
 require 'fanart_api'
 
-FanartApi::Configuration.configure do |config|
-  config.api_key = ''
-end
-
-class SampleModel
-  def get(uri)
-    self
-  end
-
-  def params(options = {})
-    self
-  end
-
-  def response
-  end
-end
-
 RSpec.configure do |config|
 end

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fanart_api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.2
 platform: ruby
 authors:
 - Krzysztof Wawer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: confiture
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-- !ruby/object:Gem::Dependency
-  name: uri_template
+  name: service_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -125,22 +97,18 @@ files:
 - lib/fanart_api.rb
 - lib/fanart_api/base.rb
 - lib/fanart_api/client.rb
-- lib/fanart_api/configuration.rb
 - lib/fanart_api/movie.rb
 - lib/fanart_api/music.rb
 - lib/fanart_api/tv.rb
 - lib/fanart_api/version.rb
-- lib/generators/fanart_api/install_generator.rb
-- lib/generators/templates/fanart_api.rb
-- spec/fanart_api/base_spec.rb
-- spec/fanart_api/client_spec.rb
-- spec/fanart_api/movie_spec.rb
-- spec/fanart_api/music_spec.rb
-- spec/fanart_api/tv_spec.rb
-- spec/integration_spec_helper.rb
+- spec/fixtures/artist.json
+- spec/fixtures/find_movies.json
+- spec/fixtures/find_series.json
+- spec/functionals/movie_spec.rb
+- spec/functionals/music_spec.rb
+- spec/functionals/tv_spec.rb
 - spec/integrations/movie_spec.rb
 - spec/integrations/music_spec.rb
-- spec/integrations/support/fanart_api.rb.example
 - spec/integrations/tv_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/wafcio/fanart_api
@@ -163,19 +131,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby client for fanart.tv API
 test_files:
-- spec/fanart_api/base_spec.rb
-- spec/fanart_api/client_spec.rb
-- spec/fanart_api/movie_spec.rb
-- spec/fanart_api/music_spec.rb
-- spec/fanart_api/tv_spec.rb
-- spec/integration_spec_helper.rb
+- spec/fixtures/artist.json
+- spec/fixtures/find_movies.json
+- spec/fixtures/find_series.json
+- spec/functionals/movie_spec.rb
+- spec/functionals/music_spec.rb
+- spec/functionals/tv_spec.rb
 - spec/integrations/movie_spec.rb
 - spec/integrations/music_spec.rb
-- spec/integrations/support/fanart_api.rb.example
 - spec/integrations/tv_spec.rb
 - spec/spec_helper.rb

data/lib/fanart_api/configuration.rb

@@ -1,7 +0,0 @@
-require 'confiture'
-
-class FanartApi::Configuration
-  include Confiture::Configuration
-
-  confiture_allowed_keys(:api_key)
-end

data/lib/generators/fanart_api/install_generator.rb

@@ -1,12 +0,0 @@
-module FanartApi
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../../templates', __FILE__)
-
-      desc 'Creates a FanartApi::Configuration initializer and copy locale files to your application.'
-      def copy_initializer
-        template 'fanart_api.rb', 'config/initializers/fanart_api.rb'
-      end
-    end
-  end
-end

data/lib/generators/templates/fanart_api.rb

@@ -1,3 +0,0 @@
-FanartApi::Configuration.configure do |config|
-  config.api_key = ''
-end

data/spec/fanart_api/base_spec.rb

@@ -1,74 +0,0 @@
-require 'spec_helper'
-
-class ExampleClass < FanartApi::Base
-end
-
-describe FanartApi::Base do
-  let(:klass) { ExampleClass }
-  let(:model) { klass.new(FanartApi::Client.new) }
-
-  describe '.get' do
-    it 'should set @uri_template' do
-      model.get('http://example.com')
-
-      model.instance_variable_get('@uri_template').class.should == URITemplate::RFC6570
-    end
-
-    it 'should return self' do
-      model.get('http://example.com').should == model
-    end
-  end
-
-  describe '.params' do
-    it 'should set @params' do
-      model.params(sample: 'test')
-
-      model.instance_variable_get('@params').should == { sample: 'test' }
-    end
-
-    it 'should return self' do
-      model.params(sample: 'test').should == model
-    end
-  end
-
-  describe '.response' do
-    it 'should call get klass method' do
-      model.instance_variable_set('@uri_template', URITemplate.new('{api_key}/series/{id}'))
-      klass.should_receive(:get)
-
-      model.response
-    end
-  end
-
-  describe '.prepare_uri' do
-    it 'should receive correct uri string' do
-      model.instance_variable_set('@uri_template', URITemplate.new('{api_key}/series/{id}'))
-
-      model.prepare_uri.should == "#{FanartApi::Configuration.api_key}/series/"
-    end
-  end
-
-  describe '.uri' do
-    it 'should receive correct uri string' do
-      model.instance_variable_set('@uri_template', URITemplate.new('{api_key}/series/{id}'))
-      model.instance_variable_set('@params', id: '1234')
-
-      model.uri.should == "#{FanartApi::Configuration.api_key}/series/1234"
-    end
-  end
-
-  describe '.restful_param_keys' do
-    it 'should receive correct uri string' do
-      uri_template = URITemplate.new('{api_key}/series/{id}')
-      model.instance_variable_set('@uri_template', uri_template)
-
-      model.restful_param_keys(uri_template.expand).sort.should == ['api_key', 'id'].sort
-    end
-  end
-
-  describe '.shared_uri' do
-    it 'should return correct string' do
-      model.shared_uri.should == '{api_key}/{id}/json/{type}/{sort}/{limit}'
-    end
-  end
-end

data/spec/fanart_api/client_spec.rb

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-describe FanartApi::Client do
-  let(:model) { FanartApi::Client.new }
-
-  describe '.movie' do
-    it 'should return movie class' do
-      model.movie.class.should == FanartApi::Movie
-    end
-  end
-
-  describe '.music' do
-    it 'should return music class' do
-      model.music.class.should == FanartApi::Music
-    end
-  end
-
-  describe '.tv' do
-    it 'should return tv class' do
-      model.tv.class.should == FanartApi::Tv
-    end
-  end
-end

data/spec/fanart_api/movie_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe FanartApi::Movie do
-  let(:klass) { FanartApi::Movie }
-  let(:model) { klass.new(FanartApi::Client.new) }
-  let(:mock_model) { SampleModel.new }
-
-  describe '.find' do
-    it 'should call get with specific params' do
-      model.should_receive(:get).with('movies/{api_key}/{id}/json/{type}/{sort}/{limit}').and_return(mock_model)
-
-      model.find('1234')
-    end
-
-    it 'should call params with specific params' do
-      model.should_receive(:params).with(id: '1234', type: 'all', sort: '1', limit: '2').and_return(mock_model)
-
-      model.find('1234')
-    end
-  end
-
-  describe '.update' do
-    it 'should call get with specific params' do
-      model.should_receive(:get).with('newmovies/{api_key}/{timestamp}').and_return(mock_model)
-
-      model.update(1234)
-    end
-
-    it 'should call params with specific params' do
-      model.should_receive(:params).with(timestamp: 1234).and_return(mock_model)
-
-      model.update(1234)
-    end
-  end
-end

data/spec/fanart_api/music_spec.rb

@@ -1,63 +0,0 @@
-require 'spec_helper'
-
-describe FanartApi::Music do
-  let(:klass) { FanartApi::Music }
-  let(:model) { klass.new(FanartApi::Client.new) }
-  let(:mock_model) { SampleModel.new }
-
-  describe '.artist' do
-    it 'should call get with specific params' do
-      model.should_receive(:get).with('artist/{api_key}/{id}/json/{type}/{sort}/{limit}').and_return(mock_model)
-
-      model.artist('1234')
-    end
-
-    it 'should call params with specific params' do
-      model.should_receive(:params).with(id: '1234', type: 'all', sort: '1', limit: '2').and_return(mock_model)
-
-      model.artist('1234')
-    end
-  end
-
-  describe '.album' do
-    it 'should call get with specific params' do
-      model.should_receive(:get).with('album/{api_key}/{id}/json/{type}/{sort}/{limit}').and_return(mock_model)
-
-      model.album('1234')
-    end
-
-    it 'should call params with specific params' do
-      model.should_receive(:params).with(id: '1234', type: 'all', sort: '1', limit: '2').and_return(mock_model)
-
-      model.album('1234')
-    end
-  end
-
-  describe '.label' do
-    it 'should call get with specific params' do
-      model.should_receive(:get).with('label/{api_key}/{id}/json/{type}/{sort}/{limit}').and_return(mock_model)
-
-      model.label('1234')
-    end
-
-    it 'should call params with specific params' do
-      model.should_receive(:params).with(id: '1234', type: 'all', sort: '1', limit: '2').and_return(mock_model)
-
-      model.label('1234')
-    end
-  end
-
-  describe '.update' do
-    it 'should call get with specific params' do
-      model.should_receive(:get).with('newmusic/{api_key}/{timestamp}').and_return(mock_model)
-
-      model.update(1234)
-    end
-
-    it 'should call params with specific params' do
-      model.should_receive(:params).with(timestamp: 1234).and_return(mock_model)
-
-      model.update(1234)
-    end
-  end
-end

data/spec/fanart_api/tv_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-
-describe FanartApi::Tv do
-  let(:klass) { FanartApi::Tv }
-  let(:model) { klass.new(FanartApi::Client.new) }
-  let(:mock_model) { SampleModel.new }
-
-  describe '.find' do
-    it 'should call get with specific params' do
-      model.should_receive(:get).with('series/{api_key}/{id}/json/{type}/{sort}/{limit}').and_return(mock_model)
-
-      model.find('1234')
-    end
-
-    it 'should call params with specific params' do
-      model.should_receive(:params).with(id: '1234', type: 'all', sort: '1', limit: '2').and_return(mock_model)
-
-      model.find('1234')
-    end
-  end
-
-  describe '.update' do
-    it 'should call get with specific params' do
-      model.should_receive(:get).with('newtv/{api_key}/{timestamp}').and_return(mock_model)
-
-      model.update(1234)
-    end
-
-    it 'should call params with specific params' do
-      model.should_receive(:params).with(timestamp: 1234).and_return(mock_model)
-
-      model.update(1234)
-    end
-  end
-end

data/spec/integration_spec_helper.rb

@@ -1,3 +0,0 @@
-require 'spec_helper'
-
-require File.join(File.dirname(__FILE__), 'integrations/support/fanart_api.rb')

data/spec/integrations/support/fanart_api.rb.example

@@ -1,3 +0,0 @@
-FanartApi::Configuration.configure do |config|
-  config.api_key = ''
-end