omdb-api 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a689d8935ccce557c928d0e8f38b8bd7cf75613d3e1fcb90bdbec4e0a8d1b5
-  data.tar.gz: fc8af5261edc11877a0d4b0114313fbedf019a76fda2c01539210d70327d4546
+  metadata.gz: b434f90503d4999be549f1e24e40bccfb83c2e0d568838c9f6840e97ed60a80f
+  data.tar.gz: 6ebabe3d1e8048ca976d92a90d2733cf266bc4d6c83405ffaac0255f8807a053
 SHA512:
-  metadata.gz: 1e7b1a6a65f3646aff09bcb100ee041a695e67c63cc10c809d7b429e7e6714126951a5c38d75248a839e0aea52b032c2ab9556272a75f05f1e421b2938817dd9
-  data.tar.gz: 0b7bc261b523b9b3c1758f6723afc14c83eae4750e6ef3c0dc4d396ce916e2636d8a3860d18285e7b430e1e2c94342f6d25e093e1f5c81e29187974fc15e5fd4
+  metadata.gz: 2bc3aa06e4c30f98ab3659ed1e701134e063e8d713fb40c3c4e1e7e5e70626f6b3a6ba2343b1d74fe49044d2674772feab1c21e457ba43ba1f067d80fbf9bd6d
+  data.tar.gz: b3dfb55d02b3ec34adfd18fbb62878afa89fee38771a892e90eb1e89e4f09f24d088dc27316304c328cca2c6015ecc0cb6eb8488a2ab31d963d01e02d957f0de

data/.rubocop.yml

@@ -6,3 +6,6 @@ Style/Documentation:
 
 Lint/Void:
   Enabled: false
+
+Layout/LineLength:
+  Enabled: false

data/lib/omdb/api/public_api.rb

@@ -5,38 +5,37 @@ module Omdb
     module PublicApi
       %i[find_by_id find_by_title].each do |method|
         define_method(method) do |value, **options|
-          request = Omdb::Api::Request.new(self, method, value, options)
-
-          data = request.response
-          movie = __format_data(data)
-
-          if request.success?
-            Omdb::Api::Movie.new(movie)
-          else
-            Omdb::Api::Error.new(movie)
+          Omdb::Api::Request.call(self, method, value, options) do |response|
+            response = format_response(response)
+            if response.dig('response') == 'False'
+              Omdb::Api::Error.new(response)
+            else
+              Omdb::Api::Movie.new(response)
+            end
           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::Request.call(self, 'search', value, options) do |response|
+          begin
+            Omdb::Api::Collection.new(
+              response.fetch('Search').map do |movie_data|
+                response = format_response(movie_data)
 
-              Omdb::Api::Movie.new(movie)
-            end
-          )
-        else
-          Omdb::Api::Error.new(request.response)
+                Omdb::Api::Movie.new(response)
+              end
+            )
+          rescue StandardError
+            Omdb::Api::Error.new(response)
+          end
         end
       end
 
-      def __format_data(data)
-        keys = data.keys.map(&:underscore)
-        keys.zip(data.values).to_h
+      private
+
+      def format_response(response)
+        response.keys.map(&:underscore).zip(response.values).to_h
       end
     end
   end

data/lib/omdb/api/request.rb

@@ -5,10 +5,14 @@ module Omdb
     class Request
       BASE_URI = 'https://www.omdbapi.com'
 
-      attr_reader :api_key, :field, :value, :options
+      attr_reader :client, :field, :value, :options
+
+      def self.call(client, method, value, options, &block)
+        new(client, method, value, options).make_get_to_imdb_api(&block)
+      end
 
       def initialize(client, method, value, options)
-        @api_key = client.api_key
+        @client  = client
         @value   = CGI.escape(value)
         @options = options
         @field   = if /id/.match?(method)
@@ -20,16 +24,15 @@ module Omdb
                    end
       end
 
-      def query_params
-        { query: { apikey: api_key, field.to_s => value.to_s }.merge(options) }
-      end
-
-      def response
-        @response ||= HTTParty.get(BASE_URI, query_params)
-      end
+      def make_get_to_imdb_api
+        params = {
+          query: {
+            apikey: client.api_key,
+            field.to_s => value.to_s
+          }.merge(options)
+        }
 
-      def success?
-        (response['Response'] || response['root']['response']) == 'True'
+        yield HTTParty.get(BASE_URI, params)
       end
     end
   end

data/lib/omdb/api/version.rb

@@ -2,6 +2,6 @@
 
 module Omdb
   module Api
-    VERSION = '1.4.2'
+    VERSION = '1.4.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omdb-api
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Nick Palaniuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-11 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport