Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.9.3-p545
1 change: 0 additions & 1 deletion .rvmrc

This file was deleted.

12 changes: 4 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,14 @@ gem 'typhoeus'
gem 'log_buddy'

# Appraisal doesn't like group blocks, so we add individually for now.
gem "bundler", "~> 1.1.0", :group => :development
gem "jeweler", "~> 1.6.4", :group => :development
gem 'rspec', '2.6.0', :group => :development
gem 'rspec', '~> 2.14.0', :group => :development
gem 'flexmock', '> 0.8.6', :group => :development
gem 'memcache-client', :group => :development
gem 'rcov', :group => :development
gem 'rdoc', :group => :development
gem 'activerecord', '>= 2.3.11', :group => :development
gem 'vcr', '~> 1', :group => :development
gem 'webmock', '>= 1.7.0', '< 1.8', :group => :development
gem 'vcr', :group => :development
gem 'webmock', :group => :development
gem 'pry', :group => :development
gem 'pry-doc', :group => :development


gem 'rack', :group => :test
gem 'rack', :group => :test
19 changes: 1 addition & 18 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,6 @@ database, an AMEE profile will be automatically created and destroyed with your
model. By overriding the function amee_save in your model, you can store data in
AMEE when your model is saved.

== CACHING

The AMEE::Connection object implements an optional cache for GET requests.

This uses ActiveSupport::Cache, and supports any ActiveSupport::Cache::Store
caching method except for MemCacheStore (which doesn't provide required features).

All GET requests are cached. POST, PUT, or DELETEs will clear the cache for any
path that matches the affected URL. #expire, #expire_matching, and #expire_all
functions are available for manual cache management. Also, all AMEE objects have
and #expire-cache function to clear them and their descendants from the cache.

To enable caching, pass ':cache => :memory_store' to AMEE::Connection.new, or add
'cache: memory_store' to your amee.yml if using Rails. If you want to use the
same caching configuration as your Rails app, you can add 'cache: rails' to
amee.yml instead. Caching is disabled by default.

== RETRY / TIMEOUT SUPPORT

The AMEE::Connection object can now automatically retry if a request fails due to
Expand All @@ -116,4 +99,4 @@ change the number of retry attempts, 3 is just used as an example above.

The Connection object also allows a timeout to be set for requests. By default this is
set to 60 seconds, but if you want to provide a different value (30 seconds for
instance), pass ':timeout => 30' to AMEE::Connection.new, or 'timeout: 30' in amee.yml.
instance), pass ':timeout => 30' to AMEE::Connection.new, or 'timeout: 30' in amee.yml.
13 changes: 1 addition & 12 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ require 'rspec/core/rake_task'
task :default => [:spec]

desc "Run specs"
RSpec::Core::RakeTask.new do |t|
# Put spec opts in a file named .rspec in root
t.rcov = true
t.rcov_opts = ['--exclude', 'spec,/*gems*,']
end
RSpec::Core::RakeTask.new

require 'jeweler'
# Fix for Jeweler to use stable branch
Expand Down Expand Up @@ -72,13 +68,6 @@ Jeweler::Tasks.new do |gem|
end
Jeweler::RubygemsDotOrgTasks.new

require 'rcov/rcovtask'
desc "Generate code coverage"
RSpec::Core::RakeTask.new(:coverage) do |t|
t.rcov = true
t.rcov_opts = ['--exclude', 'spec,/*ruby*,/*gems*']
end

require 'rdoc/task'
RDoc::Task.new do |rd|
rd.title = "AMEE Ruby"
Expand Down
6 changes: 0 additions & 6 deletions amee.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<rspec>, ["= 2.6.0"])
s.add_development_dependency(%q<flexmock>, ["> 0.8.6"])
s.add_development_dependency(%q<memcache-client>, [">= 0"])
s.add_development_dependency(%q<rcov>, [">= 0"])
s.add_development_dependency(%q<rdoc>, [">= 0"])
s.add_development_dependency(%q<activerecord>, [">= 2.3.11"])
s.add_development_dependency(%q<vcr>, [">= 0"])
s.add_development_dependency(%q<webmock>, [">= 0"])
Expand All @@ -210,8 +208,6 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rspec>, ["= 2.6.0"])
s.add_dependency(%q<flexmock>, ["> 0.8.6"])
s.add_dependency(%q<memcache-client>, [">= 0"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<rdoc>, [">= 0"])
s.add_dependency(%q<activerecord>, [">= 2.3.11"])
s.add_dependency(%q<vcr>, [">= 0"])
s.add_dependency(%q<webmock>, [">= 0"])
Expand All @@ -231,8 +227,6 @@ Gem::Specification.new do |s|
s.add_dependency(%q<rspec>, ["= 2.6.0"])
s.add_dependency(%q<flexmock>, ["> 0.8.6"])
s.add_dependency(%q<memcache-client>, [">= 0"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<rdoc>, [">= 0"])
s.add_dependency(%q<activerecord>, [">= 2.3.11"])
s.add_dependency(%q<vcr>, [">= 0"])
s.add_dependency(%q<webmock>, [">= 0"])
Expand Down
24 changes: 24 additions & 0 deletions cassettes/.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
http_interactions:
- request:
method: post
uri: https://stage.amee.com/auth/signIn
body:
encoding: US-ASCII
string: username=<AMEE_V2_API_KEY>&password=<AMEE_V1_PASSWORD>
headers:
User-Agent:
- Typhoeus - https://github.com/typhoeus/typhoeus
Accept:
- application/xml
response:
status:
code: 0
message:
headers: {}
body:
encoding: US-ASCII
string: ''
http_version:
recorded_at: Fri, 03 Apr 2015 12:29:47 GMT
recorded_with: VCR 2.9.3
54 changes: 31 additions & 23 deletions cassettes/AMEE_Connection/v2/raising_unhandled_errors.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 31 additions & 23 deletions cassettes/AMEE_Connection/v3/retries/502.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 31 additions & 23 deletions cassettes/AMEE_Connection/v3/retries/503.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading