Fix Dependency Resolution for Rails 5

.ruby-version

@@ -1 +1 @@
-2.0.0-p247
+2.3.1

Gemfile

@@ -1,13 +1,12 @@
 source 'http://rubygems.org'
 
-gem 'activeresource', '>= 2.3.8'
-
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem 'iconv'
   gem 'bundler', '~> 1.2'
   gem 'fakeweb', '~> 1.3'
-  gem 'jeweler', '~> 1.8'
+  gem 'juwelier'
 	gem 'simplecov', :require => false
   gem 'rspec', '~> 2.12'
 end

Gemfile.lock

@@ -1,51 +1,83 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    builder (2.1.2)
-    diff-lcs (1.1.3)
+    addressable (2.4.0)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
     fakeweb (1.3.0)
-    git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    git (1.3.0)
+    github_api (0.14.5)
+      addressable (~> 2.4.0)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      oauth2 (~> 1.0)
+    hashie (3.4.4)
+    highline (1.7.8)
+    iconv (1.0.4)
+    json (1.8.3)
+    json (1.8.3-java)
+    juwelier (2.1.2)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.7.7)
-    json (1.7.7-java)
-    multi_json (1.8.0)
-    rake (10.0.3)
-    rdoc (3.12.1)
+      semver
+    jwt (1.5.4)
+    mini_portile2 (2.1.0)
+    multi_json (1.8.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    nokogiri (1.6.8-java)
+    oauth2 (1.2.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    pkg-config (1.1.7)
+    rack (2.0.1)
+    rake (11.2.2)
+    rdoc (4.2.2)
       json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    semver (1.0.1)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    thread_safe (0.3.5)
+    thread_safe (0.3.5-java)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  activeresource (>= 2.3.8)
   bundler (~> 1.2)
   fakeweb (~> 1.3)
-  jeweler (~> 1.8)
+  iconv
+  juwelier
   rspec (~> 2.12)
   simplecov
+
+BUNDLED WITH
+   1.12.5

Rakefile

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'rubygems'
 require 'bundler'
 begin
@@ -9,18 +11,20 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+require 'juwelier'
+Juwelier::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name = 'wistia-api'
   gem.homepage = 'http://github.com/wistia/wistia-api'
   gem.license = 'MIT'
   gem.summary = 'Ruby wrapper for Wistia\'s API'
   gem.description = 'A ruby library for working with Wistia\'s data API.'
   gem.email = 'support@wistia.com'
   gem.authors = ['Jeff Vincent', 'Jim Bancroft', 'Mark Bates', 'Robby Grossman']
+
+  # dependencies defined in Gemfile
 end
-Jeweler::RubygemsDotOrgTasks.new
+Juwelier::RubygemsDotOrgTasks.new
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -40,7 +44,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "wistia-api #{version}"
+  rdoc.title = "ttt #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

lib/vendor/activeresource-2.3.18/lib/wistia_active_resource.rb

@@ -0,0 +1,44 @@
+#--
+# Copyright (c) 2006 David Heinemeier Hansson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+begin
+  require 'wistia_active_support'
+rescue LoadError
+  activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
+  if File.directory?(activesupport_path)
+    $:.unshift activesupport_path
+    require 'wistia_active_support'
+  end
+end
+
+require 'wistia_active_resource/formats'
+require 'wistia_active_resource/base'
+require 'wistia_active_resource/validations'
+require 'wistia_active_resource/custom_methods'
+
+module WistiaActiveResource
+  Base.class_eval do
+    include Validations
+    include CustomMethods
+  end
+end