alexa 0.6.1 → 0.6.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/alexa/api/category_listings.rb +4 -6
  3. data/lib/alexa/api/traffic_history.rb +2 -3
  4. data/lib/alexa/api/url_info.rb +9 -13
  5. data/lib/alexa/connection.rb +3 -1
  6. data/lib/alexa/version.rb +1 -1
  7. data/test/api/traffic_history_test.rb +2 -2
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 852cb7e1c9c682c411c798266bf3b628fb70521d
4
- data.tar.gz: d68ec2bc5ad52c9a0cab3ae77fa55f8d651506e7
3
+ metadata.gz: 3fac8e93b349c60e05e0a9a482ebd75491f7a5a4
4
+ data.tar.gz: b9bdfbe2fcd31a6483be3c7ceb03a4595da4e884
5
5
  SHA512:
6
- metadata.gz: 301ae67beecce760d8a1c1e0e0d7e037b2db13d7eb5e89d24aa36182ececd2fc54ee80f2902fc66830a8e1e513cd2c794d1f35696c18b1c6b6b43f163b7e3112
7
- data.tar.gz: 4197c0fae4b6e2019778e24f2d633e0e658f0de91ec9772409dd3bed0d9d50ad80935f2664045e40e1a153d1cdc3633d646aa8b68340e072c3ec064e69a8c431
6
+ metadata.gz: 4fc8f79296f3f500c348621ea2347f5764dab97961f068b86fe66476f5cb58e0d3da7c12cb3088352b37a75ca32c28758d66eca3c23f4de2a26101f5d00193cd
7
+ data.tar.gz: ea8715b4189188e50b65b79d3879b6afeaf69cdb9ed490c78b72f5467dee5b3bb8de3625a528610b127031e62559dd5c6bd01834e68f20af122de05041a87fe9
data/lib/alexa/api/category_listings.rb CHANGED
@@ -21,16 +21,14 @@ module Alexa
21
21
 
22
22
  def count
23
23
  return @count if defined?(@count)
24
- if count = safe_retrieve(parsed_body, "CategoryListingsResponse", "Response", "CategoryListingsResult", "Alexa", "CategoryListings", "Count")
25
- @count = count.to_i
26
- end
24
+ count = safe_retrieve(parsed_body, "CategoryListingsResponse", "Response", "CategoryListingsResult", "Alexa", "CategoryListings", "Count")
25
+ @count = count ? count.to_i : nil
27
26
  end
28
27
 
29
28
  def recursive_count
30
29
  return @recursive_count if defined?(@recursive_count)
31
- if recursive_count = safe_retrieve(parsed_body, "CategoryListingsResponse", "Response", "CategoryListingsResult", "Alexa", "CategoryListings", "RecursiveCount")
32
- @recursive_count = recursive_count.to_i
33
- end
30
+ recursive_count = safe_retrieve(parsed_body, "CategoryListingsResponse", "Response", "CategoryListingsResult", "Alexa", "CategoryListings", "RecursiveCount")
31
+ @recursive_count = recursive_count ? recursive_count.to_i : nil
34
32
  end
35
33
 
36
34
  def listings
data/lib/alexa/api/traffic_history.rb CHANGED
@@ -26,9 +26,8 @@ module Alexa
26
26
 
27
27
  def range
28
28
  return @range if defined?(@range)
29
- if range = safe_retrieve(parsed_body, "TrafficHistoryResponse", "Response", "TrafficHistoryResult", "Alexa", "TrafficHistory", "Range")
30
- @range = range.to_i
31
- end
29
+ range = safe_retrieve(parsed_body, "TrafficHistoryResponse", "Response", "TrafficHistoryResult", "Alexa", "TrafficHistory", "Range")
30
+ @range = range ? range.to_i : nil
32
31
  end
33
32
 
34
33
  def data
data/lib/alexa/api/url_info.rb CHANGED
@@ -19,9 +19,8 @@ module Alexa
19
19
 
20
20
  def rank
21
21
  return @rank if defined?(@rank)
22
- if rank = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "TrafficData", "Rank")
23
- @rank = rank.to_i
24
- end
22
+ rank = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "TrafficData", "Rank")
23
+ @rank = rank ? rank.to_i : nil
25
24
  end
26
25
 
27
26
  def rank_by_country
@@ -58,9 +57,8 @@ module Alexa
58
57
 
59
58
  def links_in_count
60
59
  return @links_in_count if defined?(@links_in_count)
61
- if links_in_count = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "LinksInCount")
62
- @links_in_count = links_in_count.to_i
63
- end
60
+ links_in_count = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "LinksInCount")
61
+ @links_in_count = links_in_count ? links_in_count.to_i : nil
64
62
  end
65
63
 
66
64
  def keywords
@@ -69,22 +67,20 @@ module Alexa
69
67
 
70
68
  def speed_median_load_time
71
69
  return @speed_median_load_time if defined?(@speed_median_load_time)
72
- if speed_median_load_time = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "Speed", "MedianLoadTime")
73
- @speed_median_load_time = speed_median_load_time.to_i
74
- end
70
+ speed_median_load_time = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "Speed", "MedianLoadTime")
71
+ @speed_median_load_time = speed_median_load_time ? speed_median_load_time.to_i : nil
75
72
  end
76
73
 
77
74
  def speed_percentile
78
75
  return @speed_percentile if defined?(@speed_percentile)
79
- if speed_percentile = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "Speed", "Percentile")
80
- @speed_percentile = speed_percentile.to_i
81
- end
76
+ speed_percentile = safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "ContentData", "Speed", "Percentile")
77
+ @speed_percentile = speed_percentile ? speed_percentile.to_i : nil
82
78
  end
83
79
 
84
80
  def related_links
85
81
  @related_links ||= safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "Related", "RelatedLinks", "RelatedLink")
86
82
  end
87
-
83
+
88
84
  def categories
89
85
  @categories ||= safe_retrieve(parsed_body, "UrlInfoResponse", "Response", "UrlInfoResult", "Alexa", "Related", "Categories", "CategoryData")
90
86
  end
data/lib/alexa/connection.rb CHANGED
@@ -10,6 +10,8 @@ module Alexa
10
10
  attr_accessor :secret_access_key, :access_key_id
11
11
  attr_writer :params
12
12
 
13
+ RFC_3986_UNRESERVED_CHARS = "-_.~a-zA-Z\\d"
14
+
13
15
  def initialize(credentials = {})
14
16
  self.secret_access_key = credentials.fetch(:secret_access_key)
15
17
  self.access_key_id = credentials.fetch(:access_key_id)
@@ -72,7 +74,7 @@ module Alexa
72
74
  end
73
75
 
74
76
  def query
75
- default_params.merge(params).map { |key, value| "#{key}=#{URI.escape(value.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}" }.sort.join("&")
77
+ default_params.merge(params).map { |key, value| "#{key}=#{URI.escape(value.to_s, Regexp.new("[^#{RFC_3986_UNRESERVED_CHARS}]"))}" }.sort.join("&")
76
78
  end
77
79
  end
78
80
  end
data/lib/alexa/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Alexa
2
- VERSION = "0.6.1"
2
+ VERSION = "0.6.2"
3
3
  end
data/test/api/traffic_history_test.rb CHANGED
@@ -12,8 +12,8 @@ describe Alexa::API::TrafficHistory do
12
12
  @traffic_history = Alexa::API::TrafficHistory.new(:access_key_id => "fake", :secret_access_key => "fake")
13
13
  @traffic_history.fetch(:url => "github.com", :range => 14)
14
14
 
15
- # 14 days from now
16
- assert_in_delta (Time.now - 3600 * 24 * 14).to_i, @traffic_history.arguments[:start].to_i, 0.001
15
+ # 14 days ago
16
+ assert_in_delta (Time.now - 3600 * 24 * 14).to_i, @traffic_history.arguments[:start].to_i, 1
17
17
  end
18
18
 
19
19
  describe "parsing xml" do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alexa
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.6.1
4
+ version: 0.6.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Wojciech Wnętrzak
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-08-28 00:00:00.000000000 Z
11
+ date: 2013-09-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: multi_xml