g_ruby 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d4c66b33befa89ea4aa6b22cbae4d35cd82ed60
-  data.tar.gz: c451c48de3905e79524348668721aa9831d515ea
+  metadata.gz: bf7759a53575d6479d1b10778938fb30390e9c2d
+  data.tar.gz: e850aabc50186eb77aa6b7a0963dc6d9fa75e204
 SHA512:
-  metadata.gz: d7e884830ee87f0629bae61f619465170cc7026e9ed1098dd464f732944d949c77cde05b9d5419bb1dd87f595f4e7c1bf297368fbe1a34feeca0a3e2ee6bf855
-  data.tar.gz: f47a1947f327aeac4f81155170eb3f93fe7d158a41701cea7182d3db96f3671cc49a5e55521617e8dab1c9b64658389c40406fc25a92df29946df0d4ffa32194
+  metadata.gz: 3724e6611ee774b899eb0612703d5683ceec520cd2c622d4b55249df5822d5f7be83d3e38b6d505c197edb104dfc9b6b545150c818c74f64bff3e8bd74636b3d
+  data.tar.gz: 4f6a0340cbc7287a3e8b6b930d4042043e431d6514cb5acd15fc2acd94515506aca012286b6d8ea7b9de43f4fbe3a505b6b67769a9f30e0a9d6923d995738159

data/lib/g_ruby/analytics.rb

@@ -96,75 +96,78 @@ class GRuby::Analytics
   #GRuby::Analytics.get_with_delta(access_token, start_date, end_date, profile_id, metrics, dimensions, sort, max_results)
   def self.get_with_delta(access_token, start_date, end_date, profile_id, metrics, dimensions=nil, sort=nil, limit=nil, refresh=nil)
     #begin
+    
+      response_obj = []
+      
       d30_days_ago = (Date.today - 30).to_time.strftime("%Y-%m-%d").to_s
       d60_days_ago = (Date.today - 60).to_time.strftime("%Y-%m-%d").to_s
       date_today   = Time.now.strftime("%Y-%m-%d")
 
       a0 = GRuby::Analytics.get(access_token, start_date, end_date, profile_id, metrics, dimensions, sort, limit)
-      a30 = GRuby::Analytics.get(access_token, d30_days_ago, date_today, profile_id, metrics, dimensions, sort, nil)
-      a60 = GRuby::Analytics.get(access_token, d60_days_ago, d30_days_ago, profile_id, metrics, dimensions, sort, nil)
-      
-      if a0.class.to_s != "Array"
-        return a0 if a0[:status] == "failed"
-      elsif a30.class.to_s != "Array"
-        return a30 if a0[:status] == "failed"
-      elsif a60.class.to_s != "Array"
-        return a60 if a0[:status] == "failed"
-      end
-      
-      response_obj = []
+      if a0.blank?
+        a30 = GRuby::Analytics.get(access_token, d30_days_ago, date_today, profile_id, metrics, dimensions, sort, nil)
+        a60 = GRuby::Analytics.get(access_token, d60_days_ago, d30_days_ago, profile_id, metrics, dimensions, sort, nil)
 
-      if dimensions.blank?
-        metrics.split(",").each do |metric|
-          d_this = a30[metric].to_i
-          d_last = a60[metric].to_i
-          dd = GRuby::Analytics.generate_delta_explaination(d_this, d_last, refresh)
-          if d_last == 0
-            response_obj << {tag: metric.gsub("ga:", ""), val: a0[metric], delta: 0, delta_explaination: dd}
-          else
-            response_obj << {tag: metric.gsub("ga:", ""), val: a0[metric], delta: ((d_this - d_last) * 100 / d_last), delta_explaination: dd}
-          end
+        if a0.class.to_s != "Array"
+          return a0 if a0[:status] == "failed"
+        elsif a30.class.to_s != "Array"
+          return a30 if a0[:status] == "failed"
+        elsif a60.class.to_s != "Array"
+          return a60 if a0[:status] == "failed"
         end
-      elsif dimensions.split(",").count == 1 and metrics.split(",").count == 1
-        a0.each do |i|
-          d_this = nil
-          d_last = nil
-          a30.each do |j|
-            d_this = j[1].to_i if j[0] == i[0]
-          end
-          a60.each do |k|
-            d_last = k[1].to_i if k[0] == i[0]
-          end
-          dd = GRuby::Analytics.generate_delta_explaination(d_this, d_last, refresh)
-          if d_last == 0
-            del = 0
-          else
-            del = ((d_this.to_i - d_last.to_i) * 100 / d_last.to_f)
-          end          
-          response_obj << {tag: metrics.gsub("ga:", ""), val: i[1], dimension: i[0], delta: del, delta_explaination: dd}
-        end
-      elsif dimensions.split(",").count > 1 and metrics.split(",").count == 1
-        a0.each do |i|
-          d_this = nil
-          d_last = nil
-          if dimensions == "ga:source,ga:medium"
-            k3 = i[1]=='referral' ? 'OtherSources' : (i[1]=='(none)' and i[0]=="(direct)") ? 'DirectSource' : 'searchEngine'
-          elsif dimensions == "ga:keyword,ga:medium"
-            k3 = i[1] == 'organic' ? 'OrganicKeywords' : 'PaidKeywords'
-          end
-          a30.each do |j|
-            d_this = j[2] if (j[0] == i[0] and j[1] == i[1])
+
+        if dimensions.blank?
+          metrics.split(",").each do |metric|
+            d_this = a30[metric].to_i
+            d_last = a60[metric].to_i
+            dd = GRuby::Analytics.generate_delta_explaination(d_this, d_last, refresh)
+            if d_last == 0
+              response_obj << {tag: metric.gsub("ga:", ""), val: a0[metric], delta: 0, delta_explaination: dd}
+            else
+              response_obj << {tag: metric.gsub("ga:", ""), val: a0[metric], delta: ((d_this - d_last) * 100 / d_last), delta_explaination: dd}
+            end
           end
-          a60.each do |k|
-            d_last = k[2] if (k[0] == i[0] and k[1] == i[1])
+        elsif dimensions.split(",").count == 1 and metrics.split(",").count == 1
+          a0.each do |i|
+            d_this = nil
+            d_last = nil
+            a30.each do |j|
+              d_this = j[1].to_i if j[0] == i[0]
+            end
+            a60.each do |k|
+              d_last = k[1].to_i if k[0] == i[0]
+            end
+            dd = GRuby::Analytics.generate_delta_explaination(d_this, d_last, refresh)
+            if d_last == 0
+              del = 0
+            else
+              del = ((d_this.to_i - d_last.to_i) * 100 / d_last.to_f)
+            end          
+            response_obj << {tag: metrics.gsub("ga:", ""), val: i[1], dimension: i[0], delta: del, delta_explaination: dd}
           end
-          dd = GRuby::Analytics.generate_delta_explaination(d_this, d_last, refresh)
-          if d_last.to_f == 0
-            del = 0
-          else
-            del = ((d_this.to_i - d_last.to_i) * 100 / d_last.to_f)
+        elsif dimensions.split(",").count > 1 and metrics.split(",").count == 1
+          a0.each do |i|
+            d_this = nil
+            d_last = nil
+            if dimensions == "ga:source,ga:medium"
+              k3 = i[1]=='referral' ? 'OtherSources' : (i[1]=='(none)' and i[0]=="(direct)") ? 'DirectSource' : 'searchEngine'
+            elsif dimensions == "ga:keyword,ga:medium"
+              k3 = i[1] == 'organic' ? 'OrganicKeywords' : 'PaidKeywords'
+            end
+            a30.each do |j|
+              d_this = j[2] if (j[0] == i[0] and j[1] == i[1])
+            end
+            a60.each do |k|
+              d_last = k[2] if (k[0] == i[0] and k[1] == i[1])
+            end
+            dd = GRuby::Analytics.generate_delta_explaination(d_this, d_last, refresh)
+            if d_last.to_f == 0
+              del = 0
+            else
+              del = ((d_this.to_i - d_last.to_i) * 100 / d_last.to_f)
+            end
+            response_obj << {tag: i[0], val: i[2], dimension: k3, delta: del, delta_explaination: dd}
           end
-          response_obj << {tag: i[0], val: i[2], dimension: k3, delta: del, delta_explaination: dd}
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: g_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Pykih Software