mocks/user_mock.rb in active_mocker-1.2.pre.10 vs mocks/user_mock.rb in active_mocker-1.2.pre.11

@@ -1,25 +1,24 @@
 require 'active_mocker/mock_requires'
-Object.send(:remove_const, "#{model_name}Mock") if false && ActiveMocker.class_exists?("#{model_name}Mock")
+Object.send(:remove_const, "UserMock") if ActiveMocker.class_exists?("UserMock")
 
 class UserMock < ::ActiveHash::Base
   include ActiveMocker::ActiveHash::ARApi
   include ActiveMocker::MockInstanceMethods
   extend  ActiveMocker::MockClassMethods
 
   def self.column_names
     ["id", "name", "email", "created_at", "updated_at", "password_digest", "remember_token", "admin"]
   end
 
-  def self.association_names
-    @association_names = [:microposts, :relationships, :followed_users, :reverse_relationships, :followers]
-  end
-
   def self.attribute_names
     @attribute_names = [:id, :name, :email, :created_at, :updated_at, :password_digest, :remember_token, :admin]
   end
 
+  ##################################
+  #   Attributes getter/setters    #
+  ##################################
 
   def id
     attributes['id']
   end
 
@@ -81,14 +80,19 @@
 
   def admin=(val)
     attributes['admin'] = val
   end
 
+  ##################################
+  #   Association getter/setters   #
+  ##################################
 
+  def self.association_names
+    @association_names = [:microposts, :relationships, :followed_users, :reverse_relationships, :followers]
+  end
 
 
-
   def microposts
     associations['microposts']
   end
 
   def microposts=(val)
@@ -125,32 +129,29 @@
 
   def followers=(val)
     associations['followers'] = ActiveMocker::CollectionAssociation.new(val)
   end
 
+  ##################################
+  #  Model Methods getter/setters  #
+  ##################################
 
   def self.model_instance_methods
     return @model_instance_methods if @model_instance_methods
     @model_instance_methods = {}
-      @model_instance_methods[:feed] = :not_implemented
-    
-      @model_instance_methods[:following?] = :not_implemented
-    
-      @model_instance_methods[:follow!] = :not_implemented
-    
-      @model_instance_methods[:unfollow!] = :not_implemented
-    
+    @model_instance_methods[:feed] = :not_implemented
+    @model_instance_methods[:following?] = :not_implemented
+    @model_instance_methods[:follow!] = :not_implemented
+    @model_instance_methods[:unfollow!] = :not_implemented
     @model_instance_methods
   end
 
   def self.model_class_methods
     return @model_class_methods if @model_class_methods
     @model_class_methods = {}
     @model_class_methods[:new_remember_token] = :not_implemented
-  
     @model_class_methods[:digest] = :not_implemented
-  
     @model_class_methods
   end
 
 
   def feed()
@@ -174,10 +175,9 @@
   def unfollow!(other_user)
     block =  model_instance_methods[:unfollow!]
     self.class.is_implemented(block, "#unfollow!")
     instance_exec(*[other_user], &block)
   end
-
 
 
   def self.new_remember_token()
     block =  model_class_methods[:new_remember_token]
     is_implemented(block, "::new_remember_token")