padrino-admin 0.6.3 → 0.6.7

data/lib/padrino-admin/{adapters/mm.rb → orm/mongomapper.rb}

@@ -1,29 +1,44 @@
 module Padrino
   module Admin
-    module Adapters
-      module Mm
-
+    module Orm
+      module MongoMapper
+        ##
         # Here basic functions for interact with MongoMapper
+        # 
         module Base
-          def self.included(base)
-            base.send :include, Padrino::Admin::Adapters::Base
+
+          def self.included(base) #:nodoc:
+            base.send :include, Padrino::Admin::Orm::Abstract::Base
             base.send :include, InstanceMethods
             base.extend ClassMethods
           end
-          
+
           module InstanceMethods
-          end
-          
+          end # InstanceMethods
+
           module ClassMethods
-          end
-        end
+            ##
+            # Return :activerecord
+            # 
+            def orm
+              :mongomapper
+            end
+          end # ClassMethods
+        end # Base
 
-        # Here extension for account for DataMapper
+        ##
+        # Here extension for Account for MongoMapper
+        # 
+        # Basically we need only to perform:
+        # 
+        # * Validations (email, password, role)
+        # * Generate crypted_password on save
+        # 
         module Account
-          # Extend our class when included
-          def self.included(base)
+
+          def self.included(base) #:nodoc:
             super
-            base.send :include, Padrino::Admin::Adapters::AccountUtils
+            base.send :include, Padrino::Admin::Orm::Abstract::Account
             base.send :attr_accessor, :password, :password_confirmation
             # Properties
             base.key :email,            String
@@ -31,7 +46,7 @@ module Padrino
             base.key :salt,             String
             base.key :role,             String
             # Validations
-            base.validates_presence_of     :email
+            base.validates_presence_of     :email, :role
             base.validates_presence_of     :password,                   :if => :password_required
             base.validates_presence_of     :password_confirmation,      :if => :password_required
             base.validates_length_of       :password, :within => 4..40, :if => :password_required
@@ -39,11 +54,12 @@ module Padrino
             base.validates_length_of       :email,    :within => 3..100
             base.validates_uniqueness_of   :email,    :case_sensitive => false
             base.validates_format_of       :email,    :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
+            base.validates_format_of       :role,     :with => /[A-Za-z]/
             # Callbacks
             base.before_save :generate_password
           end
-        end
-      end
-    end
-  end
-end
+        end # Account
+      end # MongoMapper
+    end # Orm
+  end # Admin
+end # Padrino

data/lib/padrino-admin/utils/literal.rb

@@ -5,7 +5,7 @@ module Padrino
       module Literal
         # This method return a json literal variable
         def to_l
-          Padrino::ExtJs::Variable.new(self)
+          Padrino::Admin::Config::Variable.new(self)
         end
       end
     end

data/padrino-admin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-admin}
-  s.version = "0.6.3"
+  s.version = "0.6.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2010-01-15}
+  s.date = %q{2010-01-26}
   s.description = %q{Admin View for Padrino applications}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
@@ -24,15 +24,12 @@ Gem::Specification.new do |s|
      "VERSION",
      "lib/padrino-admin.rb",
      "lib/padrino-admin/access_control.rb",
-     "lib/padrino-admin/adapters.rb",
-     "lib/padrino-admin/adapters/ar.rb",
-     "lib/padrino-admin/adapters/dm.rb",
-     "lib/padrino-admin/adapters/mm.rb",
-     "lib/padrino-admin/ext_js/column_store.rb",
-     "lib/padrino-admin/ext_js/config.rb",
+     "lib/padrino-admin/column_store.rb",
+     "lib/padrino-admin/config.rb",
      "lib/padrino-admin/generators/actions.rb",
      "lib/padrino-admin/generators/admin_app.rb",
      "lib/padrino-admin/generators/admin_page.rb",
+     "lib/padrino-admin/generators/admin_uploader.rb",
      "lib/padrino-admin/generators/app/app.rb.tt",
      "lib/padrino-admin/generators/app/controllers/accounts.rb",
      "lib/padrino-admin/generators/app/controllers/base.rb",
@@ -41,34 +38,39 @@ Gem::Specification.new do |s|
      "lib/padrino-admin/generators/app/public/flash/charts.swf",
      "lib/padrino-admin/generators/app/public/flash/clippy.swf",
      "lib/padrino-admin/generators/app/public/flash/expressinstall.swf",
-     "lib/padrino-admin/generators/app/public/images/backend/back.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/background.png",
-     "lib/padrino-admin/generators/app/public/images/backend/bg-content.png",
-     "lib/padrino-admin/generators/app/public/images/backend/bg-hd-slate.png",
-     "lib/padrino-admin/generators/app/public/images/backend/bg-hd.png",
-     "lib/padrino-admin/generators/app/public/images/backend/bg-intro.png",
-     "lib/padrino-admin/generators/app/public/images/backend/bg-login.png",
-     "lib/padrino-admin/generators/app/public/images/backend/bg-menu-slate.png",
-     "lib/padrino-admin/generators/app/public/images/backend/bg-menu.png",
-     "lib/padrino-admin/generators/app/public/images/backend/bg.png",
-     "lib/padrino-admin/generators/app/public/images/backend/btn-login.png",
-     "lib/padrino-admin/generators/app/public/images/backend/categories.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/delete.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/download.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/duplicate.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/edit.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/export.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/hd-bg.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/image.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/loader.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/logo-loader.png",
-     "lib/padrino-admin/generators/app/public/images/backend/logo-small.png",
-     "lib/padrino-admin/generators/app/public/images/backend/new.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/no-image.png",
-     "lib/padrino-admin/generators/app/public/images/backend/preview.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/print.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/save.gif",
-     "lib/padrino-admin/generators/app/public/images/backend/support.gif",
+     "lib/padrino-admin/generators/app/public/flash/swfupload.swf",
+     "lib/padrino-admin/generators/app/public/images/admin/back.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/background.png",
+     "lib/padrino-admin/generators/app/public/images/admin/bg-content.png",
+     "lib/padrino-admin/generators/app/public/images/admin/bg-hd-slate.png",
+     "lib/padrino-admin/generators/app/public/images/admin/bg-hd.png",
+     "lib/padrino-admin/generators/app/public/images/admin/bg-intro.png",
+     "lib/padrino-admin/generators/app/public/images/admin/bg-login.png",
+     "lib/padrino-admin/generators/app/public/images/admin/bg-menu-slate.png",
+     "lib/padrino-admin/generators/app/public/images/admin/bg-menu.png",
+     "lib/padrino-admin/generators/app/public/images/admin/bg.png",
+     "lib/padrino-admin/generators/app/public/images/admin/btn-login.png",
+     "lib/padrino-admin/generators/app/public/images/admin/cancel.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/categories.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/close.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/close.png",
+     "lib/padrino-admin/generators/app/public/images/admin/delete.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/download.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/duplicate.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/edit.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/export.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/hd-bg.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/image.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/loader.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/logo-loader.png",
+     "lib/padrino-admin/generators/app/public/images/admin/logo-small.png",
+     "lib/padrino-admin/generators/app/public/images/admin/new.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/no-image.png",
+     "lib/padrino-admin/generators/app/public/images/admin/preview.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/print.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/save.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/support.gif",
+     "lib/padrino-admin/generators/app/public/images/admin/up.gif",
      "lib/padrino-admin/generators/app/public/images/ext/default/box/corners-blue.gif",
      "lib/padrino-admin/generators/app/public/images/ext/default/box/corners.gif",
      "lib/padrino-admin/generators/app/public/images/ext/default/box/l-blue.gif",
@@ -290,6 +292,7 @@ Gem::Specification.new do |s|
      "lib/padrino-admin/generators/app/public/javascripts/effects.js",
      "lib/padrino-admin/generators/app/public/javascripts/ext.js",
      "lib/padrino-admin/generators/app/public/javascripts/prototype.js",
+     "lib/padrino-admin/generators/app/public/javascripts/swfupload.js",
      "lib/padrino-admin/generators/app/public/stylesheets/admin.css",
      "lib/padrino-admin/generators/app/public/stylesheets/ext.css",
      "lib/padrino-admin/generators/app/public/stylesheets/login.css",
@@ -304,17 +307,27 @@ Gem::Specification.new do |s|
      "lib/padrino-admin/generators/app/views/javascripts/admin.js.erb",
      "lib/padrino-admin/generators/app/views/javascripts/locale.js.erb",
      "lib/padrino-admin/generators/app/views/sessions/new.haml",
-     "lib/padrino-admin/generators/templates/controller.rb.tt",
-     "lib/padrino-admin/generators/templates/db/seeds.rb.tt",
-     "lib/padrino-admin/generators/templates/views/_form.haml.tt",
-     "lib/padrino-admin/generators/templates/views/edit.haml.tt",
-     "lib/padrino-admin/generators/templates/views/grid.js.erb.tt",
-     "lib/padrino-admin/generators/templates/views/new.haml.tt",
-     "lib/padrino-admin/generators/templates/views/store.jml.tt",
+     "lib/padrino-admin/generators/templates/page/controller.rb.tt",
+     "lib/padrino-admin/generators/templates/page/db/seeds.rb.tt",
+     "lib/padrino-admin/generators/templates/page/views/_form.haml.tt",
+     "lib/padrino-admin/generators/templates/page/views/edit.haml.tt",
+     "lib/padrino-admin/generators/templates/page/views/grid.js.erb.tt",
+     "lib/padrino-admin/generators/templates/page/views/new.haml.tt",
+     "lib/padrino-admin/generators/templates/page/views/store.jml.tt",
+     "lib/padrino-admin/generators/templates/uploader/controller.rb",
+     "lib/padrino-admin/generators/templates/uploader/lib/uploader.rb",
+     "lib/padrino-admin/generators/templates/uploader/views/grid.js.erb",
+     "lib/padrino-admin/generators/templates/uploader/views/store.jml",
      "lib/padrino-admin/helpers/authentication.rb",
      "lib/padrino-admin/helpers/view.rb",
      "lib/padrino-admin/locale/admin/en.yml",
      "lib/padrino-admin/locale/extjs/en.yml",
+     "lib/padrino-admin/middleware/flash_middleware.rb",
+     "lib/padrino-admin/orm.rb",
+     "lib/padrino-admin/orm/abstract.rb",
+     "lib/padrino-admin/orm/activerecord.rb",
+     "lib/padrino-admin/orm/datamapper.rb",
+     "lib/padrino-admin/orm/mongomapper.rb",
      "lib/padrino-admin/utils/crypt.rb",
      "lib/padrino-admin/utils/literal.rb",
      "padrino-admin.gemspec",
@@ -322,8 +335,6 @@ Gem::Specification.new do |s|
      "test/fixtures/data_mapper.rb",
      "test/fixtures/mongo_mapper.rb",
      "test/fixtures/test_column_store.jml",
-     "test/fixtures/test_generic.jml",
-     "test/fixtures/test_javascript.jml",
      "test/helper.rb",
      "test/test_access_control.rb",
      "test/test_active_record.rb",
@@ -344,8 +355,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.3"])
-      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.6.3"])
+      s.add_runtime_dependency(%q<padrino-core>, ["= 0.6.7"])
+      s.add_runtime_dependency(%q<padrino-gen>, ["= 0.6.7"])
       s.add_runtime_dependency(%q<tilt>, [">= 0.4"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -354,8 +365,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<webrat>, [">= 0.5.1"])
     else
       s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-      s.add_dependency(%q<padrino-core>, ["= 0.6.3"])
-      s.add_dependency(%q<padrino-gen>, ["= 0.6.3"])
+      s.add_dependency(%q<padrino-core>, ["= 0.6.7"])
+      s.add_dependency(%q<padrino-gen>, ["= 0.6.7"])
       s.add_dependency(%q<tilt>, [">= 0.4"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -365,8 +376,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<json_pure>, [">= 1.2.0"])
-    s.add_dependency(%q<padrino-core>, ["= 0.6.3"])
-    s.add_dependency(%q<padrino-gen>, ["= 0.6.3"])
+    s.add_dependency(%q<padrino-core>, ["= 0.6.7"])
+    s.add_dependency(%q<padrino-gen>, ["= 0.6.7"])
     s.add_dependency(%q<tilt>, [">= 0.4"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 0"])

data/test/fixtures/active_record.rb

@@ -11,7 +11,19 @@ ActiveRecord::Schema.define do
     t.column :salt,             :string
     t.column :email,            :string
   end
+
+  create_table :categories, :force => true do |t|
+    t.column :name, :string
+    t.column :account_id, :integer
+  end
+end
+
+class Account < ActiveRecord::Base
+  has_many :categories
+end
+
+class Category < ActiveRecord::Base
+  belongs_to :account
 end
 
-class Account < ActiveRecord::Base; end
-Padrino::Admin::Adapters.register(:activerecord)
+Padrino::Admin::Orm.register!

data/test/fixtures/data_mapper.rb

@@ -1,5 +1,6 @@
 require 'dm-core'
 require 'dm-validations'
+require 'dm-aggregates'
 
 DataMapper.setup(:default, 'sqlite3::memory:')
 
@@ -21,7 +22,7 @@ class Account
   def self.editor; first(:role => "Editor"); end
 end
 
-Padrino::Admin::Adapters.register(:datamapper)
+Padrino::Admin::Orm.register!
 DataMapper.auto_migrate!
 
 # We build some fake accounts

data/test/fixtures/mongo_mapper.rb

@@ -9,4 +9,4 @@ class Account
 end
 
 Account.collection.remove
-Padrino::Admin::Adapters.register(:mongomapper)
+Padrino::Admin::Orm.register!

data/test/fixtures/test_column_store.jml

@@ -4,6 +4,7 @@ columns:
     dataIndex: name
   - method: surname
   - method: category.name
+    dataIndex: categories.name
   - method: email
     header: E-mail
     sortable: false

data/test/helper.rb

@@ -10,7 +10,7 @@ require 'shoulda'
 # We try to load the vendored padrino-core if exist
 %w(core gen).each do |gem|
   if File.exist?(File.dirname(__FILE__) + "/../../padrino-#{gem}/lib")
-    $LOAD_PATH.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
+    $:.unshift File.dirname(__FILE__) + "/../../padrino-#{gem}/lib"
   end
 end
 
@@ -29,7 +29,8 @@ module Kernel
   alias :silence_stdout :silence_logger
 
   def load_fixture(file)
-    Object.send(:remove_const, :Account) if defined?(Account)
+    Object.send(:remove_const, :Account)  if defined?(Account)
+    Object.send(:remove_const, :Category) if defined?(Category)
     file += ".rb" if file !~ /.rb$/
     silence_stdout { load File.join(File.dirname(__FILE__), "fixtures", file) }
   end

data/test/test_access_control.rb

@@ -91,7 +91,7 @@ class TestAccessControl < Test::Unit::TestCase
     end
 
     should 'check config handlers' do
-      assert_kind_of Padrino::ExtJs::Variable, @access.auths(Account.editor).project_modules.collect(&:config).first[:menu].first[:handler]
+      assert_kind_of Padrino::Admin::Config::Variable, @access.auths(Account.editor).project_modules.collect(&:config).first[:menu].first[:handler]
     end
   end
 

data/test/test_active_record.rb

@@ -6,7 +6,7 @@ class TestActiveRecord < Test::Unit::TestCase
     load_fixture 'active_record'
   end
 
-  context 'for activerecord functionality' do
+  context 'for activerecord account functionality' do
 
     should 'check required fields' do
       account = Account.create
@@ -25,4 +25,59 @@ class TestActiveRecord < Test::Unit::TestCase
       assert_equal account_r, account
     end
   end
+
+  context 'for activerecord functionality' do
+
+    should 'have some standard methods' do
+      account = Account.new
+      assert_respond_to account, :new_record?
+      assert_respond_to account, :to_param
+      assert_respond_to account, :update_attributes
+      assert_respond_to Account, :count
+    end
+
+    should 'have errors_keys' do
+      account = Account.new
+      account.valid?
+      assert_equal [:email, :role, :password, :password_confirmation], account.errors_keys
+    end
+
+    should 'have table name' do
+      assert_equal "accounts", Account.table_name
+    end
+
+    should 'have orm defined' do
+      assert_equal :activerecord, Account.orm
+    end
+
+    should 'search correctly fields' do
+      accounts, categories = {}, {}
+
+      %w(gino paoli mario venuti franco).each do |name|
+        accounts[name] = Account.create(:email => "#{name}@foo.com", :role => name, :password => "some", :password_confirmation => "some")
+        assert_equal [accounts[name]], Account.ext_search(:query => name, :fields => "email,role").records
+        accounts
+      end
+
+      %w(rock soul classic rap jazz).each_with_index do |name, i|
+        categories[name] = Category.create(:name => name, :account_id => i+1)
+        assert_equal [categories[name]], Category.ext_search(:query => name, :fields => "name").records
+        accounts
+      end
+
+      # Make sure that our builtin count is correct
+      assert_equal 5, Account.ext_search({}).count
+      assert_equal 5, Account.ext_search({}).count
+
+      # Perform some search
+      assert_equal [accounts["venuti"]], Account.ext_search(:query => "en", :fields => "email,role").records
+      assert_equal [accounts["gino"], accounts["venuti"], accounts["franco"]], Account.ext_search(:query => "n", :fields => "email,role").records
+      assert_equal [accounts["venuti"], accounts["franco"]], Account.ext_search(:start => 3, :limit => 2).records
+      assert_equal [accounts["paoli"], accounts["venuti"]],  Account.ext_search(:start => 3, :limit => 2, :sort => "role", :dir => "asc").records
+
+      # Perform some extended search
+      assert_equal [accounts["venuti"]], Account.ext_search({ :query => "rap", :fields => "categories.name" }, :joins => :categories).records
+      assert_equal [accounts["franco"], accounts["mario"]], Account.ext_search({:start => 3, :limit => 2, :sort => "categories.name", :dir => "desc"}, :joins => :categories).records
+    end
+  end
 end

data/test/test_column_store.rb

@@ -11,31 +11,77 @@ class TestController < Test::Unit::TestCase
           dataIndex: name
         - method: surname
         - method: category.name
+          dataIndex: categories.name
         - method: email
           header: E-mail
           sortable: false
         - method: role
     YAML
-    @column_store = Padrino::ExtJs::ColumnStore.new(Account, config)
+    @column_store = Padrino::Admin::ColumnStore.new(Account, config)
     @column_store_direct = Account.column_store("test/fixtures/test_column_store.jml")
   end
 
   should 'have correct column fileds' do
-    result = "[{\"name\":\"account[name]\",\"header\":\"Name upcase\",\"sortable\":true,\"id\":\"account_name\",\"dataIndex\":\"accounts.name\"},{\"name\":\"account[surname]\",\"header\":\"Surname\",\"sortable\":true,\"id\":\"account_surname\",\"dataIndex\":\"accounts.surname\"},{\"name\":\"category[name]\",\"header\":\"Category.name\",\"sortable\":true,\"id\":\"category_name\",\"dataIndex\":\"category.name\"},{\"name\":\"account[email]\",\"header\":\"E-mail\",\"sortable\":false,\"id\":\"account_email\",\"dataIndex\":\"accounts.email\"},{\"name\":\"account[role]\",\"header\":\"Role\",\"sortable\":true,\"id\":\"account_role\",\"dataIndex\":\"accounts.role\"}]"
-    assert_equal result, @column_store.column_fields
-    assert_equal result, @column_store_direct.column_fields
+    result = [
+      {"name"=>"account[name]",
+       "header"=>"Name upcase",
+       "sortable"=>true,
+       "id"=>"account_name",
+       "dataIndex"=>"accounts.name"},
+      {"name"=>"account[surname]",
+       "header"=>"Surname",
+       "sortable"=>true,
+       "id"=>"account_surname",
+       "dataIndex"=>"accounts.surname"},
+      {"name"=>"category[name]",
+       "header"=>"Category.name",
+       "sortable"=>true,
+       "id"=>"category_name",
+       "dataIndex"=>"categories.name"},
+      {"name"=>"account[email]",
+       "header"=>"E-mail",
+       "sortable"=>false,
+       "id"=>"account_email",
+       "dataIndex"=>"accounts.email"},
+      {"name"=>"account[role]",
+       "header"=>"Role",
+       "sortable"=>true,
+       "id"=>"account_role",
+       "dataIndex"=>"accounts.role"}
+    ]
+    assert_equal result, @column_store.column_fields(false)
+    assert_equal result, @column_store_direct.column_fields(false)
   end
 
   should 'have correct store fields' do
-    result = "[{\"name\":\"accounts.name\",\"mapping\":\"account_name\"},{\"name\":\"accounts.surname\",\"mapping\":\"account_surname\"},{\"name\":\"category.name\",\"mapping\":\"category_name\"},{\"name\":\"accounts.email\",\"mapping\":\"account_email\"},{\"name\":\"accounts.role\",\"mapping\":\"account_role\"}]"
-    assert_equal result, @column_store.store_fields
-    assert_equal result, @column_store_direct.store_fields
+    result = [
+      {:mapping=>"account_name", :name=>"accounts.name"},
+      {:mapping=>"account_surname", :name=>"accounts.surname"},
+      {:mapping=>"category_name", :name=>"categories.name"},
+      {:mapping=>"account_email", :name=>"accounts.email"},
+      {:mapping=>"account_role", :name=>"accounts.role"}
+    ]
+    assert_equal result, @column_store.store_fields(false)
+    assert_equal result, @column_store_direct.store_fields(false)
   end
 
   should 'store data' do
-    result = "{\"results\":[{\"account_surname\":\"Not found\",\"account_email\":\"d.dagostino@lipsiasoft.com\",\"category_name\":\"Not found\",\"id\":1,\"account_role\":\"Admin\",\"account_name\":\"DADDYE\"},{\"account_surname\":\"Not found\",\"account_email\":\"editor@lipsiasoft.com\",\"category_name\":\"Not found\",\"id\":2,\"account_role\":\"Editor\",\"account_name\":\"DEXTER\"}],\"count\":2}"
-    assert_equal result, @column_store.store_data(:fields => "name,role", :query => "d", :sort => :name, :dir => :asc, :limit => 2, :offset => 0)
-    assert_equal result, @column_store_direct.store_data(:fields => "name,role", :query => "d", :sort => :name, :dir => :asc, :limit => 2, :offset => 0)
+    result = {:results=>[
+      {"account_surname"=>"Not found",
+       "account_email"=>"d.dagostino@lipsiasoft.com",
+       "category_name"=>"Not found",
+       "id"=>1,
+       "account_role"=>"Admin",
+       "account_name"=>"DADDYE"},
+      {"account_surname"=>"Not found",
+       "account_email"=>"editor@lipsiasoft.com",
+       "category_name"=>"Not found",
+       "id"=>2,
+       "account_role"=>"Editor",
+       "account_name"=>"DEXTER"}
+    ], :count=>2}
+    assert_equal result, @column_store.store_data(:json => false, :fields => "name,role", :query => "d", :sort => :name, :dir => :asc, :limit => 2, :offset => 0)
+    assert_equal result, @column_store_direct.store_data(:json => false, :fields => "name,role", :query => "d", :sort => :name, :dir => :asc, :limit => 2, :offset => 0)
   end
 
 end