mighty_grid 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7f9c3fe294d2ca3e018c9423d017080db7f0672
-  data.tar.gz: b4ee536a54684468aecaaa5637f6d95e026f2ae0
+  metadata.gz: db3be8e4ea2ceb7203c275271ab2d2f0f13b97c1
+  data.tar.gz: d31f8201be065f8ec4df6578fe31ed874e58c404
 SHA512:
-  metadata.gz: 65b8a28c2bef8f954d51dde1fc7f926ddd7952bb39aea2e7e14016d033cfb2a3d1a9f9e21995b59191904139221f34e6bd75fcd88814099ccd59563c5338e4c5
-  data.tar.gz: 1ca07348c0c9bca8cd89f9e0aa142717554ad9f5c7ba1b7bf94a0ef42a343dcb8b625ffab72d4e89a5a506de10f6000f8ff303989dfb4119d4754e7116dab04b
+  metadata.gz: 5e2284003412c988caa41624d339790fb8d675e48abf96df115f128bedc7a51055ec0fd75942708b12e2d006dfacdb2f8913dbb8f06703799eb100fad8d0341b
+  data.tar.gz: 1e953d518c34a8542c6047c6371ae10c8fa3de792d345dc18555f506ebed6fcce499a9b438c6bfb20ba847d880f70515b4a79ff67c1d769d58701d9bc05a3b9b

data/.gitignore

@@ -16,4 +16,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-log
+log
+spec/fake_app/config/*.yml

data/.travis.yml

@@ -6,6 +6,16 @@ rvm:
 
 script: bundle exec rake spec
 
+before_script:
+  - cp spec/fake_app/config/database.yml.example spec/fake_app/config/database.yml
+  - mysql -e 'create database mg_test'
+  - psql -c 'create database mg_test' -U postgres
+
+env:
+  - DB=sqlite
+  - DB=mysql
+  - DB=postgresql
+
 gemfile:
   - gemfiles/rails_32.gemfile
   - gemfiles/rails_40.gemfile
@@ -13,4 +23,5 @@ gemfile:
 
 addons:
   code_climate:
-    repo_token: 47bc411a11ccfed015bf25395d8204600c899e530c1c4beed1b7197aa61c6fb6
+    repo_token: 47bc411a11ccfed015bf25395d8204600c899e530c1c4beed1b7197aa61c6fb6
+  postgresql: "9.3"

data/Gemfile

@@ -5,8 +5,11 @@ gemspec
 group :test do
   gem 'sqlite3'
   gem "generator_spec"
-  gem 'coveralls', require: false
-  gem "codeclimate-test-reporter", require: nil
   gem 'capybara'
   gem 'database_cleaner'
+
+  gem 'coveralls', require: false
+  gem "codeclimate-test-reporter", require: nil
+  gem 'pg', require: false
+  gem 'mysql2', require: false
 end

data/gemfiles/rails_32.gemfile

@@ -8,10 +8,12 @@ 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"
+  gem "coveralls", :require => false
+  gem "codeclimate-test-reporter", :require => nil
+  gem "pg", :require => false
+  gem "mysql2", :require => false
 end
 
 gemspec :path => "../"

data/gemfiles/rails_40.gemfile

@@ -8,10 +8,12 @@ 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"
+  gem "coveralls", :require => false
+  gem "codeclimate-test-reporter", :require => nil
+  gem "pg", :require => false
+  gem "mysql2", :require => false
 end
 
 gemspec :path => "../"

data/gemfiles/rails_41.gemfile

@@ -8,10 +8,12 @@ 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"
+  gem "coveralls", :require => false
+  gem "codeclimate-test-reporter", :require => nil
+  gem "pg", :require => false
+  gem "mysql2", :require => false
 end
 
 gemspec :path => "../"

data/lib/mighty_grid/base.rb

@@ -11,9 +11,11 @@ module MightyGrid
       @filters = {}
 
       @options = {
-        page: 1,
-        per_page: MightyGrid.config.per_page,
-        name: MightyGrid.config.grid_name
+        :page     => 1,
+        :per_page => MightyGrid.config.per_page,
+        :name     => MightyGrid.config.grid_name,
+        :include  => nil,
+        :joins    => nil,
       }
 
       opts.assert_valid_keys(@options.keys)
@@ -32,7 +34,11 @@ 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])
+      @relation = @relation.
+                    page(@mg_params[:page]).
+                    per(@mg_params[:per_page]).
+                    includes(@options[:include]).
+                    joins(@options[:joins])
     end
 
     def apply_filters

data/lib/mighty_grid/version.rb

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

data/spec/fake_app/config/database.yml.example

@@ -0,0 +1,14 @@
+sqlite: 
+  adapter: sqlite3
+  database: ':memory:'
+  timeout: 500
+
+mysql:
+  adapter: mysql2
+  database: 'mg_test'
+  username: root
+
+postgresql:
+  adapter: postgresql
+  database: 'mg_test'
+  username: postgres

data/spec/fake_app/models/active_record.rb

@@ -1,11 +1,22 @@
 # MODELS
 class Product < ActiveRecord::Base
+  belongs_to :company
+end
+
+class Company < ActiveRecord::Base
+  has_many :products
 end
 
 # MIGRATIONS
 class CreateAllTables < ActiveRecord::Migration
   def self.up
-    create_table(:products) { |t| t.string :name; t.text :description }
+    create_table(:products) { |t| t.string :name; t.text :description; t.integer :company_id }
+    create_table(:companies) { |t| t.string :name; t.text :description }
+  end
+
+  def self.down
+    drop_table :products
+    drop_table :companies
   end
 end
 

data/spec/fake_app/models/config.rb

@@ -1,2 +1,5 @@
-ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
-ActiveRecord::Base.establish_connection(:test)
+configs = YAML.load_file('spec/fake_app/config/database.yml')
+ActiveRecord::Base.configurations = configs
+
+db_name = ENV['DB'] || 'sqlite'
+ActiveRecord::Base.establish_connection(db_name)

data/spec/lib/base_spec.rb

@@ -5,7 +5,7 @@ describe MightyGrid::Base do
   before(:all) do
     @controller = ActionView::TestCase::TestController.new
 
-    @default_options = {page: 1, per_page: 15, name: 'grid'}
+    @default_options = {page: 1, per_page: 15, name: 'grid', :include => nil, joins: nil}
   end
 
   describe '#new' do

data/spec/support/database_cleaner.rb

@@ -10,4 +10,8 @@ RSpec.configure do |config|
   config.after :each do
     DatabaseCleaner.clean
   end
+
+  config.after :suite do
+    CreateAllTables.down
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mighty_grid
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - jurrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,7 @@ files:
 - lib/mighty_grid/version.rb
 - mighty_grid.gemspec
 - spec/config_spec.rb
+- spec/fake_app/config/database.yml.example
 - spec/fake_app/models/active_record.rb
 - spec/fake_app/models/config.rb
 - spec/fake_app/rails_app.rb
@@ -160,6 +161,7 @@ specification_version: 4
 summary: Flexible grid for Rails
 test_files:
 - spec/config_spec.rb
+- spec/fake_app/config/database.yml.example
 - spec/fake_app/models/active_record.rb
 - spec/fake_app/models/config.rb
 - spec/fake_app/rails_app.rb