magic_grid 0.12.3 → 0.12.4

data/spec/spec_helper.rb

@@ -19,16 +19,20 @@ begin
   require 'will_paginate/array'
   require 'will_paginate/view_helpers/action_view'
   puts "Testing with WillPaginate"
+  $will_paginate = true
 rescue LoadError
   puts "skipping WillPaginate"
+  $will_paginate = false
 end
 
 begin
   require 'kaminari'
   require 'kaminari/models/array_extension'
   puts "Testing with Kaminari"
+  $kaminari = true
 rescue LoadError
   puts "skipping Kaminari"
+  $kaminari = false
 end
 
 class NullObject
@@ -77,14 +81,15 @@ module FakeCollections
 
   def fake_active_record_collection(table_name = 'some_table',
                                     columns = [:name, :description])
+    columns = columns.map{|c| {:name => c} }
     (1..1000).to_a.tap do |c|
-      c.stub(connection: fake_connection)
-      c.stub(quoted_table_name: table_name)
-      c.stub(table_name: table_name)
-      c.stub(to_sql: "SELECT * FROM MONKEYS")
+      c.stub(:connection => fake_connection)
+      c.stub(:quoted_table_name => table_name)
+      c.stub(:table_name => table_name)
+      c.stub(:to_sql => "SELECT * FROM MONKEYS")
       c.stub(:table) {
               double.tap do |t|
-                t.stub(:columns) { columns.map{|c| {name: c} } }
+                t.stub(:columns => columns)
               end
             }
       c.stub(:where) { c }
@@ -99,8 +104,8 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.include ActionView::Helpers
-  config.include WillPaginate::ActionView if Module.const_defined? :WillPaginate
-  config.include Kaminari::ActionViewExtension if Module.const_defined? :Kaminari
+  config.include WillPaginate::ActionView if $will_paginate
+  config.include Kaminari::ActionViewExtension if $kaminari
   config.include ActionFaker
   config.include FakeCollections
 

data/test/dummy/app/controllers/posts_controller.rb

@@ -16,7 +16,7 @@ class PostsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @posts }
+      format.json { render :json => @posts }
     end
   end
 
@@ -27,7 +27,7 @@ class PostsController < ApplicationController
     @posts = Post.includes(:user).where(:user_id => params[:user_id])
     respond_to do |format|
       format.html # by_user.html.erb
-      format.json { render json: @posts }
+      format.json { render :json => @posts }
     end
   end
 
@@ -38,7 +38,7 @@ class PostsController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: @post }
+      format.json { render :json => @post }
     end
   end
 
@@ -49,7 +49,7 @@ class PostsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render json: @post }
+      format.json { render :json => @post }
     end
   end
 
@@ -65,11 +65,11 @@ class PostsController < ApplicationController
 
     respond_to do |format|
       if @post.save
-        format.html { redirect_to @post, notice: 'Post was successfully created.' }
-        format.json { render json: @post, status: :created, location: @post }
+        format.html { redirect_to @post, :notice => 'Post was successfully created.' }
+        format.json { render :json => @post, :status => :created, :location => @post }
       else
-        format.html { render action: "new" }
-        format.json { render json: @post.errors, status: :unprocessable_entity }
+        format.html { render :action => "new" }
+        format.json { render :json => @post.errors, :status => :unprocessable_entity }
       end
     end
   end
@@ -81,11 +81,11 @@ class PostsController < ApplicationController
 
     respond_to do |format|
       if @post.update_attributes(params[:post])
-        format.html { redirect_to @post, notice: 'Post was successfully updated.' }
+        format.html { redirect_to @post, :notice => 'Post was successfully updated.' }
         format.json { head :ok }
       else
-        format.html { render action: "edit" }
-        format.json { render json: @post.errors, status: :unprocessable_entity }
+        format.html { render :action => "edit" }
+        format.json { render :json => @post.errors, :status => :unprocessable_entity }
       end
     end
   end

data/test/dummy/app/controllers/users_controller.rb

@@ -1,4 +1,4 @@
-if Module.const_defined? :WillPaginate
+if defined? WillPaginate
   require 'will_paginate/array'
 end
 
@@ -11,7 +11,7 @@ class UsersController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @users }
+      format.json { render :json => @users }
     end
   end
 
@@ -22,7 +22,7 @@ class UsersController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render json: @user }
+      format.json { render :json => @user }
     end
   end
 
@@ -33,7 +33,7 @@ class UsersController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render json: @user }
+      format.json { render :json => @user }
     end
   end
 
@@ -49,11 +49,11 @@ class UsersController < ApplicationController
 
     respond_to do |format|
       if @user.save
-        format.html { redirect_to @user, notice: 'User was successfully created.' }
-        format.json { render json: @user, status: :created, location: @user }
+        format.html { redirect_to @user, :notice => 'User was successfully created.' }
+        format.json { render :json => @user, :status => :created, :location => @user }
       else
-        format.html { render action: "new" }
-        format.json { render json: @user.errors, status: :unprocessable_entity }
+        format.html { render :action => "new" }
+        format.json { render :json => @user.errors, :status => :unprocessable_entity }
       end
     end
   end
@@ -65,11 +65,11 @@ class UsersController < ApplicationController
 
     respond_to do |format|
       if @user.update_attributes(params[:user])
-        format.html { redirect_to @user, notice: 'User was successfully updated.' }
+        format.html { redirect_to @user, :notice => 'User was successfully updated.' }
         format.json { head :ok }
       else
-        format.html { render action: "edit" }
-        format.json { render json: @user.errors, status: :unprocessable_entity }
+        format.html { render :action => "edit" }
+        format.json { render :json => @user.errors, :status => :unprocessable_entity }
       end
     end
   end

data/test/dummy/app/views/posts/by_user.html.erb

@@ -9,7 +9,7 @@
                    :to_s => Proc.new { |post| %>
                      <%= link_to 'Show', post %>
                      <%= link_to 'Edit', edit_post_path(post) %>
-                     <%= link_to 'Destroy', post, confirm: 'Are you sure?', method: :delete %>
+                     <%= link_to 'Destroy', post, :confirm => 'Are you sure?', :method => :delete %>
                    <% }
                  }
                ],

data/test/dummy/app/views/posts/index.html.erb

@@ -18,7 +18,7 @@
                    :to_s => Proc.new { |post| %>
                      <%= link_to 'Show', post %>
                      <%= link_to 'Edit', edit_post_path(post) %>
-                     <%= link_to 'Destroy', post, confirm: 'Are you sure?', method: :delete %>
+                     <%= link_to 'Destroy', post, :confirm => 'Are you sure?', :method => :delete %>
                    <% }
                  }
                ],
@@ -32,7 +32,7 @@
                },
                :searcher_size => 42,
                :id => 1,
-               :remote => true,
+               :remote => true
               ) %>
 
 <h3>Basic grid with built-in search</h3>
@@ -45,7 +45,7 @@
                    :to_s => Proc.new { |post| %>
                      <%= link_to 'Show', post %>
                      <%= link_to 'Edit', edit_post_path(post) %>
-                     <%= link_to 'Destroy', post, confirm: 'Are you sure?', method: :delete %>
+                     <%= link_to 'Destroy', post, :confirm => 'Are you sure?', :method => :delete %>
                    <% }
                  }
                ],
@@ -68,7 +68,7 @@
     <td>
       <%= link_to 'Show', post %>
       <%= link_to 'Edit', edit_post_path(post) %>
-      <%= link_to 'Destroy', post, confirm: 'Are you sure?', method: :delete %>
+      <%= link_to 'Destroy', post, :confirm => 'Are you sure?', :method => :delete %>
     </td>
   </tr>
 <% end %>

data/test/dummy/app/views/users/index.html.erb

@@ -10,7 +10,7 @@
     <td>
       <%= link_to 'Show', user %>
       <%= link_to 'Edit', edit_user_path(user) %>
-      <%= link_to 'Destroy', user, confirm: 'Are you sure?', method: :delete %>
+      <%= link_to 'Destroy', user, :confirm => 'Are you sure?', :method => :delete %>
     </td>
   </tr>
 <% end %>
@@ -33,7 +33,7 @@
     <td>
       <%= link_to 'Show', user %>
       <%= link_to 'Edit', edit_user_path(user) %>
-      <%= link_to 'Destroy', user, confirm: 'Are you sure?', method: :delete %>
+      <%= link_to 'Destroy', user, :confirm => 'Are you sure?', :method => :delete %>
     </td>
   </tr>
 <% end %>

data/test/dummy/config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -5,7 +5,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters format: [:json]
+  wrap_parameters :format => [:json]
 end
 
 # Disable root element in JSON by default.

data/test/dummy/test/fixtures/posts.yml

@@ -16,7 +16,7 @@ two:
 <% story = 'It was a dark and stormy night and the Captain said, "Tell me a story, son". So I began. ' * 100 %>
 <% 500.times do |i| %>
 post_<%= i %>:
-  title: <%= title.split.rotate(i).join " " %>
+  title: <%= "#{title}, part #{i}" %>
   body: <%= story %>
   published: <%= i.even? %>
   user: user_<%= i % 100 %>

data/test/dummy/test/functional/posts_controller_test.rb

@@ -18,30 +18,30 @@ class PostsControllerTest < ActionController::TestCase
 
   test "should create post" do
     assert_difference('Post.count') do
-      post :create, post: @post.attributes
+      post :create, :post => @post.attributes
     end
 
     assert_redirected_to post_path(assigns(:post))
   end
 
   test "should show post" do
-    get :show, id: @post.to_param
+    get :show, :id => @post.to_param
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, id: @post.to_param
+    get :edit, :id => @post.to_param
     assert_response :success
   end
 
   test "should update post" do
-    put :update, id: @post.to_param, post: @post.attributes
+    put :update, :id => @post.to_param, :post => @post.attributes
     assert_redirected_to post_path(assigns(:post))
   end
 
   test "should destroy post" do
     assert_difference('Post.count', -1) do
-      delete :destroy, id: @post.to_param
+      delete :destroy, :id => @post.to_param
     end
 
     assert_redirected_to posts_path

data/test/dummy/test/functional/users_controller_test.rb

@@ -19,30 +19,30 @@ class UsersControllerTest < ActionController::TestCase
 
   test "should create user" do
     assert_difference('User.count') do
-      post :create, user: @user.attributes
+      post :create, :user => @user.attributes
     end
 
     assert_redirected_to user_path(assigns(:user))
   end
 
   test "should show user" do
-    get :show, id: @user.to_param
+    get :show, :id => @user.to_param
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, id: @user.to_param
+    get :edit, :id => @user.to_param
     assert_response :success
   end
 
   test "should update user" do
-    put :update, id: @user.to_param, user: @user.attributes
+    put :update, :id => @user.to_param, :user => @user.attributes
     assert_redirected_to user_path(assigns(:user))
   end
 
   test "should destroy user" do
     assert_difference('User.count', -1) do
-      delete :destroy, id: @user.to_param
+      delete :destroy, :id => @user.to_param
     end
 
     assert_redirected_to users_path

metadata

@@ -1,96 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: magic_grid
 version: !ruby/object:Gem::Version
-  version: 0.12.3
   prerelease: 
+  version: 0.12.4
 platform: ruby
 authors:
 - Ryan Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.17
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.17
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: tarantula
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: tarantula
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+  type: :development
 description: ! "    Displays a collection (ActiveRelation or Array-like object) wrapped
   in an\n    html table with server side column sorting, filtering hooks, and search\n
   \   bar. Large collections can be paginated with either the will_paginate gem\n
@@ -212,19 +212,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 1658296312752844098
+      hash: -4357182830719738575
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 1658296312752844098
+      hash: -4357182830719738575
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23