ruby-aws 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95dee8cb700ed6360aaabd138e3b63958e0d2196
-  data.tar.gz: f3e9386d6974434ac4bda8cd54c28a9a39c7622c
+  metadata.gz: 3c6aaad8789ddc40a7fdd1e7a1b0e580f92906a2
+  data.tar.gz: b31a187c9f7ae32ef27694dc0fd1ce692e0cf8ff
 SHA512:
-  metadata.gz: f1403ccfc9c3082692ede2791110dac1b9f587d7194b5d74dfe2a3823f6874fd7dac9dfd5fa3a1eab9822e037c8386fe8845b92ebd6f3d3f56f53b3ef8722736
-  data.tar.gz: 960a5ad5fef9d51f9759b3174e3afbfd40068c4b81037ed6d17b7bb8bee751cc4e87743377c619229c114212827c88f382c7c18de88fd17689791df8a183f18c
+  metadata.gz: 59b97519cafe92afabc0ecb129e82351dca107e2e88f354e4e25a3da2516059be5bc1dc56a73234b6a15ef6effdc11a1b8b275faca0faa4eb351066c3c2bf8ee
+  data.tar.gz: d5af3916c8b0924fd868367bf99805a6c91de66954e81f7094e05be1d58f461ef5afb04cd8ea8ad6cab19ecdde5b38eaf2d53c85f2b03b1eb3d1163f40029318

data/History.md

@@ -1,3 +1,8 @@
+== 1.7.2 / 2014-02-16
+
+=== 1 major enhancement
+* ruby-aws is deprecated in favor of the mturk gem
+
 == 1.7.1 / 2014-10-20
 
 === 1 minor update

data/Manifest.txt

@@ -5,34 +5,6 @@ NOTICE.txt
 README.md
 Rakefile
 bin/ruby-aws
-lib/amazon/util.rb
-lib/amazon/util/binder.rb
-lib/amazon/util/data_reader.rb
-lib/amazon/util/filter_chain.rb
-lib/amazon/util/hash_nesting.rb
-lib/amazon/util/lazy_results.rb
-lib/amazon/util/logging.rb
-lib/amazon/util/paginated_iterator.rb
-lib/amazon/util/proactive_results.rb
-lib/amazon/util/threadpool.rb
-lib/amazon/util/user_data_store.rb
-lib/amazon/webservices/mechanical_turk.rb
-lib/amazon/webservices/mechanical_turk_requester.rb
-lib/amazon/webservices/mturk/mechanical_turk_error_handler.rb
-lib/amazon/webservices/mturk/question_generator.rb
-lib/amazon/webservices/util/amazon_authentication_relay.rb
-lib/amazon/webservices/util/command_line.rb
-lib/amazon/webservices/util/convenience_wrapper.rb
-lib/amazon/webservices/util/filter_proxy.rb
-lib/amazon/webservices/util/mock_transport.rb
-lib/amazon/webservices/util/request_signer.rb
-lib/amazon/webservices/util/rest_transport.rb
-lib/amazon/webservices/util/soap_simplifier.rb
-lib/amazon/webservices/util/soap_transport.rb
-lib/amazon/webservices/util/soap_transport_header_handler.rb
-lib/amazon/webservices/util/unknown_result_exception.rb
-lib/amazon/webservices/util/validation_exception.rb
-lib/amazon/webservices/util/xml_simplifier.rb
 lib/ruby-aws.rb
 lib/ruby-aws/version.rb
 run_rcov.sh

data/Rakefile

@@ -8,12 +8,11 @@ Hoe.spec 'ruby-aws' do
   self.version = RubyAWS::VERSION.dup
   developer 'David J Parrott', 'valthon@nothlav.net'
   license 'APLv2'
-  extra_deps << ['highline','>= 1.2.7']
-  extra_deps << ['nokogiri','>= 1.4']
+  extra_deps << ['mturk', '>= 1.8.0']
   need_tar
   need_zip
 
-  self.summary = 'Ruby libraries for working with Amazon Web Services ( Mechanical Turk )'
+  self.summary = 'Deprecated - please use the mturk gem'
   self.email = 'ruby-aws-develop@rubyforge.org'
   self.urls = ["http://rubyforge.org/projects/ruby-aws/"]
 end
@@ -21,7 +20,7 @@ end
 task :gitversion do
   gv = `git describe --dirty`.chomp.gsub(/^v/,'').gsub('-','.')
   File.open('lib/ruby-aws/version.rb', File::WRONLY | File::CREAT | File::TRUNC ) do |f|
-    f << "# Copyright:: Copyright (c) 2007-2014 Amazon Technologies, Inc.\n"
+    f << "# Copyright:: Copyright (c) 2007-2015 Amazon Technologies, Inc.\n"
     f << "# License::   Apache License, Version 2.0\n"
     f << "\n"
     f << "module RubyAWS\n"

data/lib/ruby-aws.rb

@@ -1,6 +1,7 @@
 # Copyright:: Copyright (c) 2007 Amazon Technologies, Inc.
 # License::   Apache License, Version 2.0
 
+puts 'DEPRECATION WARNING: This gem (ruby-aws) is has been replaced by the "mturk" gem.'
 require 'ruby-aws/version'
 
 module RubyAWS
@@ -16,4 +17,4 @@ module RubyAWS
 
 end
 
-require 'amazon/webservices/mechanical_turk_requester'
+require 'mturk'

data/lib/ruby-aws/version.rb

@@ -1,6 +1,6 @@
-# Copyright:: Copyright (c) 2007-2014 Amazon Technologies, Inc.
+# Copyright:: Copyright (c) 2007-2015 Amazon Technologies, Inc.
 # License::   Apache License, Version 2.0
 
 module RubyAWS
-  VERSION = '1.7.1'.freeze
+  VERSION = '1.7.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-aws
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - David J Parrott
@@ -29,36 +29,22 @@ cert_chain:
   tlC13CXjOWGW+hn+n/swny4LFXOus/qZixxiMAePSmN3QUC+bl/GvdBqZz0uPmQc
   QRVpdW2BFol3aw2mXmdYxaOwHvTxcB7DHmkfOf2h
   -----END CERTIFICATE-----
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: mturk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.7
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -115,34 +101,6 @@ files:
 - README.md
 - Rakefile
 - bin/ruby-aws
-- lib/amazon/util.rb
-- lib/amazon/util/binder.rb
-- lib/amazon/util/data_reader.rb
-- lib/amazon/util/filter_chain.rb
-- lib/amazon/util/hash_nesting.rb
-- lib/amazon/util/lazy_results.rb
-- lib/amazon/util/logging.rb
-- lib/amazon/util/paginated_iterator.rb
-- lib/amazon/util/proactive_results.rb
-- lib/amazon/util/threadpool.rb
-- lib/amazon/util/user_data_store.rb
-- lib/amazon/webservices/mechanical_turk.rb
-- lib/amazon/webservices/mechanical_turk_requester.rb
-- lib/amazon/webservices/mturk/mechanical_turk_error_handler.rb
-- lib/amazon/webservices/mturk/question_generator.rb
-- lib/amazon/webservices/util/amazon_authentication_relay.rb
-- lib/amazon/webservices/util/command_line.rb
-- lib/amazon/webservices/util/convenience_wrapper.rb
-- lib/amazon/webservices/util/filter_proxy.rb
-- lib/amazon/webservices/util/mock_transport.rb
-- lib/amazon/webservices/util/request_signer.rb
-- lib/amazon/webservices/util/rest_transport.rb
-- lib/amazon/webservices/util/soap_simplifier.rb
-- lib/amazon/webservices/util/soap_transport.rb
-- lib/amazon/webservices/util/soap_transport_header_handler.rb
-- lib/amazon/webservices/util/unknown_result_exception.rb
-- lib/amazon/webservices/util/validation_exception.rb
-- lib/amazon/webservices/util/xml_simplifier.rb
 - lib/ruby-aws.rb
 - lib/ruby-aws/version.rb
 - run_rcov.sh
@@ -202,10 +160,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Ruby libraries for working with Amazon Web Services ( Mechanical Turk )
+summary: Deprecated - please use the mturk gem
 test_files:
 - test/test_ruby-aws.rb
 - test/unit/test_question_generator.rb

data/lib/amazon/util.rb

@@ -1,10 +0,0 @@
-# Copyright:: Copyright (c) 2007 Amazon Technologies, Inc.
-# License::   Apache License, Version 2.0
-
-require 'amazon/util/logging'
-require 'amazon/util/paginated_iterator'
-require 'amazon/util/lazy_results'
-require 'amazon/util/proactive_results'
-require 'amazon/util/binder'
-require 'amazon/util/data_reader'
-require 'amazon/util/threadpool'

data/lib/amazon/util/binder.rb

@@ -1,48 +0,0 @@
-# Copyright:: Copyright (c) 2007 Amazon Technologies, Inc.
-# License::   Apache License, Version 2.0
-
-require 'erb'
-
-module Amazon
-module Util
-
-# Simple class for holding eval information
-# useful for feeding to ERB templates and the like
-class Binder
-
-  def initialize(initial={},&block) # :yields: self 
-    initial.each {|k,v| set(k,v) }
-    yield self unless block.nil?
-  end
-
-  def merge(hash)
-    hash.each {|k,v| set(k,v) }
-  end
-
-  def set(k,v)
-    self.instance_variable_set "@#{k.to_s}", "#{v.to_s}"
-  end
-
-  def bind
-    binding
-  end
-  
-  # Helper method to simplify ERB evaluation
-  def old_erb_eval( template )
-    buffer = ""
-    c = ERB::Compiler.new("")
-    c.put_cmd = "buffer <<" if c.respond_to? :put_cmd=
-    c.insert_cmd = "buffer <<" if c.respond_to? :insert_cmd=
-    compiled = c.compile template
-    eval compiled
-    return buffer
-  end
-  def erb_eval( template )
-    t = ERB.new template
-    return t.result(binding)
-  end
-
-end # Binder
-
-end # Amazon::Util
-end # Amazon

data/lib/amazon/util/data_reader.rb

@@ -1,169 +0,0 @@
-# Copyright:: Copyright (c) 2007 Amazon Technologies, Inc.
-# License::   Apache License, Version 2.0
-
-require 'yaml'
-require 'csv'
-require 'amazon/util/hash_nesting'
-
-module Amazon
-module Util
-
-# DataReader is a class for loading in data files.  It is used to support bulk file-based operations.
-# DataReader supports a number of different formats:
-# * YAML
-# * Tabular
-# * CSV
-# * Java Properties
-# By default, DataReader assumes Tabular, but load and save both support your choice of format
-class DataReader
-
-  attr_accessor :data
-
-  def initialize(data=[])
-    @data = data
-  end
-  
-  def [](index)
-    return @data[index]
-  end
-  
-  def []=(index)
-    return @data[index]
-  end
-  
-  def load( filename, format=:Tabular )
-    return {} unless File.exist? filename
-    raw_data = File.read( filename )
-    case format
-    when :Tabular
-      @data = parse_csv( raw_data, "\t" )
-    when :YAML
-      @data = YAML.load( raw_data ) || {}
-    when :CSV
-      @data = parse_csv( raw_data )
-    when :Properties
-      @data = parse_properties( raw_data )
-    else
-      raise "invalid format.  options are :Tabular, :YAML, :CSV, :Properties"
-    end
-  end
-  
-  def save( filename, format=:Tabular, force_headers=false )
-    return if @data.nil? or @data.empty?
-    existing = File.exist?( filename ) && File.size( filename ) > 0
-    File.open( filename, 'a+' ) {|f| 
-      f << case format
-      when :Tabular
-        generate_csv( @data, force_headers || !existing, "\t" )
-      when :YAML
-        YAML.dump( @data )
-      when :CSV
-        generate_csv( @data, force_headers || !existing )
-      when :Properties
-        generate_properties( @data )
-      end
-      f << "\n" # adding a newline on the end, so appending is happy
-    }
-  end
-
-  def self.load( filename, format=:Tabular )
-    reader = DataReader.new()
-    reader.load( filename, format )
-  end
-  
-  def self.save( filename, data, format=:Tabular, force_headers=false )
-    reader = DataReader.new( data )
-    reader.save( filename, format, force_headers )
-  end
-  
-  private
-  
-  def parse_csv( raw_data, delim=nil )
-    rows = nil
-    if CSV.const_defined? :Reader
-      rows = CSV.parse( raw_data, delim )
-    else
-      ops = {:row_sep => :auto}
-      ops[:col_sep] = delim unless delim.nil?
-      rows = CSV.parse( raw_data, ops )
-    end
-    return parse_rows( rows )
-  end
-
-  def parse_rows( rows )
-    processed = []
-    headers = rows.shift
-    for row in rows
-      item = {}
-      headers.each_index do |i|
-        item[headers[i].to_sym] = correct_type(row[i]) unless row[i].nil? or row[i].empty?
-      end
-      item.extend HashNesting
-      processed << item.unnest
-    end
-    return processed
-  end
-  
-  def split_data( data )
-    data = data.collect {|d| d.extend(HashNesting).nest }
-    headers = data[0].keys.sort
-    rows = data.collect { |item|
-      row = []
-      item.keys.each {|k|
-        headers << k unless headers.include? k
-        index = headers.index k
-        row[index] = item[k].to_s
-      }
-      row
-    }
-    return headers, rows
-  end
-  
-  def generate_csv( data, dump_header, delim=nil )
-    return "" if data.nil? or data.empty?
-    headers, rows = split_data( data )
-    return generate_rows( headers, rows, dump_header, delim )
-  end
-  
-  def generate_rows( headers, rows, dump_header, record_seperator=nil )
-    rows.unshift headers if dump_header
-    buff = rows.collect { |row|
-      if CSV.const_defined? :Reader
-        CSV.generate_line( row, record_seperator )
-      else
-        ops = {:row_sep => ''}
-        ops[:col_sep] = record_seperator unless record_seperator.nil?
-        CSV.generate_line( row, ops )
-      end
-    }
-    return buff.join("\n")
-  end
-
-  def parse_properties( raw_data )
-    processed = {}
-    for line in raw_data.split(/\n\r?/)
-      next if line =~ /^\W*(#.*)?$/ # ignore lines beginning w/ comments
-      if md = /^([^:=]+)[=:](.*)/.match(line)
-        processed[md[1].strip] = correct_type(md[2].strip)
-      end
-    end
-    processed.extend HashNesting
-    return processed.unnest
-  end
-  
-  def generate_properties( raw_data )
-    raw_data.extend HashNesting
-    (raw_data.nest.collect {|k,v| "#{k}:#{v}" }).join("\n")
-  end
-  
-  # convert to integer if possible
-  def correct_type( str )
-    return str.to_f if str =~ /^\d+\.\d+$/ unless str =~ /^0\d/
-    return str.to_i if str =~ /^\d+$/ unless str =~ /^0\d/
-    return str
-  end
-  
-end # DataReader
-
-end # Amazon::Util
-end # Amazon

data/lib/amazon/util/filter_chain.rb

@@ -1,79 +0,0 @@
-# Copyright:: Copyright (c) 2007 Amazon Technologies, Inc.
-# License::   Apache License, Version 2.0
-
-module Amazon
-module Util
-
-# A class for managing around style interceptors,
-# which can be used to implement a decorator design pattern.
-class FilterChain
-
-  class Filter
-   
-    attr_reader :name, :filter_params, :filter_block
- 
-    def initialize( name, filter_params, filter_block )
-      @name = name
-      @filter_params = filter_params
-      @filter_block = filter_block
-    end
-
-    def execute( chain, block_params )
-      @filter_block.call( chain, block_params, *@filter_params )
-    end
-
-  end
-
-  attr_reader :filters
-
-  def initialize()
-    @filters = []
-  end
-
-  def execute( *block_params, &block )
-    if @filters.size == 0
-      block.call( *block_params )
-    else
-      create_chain( @filters, 0, block, block_params ).call
-    end 
-  end
-
-  def add( name=nil, *filter_params, &filter_block )
-    add_filter( Filter.new( name, filter_params, filter_block ) )
-  end
-
-  def add_filter( filter )
-    if !filter.name.nil?
-      @filters.each_with_index { |existing_filter,i|
-        if filter.name == existing_filter.name
-          @filters[i] = filter
-          return
-        end
-      }
-    end
-    @filters << filter
-  end
-
-  def remove( name )
-    @filters.delete_if { |filter| name == filter.name }
-  end
-
-  def remove_all()
-    @filters.clear
-  end
-
-  private
-
-  def create_chain( filters, pos, block, block_params )
-    if pos >= filters.size
-      return proc{ block.call( *block_params ) }
-    else
-      chain = create_chain( filters, pos+1, block, block_params ) 
-      return proc { filters[pos].execute( chain, block_params ) }
-    end
-  end
-
-end
-
-end # Amazon::Util
-end # Amazon