mighty_grid 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a9d936cc145275674c22df2de88c431524ae5b
-  data.tar.gz: 4e6db4d74e7ba04cdda5562d819a94d23982b8c1
+  metadata.gz: 471b2069ac7d3edef74750b36042b2a03211677d
+  data.tar.gz: 4ef8c26232ba12dc5e82422ffaa7512bb3817a73
 SHA512:
-  metadata.gz: f037624c6a4f702cc5fa535eb774fdfa9a6cb2fc1cb2c623d734e202c87ef1be3c2fb2234e7c69c3c93de68ea899094ca8602218d9ac821b3beeaeb84768b6ac
-  data.tar.gz: 27beaa0e88adbe6ca4108b74aa6c49ac16b070173b7a45de5cc0d232248c2c6a1cf85cdb040a28dcf304755586de2e7988ba587c13e27a1637aa379daacc1872
+  metadata.gz: 25e7294b0ef6daffd9b0b6f20bc227ff7b1931b50f9522bb8795d2e354f8cd6f84480fa9180da24c1dc54c0e0779373c1a2fec44ec455be65698caef0da738f9
+  data.tar.gz: 51dfc0a4927e00f0c441e5ae996c8bdc5d86d239784cb0aac80927821b4cfe274cba26a946cba1573b685db2d97842284c91a7f5909904a334c1949097de3e18

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+log

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--format documentation

data/.travis.yml

@@ -4,9 +4,12 @@ rvm:
   - 2.0.0
   - 2.1.1
 
-script: bundle exec rspec spec
+script: bundle exec rake spec
+
+env:
+  CODECLIMATE_REPO_TOKEN: 47bc411a11ccfed015bf25395d8204600c899e530c1c4beed1b7197aa61c6fb6
 
 gemfile:
-  - gemfiles/3.2.gemfile
-  - gemfiles/4.0.gemfile
-  - gemfiles/4.1.gemfile
+  - gemfiles/rails_32.gemfile
+  - gemfiles/rails_40.gemfile
+  - gemfiles/rails_41.gemfile

data/Appraisals

@@ -1,14 +1,14 @@
-appraise "3.2" do
+appraise "rails_32" do
   gem "rails", "~> 3.2.15"
-  gem "mighty_grid", :path => "../"
+  gem "activerecord", "~> 3.2.15", require: 'active_record'
 end
 
-appraise "4.0" do
+appraise "rails_40" do
   gem "rails", "~> 4.0.0"
-  gem "mighty_grid", :path => "../"
+  gem "activerecord", "~> 4.0.0", require: 'active_record'
 end
 
-appraise "4.1" do
-  gem "rails", "~> 4.1.0.beta"
-  gem "mighty_grid", :path => "../"
+appraise "rails_41" do
+  gem "rails", "~> 4.1.0"
+  gem "activerecord", "~> 4.1.0", require: 'active_record'
 end

data/Gemfile

@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
+  gem 'sqlite3'
   gem "generator_spec"
   gem 'coveralls', require: false
+  gem "codeclimate-test-reporter", require: nil
+  gem 'capybara'
+  gem 'database_cleaner'
 end

data/README.md

@@ -1,11 +1,6 @@
-# MightyGrid
+# MightyGrid [![Gem Version](http://img.shields.io/gem/v/mighty_grid.svg)](http://badge.fury.io/rb/mighty_grid) [![Build Status](https://travis-ci.org/jurrick/mighty_grid.svg?branch=master)](https://travis-ci.org/jurrick/mighty_grid) [![Code Climate](https://codeclimate.com/github/jurrick/mighty_grid.png)](https://codeclimate.com/github/jurrick/mighty_grid) [![Inline docs](http://inch-pages.github.io/github/jurrick/mighty_grid.png)](http://inch-pages.github.io/github/jurrick/mighty_grid)
 
-MightyGrid is a flexible grid solution for Rails.
-
-[![Gem Version](https://badge.fury.io/rb/mighty_grid.svg)](http://badge.fury.io/rb/mighty_grid)
-[![Build Status](https://travis-ci.org/jurrick/mighty_grid.svg?branch=master)](https://travis-ci.org/jurrick/mighty_grid)
-[![Coverage Status](https://coveralls.io/repos/jurrick/mighty_grid/badge.png)](https://coveralls.io/r/jurrick/mighty_grid)
-[![Inline docs](http://inch-pages.github.io/github/jurrick/mighty_grid.png)](http://inch-pages.github.io/github/jurrick/mighty_grid)
+MightyGrid is a flexible grid solution for Ruby On Rails.
 
 ## Installation
 

data/Rakefile

@@ -1,6 +1,32 @@
+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|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
 desc 'Default: run unit tests.'
-task :default => []
+task :default => "spec:all"
+
+namespace :spec do
+  %w(rails_32 rails_40 rails_41).each do |gemfile|
+    desc "Run tests against #{gemfile}"
+    task gemfile do
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+    end
+  end
+
+  desc "Run all tests"
+  task :all do
+    %w(rails_32 rails_40 rails_41).each do |gemfile|
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
+    end
+  end
+end

data/gemfiles/{3.2.gemfile → rails_32.gemfile}

@@ -3,11 +3,15 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 3.2.15"
-gem "mighty_grid", :path => "../"
+gem "activerecord", "~> 3.2.15", :require => "active_record"
 
 group :test do
+  gem "sqlite3"
   gem "generator_spec"
   gem "coveralls", :require => false
+  gem "codeclimate-test-reporter", :require => nil
+  gem "capybara"
+  gem "database_cleaner"
 end
 
 gemspec :path => "../"

data/gemfiles/{4.0.gemfile → rails_40.gemfile}

@@ -3,11 +3,15 @@
 source "https://rubygems.org"
 
 gem "rails", "~> 4.0.0"
-gem "mighty_grid", :path => "../"
+gem "activerecord", "~> 4.0.0", :require => "active_record"
 
 group :test do
+  gem "sqlite3"
   gem "generator_spec"
   gem "coveralls", :require => false
+  gem "codeclimate-test-reporter", :require => nil
+  gem "capybara"
+  gem "database_cleaner"
 end
 
 gemspec :path => "../"

data/gemfiles/rails_41.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+gem "activerecord", "~> 4.1.0", :require => "active_record"
+
+group :test do
+  gem "sqlite3"
+  gem "generator_spec"
+  gem "coveralls", :require => false
+  gem "codeclimate-test-reporter", :require => nil
+  gem "capybara"
+  gem "database_cleaner"
+end
+
+gemspec :path => "../"

data/lib/mighty_grid/base.rb

@@ -78,7 +78,7 @@ module MightyGrid
     end
 
     def order_direction
-      (current_grid_params.has_key?('order_direction')) ? (['asc', 'desc'] - [current_grid_params['order_direction']]).first : MightyGrid.config.order_direction
+      (current_grid_params.has_key?('order_direction')) ? (['asc', 'desc'] - [current_grid_params['order_direction'].to_s]).first : MightyGrid.config.order_direction
     end
 
     def like_operator

data/lib/mighty_grid/helpers/mighty_grid_view_helpers.rb

@@ -16,50 +16,12 @@ module MightyGrid
       table_html_classes = ["mighty-grid"] + MightyGrid.config.table_class.split(' ')
       table_html_attrs[:class] = (table_html_classes + table_html_attrs[:class].split(' ')).reject(&:blank?).uniq.join(' ')
 
-      header_tr_html = options[:header_tr_html] || {}
-      header_tr_html[:class] ||= ''
-      header_tr_html_classes = MightyGrid.config.header_tr_class.split(' ')
-      header_tr_html[:class] = (header_tr_html_classes + header_tr_html[:class].split(' ')).reject(&:blank?).uniq.join(' ')
-
       grid.read
 
       grid.output_buffer = content_tag :table, table_html_attrs do
-        html = content_tag :thead do
-          content_tag :tr, header_tr_html do
-            rendering.columns.map { |column|
-              content_tag :th, column.th_attrs do
-                if column.options[:ordering]
-                  link_to(column.title, "?#{MightyGrid::MgHash.rec_merge(grid.params, {grid.name => {order: column.attribute, order_direction: grid.order_direction}}).except('controller', 'action').to_query}").html_safe
-                else
-                  column.title.html_safe
-                end
-              end
-            }.join.html_safe
-          end
-        end
-
-        html += content_tag :tfoot do
-          html_record = content_tag :tr do
-            content_tag :td, colspan: rendering.total_columns do
-              html_pag = paginate(grid.relation, theme: MightyGrid.config.pagination_theme, param_name: "#{grid.name}[page]")
-              html_pag += page_entries_info(grid.relation)
-              html_pag.html_safe
-            end
-          end
-
-          html_record.html_safe
-        end
-
-        html += content_tag :tbody do
-          html_record = ''
-          grid.relation.each do |rel|
-            html_record += content_tag :tr do
-              rendering.columns.map{|column| content_tag :td, column.render(rel), column.attrs}.join.html_safe
-            end
-          end
-          html_record.html_safe
-        end
-
+        html = header_grid_html(rendering, grid, options)
+        html += footer_grid_html(rendering, grid)
+        html += body_grid_html(rendering, grid)
         html
       end
 
@@ -71,6 +33,8 @@ module MightyGrid
 
     def mighty_filter_for(grid, options={}, &block)
       html_options = options[:html] ||= {}
+      html_options[:class] ||= ''
+      html_options[:class] = (['mighty-grid-filter'] + html_options[:class].split(' ')).reject(&:blank?).uniq.join(' ')
       html_options[:method] = options.delete(:method) if options.has_key?(:method)
       html_options[:method] ||= :get
 
@@ -80,5 +44,54 @@ module MightyGrid
       form_tag(options[:url] || {}, html_options){ output }
     end
 
+    def header_grid_html(rendering, grid, options)
+      header_tr_html = options[:header_tr_html] || {}
+      header_tr_html[:class] ||= ''
+      header_tr_html_classes = MightyGrid.config.header_tr_class.split(' ')
+      header_tr_html[:class] = (header_tr_html_classes + header_tr_html[:class].split(' ')).reject(&:blank?).uniq.join(' ')
+
+      content_tag :thead do
+        content_tag :tr, header_tr_html do
+          rendering.columns.map { |column|
+            content_tag :th, column.th_attrs do
+              if column.options[:ordering]
+                link_to(column.title, "?#{MightyGrid::MgHash.rec_merge(grid.params, {grid.name => {order: column.attribute, order_direction: grid.order_direction}}).except('controller', 'action').to_query}").html_safe
+              else
+                column.title.html_safe
+              end
+            end
+          }.join.html_safe
+        end
+      end
+    end
+
+    def body_grid_html(rendering, grid)
+      content_tag :tbody do
+        html_record = ''
+        grid.relation.each do |rel|
+          html_record += content_tag :tr do
+            rendering.columns.map{|column| content_tag :td, column.render(rel), column.attrs}.join.html_safe
+          end
+        end
+        html_record.html_safe
+      end
+    end
+
+    def footer_grid_html(rendering, grid)
+      content_tag :tfoot do
+        html_record = content_tag :tr do
+          content_tag :td, colspan: rendering.total_columns do
+            html_pag = paginate(grid.relation, theme: MightyGrid.config.pagination_theme, param_name: "#{grid.name}[page]")
+            html_pag += content_tag :strong do
+              "#{grid.relation.offset_value + 1} – #{grid.relation.offset_value + grid.relation.size} of #{grid.relation.total_count}".html_safe
+            end
+            html_pag.html_safe
+          end
+        end
+
+        html_record.html_safe
+      end
+    end
+
   end
 end

data/lib/mighty_grid/version.rb

@@ -1,3 +1,3 @@
 module MightyGrid
-  VERSION = "0.0.6"
+  VERSION = "0.1.0"
 end

data/lib/mighty_grid.rb

@@ -1,6 +1,7 @@
 module MightyGrid; end
 
 require 'action_view'
+require 'kaminari'
 
 require 'mighty_grid/version'
 require 'mighty_grid/config'
@@ -15,7 +16,5 @@ require 'mighty_grid/mighty_grid_controller'
 # GENERATORS
 require 'generators/mighty_grid/config_generator'
 
-require 'kaminari.rb'
-
 require 'mighty_grid/engine'
 require 'mighty_grid/base'

data/spec/fake_app/models/active_record.rb

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

data/spec/fake_app/models/config.rb

@@ -0,0 +1,2 @@
+ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+ActiveRecord::Base.establish_connection(:test)

data/spec/fake_app/rails_app.rb

@@ -0,0 +1,43 @@
+require 'action_controller/railtie'
+require 'action_view/railtie'
+
+require 'capybara/rspec'
+
+require 'fake_app/models/config'
+
+app = Class.new(Rails::Application)
+app.config.secret_token = '7295e7f2718c940f459e5062f575cd92'
+app.config.session_store :cookie_store, :key => '_myapp_session'
+app.config.active_support.deprecation = :log
+app.config.eager_load = false
+
+# Rais.root
+app.config.root = File.dirname(__FILE__)
+Rails.backtrace_cleaner.remove_silencers!
+app.initialize!
+
+# ROUTES
+app.routes.draw do
+  resources :products
+end
+
+# MODELS
+require 'fake_app/models/active_record'
+
+# CONTROLLERS
+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
+  end
+end
+
+# HELPERS
+Object.const_set(:ApplicationHelper, Module.new)
+
+Capybara.app = app

data/spec/lib/base_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+describe MightyGrid::Base do
+  
+  before(:all) do
+    @controller = ActionView::TestCase::TestController.new
+
+    @default_options = {page: 1, per_page: 15, name: 'grid'}
+  end
+
+  describe '#new' do
+    context 'by default' do
+      subject { MightyGrid::Base.new(Product, @controller) }
+      its(:params) { should == {} }
+      its(:options) { should == @default_options }
+      its(:mg_params) { should == @default_options }
+      its(:filters) { should == {} }
+      its(:name) { should == 'grid' }
+      its(:relation) { should == Product }
+      its(:klass) { should == Product }
+      its(:current_grid_params) { should == {} }
+      its(:order_direction) { should == MightyGrid.config.order_direction }
+      its(:filter_param_name) { should == 'f' }
+      context 'controller' do
+        it { instance_variable_get(:@controller).should == @controller }
+      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'} }
+    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'} }
+      after(:all){ @controller.params = {} }
+    end
+
+    context 'with bad options' do
+      it { expect{MightyGrid::Base.new(Product, @controller, bad_option: 123)}.to raise_error(ArgumentError) }
+    end
+  end
+
+  describe '#get_current_grid_param' do
+    before(:all){ @controller.params = {'grid'=>{per_page: 30}} }
+    subject { MightyGrid::Base.new(Product, @controller).get_current_grid_param(:per_page) }
+    it { should == 30 }
+  end
+
+end

data/spec/requests/products_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+feature 'Product' do
+  background { 1.upto(100) {|i| Product.create! :name => "product#{'%03d' % i}" } }
+
+  subject { page }
+
+  describe "Index Page" do
+    before { visit '/products' }
+
+    it { should have_selector('table.mighty-grid') }
+    it { should have_selector('ul.pagination') }
+  end
+
+end

data/spec/spec_helper.rb

@@ -13,14 +13,18 @@ Bundler.require
 require 'coveralls'
 Coveralls.wear!
 
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
+if defined? Rails
+  require 'fake_app/rails_app'
+  require 'rspec-rails'
+end
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
 end

data/spec/support/capybara.rb

@@ -0,0 +1,10 @@
+require 'capybara/rspec'
+require 'capybara/dsl'
+
+RSpec.configure do |config|
+  config.include Capybara::DSL
+end
+
+Capybara.configure do |config|
+  config.run_server = false
+end

data/spec/support/database_cleaner.rb

@@ -0,0 +1,13 @@
+require 'database_cleaner'
+
+RSpec.configure do |config|
+  config.before :suite do
+    DatabaseCleaner.clean_with :truncation
+  end
+  config.before :each do
+    DatabaseCleaner.start
+  end
+  config.after :each do
+    DatabaseCleaner.clean
+  end
+end

data/vendor/assets/javascripts/mighty_grid.js.coffee

@@ -0,0 +1,6 @@
+$ ->
+  $(document).on 'reset', '.mighty-grid-filter', (e) ->
+    $(e.target).find('[type="hidden"].clear_required').val('')
+    url = window.location.href.split('?')
+    if url.length > 1
+      window.location.replace(url[0])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mighty_grid
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - jurrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-27 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -102,9 +102,9 @@ 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
-- gemfiles/3.2.gemfile
-- gemfiles/4.0.gemfile
-- gemfiles/4.1.gemfile
+- gemfiles/rails_32.gemfile
+- gemfiles/rails_40.gemfile
+- gemfiles/rails_41.gemfile
 - lib/generators/mighty_grid/config_generator.rb
 - lib/generators/mighty_grid/templates/mighty_grid_config.rb
 - lib/mighty_grid.rb
@@ -122,9 +122,16 @@ files:
 - lib/mighty_grid/version.rb
 - mighty_grid.gemspec
 - spec/config_spec.rb
+- spec/fake_app/models/active_record.rb
+- spec/fake_app/models/config.rb
+- spec/fake_app/rails_app.rb
+- spec/lib/base_spec.rb
 - spec/lib/generators/config_generator_spec.rb
-- spec/mighty_grid_spec.rb
+- spec/requests/products_spec.rb
 - spec/spec_helper.rb
+- spec/support/capybara.rb
+- spec/support/database_cleaner.rb
+- vendor/assets/javascripts/mighty_grid.js.coffee
 - vendor/assets/stylesheets/mighty_grid.css
 homepage: http://github.com/jurrick/mighty_grid
 licenses:
@@ -152,6 +159,12 @@ specification_version: 4
 summary: Flexible grid for Rails
 test_files:
 - spec/config_spec.rb
+- spec/fake_app/models/active_record.rb
+- spec/fake_app/models/config.rb
+- spec/fake_app/rails_app.rb
+- spec/lib/base_spec.rb
 - spec/lib/generators/config_generator_spec.rb
-- spec/mighty_grid_spec.rb
+- spec/requests/products_spec.rb
 - spec/spec_helper.rb
+- spec/support/capybara.rb
+- spec/support/database_cleaner.rb

data/gemfiles/4.1.gemfile

@@ -1,13 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.1.0.beta"
-gem "mighty_grid", :path => "../"
-
-group :test do
-  gem "generator_spec"
-  gem "coveralls", :require => false
-end
-
-gemspec :path => "../"

data/spec/mighty_grid_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe MightyGrid::Base do
-  
-  # it { pending }
-
-end