alexa 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 852cb7e1c9c682c411c798266bf3b628fb70521d
-  data.tar.gz: d68ec2bc5ad52c9a0cab3ae77fa55f8d651506e7
+  metadata.gz: 3fac8e93b349c60e05e0a9a482ebd75491f7a5a4
+  data.tar.gz: b9bdfbe2fcd31a6483be3c7ceb03a4595da4e884
 SHA512:
-  metadata.gz: 301ae67beecce760d8a1c1e0e0d7e037b2db13d7eb5e89d24aa36182ececd2fc54ee80f2902fc66830a8e1e513cd2c794d1f35696c18b1c6b6b43f163b7e3112
-  data.tar.gz: 4197c0fae4b6e2019778e24f2d633e0e658f0de91ec9772409dd3bed0d9d50ad80935f2664045e40e1a153d1cdc3633d646aa8b68340e072c3ec064e69a8c431
+  metadata.gz: 4fc8f79296f3f500c348621ea2347f5764dab97961f068b86fe66476f5cb58e0d3da7c12cb3088352b37a75ca32c28758d66eca3c23f4de2a26101f5d00193cd
+  data.tar.gz: ea8715b4189188e50b65b79d3879b6afeaf69cdb9ed490c78b72f5467dee5b3bb8de3625a528610b127031e62559dd5c6bd01834e68f20af122de05041a87fe9

data/lib/alexa/api/category_listings.rb

@@ -21,16 +21,14 @@ module Alexa
 
       def count
         return @count if defined?(@count)
-        if count = safe_retrieve(parsed_body, "CategoryListingsResponse", "Response", "CategoryListingsResult", "Alexa", "CategoryListings", "Count")
-          @count = count.to_i
-        end
+        count = safe_retrieve(parsed_body, "CategoryListingsResponse", "Response", "CategoryListingsResult", "Alexa", "CategoryListings", "Count")
+        @count = count ? count.to_i : nil
       end
 
       def recursive_count
         return @recursive_count if defined?(@recursive_count)
-        if recursive_count = safe_retrieve(parsed_body, "CategoryListingsResponse", "Response", "CategoryListingsResult", "Alexa", "CategoryListings", "RecursiveCount")
-          @recursive_count = recursive_count.to_i
-        end
+        recursive_count = safe_retrieve(parsed_body, "CategoryListingsResponse", "Response", "CategoryListingsResult", "Alexa", "CategoryListings", "RecursiveCount")
+        @recursive_count = recursive_count ? recursive_count.to_i : nil
       end
 
       def listings

data/lib/alexa/api/traffic_history.rb

@@ -26,9 +26,8 @@ module Alexa
 
       def range
         return @range if defined?(@range)
-        if range = safe_retrieve(parsed_body, "TrafficHistoryResponse", "Response", "TrafficHistoryResult", "Alexa", "TrafficHistory", "Range")
-          @range = range.to_i
-        end
+        range = safe_retrieve(parsed_body, "TrafficHistoryResponse", "Response", "TrafficHistoryResult", "Alexa", "TrafficHistory", "Range")
+        @range = range ? range.to_i : nil
       end
 
       def data

data/lib/alexa/api/url_info.rb

@@ -19,9 +19,8 @@ module Alexa
 
       def rank
         return @rank if defined?(@rank)
-        if rank = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "TrafficData", "Rank")
-          @rank = rank.to_i
-        end
+        rank = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "TrafficData", "Rank")
+        @rank = rank ? rank.to_i : nil
       end
 
       def rank_by_country
@@ -58,9 +57,8 @@ module Alexa
 
       def links_in_count
         return @links_in_count if defined?(@links_in_count)
-        if links_in_count = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "LinksInCount")
-          @links_in_count = links_in_count.to_i
-        end
+        links_in_count = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "LinksInCount")
+        @links_in_count = links_in_count ? links_in_count.to_i : nil
       end
 
       def keywords
@@ -69,22 +67,20 @@ module Alexa
 
       def speed_median_load_time
         return @speed_median_load_time if defined?(@speed_median_load_time)
-        if speed_median_load_time = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "Speed", "MedianLoadTime")
-          @speed_median_load_time = speed_median_load_time.to_i
-        end
+        speed_median_load_time = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "Speed", "MedianLoadTime")
+        @speed_median_load_time = speed_median_load_time ? speed_median_load_time.to_i : nil
       end
 
       def speed_percentile
         return @speed_percentile if defined?(@speed_percentile)
-        if speed_percentile = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "Speed", "Percentile")
-          @speed_percentile = speed_percentile.to_i
-        end
+        speed_percentile = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "Speed", "Percentile")
+        @speed_percentile = speed_percentile ? speed_percentile.to_i : nil
       end
 
       def related_links
         @related_links ||= safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "Related", "RelatedLinks", "RelatedLink")
       end
-      
+
       def categories
         @categories ||= safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "Related", "Categories", "CategoryData")
       end

data/lib/alexa/connection.rb

@@ -10,6 +10,8 @@ module Alexa
     attr_accessor :secret_access_key, :access_key_id
     attr_writer :params
 
+    RFC_3986_UNRESERVED_CHARS = "-_.~a-zA-Z\\d"
+
     def initialize(credentials = {})
       self.secret_access_key = credentials.fetch(:secret_access_key)
       self.access_key_id     = credentials.fetch(:access_key_id)
@@ -72,7 +74,7 @@ module Alexa
     end
 
     def query
-      default_params.merge(params).map { |key, value| "#{key}=#{URI.escape(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}" }.sort.join("&")
+      default_params.merge(params).map { |key, value| "#{key}=#{URI.escape(value.to_s, Regexp.new("[^#{RFC_3986_UNRESERVED_CHARS}]"))}" }.sort.join("&")
     end
   end
 end

data/lib/alexa/version.rb

@@ -1,3 +1,3 @@
 module Alexa
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/test/api/traffic_history_test.rb

@@ -12,8 +12,8 @@ describe Alexa::API::TrafficHistory do
     @traffic_history = Alexa::API::TrafficHistory.new(:access_key_id => "fake", :secret_access_key => "fake")
     @traffic_history.fetch(:url => "github.com", :range => 14)
 
-    # 14 days from now
-    assert_in_delta (Time.now - 3600 * 24 * 14).to_i, @traffic_history.arguments[:start].to_i, 0.001
+    # 14 days ago
+    assert_in_delta (Time.now - 3600 * 24 * 14).to_i, @traffic_history.arguments[:start].to_i, 1
   end
 
   describe "parsing xml" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexa
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Wojciech Wnętrzak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_xml