google_reviews 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a2390398990045326e6bb2fb15d1554cc4584828cb7eaa9c718f15cf4bc5963
-  data.tar.gz: 18c7d38928b7e37b0e42496459460e6c8fcef006afb7269eac28e31ab52c05e2
+  metadata.gz: ca7e65247ded03cfbf602e3fcee265503daaacc8e653196618996ebb771bfcd0
+  data.tar.gz: e38088f8c3822c7f21683fc259ce3a00a9ccd11d4e3b2fe61b7cd9bfbbb44400
 SHA512:
-  metadata.gz: 55110b305862e5b54dd11298cfaa1828353de938cedb9eed84faf959d02343c497a811082911914d9cc0ff7ed816a374131fc9ae50bb04f73ec33bcd1d897638
-  data.tar.gz: c88bbdb138bda9198b0ecbdaff8e4399d15be666510eb2ed17cacdb7007f4f733321f728cde5470f1b3f67d313fa42fa8f031103362bdf8169468025dff0898b
+  metadata.gz: 89f48ebec6ff0acc71db451657dd5a643635606cf57ebf5776c33783dd53971f379e095de5e27654df58f38915e9fac4c6ab610504e71af0084ab9fe02d4b907
+  data.tar.gz: d0f307c5981696f98a16483286f66ae21891ea1b36fedb92d99f7fe584216a6a53e4b83bd9a5627b616232a439861715ce78df3bf6fdf41ea26417e17a31adfc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    google_reviews (1.0.0)
+    google_reviews (1.0.1)
       i18n
 
 GEM

data/lib/google_reviews/response.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module GoogleReviews
+  # Response Object
+  class Response
+    attr_reader :status, :data, :error
+
+    def initialize(data: [], status: "OK", error: "")
+      @data = data
+      @status = status
+      @error = error
+    end
+
+    def success?
+      status == "OK"
+    end
+  end
+end

data/lib/google_reviews/review.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module GoogleReviews
+  # Google Review Object
+  class Review
+    attr_accessor :text, :time, :rating, :language, :author_url, :translated, :author_name,
+                  :original_language, :profile_photo_url, :relative_time_description
+
+    def initialize(data)
+      @text = data["text"]
+      @time = data["time"]
+      @rating = data["rating"]
+      @language = data["language"]
+      @author_url = data["author_url"]
+      @translated = data["translated"]
+      @author_name = data["author_name"]
+      @original_language = data["original_language"]
+      @profile_photo_url = data["profile_photo_url"]
+      @relative_time_description = data["relative_time_description"]
+    end
+  end
+end

data/lib/google_reviews/utils.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "google_reviews/review"
+
 # GoogleReviews module
 module GoogleReviews
   # Various utility methods
@@ -13,28 +15,40 @@ module GoogleReviews
     end
 
     def formatted_reviews_data(reviews)
+      return [] if reviews.nil? || reviews.empty?
+
       reviews.map do |review|
-        {
-          text: review["text"],
-          time: review["time"],
-          rating: review["rating"],
-          language: review["language"],
-          author_url: review["author_url"],
-          translated: review["translated"],
-          author_name: review["author_name"],
-          original_language: review["original_language"],
-          profile_photo_url: review["profile_photo_url"],
-          relative_time_description: review["relative_time_description"],
-        }
+        Review.new(review)
       end
     end
 
+    def execute_place_name_request(url)
+      data = ApiRequest.execute(url)
+
+      raise ApiError, I18n.t("messages.search_place_api_error", exception: data["status"]) unless data["status"] == "OK"
+
+      data["results"]
+    end
+
+    def execute_place_id_request(url)
+      data = ApiRequest.execute(url)
+
+      error = I18n.t("messages.search_id_api_error", exception: data["status"])
+      return GoogleReviews::Response.new(status: data["status"], error: error) unless data["status"] == "OK"
+
+      reviews = data["result"]["reviews"]
+      return GoogleReviews::Response.new if reviews.nil? || reviews.empty?
+
+      GoogleReviews::Response.new(data: formatted_reviews_data(reviews))
+    end
+
     private
 
     def encoded_place_name(place_name)
       URI.encode_www_form_component(place_name)
     end
 
-    module_function :request_uri, :formatted_reviews_data, :encoded_place_name
+    module_function :request_uri, :formatted_reviews_data, :encoded_place_name, :execute_place_id_request,
+                    :execute_place_name_request
   end
 end

data/lib/google_reviews/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GoogleReviews
-  VERSION = "1.0.1"
+  VERSION = "1.1.2"
 end

data/lib/google_reviews.rb

@@ -5,6 +5,7 @@ require "json"
 require "net/http"
 require "google_reviews/error"
 require "google_reviews/utils"
+require "google_reviews/response"
 require "google_reviews/constants"
 require "google_reviews/api_request"
 require "google_reviews/translations"
@@ -16,25 +17,24 @@ module GoogleReviews
     def self.fetch_reviews_by_place_name(api_key, place_name)
       url = Utils.request_uri(api_key, place_name: place_name)
 
-      data = ApiRequest.execute(url)
+      begin
+        data = Utils.execute_place_name_request(url)
+        return GoogleReviews::Response.new unless data
 
-      raise ApiError, I18n.t("messages.search_place_api_error", exception: data["status"]) unless data["status"] == "OK"
-
-      place_id = data["results"].first["place_id"]
-      fetch_reviews_by_place_id(api_key, place_id)
+        fetch_reviews_by_place_id(api_key, data.first["place_id"])
+      rescue ApiError => e
+        GoogleReviews::Response.new(status: "409", error: e)
+      end
     end
 
     def self.fetch_reviews_by_place_id(api_key, place_id)
       url = Utils.request_uri(api_key, place_id: place_id)
 
-      data = ApiRequest.execute(url)
-
-      raise ApiError, I18n.t("messages.search_id_api_error", exception: data["status"]) unless data["status"] == "OK"
-
-      reviews = data["result"]["reviews"]
-      return [] if reviews.nil? || reviews.empty?
-
-      Utils.formatted_reviews_data(reviews)
+      begin
+        Utils.execute_place_id_request(url)
+      rescue ApiError => e
+        GoogleReviews::Response.new(status: "409", error: e)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: google_reviews
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.2
 platform: ruby
 authors:
 - gullariz12
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -61,6 +61,8 @@ files:
 - lib/google_reviews/api_request.rb
 - lib/google_reviews/constants.rb
 - lib/google_reviews/error.rb
+- lib/google_reviews/response.rb
+- lib/google_reviews/review.rb
 - lib/google_reviews/translations.rb
 - lib/google_reviews/utils.rb
 - lib/google_reviews/version.rb