Merge 920e57e into 7cfa698

flexirest.gemspec

@@ -43,9 +43,12 @@ Gem::Specification.new do |spec|
   # ActiveSupport 5+ requires Ruby 2.2.2
   if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.2.2')
     spec.add_runtime_dependency "activesupport"
+    spec.add_runtime_dependency "activemodel"
   else
     spec.add_runtime_dependency "activesupport", "< 5.0.0"
+    spec.add_runtime_dependency "activemodel", "< 5.0.0"
   end
+
   # JSON is an implicit dependency of something, but JSON v2+ requires Ruby 2+
   # Same with "tins" which is a dependency of coveralls
   if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')

lib/flexirest.rb

@@ -1,4 +1,6 @@
 require 'active_support/all'
+require 'active_model'
+
 require "flexirest/version"
 require "flexirest/attribute_parsing"
 require "flexirest/associations"
@@ -16,7 +18,6 @@
 require "flexirest/json_api_proxy"
 require "flexirest/request"
 require "flexirest/request_delegator"
-require "flexirest/validation"
 require "flexirest/callbacks"
 require "flexirest/proxy_base"
 require "flexirest/recording"

lib/flexirest/base.rb

@@ -1,9 +1,10 @@
 module Flexirest
   class Base
+    include ActiveModel::Validations
+
     include Mapping
     include Configuration
     include Callbacks
-    include Validation
     include Caching
     include Recording
     include AttributeParsing
@@ -62,10 +63,6 @@ def changes
       @dirty_attributes
     end
 
-    def errors
-      @attributes[:errors] || (_errors != {} ? _errors : nil)
-    end
-
     def self._request(request, method = :get, params = nil, options = {})
       prepare_direct_request(request, method, options).call(params)
     end

spec/lib/base_spec.rb

@@ -206,12 +206,6 @@ class OutsideBaseExample < Flexirest::Base ; end
     expect(client).to_not be_dirty
   end
 
-  it "should not overly pollute the instance method namespace to reduce chances of clashing (<13 instance methods)" do
-    instance_methods = EmptyExample.instance_methods - Object.methods
-    instance_methods = instance_methods - instance_methods.grep(/^_/)
-    expect(instance_methods.size).to be < 13
-  end
-
   it "should raise an exception for missing attributes if whiny_missing is enabled" do
     expect{EmptyExample.new.first_name}.to raise_error(Flexirest::NoAttributeException)
   end

spec/lib/request_spec.rb

@@ -834,7 +834,7 @@ class WhitelistedDateClient < Flexirest::Base
     expect(e).to be_instance_of(Flexirest::HTTPBadRequestClientException)
     expect(e.status).to eq(400)
     expect(object.first_name).to eq 'John'
-    expect(object.errors).to eq(nil)
+    expect(object.errors).to be_empty
   end
 
   it "should raise an exception if you try to pass in an unsupport method" do