From 831afd710186029531376e6bcb1d58d9f40e5677 Mon Sep 17 00:00:00 2001
From: Yuri Leikind <yuri.leikind@gmail.com>
Date: Tue, 25 Feb 2014 18:48:10 +0100
Subject: [PATCH] Revert "added in-memory adapter"

This reverts commit 1079d70c059c541df39552eaa3111e47a23fe333.

Conflicts:
	lib/wice/memory_adapter.rb
---
 .gitignore                       |  3 +--
 lib/wice/wice_grid_controller.rb |  1 +
 lib/wice_grid.rb                 | 21 +++++++--------------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 049a8905..b4134af0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
-*~
+tmp
\ No newline at end of file
diff --git a/lib/wice/wice_grid_controller.rb b/lib/wice/wice_grid_controller.rb
index 0e5e3611..621da20c 100644
--- a/lib/wice/wice_grid_controller.rb
+++ b/lib/wice/wice_grid_controller.rb
@@ -65,6 +65,7 @@ def save_wice_grid_queries
     # can be changed in <tt>lib/wice_grid_config.rb</tt>, this is convenient if you want to set a project wide setting
     # without having to repeat it for every grid instance.
 
+
     def initialize_grid(klass, opts = {})
       wg = WiceGrid.new(klass, self, opts)
       self.wice_grid_instances = [] if self.wice_grid_instances.nil?
diff --git a/lib/wice_grid.rb b/lib/wice_grid.rb
index 1ae41d9c..69ea6f32 100644
--- a/lib/wice_grid.rb
+++ b/lib/wice_grid.rb
@@ -3,7 +3,6 @@
 require 'wice/wice_grid_misc.rb'
 require 'wice/wice_grid_core_ext.rb'
 require 'wice/grid_renderer.rb'
-require 'wice/memory_adapter.rb'
 require 'wice/table_column_matrix.rb'
 require 'wice/active_record_column_wrapper.rb'
 require 'wice/helpers/wice_grid_view_helpers.rb'
@@ -64,22 +63,16 @@ class WiceGrid
 
     # core workflow methods START
 
-    def initialize(klass_or_relation_or_memory_adapter, controller, opts = {})  #:nodoc:
+    def initialize(klass_or_relation, controller, opts = {})  #:nodoc:
       @controller = controller
 
-      @relation = klass_or_relation_or_memory_adapter
-      if klass_or_relation_or_memory_adapter.is_a?(Wice::MemoryAdapter::MemoryAdapter)
-        @klass = klass_or_relation_or_memory_adapter.klass
-      elsif klass_or_relation_or_memory_adapter.is_a?(ActiveRecord::Relation)
-        @klass = klass_or_relation_or_memory_adapter.klass
-      else
-        @klass = klass_or_relation_or_memory_adapter
-      end
+      @relation = klass_or_relation
+      @klass = klass_or_relation.is_a?(ActiveRecord::Relation) ?
+        klass_or_relation.klass :
+        klass_or_relation
 
-      if not @klass.is_a?(Wice::MemoryAdapter::MemoryAdapterKlass)
-        unless @klass.kind_of?(Class) && @klass.ancestors.index(ActiveRecord::Base)
-          raise WiceGridArgumentError.new("Data model class must be a relation, memory adapter, or derived from active record")
-        end
+      unless @klass.kind_of?(Class) && @klass.ancestors.index(ActiveRecord::Base)
+        raise WiceGridArgumentError.new("ActiveRecord model class (second argument) must be a Class derived from ActiveRecord::Base")
       end
 
       # validate :with_resultset & :with_paginated_resultset