lib/active_remote/base.rb in active_remote-3.3.3 vs lib/active_remote/base.rb in active_remote-5.0.0.pre

@@ -1,57 +1,49 @@
-require 'active_model/callbacks'
+require "active_model/callbacks"
 
-require 'active_remote/association'
-require 'active_remote/attribute_assignment'
-require 'active_remote/attribute_definition'
-require 'active_remote/attributes'
-require 'active_remote/config'
-require 'active_remote/dirty'
-require 'active_remote/dsl'
-require 'active_remote/integration'
-require 'active_remote/persistence'
-require 'active_remote/primary_key'
-require 'active_remote/query_attributes'
-require 'active_remote/rpc'
-require 'active_remote/scope_keys'
-require 'active_remote/search'
-require 'active_remote/serialization'
-require 'active_remote/typecasting'
-require 'active_remote/validations'
+require "active_remote/association"
+require "active_remote/attribute_definition"
+require "active_remote/attributes"
+require "active_remote/config"
+require "active_remote/dirty"
+require "active_remote/dsl"
+require "active_remote/integration"
+require "active_remote/persistence"
+require "active_remote/primary_key"
+require "active_remote/query_attributes"
+require "active_remote/rpc"
+require "active_remote/scope_keys"
+require "active_remote/search"
+require "active_remote/serialization"
+require "active_remote/validations"
 
 module ActiveRemote
   class Base
     extend ::ActiveModel::Callbacks
-    extend ::ActiveModel::Naming
 
-    include ::ActiveModel::Conversion
-    include ::ActiveModel::Validations
+    include ::ActiveModel::Model
 
     include ::ActiveRemote::Association
-    include ::ActiveRemote::AttributeAssignment
     include ::ActiveRemote::Attributes
     include ::ActiveRemote::DSL
     include ::ActiveRemote::Integration
     include ::ActiveRemote::Persistence
     include ::ActiveRemote::PrimaryKey
     include ::ActiveRemote::QueryAttributes
     include ::ActiveRemote::RPC
     include ::ActiveRemote::ScopeKeys
     include ::ActiveRemote::Search
     include ::ActiveRemote::Serialization
-    include ::ActiveRemote::Typecasting
 
     # Overrides some methods, providing support for dirty tracking,
     # so it needs to be included last.
     include ::ActiveRemote::Dirty
 
     # Overrides persistence methods, so it must included after
     include ::ActiveRemote::Validations
     include ::ActiveModel::Validations::Callbacks
 
-    attr_reader :last_request, :last_response
-
     define_model_callbacks :initialize, :only => :after
 
     def initialize(attributes = {})
       @attributes = self.class.send(:default_attributes_hash).dup
 
@@ -76,10 +68,11 @@
 
       self
     end
 
     def freeze
-      @attributes.freeze; self
+      @attributes.freeze
+      self
     end
 
     def frozen?
       @attributes.frozen?
     end