mighty_grid 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e08e21c7f221bea010b0122ccf6e2063ca5183b
-  data.tar.gz: 2a51d49c0f285e2a80ca07fa93e070f93d422588
+  metadata.gz: 7d3d1e2a4aa491cd41cb2ab49f395647aa281538
+  data.tar.gz: 08344ab81f0419c86511071fea30144dc21ba192
 SHA512:
-  metadata.gz: eb31c9ab5787ccf06f65f4c90db91cf0fbb5f5f768b4406c36a3fe3aba07437751fbb79139f52eacc86fb3a80bd87e70bdd32ff169b98b708f4060b82e6a7d1e
-  data.tar.gz: 71124468f6649987aca7fee50dc2fb9bf045298b2ff30a971d2bab67043df808c6c5a1d21fc91bbd64de901fe74769043ae51bfa78d2462cd779b911a3a80b59
+  metadata.gz: 7f4025181acf0ca7074b0c55fc9a12e2b065f4352019e0806cecb1bc27b418f12a3a811067b834feb7c88802d63934f85f826b96d53c6426db8f7d95f79b3f51
+  data.tar.gz: e0fba9c3e9be9f0c641dce7c03e5d67688efd01f1c83f710f1e35f5cf932935210f4842b93cb782653ee7722f73c0f6ae3a087d962b647f36f65d47cd2d6ec31

data/app/views/kaminari/mighty_grid/_gap.html.erb

@@ -0,0 +1,3 @@
+<li class="disabled">
+  <%= link_to raw(t 'views.pagination.truncate'), '#' %>
+</li>

data/app/views/kaminari/mighty_grid/_next_page.html.erb

@@ -0,0 +1,3 @@
+<li>
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+</li>

data/app/views/kaminari/mighty_grid/_page.html.erb

@@ -0,0 +1,3 @@
+<li class="<%= 'active' if page.current? %>">
+  <%= link_to page, page.current? ? '#' : url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/app/views/kaminari/mighty_grid/_paginator.html.erb

@@ -0,0 +1,15 @@
+<%= paginator.render do -%>
+    <ul class="pagination pagination-sm pull-right">
+      <%= first_page_tag unless current_page.first? %>
+      <%= prev_page_tag unless current_page.first? %>
+      <% each_page do |page| -%>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end -%>
+      <% end -%>
+      <%= next_page_tag unless current_page.last? %>
+      <%= last_page_tag unless current_page.last? %>
+    </ul>
+<% end -%>

data/app/views/kaminari/mighty_grid/_prev_page.html.erb

@@ -0,0 +1,3 @@
+<li>
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</li>

data/lib/mighty_grid.rb

@@ -1,11 +1,14 @@
 require 'mighty_grid/version'
+require 'mighty_grid/mighty_grid_ext'
 require 'mighty_grid/column'
 require 'mighty_grid/grid_renderer'
 require 'mighty_grid/helpers/mighty_grid_view_helpers'
 require 'mighty_grid/mighty_grid_controller'
 
+require 'kaminari.rb'
+
 module MightyGrid
-  # Your code goes here...
+
   class MightyGridEngine < ::Rails::Engine
     initializer 'mighty_grid_railtie.configure_rails_initialization' do |app|
 
@@ -15,6 +18,9 @@ module MightyGrid
 
       ActiveSupport.on_load :action_view do
         ::ActionView::Base.class_eval { include MightyGrid::GridViewHelper }
+
+        # It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
+        require 'mighty_grid/kaminari_monkey_patching'
       end
 
     end
@@ -22,18 +28,55 @@ module MightyGrid
 
   class Base
 
-    attr_reader :klass, :relation
-
+    attr_reader :klass, :name, :relation, :options, :mg_params
     attr_accessor :output_buffer
 
     def initialize(klass_or_relation, controller, opts = {})  #:nodoc:
       @controller = controller
 
+      @options = {
+        page: 1,
+        per_page: 10,
+        name: 'grid'
+      }
+
+      opts.assert_valid_keys(@options.keys)
+      @options.merge!(opts)
+
+      @name = @options[:name].to_s
+
+      load_grid_params
+
       @relation = klass_or_relation
 
       @klass = klass_or_relation.is_a?(ActiveRecord::Relation) ? klass_or_relation.klass : klass_or_relation
 
     end
 
+    def read
+      @relation = @relation.order(@mg_params[:order] => @mg_params[:order_direction].to_sym) if @mg_params[:order].present? && @mg_params[:order_direction].present?
+      @relation = @relation.page(@mg_params[:page]).per(@mg_params[:per_page])
+    end
+
+    def params
+      @controller.params
+    end
+
+    def load_grid_params
+      @mg_params = {}
+      @mg_params.merge!(@options)
+      if current_grid_params
+        @mg_params.merge!(current_grid_params.symbolize_keys)
+      end
+    end
+
+    def current_grid_params
+      params[name] || {}
+    end
+
+    def order_direction
+      (current_grid_params.has_key?('order_direction')) ? (['asc', 'desc'] - [current_grid_params['order_direction']]).first : 'asc'
+    end
+
   end
 end

data/lib/mighty_grid/column.rb

@@ -1,19 +1,26 @@
 module MightyGrid
   class Column
 
-    attr_reader :display_property
-    attr_accessor :render_value, :attrs
+    attr_reader :display_property, :attribute, :attrs, :th_attrs, :options, :title
+    attr_accessor :render_value
 
     def initialize(attr_or_options=nil, options=nil, &block)
       @attrs = {}
       if block_given?
+        @options = attr_or_options
         @display_property = :block
         @render_value = block
-        @attrs = attr_or_options[:html] if attr_or_options && attr_or_options.has_key?(:html)
+        @attrs = options[:html] if options && options.has_key?(:html)
+        @th_attrs = options[:th_html] if options && options.has_key?(:th_html)
+        @title = options[:title] || ''
       else
+        @options = options
+        @attribute = attr_or_options
         @display_property = :attr
-        @render_value = attr_or_options
+        @render_value = attribute
         @attrs = options[:html] if options && options.has_key?(:html)
+        @th_attrs = options[:th_html] if options && options.has_key?(:th_html)
+        @title = options[:title] || ''
       end
     end
 

data/lib/mighty_grid/grid_renderer.rb

@@ -1,6 +1,6 @@
 module MightyGrid
   class GridRenderer
-    attr_reader :columns, :th_columns
+    attr_reader :columns, :th_columns, :total_columns
 
     def initialize(grid, view)
       @columns = []
@@ -10,14 +10,18 @@ module MightyGrid
     def column(attr_or_options = {}, options=nil, &block)
       if block_given?
         options = attr_or_options.symbolize_keys
-        @th_columns << {title: options[:title], html: options[:th_html]}
-        @columns << MightyGrid::Column.new(options[:html], &block)
+        @columns << MightyGrid::Column.new(options, &block)
       else
-        @columns << MightyGrid::Column.new(attr_or_options, options)
-        th_column = {title: attr_or_options.to_s.titleize}
-        th_column[:html] = options ? options[:th_html] : {}
-        @th_columns << th_column
+        attribute = attr_or_options.to_sym
+        options = {} unless options.is_a?(Hash)
+        opts = {
+          title: attr_or_options.to_s.titleize,
+          ordering: true,
+          attribute: attribute
+        }.merge!(options)
+        @columns << MightyGrid::Column.new(attribute, opts)
       end
+      @total_columns = @columns.count
     end
   end
 end

data/lib/mighty_grid/helpers/mighty_grid_view_helpers.rb

@@ -12,15 +12,39 @@ module MightyGrid
       block.call(rendering)
 
       table_html_attrs = options[:html] || {}
+      table_html_attrs[:class] += ' mighty-grid'
+
       header_tr_html = options[:header_tr_html] || {}
 
+      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.th_columns.map{|column| content_tag :th, column[:title], column[:html]}.join.html_safe
+            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: 'mighty_grid', 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|
@@ -39,5 +63,6 @@ module MightyGrid
     def render_grid(grid)
       grid.output_buffer.html_safe
     end
+
   end
 end

data/lib/mighty_grid/kaminari_monkey_patching.rb

@@ -0,0 +1,13 @@
+# encoding: UTF-8
+# It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
+module Kaminari #:nodoc:
+  module Helpers #:nodoc:
+    class Tag #:nodoc:
+      def page_url_for(page) #:nodoc:
+        current_page_params_as_query_string = @param_name.to_s + '=' + (page <= 1 ? nil : page).to_s
+        current_page_params_as_hash = Rack::Utils.parse_nested_query(current_page_params_as_query_string)
+        @template.url_for MightyGrid::MgHash.rec_merge(@params, current_page_params_as_hash).symbolize_keys
+      end
+    end
+  end
+end

data/lib/mighty_grid/mighty_grid_ext.rb

@@ -0,0 +1,21 @@
+module MightyGrid
+  module MgHash
+    class << self
+    	# A deep merge of two hashes.
+      # That is, if both hashes have the same key and the values are hashes, these two hashes should also be merged.
+      # Used for merging two sets of params.
+      def rec_merge(hash, other)  #:nodoc:
+        res = hash.clone
+        other.each do |key, other_value|
+          value = res[key]
+          if value.is_a?(Hash) && other_value.is_a?(Hash)
+            res[key] = rec_merge value, other_value
+          else
+            res[key] = other_value
+          end
+        end
+        res
+      end
+    end
+  end
+end

data/lib/mighty_grid/version.rb

@@ -1,3 +1,3 @@
 module MightyGrid
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/mighty_grid.gemspec

@@ -20,4 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+
+  spec.add_dependency 'kaminari', '~> 0.15.0'
 end

data/vendor/assets/stylesheets/mighty_grid.css

@@ -0,0 +1,3 @@
+.mighty-grid .pagination {
+  margin: 0;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mighty_grid
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - jurrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
 description: Flexible grid for Rails
 email:
 - jurianp@gmail.com
@@ -51,14 +65,24 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/views/kaminari/mighty_grid/_first_page.html.erb
+- app/views/kaminari/mighty_grid/_gap.html.erb
+- app/views/kaminari/mighty_grid/_last_page.html.erb
+- app/views/kaminari/mighty_grid/_next_page.html.erb
+- 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
 - lib/mighty_grid.rb
 - lib/mighty_grid/column.rb
 - lib/mighty_grid/grid_renderer.rb
 - lib/mighty_grid/helpers/mighty_grid_view_helpers.rb
+- lib/mighty_grid/kaminari_monkey_patching.rb
 - lib/mighty_grid/mighty_grid_controller.rb
+- lib/mighty_grid/mighty_grid_ext.rb
 - lib/mighty_grid/version.rb
 - mighty_grid.gemspec
 - spec/spec_helper.rb
+- vendor/assets/stylesheets/mighty_grid.css
 homepage: http://github.com/jurrick/mighty_grid
 licenses:
 - MIT
@@ -85,4 +109,3 @@ specification_version: 4
 summary: Flexible grid for Rails
 test_files:
 - spec/spec_helper.rb
-has_rdoc: