hackerdude-aws 2.3.25 → 2.3.26

data/lib/aws.rb

@@ -27,4 +27,4 @@ require 'sdb/right_sdb_interface'
 require 'acf/right_acf_interface'
 require 'elb/elb_interface'
 require 'rds/rds'
-require 'alexa/alexa'
+

data/lib/awsbase/support.rb

@@ -51,40 +51,6 @@ unless defined? ActiveSupport
             constant
         end
 
-    		# By default, +camelize+ converts strings to UpperCamelCase. If the argument to +camelize+
-    		# is set to <tt>:lower</tt> then +camelize+ produces lowerCamelCase.
-    		# 
-    		# +camelize+ will also convert '/' to '::' which is useful for converting paths to namespaces.
-    		# 
-    		# Examples:
-    		#   "active_record".camelize                # => "ActiveRecord"
-    		#   "active_record".camelize(:lower)        # => "activeRecord"
-    		#   "active_record/errors".camelize         # => "ActiveRecord::Errors"
-    		#   "active_record/errors".camelize(:lower) # => "activeRecord::Errors"
-    		def camelize(lower_case_and_underscored_word=self, first_letter_in_uppercase = true)
-      		if first_letter_in_uppercase
-        		lower_case_and_underscored_word.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-      		else
-        		lower_case_and_underscored_word.first.downcase + camelize(lower_case_and_underscored_word)[1..-1]
-      		end
-    		end
-
-    # The reverse of +camelize+. Makes an underscored, lowercase form from the expression in the string.
-    #
-    # Changes '::' to '/' to convert namespaces to paths.
-    #
-    # Examples:
-    #   "ActiveRecord".underscore         # => "active_record"
-    #   "ActiveRecord::Errors".underscore # => active_record/errors
-    def underscore
-      self.to_s.gsub(/::/, '/').
-        gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-        gsub(/([a-z\d])([A-Z])/,'\1_\2').
-        tr("-", "_").
-        downcase
-    end
-			
-
     end
 
 

metadata

@@ -1,24 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: hackerdude-aws
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 2
   - 3
-  - 25
-  version: 2.3.25
+  - 26
+  version: 2.3.26
 platform: ruby
 authors: 
 - Travis Reeder
 - Chad Arimura
 - RightScale
-- David Martinez
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-17 00:00:00 -08:00
+date: 2010-12-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,7 +76,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
-description: AWS Ruby Library for interfacing with Amazon Web Services. Alexa-experimental branch.
+description: AWS Ruby Library for interfacing with Amazon Web Services.
 email: travis@appoxy.com
 executables: []
 
@@ -87,7 +86,6 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - lib/acf/right_acf_interface.rb
-- lib/alexa/alexa.rb
 - lib/aws.rb
 - lib/awsbase/aws_response_array.rb
 - lib/awsbase/benchmark_fix.rb
@@ -107,8 +105,6 @@ files:
 - README.markdown
 - test/acf/test_acf.rb
 - test/acf/test_helper.rb
-- test/alexa/test_alexa.rb
-- test/alexa/test_helper.rb
 - test/ec2/test_ec2.rb
 - test/ec2/test_helper.rb
 - test/ec2/test_mon.rb
@@ -126,12 +122,12 @@ files:
 - test/test_credentials.rb
 - test/ts_right_aws.rb
 has_rdoc: true
-homepage: http://github.com/hackerdude/aws/
+homepage: http://github.com/appoxy/aws/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -158,12 +154,10 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: AWS Ruby Library for interfacing with Amazon Web Services. Hackerdude branch including Alexa (Experimental).
+summary: AWS Ruby Library for interfacing with Amazon Web Services.
 test_files: 
 - test/acf/test_acf.rb
 - test/acf/test_helper.rb
-- test/alexa/test_alexa.rb
-- test/alexa/test_helper.rb
 - test/ec2/test_ec2.rb
 - test/ec2/test_helper.rb
 - test/ec2/test_mon.rb

data/lib/alexa/alexa.rb

@@ -1,239 +0,0 @@
-module Aws
-class Alexa
-  include AwsBaseInterface
-	DEFAULT_HOST = "awis.amazonaws.com"
-	DEFAULT_PATH = "/"
-  API_VERSION = "2005-07-11"
-  DEFAULT_PROTOCOL = 'http'
-  DEFAULT_PORT     = 80
-
-  VALID_URLINFO_RESPONSE_GROUPS = [
-    :related_links,
-    :categories,
-    :rank,
-    :rank_by_country,
-    :rank_by_city,
-    :usage_stats,
-    :contact_info,
-    :adult_content,
-    :speed,
-    :language,
-    :keywords,
-    :owned_domains,
-    :links_in_count,
-    :site_data
-  ]
-    # TODO - the docs mentions :popups on the meta groups, but it's not on the response group. Oversight? Check to see if that kind of info is being passed
-
-	VALID_CATEGORY_BROWSE_RESPONSE_GROUPS = [ :categories, 
-			:related_categories, 
-			:language_categories, 
-			:letter_bars
-	]
-
-  META_GROUPS = {
-    :related=>[:related_links, :categories],
-    :traffic_data=>[:rank, :usage_stats],
-    :content_data=>[:site_data, :adult_content, :popups, :speed, :language]
-  }
-  @@bench = AwsBenchmarkingBlock.new
-  def self.bench_xml
-    @@bench.xml
-  end
-  def self.bench_ec2
-    @@bench.service
-  end
-
-	@@api = ENV['ALEXA_API_VERSION'] || API_VERSION
-  def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
-    init({ :name             => 'ALEXA',
-           :default_host     => ENV['ALEXA_URL'] ? URI.parse(ENV['ALEXA_URL']).host   : DEFAULT_HOST,
-           :default_port     => ENV['ALEXA_URL'] ? URI.parse(ENV['ALEXA_URL']).port   : DEFAULT_PORT,
-           :default_service  => ENV['ALEXA_URL'] ? URI.parse(ENV['ALEXA_URL']).path   : DEFAULT_PATH,
-           :default_protocol => ENV['ALEXA_URL'] ? URI.parse(ENV['ALEXA_URL']).scheme : DEFAULT_PROTOCOL,
-          :api_version => API_VERSION },
-         aws_access_key_id    || ENV['AWS_ACCESS_KEY_ID'] ,
-         aws_secret_access_key|| ENV['AWS_SECRET_ACCESS_KEY'],
-         params)
-    # EC2 doesn't really define any transient errors to retry, and in fact,
-    # when they return a 503 it is usually for 'request limit exceeded' which
-    # we most certainly should not retry.  So let's pare down the list of
-    # retryable errors to InternalError only (see AwsBase for the default
-    # list)
-    amazon_problems = ['InternalError']
-  end
-
-  def generate_request(action, params={}) #:nodoc:
-    service_hash = {"Action"         => action,
-                    "AWSAccessKeyId" => @aws_access_key_id,
-                    "Version"        => @@api }
-    service_hash.update(params)
-    service_params = signed_service_params(@aws_secret_access_key, service_hash, :get, @params[:server], @params[:service])
-
-    # use POST method if the length of the query string is too large
-    if service_params.size > 2000
-      if signature_version == '2'
-        # resign the request because HTTP verb is included into signature
-        service_params = signed_service_params(@aws_secret_access_key, service_hash, :post, @params[:server], @params[:service])
-      end
-      request = Net::HTTP::Post.new(@params[:service])
-      request.body = service_params
-      request['Content-Type'] = 'application/x-www-form-urlencoded'
-    else
-      request        = Net::HTTP::Get.new("#{@params[:service]}?#{service_params}")
-    end
-      # prepare output hash
-    { :request  => request,
-      :server   => @params[:server],
-      :port     => @params[:port],
-      :protocol => @params[:protocol] }
-  end
-
-  def request_info(request, parser)  #:nodoc:
-    thread = @params[:multi_thread] ? Thread.current : Thread.main
-    thread[:ec2_connection] ||= Rightscale::HttpConnection.new(:exception => AwsError, :logger => @logger)
-    request_info_impl(thread[:ec2_connection], @@bench, request, parser)
-  end
-
-	# Quickly return the alexa URL info, (rank only)
-	#
-	# Example:
-	# 	alexa_rank("http://www.yahoo.com")[:rank][:text]  # 4
-	def alexa_rank(url, params={}, cache_for = nil)
-		result =  alexa_url_info(url, {:response_groups=>:rank})
-		return result[:url_info_response][:response][:url_info_result][:alexa][:traffic_data]
-	end
-
-	# Retrieves the Alexa URL info for a URL.
-	# By default it returns every response group. 
-	# Override response_groups to set your own.
-	#
-	# Example:
-	#  alexa_url_info("http://www.google.com")[:url_info_response]..
-	def alexa_url_info(url, opts={}, cache_for=nil, parser = QAlexaUrlInfoParser)
-		options = {:response_groups=>VALID_URLINFO_RESPONSE_GROUPS}.merge(opts)
-		request_hash = {}
-		request_hash['Url'] = url
-		request_hash['ResponseGroup'] = response_groups_to_param(options[:response_groups])
-		params.each do |key, val|
-			request_hash.merge! hash_params(key, (val.is_a?(Array) ? val : [val]))
-		end
-		link = generate_request('UrlInfo', request_hash)
-		request_cache_or_info(cache_for, link, parser, @@bench, cache_for)
-	rescue Exception
-		on_exception
-	end
-
-	# Returns a list of subcategories inside a category
-	#
-  def alexa_category_browse(path, opts={}, cache_for=nil, parser = QAlexaUrlInfoParser)
-		options = {:response_groups=>VALID_CATEGORY_BROWSE_RESPONSE_GROUPS}.merge(opts)
-		request_hash = {}
-		request_hash['Path'] = path
-		request_hash['ResponseGroup'] = response_groups_to_param(options[:response_groups])
-		params.each do |key, val|
-		request_hash.merge! hash_params(key, (val.is_a?(Array) ? val : [val]))
-		end
-		link = generate_request('CategoryBrowse', request_hash)
-		request_cache_or_info(cache_for, link, parser, @@bench, cache_for)
-	rescue Exception
-		on_exception
-  end
-
-	# Returns a list of category listings
-  def alexa_category_listings(path, cache_for=nil, parser = QAlexaUrlInfoParser)
-		request_hash = {}
-		request_hash['Path'] = path
-		request_hash['ResponseGroup'] = "Listings"
-		params.each do |key, val|
-		request_hash.merge! hash_params(key, (val.is_a?(Array) ? val : [val]))
-		end
-		link = generate_request('CategoryListings', request_hash)
-		request_cache_or_info(cache_for, link, parser, @@bench, cache_for)
-	rescue Exception
-		on_exception
-  end
-
-  def alexa_sites_linking_in(path, cache_for, parser = QAlexaUrlInfoParser)
-		request_hash = {}
-		request_hash['Path'] = path
-		request_hash['ResponseGroup'] = "SitesLinkingIn"
-		params.each do |key, val|
-		request_hash.merge! hash_params(key, (val.is_a?(Array) ? val : [val]))
-		end
-		link = generate_request('CategoryListings', request_hash)
-		request_cache_or_info(cache_for, link, parser, @@bench, cache_for)
-	rescue Exception
-		on_exception
-  end
-
-  def alexa_traffic_history
-    throw ArgumentError.new("Not Implemented. Sorry!")
-  end
-
-	private
-
-		def response_groups_to_param(groups)
-			actual_groups = groups.is_a?(Array) ? groups : [groups]
-			actual_groups.collect{|g| g.to_s.camelize }.join(",")
-		end
-
-end
-
-	class QAlexaElementHash < Hash
-		attr_accessor :finalized
-		def last
-			self
-		end
-		def to_s
-			return has_key?(:text) ? self[:text] : super.to_s
-		end
-	end
-
-	class QAlexaUrlInfoParser < AwsParser
-
-		def initialize(args)
-			super(args)
-			@result = {}
-		end
-
-		def tagstart(name, attr)
-			item = current_item(name)
-			_attr = attr.dup
-			_attr.delete("xmlns:aws")
-			item.merge!(_attr)
-		end
-
-		def tagend(name)
-			element = current_item(name)
-			element[:text] = @text.strip
-			element.finalized = true
-		end
-
-		def current_item(name)
-			outer = @result
-			inner = nil
-			path_array = @xmlpath.split('/')
-			path_array << name
-			path_array.collect{|s| s.sub('aws:','')}.each{|_xpath_element|
-				name_sym = symbol_for(_xpath_element)
-				inner = outer[name_sym] || QAlexaElementHash.new
-				inner = inner.last # Sometimes we may get an array.
-				if inner.finalized
-					old_inner = inner
-					inner = QAlexaElementHash.new
-					outer[name_sym] = [old_inner, inner]
-				end
-				outer[name_sym] = inner if ! outer.has_key?(name_sym)
-				outer = inner
-			}
-			return inner.nil? ? outer : inner
-		end
-
-		def symbol_for(name)
-			sym_name = name.sub('aws:','').underscore.to_sym
-		end
-
-	end
-
-end

data/test/alexa/test_alexa.rb

@@ -1,53 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-require 'pp'
-require File.dirname(__FILE__) + '/../test_credentials.rb'
-
-require 'ruby-debug'
-Debugger.start
-
-# Tests the Alexa AWS implementation
-# Note this is very preliminary code. The code just spits back hashes
-# and it has no concept of types just yet. The parser can 
-# be overriden on the calls if you need stronger types and must 
-# have something right away.
-class TestAlexa < Test::Unit::TestCase
-
-		def setup
-        TestCredentials.get_credentials
-        @alexa   = Aws::Alexa.new(TestCredentials.aws_access_key_id,
-                              TestCredentials.aws_secret_access_key)
-		end
-
-		# Quick rank request
-		def test_rank
-		return
-			TestCredentials.get_credentials
-			rank = @alexa.alexa_rank("http://www.youtube.com")
-			assert ! rank.empty?
-			assert ! rank[:rank][:text].blank?
-			assert rank[:rank][:text].to_i > 0
-			assert ! rank[:data_url][:text].blank?
-		end
-
-		def test_alexa_urlinfo
-			TestCredentials.get_credentials
-			result = @alexa.alexa_url_info("http://www.yahoo.com")
-			assert result[:url_info_response][:response][:url_info_result][:alexa][:contact_info][:company_stock_ticker][:text] == "YHOO"
-		end
-
-		def test_alexa_category_browse
-			TestCredentials.get_credentials
-			category_browse = @alexa.alexa_category_browse("Top/Computers/Software/Operating_Systems")
-			assert ! category_browse.empty?
-			assert ! category_browse[:category_browse_response][:response][:category_browse_result][:alexa][:category_browse][:categories][:category].first[:path][:text].blank?
-			
-		end
-
-		def test_alexa_category_listings
-			TestCredentials.get_credentials
-			category_browse = @alexa.alexa_category_listings("Top/Computers/Software/Operating_Systems")
-			assert ! category_browse.empty?
-			assert category_browse[:category_listings_response][:response][:category_listings_result][:alexa][:category_listings][:listings][:listing].length > 0
-		end
-
-end

data/test/alexa/test_helper.rb

@@ -1,2 +0,0 @@
-require 'test/unit'
-require File.dirname(__FILE__) + '/../../lib/aws'