dataduck 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd5effb261990d6eccb37fe16de93195c89ef24
-  data.tar.gz: b2c7d31fac424890e6b605d2828423b624625467
+  metadata.gz: 5944e3a23d61e1bcdbfa5c82e1a8d0ee3fe8b4cf
+  data.tar.gz: 70c2e2b7af5377e13f473a9f7f56df438e5b6491
 SHA512:
-  metadata.gz: 61b17cc19b83ad9733b9744de6a65f884af5f3b145ddbc967ce01eff2fa8b552b103c9c69016c59f87c729cd9bc10866ed5ee720f903236c90e1d2b4ec2712c5
-  data.tar.gz: 0217b069e2d3997698c4135a170c65c22d16187cb02d35adf68d4e62c8798073c2c95a9d5f9689329762cc8c6d25a0b5682f542f7b802918a6776f792e302db3
+  metadata.gz: af935179e9a4a52d56423cb2a785db6d51421caaaba6d5fa33b6283708b6199252770892446b394c826fab07d75e57553c43d8ccf15754156fe063fc48732e54
+  data.tar.gz: 51ef2d29c8092aaf30e65326701ed3936c3e77a745ad171dbfd6d993c608e2312344258b31f0c525dd607739ae4376471ef3017858fbb50e6772bf4481b4b263

data/lib/dataduck/table.rb

@@ -146,7 +146,7 @@ module DataDuck
         end
       end
 
-      if base_query.downcase.include?(' where ')
+      if base_query.downcase.split("from").last.include?(' where ')
         extract_part.gsub!('WHERE ', 'AND ')
       end
 

data/lib/dataduck/version.rb

@@ -2,7 +2,7 @@ module DataDuck
   if !defined?(DataDuck::VERSION)
     VERSION_MAJOR = 0
     VERSION_MINOR = 6
-    VERSION_PATCH = 6
+    VERSION_PATCH = 7
     VERSION = [VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH].join('.')
   end
 end

data/lib/integrations/semrush/organic_results.rb

@@ -4,6 +4,8 @@ require 'uri'
 
 module DataDuck
   module SEMRush
+    class OrganicResultsAPIError < Exception; end
+
     class OrganicResults < DataDuck::IntegrationTable
       def display_limit
         20
@@ -29,7 +31,11 @@ module DataDuck
         self.data = []
 
         self.phrases.each do |phrase|
-          self.extract_results_for_keyword_and_date!(phrase)
+          begin
+            self.extract_results_for_keyword_and_date!(phrase)
+          rescue OrganicResultsAPIError => err
+            DataDuck::Logs.error(err)
+          end
         end
       end
 
@@ -39,9 +45,15 @@ module DataDuck
         escaped_phrase = URI.escape(phrase)
         semrush_api_url = "http://api.semrush.com/?type=phrase_organic&key=#{ self.key }&display_limit=#{ self.display_limit }&export_columns=Dn,Ur&phrase=#{ escaped_phrase }&database=#{ self.search_database }"
 
+        puts semrush_api_url
+
         response = Typhoeus.get(semrush_api_url)
         if response.response_code != 200
-          raise Exception.new("SEMrush API returned error #{ response.response_code} #{ response.body }")
+          raise OrganicResultsAPIError.new("SEMrush API for phrase #{ phrase } returned error #{ response.response_code } #{ response.body }")
+        end
+
+        if response.body.start_with?("ERROR ")
+          raise OrganicResultsAPIError.new("SEMrush API for phrase #{ phrase } returned 200 but with a body stating #{ response.body }")
         end
 
         rank = -1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dataduck
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Jeff Pickhardt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-07 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler