Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
*HEAD (Jan 2014)
15 Jan 2014: Roman Shterenzon <romanbsd@yahoo.com>
Remove Typhoeus as dependency

*embedly-1.8.0 (17 Jun 2013)

17 Jun 2013: Felipe Elias Philipp <felipeelias@gmail.com>
Expand Down
6 changes: 1 addition & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,12 @@ gem "querystring"
gem "oauth"
gem "json"

platforms :mri do
gem "typhoeus"
end

group :development do
gem "typhoeus"
gem "jeweler"
gem "cucumber"
gem "rake"
gem "rspec"
gem "yard"
gem "aruba"
end

6 changes: 3 additions & 3 deletions embedly.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ Gem::Specification.new do |s|
s.executables = ["embedly_extract", "embedly_objectify", "embedly_oembed", "embedly_preview"]
s.extra_rdoc_files = [
"ChangeLog",
"README.rdoc"
"README.md"
]
s.files = [
"ChangeLog",
"Gemfile",
"MIT-LICENSE",
"README.rdoc",
"README.md",
"Rakefile",
"VERSION",
"bin/embedly_extract",
Expand Down Expand Up @@ -63,7 +63,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency(%q<querystring>, [">= 0"])
s.add_runtime_dependency(%q<oauth>, [">= 0"])
s.add_runtime_dependency(%q<json>, [">= 0"])
s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
s.add_development_dependency(%q<typhoeus>, [">= 0"])
s.add_development_dependency(%q<jeweler>, [">= 0"])
s.add_development_dependency(%q<cucumber>, [">= 0"])
s.add_development_dependency(%q<rake>, [">= 0"])
Expand Down
2 changes: 1 addition & 1 deletion lib/embedly/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def current_requester
def reset
self.logger = default_logger
self.debug = false
self.request_with :typhoeus
self.request_with :net_http
end

private
Expand Down
3 changes: 0 additions & 3 deletions lib/embedly/request/typhoeus.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,4 @@ def get(uri, options = {})
Embedly::Typhoeus::Request.new(api)
end
rescue LoadError
require "logger"
logger = Logger.new(STDERR)
logger.warn { "typhoeus failed to load" }
end
4 changes: 2 additions & 2 deletions spec/embedly/configuration_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ module Embedly
config.key.should == 'my_api_key'
end

it "requests typhoeus by default" do
config.requester.should == :typhoeus
it "requests using Net::HTTP by default" do
config.requester.should == :net_http
end
end

Expand Down