omdb-api 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6a2c321db04cfe60d53a29f52e1224e9f12ced5652b36d625a4d2b89f8e1ffea
-  data.tar.gz: 586faa3491d686935bccd36a958656be6ecdd7f92a1f660ea384cb448baa665a
+SHA1:
+  metadata.gz: 62bb6e258bb5205766ccb941ac9d91137698295b
+  data.tar.gz: 03b575568253ace39829ebc50f18098ff81cd876
 SHA512:
-  metadata.gz: 9caec6e78e7b108c2843825ab48013f4a105b103d621238b72439cd597ecb4be701ac9513768ec9c7871cc08fd0f81f62e1866e81e7984615e6ab55bdf79d106
-  data.tar.gz: 28ed895fd0cee519bd33977513de95e6d5c400530b8a935eee53523f6c5fe15dabf8a6023e82460baed53ae7786b25942698fd8ca1e98a34307928327fdd6526
+  metadata.gz: e0ab3602c4603c6139d2a588775cd6edc7004ef2208064480933f509e4dde26f6962aac643bbb9f584e40402faa40111699d568689b67ca1882da7d8d6a5858e
+  data.tar.gz: fe2ced8a302a4574e0ff4397915d2fae8fcaea7852d2abf096af825015b8d79ffeb0902b9048b6c3e9ef3d5b17e57d2f92a75a6027a940f3c1f7cf19f7272cb8

data/.travis.yml

@@ -1,4 +1,3 @@
 language: ruby
 rvm:
-  - 2.2.2
-before_install: gem install bundler -v 1.11.2
+  - 2.5.1

data/README.md

@@ -26,11 +26,21 @@ Or install it yourself as:
 
 ## Usage
 
+### Configuration
+
 First you have to create a client object with your API key
 
 `client = Omdb::Api::Client.new(api_key: [your API key])`
 
-Then you can query with this client object
+You can also set the API key with a block
+
+```ruby
+client = Omdb::Api::Client.new do |config|
+  config.api_key = api_key
+end
+```
+
+### API
 
 ```ruby
 require 'omdb/api'

data/Rakefile

@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
-RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new
 
-task default: %i[rubocop spec]
+task default: %i[spec rubocop]

data/lib/omdb/api.rb

@@ -7,4 +7,6 @@ require 'omdb/api/public_api'
 require 'omdb/api/client'
 require 'omdb/api/request'
 require 'omdb/api/error'
+require 'active_support'
+require 'active_support/core_ext/string'
 require 'httparty'

data/lib/omdb/api/error.rb

@@ -1,24 +1,14 @@
 # frozen_string_literal: true
 
+require 'klass_param'
+
 module Omdb
   module Api
     class Error
-      ERROR_ATTRIBUTES = %i[
-        response
-        error
-      ].freeze
-
-      attr_reader(*ERROR_ATTRIBUTES)
-
-      def initialize(response)
-        attrs(response)
-      end
+      include KlassParam
 
-      def attrs(response)
-        response.each_key do |key|
-          instance_variable_set("@#{key.downcase}".to_sym, response[key])
-        end
-      end
+      param :response
+      param :error
     end
   end
 end

data/lib/omdb/api/movie.rb

@@ -1,42 +1,32 @@
 # frozen_string_literal: true
 
+require 'klass_param'
+
 module Omdb
   module Api
     class Movie
-      MOVIE_ATTRIBUTES = %i[
-        actors
-        awards
-        country
-        director
-        genre
-        imdbid
-        imdbrating
-        imdbvotes
-        language
-        metascore
-        plot
-        poster
-        rated
-        released
-        runtime
-        title
-        type
-        writer
-        year
-        error
-      ].freeze
-
-      attr_reader(*MOVIE_ATTRIBUTES)
-
-      def initialize(response)
-        attrs(response)
-      end
+      include KlassParam
 
-      def attrs(response)
-        response.each_key do |key|
-          instance_variable_set("@#{key.downcase}".to_sym, response[key])
-        end
-      end
+      param :actors
+      param :awards
+      param :country
+      param :director
+      param :genre
+      param :imdb_id
+      param :imdb_rating
+      param :imdb_votes
+      param :language
+      param :metascore
+      param :plot
+      param :poster
+      param :rated
+      param :released
+      param :runtime
+      param :title
+      param :type
+      param :writer
+      param :year
+      param :error
     end
   end
 end

data/lib/omdb/api/public_api.rb

@@ -3,24 +3,41 @@
 module Omdb
   module Api
     module PublicApi
-      %i[find_by_id find_by_title search].each do |method|
+      %i[find_by_id find_by_title].each do |method|
         define_method(method) do |value, **options|
-          request = Omdb::Api::Request.new(api_key, method, value, options)
+          request = Omdb::Api::Request.new(self, method, value, options)
 
-          if method == :search && request.success?
-            movies = [].tap do |m|
-              request.response.fetch('Search').each do |movie|
-                m << Omdb::Api::Movie.new(movie)
-              end
-            end
-            Omdb::Api::Collection.new(movies)
-          elsif request.success?
-            Omdb::Api::Movie.new(request.response)
+          data = request.response
+          movie = __format_data(data)
+
+          if request.success?
+            Omdb::Api::Movie.new(params: movie)
           else
-            Omdb::Api::Error.new(request.response)
+            Omdb::Api::Error.new(params: movie)
           end
         end
       end
+
+      def search(value, options = {})
+        request = Omdb::Api::Request.new(self, 'search', value, options)
+
+        if request.success?
+          Omdb::Api::Collection.new(
+            request.response.fetch('Search').map do |movie|
+              movie = __format_data(movie)
+
+              Omdb::Api::Movie.new(params: movie)
+            end
+          )
+        else
+          Omdb::Api::Error.new(params: request.response)
+        end
+      end
+
+      def __format_data(data)
+        keys = data.keys.map(&:underscore)
+        keys.zip(data.values).to_h
+      end
     end
   end
 end

data/lib/omdb/api/request.rb

@@ -3,12 +3,14 @@
 module Omdb
   module Api
     class Request
-      BASE_URI = 'https://www.omdbapi.com'
+      BASE_URI = 'https://www.omdbapi.com'.freeze
 
       attr_reader :api_key, :field, :value, :options
 
-      def initialize(api_key, method, value, options)
-        @api_key = api_key
+      def initialize(client, method, value, options)
+        @api_key = client.api_key
+        @value   = CGI.escape(value)
+        @options = options
         @field   = if /id/.match?(method)
                      'i'
                    elsif /title/.match?(method)
@@ -16,8 +18,6 @@ module Omdb
                    else
                      's'
                    end
-        @value   = CGI.escape(value)
-        @options = options
       end
 
       def query_params

data/lib/omdb/api/version.rb

@@ -2,6 +2,6 @@
 
 module Omdb
   module Api
-    VERSION = '1.0.0'
+    VERSION = '1.2.0'.freeze
   end
 end

data/omdb-api.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   end
 
   spec.require_paths = ['lib']
+  spec.add_dependency 'activesupport'
   spec.add_dependency 'httparty'
+  spec.add_dependency 'klass_param'
   spec.add_development_dependency 'bundler'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: omdb-api
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Nick Palaniuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-25 00:00:00.000000000 Z
+date: 2019-04-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -24,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: klass_param
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby interface for the OMDB API