mighty_grid 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db3be8e4ea2ceb7203c275271ab2d2f0f13b97c1
-  data.tar.gz: d31f8201be065f8ec4df6578fe31ed874e58c404
+  metadata.gz: 0a1b8f39980c43212fbbcaf1536e2885315b0d25
+  data.tar.gz: 3c3a494e5aa3765bb575138ce551d8e926c9c5c7
 SHA512:
-  metadata.gz: 5e2284003412c988caa41624d339790fb8d675e48abf96df115f128bedc7a51055ec0fd75942708b12e2d006dfacdb2f8913dbb8f06703799eb100fad8d0341b
-  data.tar.gz: 1e953d518c34a8542c6047c6371ae10c8fa3de792d345dc18555f506ebed6fcce499a9b438c6bfb20ba847d880f70515b4a79ff67c1d769d58701d9bc05a3b9b
+  metadata.gz: 8a6873ec703fa7b3f069aa39a781914c696ce7f67fda8d64da8b25a4a04301665525bebae0bead8424de7f6627c23f9c78cd4883535f3101d9d54f17a37aa6e9
+  data.tar.gz: d6fed277c241aa679c1b194566e3bcbda77c4d41bab23c6473fb6a58b47ac0bccb447c79a36320cac69d09328cb40571c2e5f5e3178eae568d6d3f62e850e16a

data/README.md

@@ -54,7 +54,7 @@ pagination_theme  # 'mighty_grid' by default
 There's a handy generator that generates the default configuration file into config/initializers directory.
 Run the following generator command, then edit the generated file.
 
-    $ rails g mighty_grid:config
+    $ rails g mighty_grid:install
 
 ## Contributing
 

data/config/locales/en.yml

@@ -0,0 +1,5 @@
+en:
+  mighty_grid:
+    filters:
+      submit: Apply changes
+      reset: Reset changes

data/lib/generators/mighty_grid/install_generator.rb

@@ -0,0 +1,17 @@
+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."
+
+      def copy_config_file
+        template 'mighty_grid_config.rb', 'config/initializers/mighty_grid_config.rb'
+      end
+
+      def copy_locale_file
+        copy_file '../../../../config/locales/en.yml', 'config/locales/mighty_grid.en.yml'
+      end
+    end
+  end
+end

data/lib/mighty_grid/base.rb

@@ -44,10 +44,10 @@ module MightyGrid
     def apply_filters
       filter_params.each do |filter_name, filter_value|
         next if filter_value.blank? || !klass.column_names.include?(filter_name)
-        if @filters.has_key?(filter_name.to_sym) && Array === @filters[filter_name.to_sym] ||
-          klass.columns_hash[filter_name].type == :boolean
+        field_type = klass.columns_hash[filter_name].type
+        if @filters.has_key?(filter_name.to_sym) && Array === @filters[filter_name.to_sym] || field_type == :boolean
           @relation = @relation.where(filter_name => filter_value)
-        elsif [:string, :text].include?(klass.columns_hash[filter_name].type)
+        elsif [:string, :text].include?(field_type)
           @relation = @relation.where("\"#{klass.table_name}\".\"#{filter_name}\" #{like_operator} ?", "%#{filter_value}%")
         end
       end

data/lib/mighty_grid/config.rb

@@ -1,6 +1,10 @@
 require 'active_support/configurable'
 
 module MightyGrid
+  # Configures global settings for MightyGrid
+  #   MightyGrid.configure do |config|
+  #     config.grid_name = 'g'
+  #   end
   def self.configure(&block)
     yield @config ||= MightyGrid::Configuration.new
   end

data/lib/mighty_grid/filter_renderer.rb

@@ -7,7 +7,8 @@ module MightyGrid
     end
 
     def label(name, content_or_options = nil, options = nil, &block)
-      label_tag(name, content_or_options, options, &block)
+      filter_name = @grid.get_filter_name(name).parameterize('_')
+      label_tag(filter_name, content_or_options, options, &block)
     end
 
     def text_field(name, options={})
@@ -31,12 +32,14 @@ module MightyGrid
       check_box_tag(@grid.get_filter_name(name), value, checked, options)
     end
 
-    def submit(content = "Apply changes", options = {})
+    def submit(content = nil, options = {})
+      content = I18n.t("mighty_grid.filters.submit", default: 'Apply changes') if content.blank?
       options.merge!(type: :submit)
       content_tag(:button, content, options)
     end
 
-    def reset(content = "Reset changes", options = {})
+    def reset(content = nil, options = {})
+      content = I18n.t("mighty_grid.filters.reset", default: 'Reset changes') if content.blank?
       options.merge!(type: :reset)
       content_tag(:button, content, options)
     end

data/lib/mighty_grid/grid_renderer.rb

@@ -3,6 +3,7 @@ module MightyGrid
     attr_reader :columns, :th_columns, :total_columns, :blank_slate_handler
 
     def initialize(grid, view)
+      @grid = grid
       @columns = []
       @th_columns = []
       @blank_slate_handler = nil
@@ -16,7 +17,7 @@ module MightyGrid
         attribute = attr_or_options.to_sym
         options = {} unless options.is_a?(Hash)
         opts = {
-          title: attr_or_options.to_s.titleize,
+          title: @grid.klass.human_attribute_name(attribute),
           ordering: true,
           attribute: attribute
         }.merge!(options)
@@ -25,7 +26,7 @@ module MightyGrid
       @total_columns = @columns.count
     end
 
-    def blank_slate(html_or_opts, &block)
+    def blank_slate(html_or_opts = nil, &block)
       if (html_or_opts.is_a?(Hash) && html_or_opts.has_key?(:partial) || html_or_opts.is_a?(String)) && !block_given?
         @blank_slate_handler = html_or_opts
       elsif html_or_opts.nil? && block_given?

data/lib/mighty_grid/helpers/mighty_grid_view_helpers.rb

@@ -36,6 +36,7 @@ module MightyGrid
       grid.output_buffer.html_safe
     end
 
+    # Creates a form to filter the data in the target grid.
     def mighty_filter_for(grid, options={}, &block)
       html_options = options[:html] ||= {}
       html_options = MightyGrid::MgHTML.join_html_classes(html_options, 'mighty-grid-filter')

data/lib/mighty_grid/version.rb

@@ -1,3 +1,3 @@
 module MightyGrid
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/mighty_grid.rb

@@ -14,7 +14,7 @@ require 'mighty_grid/helpers/mighty_grid_view_helpers'
 require 'mighty_grid/mighty_grid_controller'
 
 # GENERATORS
-require 'generators/mighty_grid/config_generator'
+require 'generators/mighty_grid/install_generator'
 
 require 'mighty_grid/engine'
 require 'mighty_grid/base'

data/spec/fake_app/rails_app.rb

@@ -29,11 +29,7 @@ class ApplicationController < ActionController::Base; end
 class ProductsController < ApplicationController
   def index
     @products_grid = init_grid(Product)
-    render :inline => <<-ERB
-<%= grid @products_grid do |g| %>
-<% g.column :name %>
-<% end %>
-ERB
+    render 'spec/fake_app/views/index', layout: false
   end
 end
 

data/spec/fake_app/views/index.html.erb

@@ -0,0 +1,8 @@
+<%= mighty_filter_for @products_grid do |filter| %>
+  <%= filter.text_field :name %>
+  <%= filter.submit %>
+<% end %>
+
+<%= grid @products_grid do |g| %>
+<% g.column :name %>
+<% end %>

data/spec/lib/base_spec.rb

@@ -110,4 +110,16 @@ describe MightyGrid::Base do
     after(:all){ @controller.params = {} }
   end
 
+  describe '#like_operator' do
+    subject { MightyGrid::Base.new(Product, @controller) }
+    context "when DB is #{ENV['DB']}" do
+      case ENV['DB']
+        when 'postgresql'
+          it{ subject.like_operator.should == 'ILIKE' }
+        when 'sqlite', 'mysql'
+          it{ subject.like_operator.should == 'LIKE' }
+      end
+    end
+  end
+
 end

data/spec/lib/generators/{config_generator_spec.rb → install_generator_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 require "generator_spec"
 
-describe MightyGrid::Generators::ConfigGenerator do
+describe MightyGrid::Generators::InstallGenerator do
   destination File.expand_path("../../tmp", __FILE__)
 
   before(:all) do
@@ -13,4 +13,9 @@ describe MightyGrid::Generators::ConfigGenerator do
   it "creates config initializer" do
     assert_file "config/initializers/mighty_grid_config.rb"
   end
+
+  it "creates locale file" do
+    assert_file "config/locales/mighty_grid.en.yml"
+  end
+
 end

data/spec/requests/products_spec.rb

@@ -5,11 +5,27 @@ feature 'Product' do
 
   subject { page }
 
-  describe "Index Page" do
+  describe 'Index Page' do
     before { visit '/products' }
 
-    it { should have_selector('table.mighty-grid') }
-    it { should have_selector('ul.pagination') }
+    it { should have_selector 'form.mighty-grid-filter' }
+    it { should have_selector 'table.mighty-grid' }
+    it { should have_selector 'ul.pagination' }
+  end
+
+  scenario 'filtering by fields' do
+    visit '/products'
+
+    product_name = Product.first.name
+    
+    within '.mighty-grid-filter' do
+      fill_in "grid_f_name", :with => product_name
+    end
+
+    click_button "Apply changes"
+
+    expect(page).to have_content product_name
+    expect(page).to have_content '1 of 1'
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mighty_grid
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - jurrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,10 +102,11 @@ files:
 - app/views/kaminari/mighty_grid/_page.html.erb
 - app/views/kaminari/mighty_grid/_paginator.html.erb
 - app/views/kaminari/mighty_grid/_prev_page.html.erb
+- config/locales/en.yml
 - gemfiles/rails_32.gemfile
 - gemfiles/rails_40.gemfile
 - gemfiles/rails_41.gemfile
-- lib/generators/mighty_grid/config_generator.rb
+- lib/generators/mighty_grid/install_generator.rb
 - lib/generators/mighty_grid/templates/mighty_grid_config.rb
 - lib/mighty_grid.rb
 - lib/mighty_grid/base.rb
@@ -126,9 +127,10 @@ files:
 - spec/fake_app/models/active_record.rb
 - spec/fake_app/models/config.rb
 - spec/fake_app/rails_app.rb
+- spec/fake_app/views/index.html.erb
 - spec/lib/base_spec.rb
 - spec/lib/column_spec.rb
-- spec/lib/generators/config_generator_spec.rb
+- spec/lib/generators/install_generator_spec.rb
 - spec/requests/products_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
@@ -165,9 +167,10 @@ test_files:
 - spec/fake_app/models/active_record.rb
 - spec/fake_app/models/config.rb
 - spec/fake_app/rails_app.rb
+- spec/fake_app/views/index.html.erb
 - spec/lib/base_spec.rb
 - spec/lib/column_spec.rb
-- spec/lib/generators/config_generator_spec.rb
+- spec/lib/generators/install_generator_spec.rb
 - spec/requests/products_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb

data/lib/generators/mighty_grid/config_generator.rb

@@ -1,16 +0,0 @@
-module MightyGrid
-  module Generators
-    class ConfigGenerator < Rails::Generators::Base
-      source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-
-      desc <<DESC
-Description:
-    Copies MightyGrid configuration file to your application's initializer directory.
-DESC
-
-      def copy_config_file
-        template 'mighty_grid_config.rb', 'config/initializers/mighty_grid_config.rb'
-      end
-    end
-  end
-end