gitter 1.1.5 → 1.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6bd933134f3ed6527bb09e5d111be1c5b52b35c7
+  data.tar.gz: 44ecdd458d9a550b067de509b170493afc2c5283
+SHA512:
+  metadata.gz: 63880cdac97fc53c3dbf0b5a3a9d2dbe947a811912118a9b3a7f2b590e50263802dbd79ad8524e288added1f19308b020f0e7fc5d5944e1ef697b7860889973e
+  data.tar.gz: beb207ecac0707f69620d8c543e6ac758bc6217509777e04cfc8e32015f033f9ab49398950e04c7fafcbb7ceaa7d67f0a69168af6eb1e3a3f1aa16d3698207c2

data/Readme.markdown

@@ -39,7 +39,7 @@ class ArticleGrid << Gitter::Grid
   filter :topsellers, :scope => :topsellers
 
   # customized filter 
-  filter :on_stock, do |scope|
+  filter :on_stock do |scope|
     scope.where('stock > 0')
   end
 
@@ -73,9 +73,10 @@ class ArticleGrid << Gitter::Grid
   # make the column sortable
   column :name, :sort => true     
 
-  # customize your data cell
+  # Customize your data cell
+  # Access your model through variable 'model'
   column :price, :sort => true do
-    "#{price/100.floor},#{price%100} USD"
+    "#{model.price/100.floor},#{model.price%100} USD"
   end
   
   # helpers are accessible via #h
@@ -107,12 +108,12 @@ Render you grid:
 %table
   %tr
     - @grid.headers.each do |header|
-    %th = header
+      %th = header
 
   - @grid.rows.each do |row|
     %tr
       - row.each do |cell|
-      %th = cell 
+        %th = cell 
 ```
 [More about grids](https://github.com/tracksun/gitter/wiki/Grids)
 
@@ -157,3 +158,5 @@ API inspired by [datagrid](https://github.com/bogdan/datagrid)
 # License
 
 Gitter is released under the MIT license
+
+Copyright © 2013 Thomas Sonntag

data/gitter.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "gitter"
   s.version     = Gitter::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Thomas Sommtag"]
+  s.authors     = ["Thomas Sonntag"]
   s.email       = ["git@sonntagsbox.de"]
   s.homepage    = "http://github.com/tracksun/gitter"
   s.summary     = %q{Ruby gem to define searches, facets and data grids for Rails applications}

data/lib/gitter.rb

@@ -6,6 +6,7 @@ module Gitter
   autoload :Helper,      'gitter/helper'
   autoload :Controller,  'gitter/controller'
   autoload :Table,       'gitter/table'
+  autoload :EnumerableDriver, 'gitter/drivers/enumerable_driver'
 
   class ConfigurationError < StandardError
   end

data/lib/gitter/base.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'active_support/hash_with_indifferent_access'
 require 'artdeco'
 require 'gitter/filters.rb'
 require 'gitter/facet.rb'
@@ -26,7 +27,7 @@ module Gitter
 
       @params = @decorator.params.fetch(key){{}}.symbolize_keys
 
-      @filters, @values, @facets = {}, {}, {} 
+      @filters, @values, @facets = {}.with_indifferent_access, {}.with_indifferent_access, {}.with_indifferent_access 
       scope = opts.delete(:scope){nil}
       @options = opts.dup
 
@@ -77,7 +78,7 @@ module Gitter
     def scope &scope
       if scope
         @scope = scope
-       else
+      else
         filtered_driver.scope
       end 
     end
@@ -97,10 +98,15 @@ module Gitter
         if opts[:facet] && opts[:facet] != true
           opts.merge! values: opts[:facet]
         end
-        filters = [select].flatten.map{|name| @filters[name] || scope_filter(name)}
+        select = [select] unless select.respond_to?(:each)
+        filters = select.map do |label,filter_name| 
+          filter_name ||= label
+          @filters[filter_name] || scope_filter(label,filter_name,label: label)
+        end
         SelectFilter.new self, name, filters, opts
-      when s = opts.delete(:scope)
-        scope_filter( s == true ? name : s, opts )
+      when scope_name = opts.delete(:scope)
+        scope_name = name if scope_name == true
+        scope_filter name, scope_name
       else 
         if opts[:facet] && opts[:facet] != true
           opts.merge! values: opts[:facet]
@@ -138,11 +144,11 @@ module Gitter
         create_driver(scope).less_or_equal(column, value).scope
       end
 
-      filter name, :column => column
+      filter name, column: column
     end
 
-    def scope_filter name, opts = {}
-      BlockFilter.new(self,name, opts){|scope| create_driver(scope).named_scope(name).scope}
+    def scope_filter name, scope_name, opts = {}
+      BlockFilter.new(self, name, opts){|scope| create_driver(scope).named_scope(scope_name).scope}
     end
 
   end

data/lib/gitter/breadcrumbs.rb

@@ -16,6 +16,20 @@ module Gitter
       end
     end
 
+    def breadcrumbs_info
+      @breadcrumbs_info ||= begin
+        p = {}
+        filters.inject({}) do |memo,filter|
+          value = filter_value filter.name
+          if value.present?
+            p[filter.name] = value
+            memo[filter.name] = { label: filter.label, value: value, url: url_for(scoped_params(p)) }
+          end 
+          memo
+        end
+      end
+    end
+
     def render_breadcrumbs delim = '>', params = {}
       delim_tag = h.content_tag :span, delim, {class: 'breadcrumb_delim'}
 

data/lib/gitter/column.rb

@@ -86,9 +86,18 @@ module Gitter
     def link label = nil, params = {}, options = {}
       label ||= headers.first.label
       if @order
-        img = order_img_tag(options)
-        label = grid.h.content_tag :span, img + label if ordered?
-        grid.h.link_to label, order_params.deep_merge(params), options
+        #img = order_img_tag(options)
+        #label = grid.h.content_tag :span, img + label if ordered?
+        #grid.h.link_to label, order_params.deep_merge(params), options
+        s = ''
+        if !ordered? || !desc?
+          s += grid.h.link_to order_img_tag(false), order_params( true).deep_merge(params), options
+        end
+        if !ordered? ||  desc?
+          s += grid.h.link_to order_img_tag(true), order_params(false).deep_merge(params), options
+        end
+        s += " #{label}"
+        grid.h.raw s
       else
         label
       end
@@ -100,10 +109,12 @@ module Gitter
 
     private
 
-    def order_img_tag opts = {}
-      desc_img = opts.delete(:desc_img){'sort_desc.gif'}
-      asc_img  = opts.delete(:asc_img){'sort_asc.gif'}
-      grid.h.image_tag( desc? ? desc_img : asc_img)
+    def order_img_tag desc = desc?, opts = {}
+      #desc_img = opts.delete(:desc_img){grid.h.image_tag 'sort_desc.gif'}
+      #asc_img  = opts.delete(:asc_img ){grid.h.image_tag 'sort_asc.gif' }
+      desc_img = opts.delete(:desc_img){grid.h.fa_icon 'sort-down'}
+      asc_img  = opts.delete(:asc_img ){grid.h.fa_icon 'sort-up' }
+      desc ? asc_img : desc_img
     end
 
     def to_boolean s
@@ -112,16 +123,14 @@ module Gitter
 
     # if current params contain order for this column then revert direction 
     # else add order_params for this column to current params
-    def order_params
-      @order_params ||= begin
-        p = grid.params.dup
-        if ordered?
-          p[:desc] = !desc?
-        else
-          p = p.merge order: name, desc: false 
-        end
-        grid.scoped_params p
+    def order_params desc = !desc?
+      p = grid.params.dup
+      if ordered?
+        p[:desc] = desc
+      else
+        p = p.merge order: name, desc: desc 
       end
+      grid.scoped_params p
     end
 
     def cell model

data/lib/gitter/columns.rb

@@ -2,14 +2,21 @@ require 'active_support/concern'
 require 'gitter/column'
 require 'gitter/header'
 require 'gitter/cell'
+require 'active_support/benchmarkable'
+require 'logger'
   
 module Gitter
   module Columns
+    include ActiveSupport::Benchmarkable
     extend ActiveSupport::Concern
   
     included do
       alias_method_chain :scope, :columns
     end
+
+    def logger
+      @logger ||= Logger.new(STDOUT)
+    end
   
     def header_row
       @current_header_row = []
@@ -47,8 +54,15 @@ module Gitter
     end
  
     def rows_for model
-      cols = columns.map{|c| [c.cells(model)].flatten }
+#benchmark "---------rows_for #{model}" do
+      cols = nil
+      cols = columns.map do |c| 
+#  benchmark "cells for #{c.name}" do
+        [c.cells(model)].flatten
+#  end
+      end
       max = cols.map{|col|col.size}.max
+
       cols.map do |col| 
         nil_padded_cells = Array.new(max){|i| col[i]}
 	cells = []
@@ -62,6 +76,7 @@ module Gitter
 	end
 	cells
       end.transpose
+#end
     end
  
     def rows scope = nil

data/lib/gitter/drivers/enumerable_driver.rb

@@ -0,0 +1,74 @@
+require 'gitter/drivers/abstract_driver'
+module Gitter
+  
+  class EnumerableDriver < AbstractDriver
+    
+    def count
+      scope.size
+    end
+    
+    def order attr, desc = nil
+      sign = case desc
+        when true, 'true'   then 1 
+        when false, 'false' then -1
+        else -1 
+      end
+      new scope.sort{|a,b| sign * (a.send(attr).try(:to_s) <=> b.send(attr).try(:to_s)) }
+    end
+   
+    def unordered
+      self
+    end
+
+    def group arg
+      new scope.group_by(&arg)
+    end
+
+    def where attr_values, opts = {}
+      exact = opts.fetch(:exact){true}
+      ignore_case = opts.fetch(:ignore_case){false}
+      strip_blank = opts.fetch(:strip_blank){false}
+
+      attr_texts =  attr_values.map do |attr,value| 
+        value = value.strip if strip_blank
+        text = exact ? value : /#{value}/
+        text = /#{value}/i if ignore_case
+        [attr,text]
+      end
+
+      s = scope.find_all do |item|
+        attr_texts.all? do |attr,text| 
+          data = item.send(attr).try(:to_s)
+          text === data
+        end
+      end
+
+      new s
+    end
+
+    def greater_or_equal attr, value
+      scope.find_all{|item| item.send(:attr) >= value}
+    end
+
+    def less_or_equal attr, value
+      scope.find_all{|item| item.send(:attr) <= value}
+    end
+
+    def each &block
+      new scope.each(&block)
+    end
+    
+    def named_scope name
+      raise NotImplementError
+    end
+    
+    def distinct_values attr
+      group(attr).keys.uniq
+    end
+
+    def to_s
+      scope.to_s
+    end
+
+  end
+end

data/lib/gitter/facet.rb

@@ -30,13 +30,15 @@ module Gitter
       @label || raw_value || '-'
     end
 
-    def link
+    def link opts = {}
       @link ||= begin
         p = grid.params.dup 
         p.delete name
         p[name] = raw_value if raw_value.present?
         p = grid.scoped_params p
         p[:page] = 1
+        p[:show] = true
+        p = p.merge(opts)
 
         value_class = selected? ? 'facet_value_selected' : 'selected' 
         value_tag = h.content_tag :span, label, class: value_class
@@ -44,7 +46,6 @@ module Gitter
 
         if selected? or not facet.selected?
           count_tag = h.content_tag :span, "(#{count})", class: 'facet_count'
-          #count_tag = h.link_to count_tag,  url_for(p.merge(show: true))
         else
           count_tag = ''
         end

data/lib/gitter/filters/abstract_filter.rb

@@ -1,12 +1,15 @@
+module Gitter
+
   class AbstractFilter
 
-    attr_reader :grid, :name, :input_options, :input_tag, :formatter, :order, :label
+    attr_reader :grid, :name, :input_options, :input_tag, :input_class, :formatter, :order, :label
 
     def initialize grid, name, opts = {}
        @grid, @name = grid, name
        @label = opts.delete(:label){grid.translate(:filters, name)}
        @input_options = opts.delete(:input){nil}
        @input_tag = opts.delete(:input_tag){nil}
+       @input_class = opts.delete(:input_class){''}
        @include_blank = opts.delete(:include_blank){false}
        
        @formatter = opts.delete(:formatter){nil}
@@ -52,7 +55,7 @@
       return '' unless input?
 
       @input_tag ||= if col = collection
-        col = [''] + col if include_blank? && col.size > 1
+        #col = [''] + col if include_blank? && col.size > 1
         select_tag col
       else
         text_field_tag
@@ -60,11 +63,12 @@
     end
 
     def text_field_tag
-      @text_field_tag ||= h.text_field_tag scoped_name, grid.params[name.intern], :class => 'grid'
+      @text_field_tag ||= h.text_field_tag scoped_name, grid.params[name.intern], 
+        class: input_classes 
     end
 
     def select_tag collection 
-      h.select_tag scoped_name, h.options_for_select(collection, grid.params[name.intern]), :class => 'grid'
+      h.select_tag scoped_name, h.options_for_select(collection, grid.params[name.intern]), include_blank: include_blank?, class: input_classes
     end
 
     def format value
@@ -91,4 +95,9 @@
     def sort_hash hash
       hash.keys.sort.inject({}){|memo,k|memo[k] = hash[k]; memo}
     end
+
+    def input_classes
+      "grid grid-#{name} #{input_class}"
+    end
+  end
 end

data/lib/gitter/filters/select_filter.rb

@@ -6,7 +6,7 @@ module Gitter
 
     def initialize grid, name, filters, opts = {} 
       super grid, name, opts
-      @filters = filters.inject({}){|memo,filter| memo[filter.name] = filter; memo}
+      @filters = filters.inject({}.with_indifferent_access){|memo,filter| memo[filter.name] = filter; memo}
       @values = opts[:values]
       if @input_options == true
         @input_options = {}

data/lib/gitter/helpers.rb

@@ -40,5 +40,9 @@ module Gitter
       end
     end
 
+    def input_tag name
+      input_tags[name]
+    end
+
   end
 end

data/lib/gitter/table.rb

@@ -90,12 +90,12 @@ module Gitter
       end 
     end
 
-    def html
+    def html opts = {}
       @html ||= begin
         h = rows.map do |row|
-          Table.tag :tr, (row.map{|cell| cell.html} * "\n")
+          Table.tag :tr, (row.map{|cell| cell.html} * "\n"), (opts[:tr_html]||{})
         end * "\n"
-	Table.tag :table, h
+	Table.tag :table, h, (opts[:table_html]||{})
       end
     end
 

data/lib/gitter/version.rb

@@ -1,3 +1,3 @@
 module Gitter
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,75 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: gitter
 version: !ruby/object:Gem::Version
-  version: 1.1.5
-  prerelease: 
+  version: 1.1.6
 platform: ruby
 authors:
-- Thomas Sommtag
+- Thomas Sonntag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: artdeco
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
-description: ! "    To be used within Rails applications.\n    Helps you to define
-  searches with filters and facets \n    and data tables with sortable columns and
-  filters.\n"
+description: "    To be used within Rails applications.\n    Helps you to define searches
+  with filters and facets \n    and data tables with sortable columns and filters.\n"
 email:
 - git@sonntagsbox.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -91,6 +83,7 @@ files:
 - lib/gitter/driver.rb
 - lib/gitter/drivers/abstract_driver.rb
 - lib/gitter/drivers/active_record_driver.rb
+- lib/gitter/drivers/enumerable_driver.rb
 - lib/gitter/facet.rb
 - lib/gitter/filters.rb
 - lib/gitter/filters/abstract_filter.rb
@@ -126,27 +119,42 @@ files:
 - spec/support/person_grid.rb
 homepage: http://github.com/tracksun/gitter
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - assets
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: gitter
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby gem to define searches, facets and data grids for Rails applications
-test_files: []
+test_files:
+- spec/breadcrumbs_spec.rb
+- spec/column_filter_spec.rb
+- spec/column_spec.rb
+- spec/facets_spec.rb
+- spec/grid_spec.rb
+- spec/helper_spec.rb
+- spec/i18n_spec.rb
+- spec/inputs_spec.rb
+- spec/locales/de.yml
+- spec/locales/en.yml
+- spec/range_filter_spec.rb
+- spec/scope_filter_spec.rb
+- spec/select_filter_spec.rb
+- spec/spec_helper.rb
+- spec/support/database.rb
+- spec/support/person_grid.rb