From 9ee06b5f16f727369efcf083f33043a31e801d46 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 13 Dec 2014 22:59:34 -0500 Subject: [PATCH 1/2] back to https for rekognition --- lib/mustachio/rekognition.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/mustachio/rekognition.rb b/lib/mustachio/rekognition.rb index eb57e5b..d8d7eb7 100644 --- a/lib/mustachio/rekognition.rb +++ b/lib/mustachio/rekognition.rb @@ -13,7 +13,7 @@ def data file end def json file, jobs = 'face' - conn = Faraday.new :url => 'http://rekognition.com' do |faraday| + conn = Faraday.new :url => 'https://rekognition.com' do |faraday| faraday.request :multipart faraday.request :url_encoded faraday.adapter :excon From 0cb70d4e97145fc4402bfdadff70817281c2602b Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Sat, 13 Dec 2014 23:07:12 -0500 Subject: [PATCH 2/2] better conditional loading in rakefile --- Rakefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index 48c6905..4f9c69c 100644 --- a/Rakefile +++ b/Rakefile @@ -11,8 +11,10 @@ rescue Bundler::BundlerError => e end require 'rake' -if defined?(Jeweler) +begin require 'jeweler' +rescue LoadError +else Jeweler::Tasks.new do |gem| # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options gem.name = "mustachio" @@ -27,9 +29,11 @@ if defined?(Jeweler) Jeweler::RubygemsDotOrgTasks.new end -if defined?(RSpec) +begin require 'rspec/core' require 'rspec/core/rake_task' +rescue LoadError +else RSpec::Core::RakeTask.new(:spec) do |spec| spec.pattern = FileList['spec/**/*_spec.rb'] end