mighty_grid 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b86bd1ed6d0734fa6d924b5b462469828a65ee0
-  data.tar.gz: 40241a4547e70b2829b4abe1e579cb757ea44fb2
+  metadata.gz: f7f9c3fe294d2ca3e018c9423d017080db7f0672
+  data.tar.gz: b4ee536a54684468aecaaa5637f6d95e026f2ae0
 SHA512:
-  metadata.gz: 7b364645a807c3268e3f073118f30832c852e9a312f9cb21e554122579a2d5ef27f3480ad43237178c253677f5fa05fceb0336b1b9103d67e98836a98ffba7d2
-  data.tar.gz: 3c25be9911a6eb1905a455a53c08f5e4419c97d1ce2fcebe06ca04f53e976d7c9ebabd2fc51ae6a0a413f55a3fb449cb9a336222e28afaa1cd10e7299a5ff201
+  metadata.gz: 65b8a28c2bef8f954d51dde1fc7f926ddd7952bb39aea2e7e14016d033cfb2a3d1a9f9e21995b59191904139221f34e6bd75fcd88814099ccd59563c5338e4c5
+  data.tar.gz: 1ca07348c0c9bca8cd89f9e0aa142717554ad9f5c7ba1b7bf94a0ef42a343dcb8b625ffab72d4e89a5a506de10f6000f8ff303989dfb4119d4754e7116dab04b

data/.travis.yml

@@ -6,10 +6,11 @@ rvm:
 
 script: bundle exec rake spec
 
-env:
-  CODECLIMATE_REPO_TOKEN: 47bc411a11ccfed015bf25395d8204600c899e530c1c4beed1b7197aa61c6fb6
-
 gemfile:
   - gemfiles/rails_32.gemfile
   - gemfiles/rails_40.gemfile
-  - gemfiles/rails_41.gemfile
+  - gemfiles/rails_41.gemfile
+
+addons:
+  code_climate:
+    repo_token: 47bc411a11ccfed015bf25395d8204600c899e530c1c4beed1b7197aa61c6fb6

data/Rakefile

@@ -1,9 +1,5 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
 require "bundler/gem_tasks"
 require 'appraisal'
-require 'rspec/core'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/lib/mighty_grid/base.rb

@@ -31,7 +31,7 @@ module MightyGrid
 
     def read
       apply_filters
-      @relation = @relation.order(@mg_params[:order] => @mg_params[:order_direction].to_sym) if @mg_params[:order].present? && @mg_params[:order_direction].present?
+      @relation = @relation.order(@mg_params[:order] => current_order_direction.to_sym) if @mg_params[:order].present? && current_order_direction.present?
       @relation = @relation.page(@mg_params[:page]).per(@mg_params[:per_page])
     end
 
@@ -78,10 +78,19 @@ module MightyGrid
     end
 
     def order_params(attribute)
-      {@name => {order: attribute, order_direction: order_direction}}
+      direction = attribute.to_s == @mg_params[:order] ? another_order_direction : 'asc'
+      {@name => {order: attribute, order_direction: direction}}
     end
 
-    def order_direction
+    def current_order_direction
+      direction = nil
+      if current_grid_params.has_key?('order_direction') && ['asc', 'desc'].include?(current_grid_params['order_direction'].downcase)
+        direction = current_grid_params['order_direction'].downcase
+      end
+      direction
+    end
+
+    def another_order_direction
       (current_grid_params.has_key?('order_direction')) ? (['asc', 'desc'] - [current_grid_params['order_direction'].to_s]).first : MightyGrid.config.order_direction
     end
 

data/lib/mighty_grid/version.rb

@@ -1,3 +1,3 @@
 module MightyGrid
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/fake_app/models/active_record.rb

@@ -1,11 +1,13 @@
+# MODELS
 class Product < ActiveRecord::Base
 end
 
-#migrations
+# MIGRATIONS
 class CreateAllTables < ActiveRecord::Migration
   def self.up
-    create_table(:products) { |t| t.string :name }
+    create_table(:products) { |t| t.string :name; t.text :description }
   end
 end
+
 ActiveRecord::Migration.verbose = false
 CreateAllTables.up

data/spec/lib/base_spec.rb

@@ -19,23 +19,24 @@ describe MightyGrid::Base do
       its(:relation) { should == Product }
       its(:klass) { should == Product }
       its(:current_grid_params) { should == {} }
-      its(:order_direction) { should == MightyGrid.config.order_direction }
+      its(:current_order_direction) { should == nil }
+      its(:another_order_direction) { should == 'asc' }
       its(:filter_param_name) { should == 'f' }
       context 'controller' do
-        it { instance_variable_get(:@controller).should == @controller }
+        it { instance_variable_get(:@controller).should be_an_instance_of ActionView::TestCase::TestController }
       end
     end
 
     context 'with custom' do
       subject { MightyGrid::Base.new(Product, @controller, page: 2, per_page: 10, name: 'grid1') }
-      its(:options) { should == {page: 2, per_page: 10, name: 'grid1'} }
+      its(:options) { should == @default_options.merge(page: 2, per_page: 10, name: 'grid1') }
     end
 
     context 'with custom' do
       before(:all){ @controller.params = {'grid' => {page: 5, per_page: 30, name: 'grid2'}} }
       subject { MightyGrid::Base.new(Product, @controller) }
       its(:params) { should == @controller.params }
-      its(:mg_params) { should == {page: 5, per_page: 30, name: 'grid2'} }
+      its(:mg_params) { should == @default_options.merge(page: 5, per_page: 30, name: 'grid2') }
       after(:all){ @controller.params = {} }
     end
 
@@ -48,6 +49,65 @@ describe MightyGrid::Base do
     before(:all){ @controller.params = {'grid'=>{per_page: 30}} }
     subject { MightyGrid::Base.new(Product, @controller).get_current_grid_param(:per_page) }
     it { should == 30 }
+    after(:all){ @controller.params = {} }
+  end
+
+  describe '#current_order_direction' do
+    context 'with ASC controller param' do
+      before(:all){ @controller.params = {'grid'=>{'order_direction' => 'asc'}} }
+      subject { MightyGrid::Base.new(Product, @controller) }
+      its(:current_order_direction) { should == 'asc' }
+      after(:all){ @controller.params = {} }
+    end
+
+    context 'with DESC controller param' do
+      before(:all){ @controller.params = {'grid'=>{'order_direction' => 'desc'}} }
+      subject { MightyGrid::Base.new(Product, @controller) }
+      its(:current_order_direction) { should == 'desc' }
+      after(:all){ @controller.params = {} }
+    end
+
+    context 'with BAD controller param' do
+      before(:all){ @controller.params = {'grid'=>{'order_direction' => 'bad'}} }
+      subject { MightyGrid::Base.new(Product, @controller) }
+      its(:current_order_direction) { should == nil }
+      after(:all){ @controller.params = {} }
+    end
+  end
+
+  describe '#another_order_direction' do
+    context 'with ASC controller param' do
+      before(:all){ @controller.params = {'grid'=>{'order_direction' => 'asc'}} }
+      subject { MightyGrid::Base.new(Product, @controller) }
+      its(:another_order_direction) { should == 'desc' }
+      after(:all){ @controller.params = {} }
+    end
+
+    context 'with DESC controller param' do
+      before(:all){ @controller.params = {'grid'=>{'order_direction' => 'desc'}} }
+      subject { MightyGrid::Base.new(Product, @controller) }
+      its(:another_order_direction) { should == 'asc' }
+      after(:all){ @controller.params = {} }
+    end
+
+    context 'with BAD controller param' do
+      before(:all){ @controller.params = {'grid'=>{'order_direction' => 'bad'}} }
+      subject { MightyGrid::Base.new(Product, @controller) }
+      its(:another_order_direction) { should == 'asc' }
+      after(:all){ @controller.params = {} }
+    end
+  end
+
+  describe '#order_params' do
+    before(:all){ @controller.params = {'grid'=>{'order' => 'name', 'order_direction' => 'asc'}} }
+    subject { MightyGrid::Base.new(Product, @controller) }
+    context 'with current order attribute' do
+      it { subject.order_params(:name).should == {'grid'=>{order: :name, order_direction: 'desc'}} }
+    end
+    context 'with other order attribute' do
+      it { subject.order_params(:description).should == {'grid'=>{order: :description, order_direction: 'asc'}} }
+    end
+    after(:all){ @controller.params = {} }
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mighty_grid
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - jurrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-11 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler