datagrid 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b69adb5df9eebf47a8446dd095c6b966b635649
-  data.tar.gz: 576710b7d11168fcde29d19eddc77f730b94fd43
+  metadata.gz: 2a4a2eb29ee46c28e9a999c0344f1b7552259e1b
+  data.tar.gz: 758b66ea4521616cbb3dc76ac959a228446c33c6
 SHA512:
-  metadata.gz: 74512141aa0e4dd111ed9dea6783f562c71f509ae45b7a81395371b716331d75a5a95383e2157858c1555f7183de042f33143286eadef72a17db72dba9a83d3f
-  data.tar.gz: 79d7d6e111160e03a1df224be0c3f8263cf968dc2d2266a1c3ca5a2f495adf9c0edb0f71d62e5428953f380b5b4fd3c1594848c7a89f03a41a40227f60b9a7d9
+  metadata.gz: 6232d055d5c2b037a18007ac3e77ec1423863da9a8e0085420a49d4275459c3d3e68f0451c285941d14cae0741ceadc6a62d866d279cd39d5db6bcc52a02969e
+  data.tar.gz: 8b06d12a459dd0a8cd2115d1c8721f5676859d747fc08cd890c748fb2949f8b4177050379ac040caf5b16883960f6e39f2729be22074f9b5e2670ba594aa972d

data/Gemfile

@@ -9,7 +9,7 @@ group :development do
 
 
   gem "debugger", :platform => :ruby_19
-  gem "byebug", :platform => [:ruby_20, :ruby_21, :ruby_22] & Bundler::Dsl::VALID_PLATFORMS
+  gem "byebug", :platform => [:ruby_20, :ruby_21, :ruby_22, :ruby_23] & Bundler::Dsl::VALID_PLATFORMS
 
   gem "rspec", ">= 3"
   gem "nokogiri" # used to test html output

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/datagrid.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: datagrid 1.4.2 ruby lib
+# stub: datagrid 1.4.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "datagrid"
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Bogdan Gusiev"]
-  s.date = "2016-03-08"
+  s.date = "2016-03-31"
   s.description = "This allows you to easily build datagrid aka data tables with sortable columns and filters"
   s.email = "agresso@gmail.com"
   s.extra_rdoc_files = [
@@ -129,7 +129,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/bogdan/datagrid"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.4.7"
   s.summary = "Ruby gem to create datagrids"
 
   if s.respond_to? :specification_version then

data/lib/datagrid/column_names_attribute.rb

@@ -42,15 +42,15 @@ module Datagrid
       super(*column_names)
     end
 
-    # Returns a list of columns with <tt>:mandatory => true</tt> option
+    # Returns a list of enabled columns with <tt>:mandatory => true</tt> option
     # If no mandatory columns specified than all of them considered mandatory
     def mandatory_columns
-      columns_array.select(&:mandatory?)
+      available_columns.select {|c| c.mandatory? }
     end
 
-    # Returns a list of columns without <tt>:mandatory => true</tt> option
+    # Returns a list of enabled columns without <tt>:mandatory => true</tt> option
     def optional_columns
-      columns_array - mandatory_columns
+      available_columns - mandatory_columns
     end
 
     protected

data/lib/datagrid/scaffold.rb

@@ -1,11 +1,19 @@
 require "rails/generators"
 
 class Datagrid::Scaffold < Rails::Generators::NamedBase
+
+  include Rails::Generators::ResourceHelpers
+
+  check_class_collision :suffix => "Grid"
   source_root File.expand_path(__FILE__ + "/../../../templates")
 
   def create_scaffold
     template "grid.rb.erb", "app/grids/#{grid_class_name.underscore}.rb"
-    template "controller.rb.erb", "app/controllers/#{grid_controller_name.underscore}.rb"
+    if File.exists?(grid_controller_file)
+      inject_into_file grid_controller_file, index_action, :after => %r{class .*#{grid_controller_name}.*\n}
+    else
+      template "controller.rb.erb", grid_controller_file
+    end
     template "index.html.erb", "app/views/#{grid_controller_short_name}/index.html.erb"
     route("resources :#{grid_controller_short_name}")
     unless defined?(::Kaminari) || defined?(::WillPaginate)
@@ -28,11 +36,15 @@ class Datagrid::Scaffold < Rails::Generators::NamedBase
   def grid_class_name
     file_name.camelize.pluralize + "Grid"
   end
-  
+
   def grid_controller_name
     grid_controller_short_name.camelize + "Controller"
   end
 
+  def grid_controller_file
+    Rails.root.join("app/controllers/#{grid_controller_name.underscore}.rb")
+  end
+
   def grid_controller_short_name
     file_name.underscore.pluralize
   end
@@ -41,14 +53,10 @@ class Datagrid::Scaffold < Rails::Generators::NamedBase
     file_name.camelize.singularize
   end
 
-  def grid_ivar_name
+  def grid_param_name
     grid_class_name.underscore
   end
 
-  def paginate_code
-    "page(params[:page])"
-  end
-
   def pagination_helper_code
     if defined?(::WillPaginate)
       "will_paginate(@grid.assets)"
@@ -63,4 +71,14 @@ class Datagrid::Scaffold < Rails::Generators::NamedBase
     grid_controller_short_name + "_path"
   end
 
+  def index_action
+    indent(<<-RUBY)
+def index
+  @grid = #{grid_class_name}.new(params[:#{grid_param_name}]) do |scope|
+    scope.page(params[:page])
+  end
+end
+RUBY
+  end
+
 end

data/spec/datagrid/column_names_attribute_spec.rb

@@ -63,4 +63,24 @@ describe Datagrid::ColumnNamesAttribute do
     end
 
   end
+
+  context "when some columns are disabled" do
+    subject do
+      test_report do
+        scope {Entry}
+        column(:id, :mandatory => true)
+        column(:name)
+        column(:category, if: proc { false })
+        column(:group, :mandatory => true, if: proc { false })
+      end
+    end
+
+    it "excludes them from mandatory_columns" do
+      expect(subject.mandatory_columns.map(&:name)).to eq([:id])
+    end
+
+    it "excludes them from optional_columns" do
+      expect(subject.optional_columns.map(&:name)).to eq([:name])
+    end
+  end
 end

data/spec/datagrid/scaffold_spec.rb

@@ -1,30 +1,39 @@
 require 'spec_helper'
 
 describe Datagrid::Scaffold do
-  subject { Datagrid::Scaffold.new([""]) }
+  subject { Datagrid::Scaffold.new(["user"]) }
 
-  describe '.paginate_code' do
-    it 'should fall through options successfully' do
-      expect(subject.paginate_code).to eql('page(params[:page])')
-    end
-  end
 
   describe '.pagination_helper_code' do
-    it 'should fall through options successfully' do
+    it 'uses kaminari by default' do
       expect(subject.pagination_helper_code).to eql('paginate(@grid.assets)')
     end
 
-    context "when Kaminari exists" do
+    context "when WillPaginate exists" do
       before(:each) do
-        Object.const_set("Kaminari", 1)
+        Object.const_set("WillPaginate", 1)
       end
-      it 'should fall through options successfully' do
-        expect(subject.pagination_helper_code).to eql('paginate(@grid.assets)')
+      it 'uses willpaginate' do
+        expect(subject.pagination_helper_code).to eql('will_paginate(@grid.assets)')
       end
 
       after(:each) do
-        Object.send(:remove_const, "Kaminari")
+        Object.send(:remove_const, "WillPaginate")
       end
     end
   end
+
+  describe ".index_action" do
+
+    it "works" do
+      expect(subject.index_action).to eq(<<-RUBY)
+  def index
+    @grid = UsersGrid.new(params[:users_grid]) do |scope|
+      scope.page(params[:page])
+    end
+  end
+RUBY
+    end
+
+  end
 end

data/templates/controller.rb.erb

@@ -1,10 +1,6 @@
 class <%= grid_controller_name %> < ApplicationController
 
-  def index
-    @grid = <%= grid_class_name %>.new(params[:<%= grid_ivar_name %>]) do |scope|
-      scope.<%= paginate_code %>
-    end
-  end
+<%= index_action -%>
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datagrid
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Bogdan Gusiev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -328,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Ruby gem to create datagrids