Merge pull request #623 from mlibrary/fixup/ga-limits-2

hit the ga quota in a different way, expanding the exception handling

app/presenters/concerns/analytics_presenter.rb

@@ -3,35 +3,35 @@ module AnalyticsPresenter
 
   def pageviews_by_path(path)
     count = 0
-    profile = google_analytics_profile
-    if profile.present?
-      begin
+    begin
+      profile = google_analytics_profile
+      if profile.present?
         Pageview.results(profile).each do |entry|
           count += entry[:pageviews].to_i if entry[:pagePath] == path
         end
-      rescue OAuth2::Error => e
-        Rails.logger.error(e.code["message"])
       end
+    rescue OAuth2::Error => e
+      Rails.logger.error(e.code["message"])
     end
     return count
   end
 
   def pageviews_by_ids(ids)
     count = 0
-    profile = google_analytics_profile
-    if profile.present?
-      begin
+    begin
+      profile = google_analytics_profile
+      if profile.present?
         Pageview.results(profile).each do |entry|
           ids.each do |id|
             count += entry[:pageviews].to_i if entry[:pagePath].include? id
           end
         end
-      rescue OAuth2::Error => e
-        # TODO: we're hitting GA quotas for monograph_catalog pages in production.
-        # Need to figure out a better way to do this...
-        Rails.logger.error(e.code["message"])
-        return nil
       end
+    rescue OAuth2::Error => e
+      # TODO: we're hitting GA quotas for monograph_catalog pages in production.
+      # Need to figure out a better way to do this...
+      Rails.logger.error(e.code["message"])
+      return nil
     end
     return count
   end