mighty_grid 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9fb8a05f406c93425c49c6bc860276ab6d7140b
-  data.tar.gz: 6245a2f298bf5db56c004e3fb81d13413993dfcb
+  metadata.gz: 74b8144f9e7e58cdc96ca3d0b807c64480fb1358
+  data.tar.gz: 3df768d2465fef24ef982f16b48c1f63c9835f39
 SHA512:
-  metadata.gz: a4867e8238ab8c79d6c525bc5d1b325c6d57c7ab010e0a547bd66583e69cc17f87ee7de682b961e6adb9b9f7bcae40e0fb2f87d6a5a8585bd78a4984f6214880
-  data.tar.gz: 12f58aca2256556dca79d1932f9008a62212206b2d80fdbe4e0f0e0d7001bf9b17d137f6737522c7725b295e1d47a7f99723d34fba228ca1ad19e40dc9a3fe5d
+  metadata.gz: c198e16b636905e23ecdf31a2c9fc76c2275a4db88aee84df62ebf5e7532a78a1e25c925af505413c4886dafa1aff02562fb9f294a89815e2d16132765972717
+  data.tar.gz: c5425779bef23b7b99d6b7b61531cc26990c73a8e86ba9e95ed652af42433645ab2f75dd09a0db460b4dd89dc34a5cfa47d3cc29d3c21ad0d6725539d8d4c510

data/.gitignore

@@ -17,4 +17,10 @@ test/tmp
 test/version_tmp
 tmp
 log
-spec/fake_app/config/*.yml
+database.yml
+
+spec/dummy/db/*.sqlite3
+spec/dummy/db/*.sqlite3-journal
+spec/dummy/log/*.log
+spec/dummy/tmp/
+spec/dummy/.sass-cache

data/.travis.yml

@@ -2,11 +2,14 @@ language: ruby
 rvm:
   - 2.0.0
   - 2.1.1
+  - ruby-head
 
-script: bundle exec rake spec cucumber
+script:
+  - bundle exec rake -f spec/dummy/Rakefile db:migrate
+  - bundle exec rake spec cucumber
 
 before_script:
-  - cp spec/fake_app/config/database.yml.example spec/fake_app/config/database.yml
+  - cp spec/dummy/config/database.yml.travis spec/dummy/config/database.yml
   - mysql -e 'create database mg_test'
   - psql -c 'create database mg_test' -U postgres
 
@@ -23,4 +26,8 @@ gemfile:
 addons:
   code_climate:
     repo_token: 47bc411a11ccfed015bf25395d8204600c899e530c1c4beed1b7197aa61c6fb6
-  postgresql: "9.3"
+  postgresql: "9.3"
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Appraisals

@@ -1,14 +1,17 @@
 appraise "rails_32" do
-  gem "rails", "~> 3.2.15"
-  gem "activerecord", "~> 3.2.15", require: 'active_record'
+  gem "rails", "~> 3.2.19"
+  gem "activerecord", "~> 3.2.19", require: 'active_record'
+  gem 'coffee-rails', '~> 3.2.0'
 end
 
 appraise "rails_40" do
   gem "rails", "~> 4.0.0"
   gem "activerecord", "~> 4.0.0", require: 'active_record'
+  gem 'coffee-rails', '~> 4.0.0'
 end
 
 appraise "rails_41" do
   gem "rails", "~> 4.1.0"
   gem "activerecord", "~> 4.1.0", require: 'active_record'
-end
+  gem 'coffee-rails', '~> 4.0.0'
+end

data/Gemfile

@@ -2,16 +2,21 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'uglifier', '>= 1.3.0' # Use Uglifier as compressor for JavaScript assets
+gem 'jquery-rails' # Use jquery as the JavaScript library
+
 group :test do
   gem 'sqlite3'
   gem "generator_spec"
-  gem 'capybara'
+  gem 'capybara', require: false
   gem 'database_cleaner'
-  gem 'cucumber-rails'
+  gem 'cucumber-rails', require: false
   gem 'spreewald'
+  gem 'poltergeist'
+  gem 'launchy'
 
   gem 'coveralls', require: false
   gem "codeclimate-test-reporter", require: nil
   gem 'pg', require: false
   gem 'mysql2', require: false
-end
+end

data/Rakefile

@@ -1,16 +1,15 @@
-require "bundler/gem_tasks"
 require 'appraisal'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
-if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
-  task :default => :appraisal
+Bundler::GemHelper.install_tasks
+
+if !ENV['APPRAISAL_INITIALIZED'] && !ENV['TRAVIS']
+  task default: :appraisal
 end
 
 desc 'Test the paperclip plugin.'
 RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run integration test'
-Cucumber::Rake::Task.new do |t|
-  t.cucumber_opts = %w{--format progress}
-end
+Cucumber::Rake::Task.new

data/features/filtering.feature

@@ -27,16 +27,17 @@ Feature: Filtering
     And I should see "user101"
     And I should see "1 of 1"
 
-  # Scenario: Reset filter
-  #   Given I am on the list of users page
-  #   When I fill in "Name" with "user001"
-  #   And I select "Admin" from "Role"
-  #   And I check "Banned"
-  #   And I press "Apply changes"
-  #   Then the "Name" field should contain "user001"
-  #   And "Admin" should be selected for "Role"
-  #   And the "Banned" checkbox should be checked
-  #   When I press "Reset changes"
-  #   Then the "Name" field should contain ""
-  #   And nothing should be selected for "Role"
-  #   And the "Banned" checkbox should not be checked
+  @javascript
+  Scenario: Reset filter
+    Given I am on the list of users page
+    When I fill in "Name" with "user001"
+    And I select "Admin" from "Role"
+    And I check "Banned"
+    And I press "Apply changes"
+    Then the "Name" field should contain "user001"
+    And "Admin" should be selected for "Role"
+    And the "Banned" checkbox should be checked
+    When I press "Reset changes"
+    Then the "Name" field should contain ""
+    And nothing should be selected for "Role"
+    And the "Banned" checkbox should not be checked

data/features/step_definitions/steps.rb

@@ -1,5 +1,5 @@
 Given /^I generate (\d+) users$/ do |n|
-  1.upto(n.to_i) {|i| User.create! :name => "user#{'%03d' % i}" }
-  User.create! :name => "admin#{'%03d' % 1}", role: :admin
-  User.create! :name => "user#{'%03d' % (n.to_i + 1)}", is_banned: true
-end
+  1.upto(n.to_i) { |i| User.create! name: "user#{format('%03d', i)}" }
+  User.create! name: "admin#{format('%03d', 1)}", role: :admin
+  User.create! name: "user#{format('%03d', (n.to_i + 1))}", is_banned: true
+end

data/features/support/capybara.rb

@@ -0,0 +1,8 @@
+require 'capybara/poltergeist'
+
+# Capybara.register_driver :poltergeist_debug do |app|
+#   Capybara::Poltergeist::Driver.new(app, :inspector => true)
+# end
+
+Capybara.javascript_driver = :poltergeist
+# Capybara.javascript_driver = :poltergeist_debug

data/features/support/database_cleaner.rb

@@ -4,9 +4,9 @@ begin
 
   DatabaseCleaner.strategy = :truncation
 rescue NameError
-  raise "You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it."
+  raise 'You need to add database_cleaner to your Gemfile (in the :test group) if you wish to use it.'
 end
 
 # Around do |scenario, block|
 #   DatabaseCleaner.cleaning(&block)
-# end
+# end

data/features/support/env.rb

@@ -4,14 +4,15 @@ begin
 rescue LoadError
 end
 
-require 'capybara/cucumber'
 require 'bundler/setup'
 Bundler.require
 
+require 'capybara/cucumber'
+
 if defined? Rails
-  require_relative '../../spec/fake_app/rails_app'
+  require File.expand_path("../../../spec/dummy/config/environment.rb",  __FILE__)
 end
 
 require 'spreewald/web_steps'
 require 'spreewald/table_steps'
-require 'spreewald/development_steps'
+require 'spreewald/development_steps'

data/features/support/paths.rb

@@ -15,13 +15,13 @@ module NavigationHelpers
       begin
         page_name =~ /^the (.*) page$/
         path_components = $1.split(/\s+/)
-        self.send(path_components.push('path').join('_').to_sym)
+        send(path_components.push('path').join('_').to_sym)
       rescue NoMethodError, ArgumentError
-        raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
-          "Now, go and add a mapping in #{__FILE__}"
+        raise "Can't find mapping from \"#{page_name}\" to a path.\n" \
+              "Now, go and add a mapping in #{__FILE__}"
       end
     end
   end
 end
 
-World(NavigationHelpers)
+World(NavigationHelpers)

data/gemfiles/rails_32.gemfile

@@ -2,16 +2,21 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 3.2.15"
-gem "activerecord", "~> 3.2.15", :require => "active_record"
+gem "rails", "~> 3.2.19"
+gem "activerecord", "~> 3.2.19", :require => "active_record"
+gem "coffee-rails", "~> 3.2.0"
 
 group :test do
   gem "sqlite3"
   gem "generator_spec"
-  gem "capybara"
+  gem "capybara", :require => false
   gem "database_cleaner"
-  gem "cucumber-rails"
+  gem "cucumber-rails", :require => false
   gem "spreewald"
+  gem "poltergeist"
+  gem "launchy"
+  gem "uglifier", ">= 1.3.0"
+  gem "jquery-rails"
   gem "coveralls", :require => false
   gem "codeclimate-test-reporter", :require => nil
   gem "pg", :require => false

data/gemfiles/rails_40.gemfile

@@ -4,14 +4,19 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.0.0"
 gem "activerecord", "~> 4.0.0", :require => "active_record"
+gem "coffee-rails", "~> 4.0.0"
 
 group :test do
   gem "sqlite3"
   gem "generator_spec"
-  gem "capybara"
+  gem "capybara", :require => false
   gem "database_cleaner"
-  gem "cucumber-rails"
+  gem "cucumber-rails", :require => false
   gem "spreewald"
+  gem "poltergeist"
+  gem "launchy"
+  gem "uglifier", ">= 1.3.0"
+  gem "jquery-rails"
   gem "coveralls", :require => false
   gem "codeclimate-test-reporter", :require => nil
   gem "pg", :require => false

data/gemfiles/rails_41.gemfile

@@ -4,14 +4,19 @@ source "https://rubygems.org"
 
 gem "rails", "~> 4.1.0"
 gem "activerecord", "~> 4.1.0", :require => "active_record"
+gem "coffee-rails", "~> 4.0.0"
 
 group :test do
   gem "sqlite3"
   gem "generator_spec"
-  gem "capybara"
+  gem "capybara", :require => false
   gem "database_cleaner"
-  gem "cucumber-rails"
+  gem "cucumber-rails", :require => false
   gem "spreewald"
+  gem "poltergeist"
+  gem "launchy"
+  gem "uglifier", ">= 1.3.0"
+  gem "jquery-rails"
   gem "coveralls", :require => false
   gem "codeclimate-test-reporter", :require => nil
   gem "pg", :require => false

data/lib/generators/mighty_grid/install_generator.rb

@@ -1,9 +1,11 @@
+require 'rails/generators'
+
 module MightyGrid
   module Generators
     class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
 
-      desc "Copies MightyGrid configuration and locale files to your application."
+      desc 'Copies MightyGrid configuration and locale files to your application.'
 
       def copy_config_file
         template 'mighty_grid_config.rb', 'config/initializers/mighty_grid_config.rb'
@@ -14,4 +16,4 @@ module MightyGrid
       end
     end
   end
-end
+end

data/lib/generators/mighty_grid/templates/mighty_grid_config.rb

@@ -12,4 +12,4 @@ MightyGrid.configure do |config|
   # config.table_class = ''
   # config.header_tr_class = ''
   # config.pagination_template = 'mighty_grid'
-end
+end

data/lib/mighty_grid/base.rb

@@ -1,7 +1,5 @@
 module MightyGrid
-
   class Base
-
     attr_reader :klass, :name, :relation, :options, :mg_params, :controller
     attr_accessor :output_buffer, :filters
 
@@ -11,13 +9,13 @@ module MightyGrid
       @filters = {}
 
       @options = {
-        :page       => 1,
-        :per_page   => MightyGrid.config.per_page,
-        :name       => MightyGrid.config.grid_name,
-        :include    => nil,
-        :joins      => nil,
-        :conditions => nil,
-        :group      => nil
+        page:       1,
+        per_page:   MightyGrid.config.per_page,
+        name:       MightyGrid.config.grid_name,
+        include:    nil,
+        joins:      nil,
+        conditions: nil,
+        group:      nil
       }
 
       opts.assert_valid_keys(@options.keys)
@@ -35,13 +33,13 @@ module MightyGrid
     def read
       apply_filters
       @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]).
-                    includes(@options[:include]).
-                    joins(@options[:joins]).
-                    where(@options[:conditions]).
-                    group(@options[:group])
+      @relation = @relation
+                    .page(@mg_params[:page])
+                    .per(@mg_params[:per_page])
+                    .includes(@options[:include])
+                    .joins(@options[:joins])
+                    .where(@options[:conditions])
+                    .group(@options[:group])
     end
 
     # Apply filters
@@ -58,19 +56,17 @@ module MightyGrid
         next if filter_value.blank? || !model.column_names.include?(name)
 
         if model && model.superclass == ActiveRecord::Base
-          filter_type = model.columns_hash[name].type
+          field_type = model.columns_hash[name].type
         else
           next
         end
 
-        field_type ||= model.columns_hash[name].type
         table_name = model.table_name
-        
-        if @filters.has_key?(filter_name.to_sym) && @filters[filter_name.to_sym].is_a?(Array)
+        if @filters.key?(filter_name.to_sym) && @filters[filter_name.to_sym].is_a?(Array)
           @relation = @relation.where(table_name => { filter_name => filter_value })
         elsif field_type == :boolean
-          value = ['true', '1', 't'].include?(filter_value) ? true : false
-          @relation = @relation.where(table_name => {filter_name => value})
+          value = %w(true 1 t).include?(filter_value) ? true : false
+          @relation = @relation.where(table_name => { filter_name => value })
         elsif [:string, :text].include?(field_type)
           @relation = @relation.where("#{table_name}.#{name} #{like_operator} ?", "%#{filter_value}%")
         end
@@ -89,14 +85,14 @@ module MightyGrid
       if current_grid_params
         @mg_params.merge!(current_grid_params.symbolize_keys)
         if @mg_params[:order].present? && !@mg_params[:order].to_s.include?('.')
-          @mg_params[:order] = "#{klass.table_name}.#{@mg_params[:order]}" 
+          @mg_params[:order] = "#{klass.table_name}.#{@mg_params[:order]}"
         end
       end
     end
 
     # Get current grid parameter by name
     def get_current_grid_param(name)
-      current_grid_params.has_key?(name) ? current_grid_params[name] : nil
+      current_grid_params.key?(name) ? current_grid_params[name] : nil
     end
 
     # Get filter parameters
@@ -105,7 +101,9 @@ module MightyGrid
     end
 
     # Get filter parameter name
-    def filter_param_name; 'f' end
+    def filter_param_name
+      'f'
+    end
 
     # Get filter name by field
     def get_filter_name(field, model = nil)
@@ -122,18 +120,18 @@ module MightyGrid
     def order_params(attribute, model = nil, direction = nil)
       order = model.present? ? "#{model.table_name}.#{attribute}" : attribute.to_s
       direction ||= order == current_grid_params['order'] ? another_order_direction : 'asc'
-      {@name => {order: order, order_direction: direction}}
+      { @name => { order: order, order_direction: direction } }
     end
 
     # Get current order direction if current order parameter coincides with the received parameter
     def get_active_order_direction(parameters)
-      (parameters[@name]['order'] == current_grid_params['order']) ? current_order_direction : nil
+      parameters[@name]['order'] == current_grid_params['order'] ? current_order_direction : nil
     end
 
     # Get current 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)
+      if current_grid_params.key?('order_direction') && %w(asc desc).include?(current_grid_params['order_direction'].downcase)
         direction = current_grid_params['order_direction'].downcase
       end
       direction
@@ -141,17 +139,16 @@ module MightyGrid
 
     # Get another order direction
     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
+      current_grid_params.key?('order_direction') ? (%w(asc desc) - [current_grid_params['order_direction'].to_s]).first : MightyGrid.config.order_direction
     end
 
-    # Get <tt>like</tt> or <tt>ilike</tt> operator depending on the database adapter 
+    # Get <tt>like</tt> or <tt>ilike</tt> operator depending on the database adapter
     def like_operator
       if ActiveRecord::ConnectionAdapters.const_defined?(:PostgreSQLAdapter) && ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
         'ILIKE'
       else
-        'LIKE'  
+        'LIKE'
       end
     end
-
   end
-end
+end

data/lib/mighty_grid/column.rb

@@ -1,14 +1,13 @@
 module MightyGrid
   class Column
-
     attr_reader :attribute, :attrs, :th_attrs, :options, :title, :model, :partial
     attr_accessor :render_value
 
-    def initialize(options={}, &block)
+    def initialize(options = {}, &block)
       @attrs = {}
       @th_attrs = {}
 
-      @attribute = options.delete(:attribute) if options.has_key?(:attribute)
+      @attribute = options.delete(:attribute) if options.key?(:attribute)
 
       @options ||= options
 
@@ -19,25 +18,24 @@ module MightyGrid
       end
 
       @model = @options[:model]
-      raise MightyGridArgumentError.new("Model of field for filtering should have type ActiveRecord") if @model && @model.superclass != ActiveRecord::Base
-      
-      @attrs = @options[:html] if @options.has_key?(:html)
-      @th_attrs = @options[:th_html] if @options.has_key?(:th_html)
-      @title = @options.has_key?(:title) && @options[:title] || ''
+      fail MightyGridArgumentError.new('Model of field for filtering should have type ActiveRecord') if @model && @model.superclass != ActiveRecord::Base
+
+      @attrs = @options[:html] if @options.key?(:html)
+      @th_attrs = @options[:th_html] if @options.key?(:th_html)
+      @title = @options.key?(:title) && @options[:title] || ''
     end
 
     def render(record)
       case @render_value
-        when String, Symbol
-          rec = @model ? record.send(@model.to_s.underscore) : record
-          return rec[@render_value]
-        when Proc
-          value = @render_value.call(record)
-          return ERB::Util.h(value).to_s.html_safe
-        else
-          # raise
+      when String, Symbol
+        rec = @model ? record.send(@model.to_s.underscore) : record
+        return rec[@render_value]
+      when Proc
+        value = @render_value.call(record)
+        return ERB::Util.h(value).to_s.html_safe
+      else
+        # raise
       end
     end
-
   end
-end
+end

data/lib/mighty_grid/config.rb

@@ -46,4 +46,4 @@ module MightyGrid
     config.header_tr_class = ''
     config.pagination_theme = 'mighty_grid'
   end
-end
+end

data/lib/mighty_grid/engine.rb

@@ -1,5 +1,4 @@
 module MightyGrid
-
   class MightyGridEngine < ::Rails::Engine
     initializer 'mighty_grid_railtie.configure_rails_initialization' do |app|
 
@@ -16,5 +15,4 @@ module MightyGrid
 
     end
   end
-  
-end
+end

data/lib/mighty_grid/filter_renderer.rb

@@ -17,17 +17,17 @@ module MightyGrid
     end
 
     # Get <tt>input</tt> HTML tag
-    def text_field(name, options={})
+    def text_field(name, options = {})
       f_options = filter_options(name, options)
       text_field_tag(@grid.get_filter_name(name, f_options[:model]), get_filter_param(name, f_options[:model]), options)
     end
 
     # Get <tt>select</tt> HTML tag
-    def select(name, option_tags=nil, options={})
+    def select(name, option_tags = nil, options = {})
       @grid.filters[name] = option_tags
       selected = nil
-      selected = options.delete(:selected) if options.has_key?(:selected)
-      
+      selected = options.delete(:selected) if options.key?(:selected)
+
       f_options = filter_options(name, options)
 
       selected = get_filter_param(name, f_options[:model]) if get_filter_param(name, f_options[:model])
@@ -41,44 +41,44 @@ module MightyGrid
       checked = true if get_filter_param(name)
 
       f_options = filter_options(name, options)
-      
+
       check_box_tag(@grid.get_filter_name(name, f_options[:model]), value, checked, options)
     end
 
     # Get button for Apply filter changes
     def submit(content = nil, options = {})
-      content = I18n.t("mighty_grid.filters.submit", default: 'Apply changes') if content.blank?
+      content = I18n.t('mighty_grid.filters.submit', default: 'Apply changes') if content.blank?
       options.merge!(type: :submit)
       content_tag(:button, content, options)
     end
 
     # Get button for Reset filter changes
     def reset(content = nil, options = {})
-      content = I18n.t("mighty_grid.filters.reset", default: 'Reset changes') if content.blank?
+      content = I18n.t('mighty_grid.filters.reset', default: 'Reset changes') if content.blank?
       options.merge!(type: :reset)
       content_tag(:button, content, options)
     end
 
     private
 
-      def get_filter_param(name, model = nil)
-        filter_name = model ? "#{model.table_name}.#{name}" : name
-        @grid.filter_params.has_key?(filter_name) ? @grid.filter_params[filter_name] : nil
-      end
+    def get_filter_param(name, model = nil)
+      filter_name = model ? "#{model.table_name}.#{name}" : name
+      @grid.filter_params.key?(filter_name) ? @grid.filter_params[filter_name] : nil
+    end
 
-      def get_filter_id(name: nil, model: nil)
-        @grid.get_filter_name(name, model).parameterize('_')
-      end
+    def get_filter_id(name: nil, model: nil)
+      @grid.get_filter_name(name, model).parameterize('_')
+    end
 
-      def filter_options(name, options, with_id = true)
-        opts = {name: name}
-        if options.is_a?(Hash) && options.has_key?(:model)
-          model = options.delete(:model)
-          raise MightyGridArgumentError.new("Model of field for filtering should have type ActiveRecord") if model.present? && model.superclass != ActiveRecord::Base
-          opts.merge!(model: model)
-          options.merge!(id: get_filter_id(opts)) if with_id
-        end
-        opts
+    def filter_options(name, options, with_id = true)
+      opts = { name: name }
+      if options.is_a?(Hash) && options.key?(:model)
+        model = options.delete(:model)
+        fail MightyGridArgumentError.new('Model of field for filtering should have type ActiveRecord') if model.present? && model.superclass != ActiveRecord::Base
+        opts.merge!(model: model)
+        options.merge!(id: get_filter_id(opts)) if with_id
       end
+      opts
+    end
   end
-end
+end