wice_grid 4.1.0 → 6.1.3

data/config/locales/uk.yml

@@ -1,9 +1,4 @@
 uk:
-  date:
-    order:
-      - :year
-      - :month
-      - :day
   wice_grid:
     show_filter_tooltip: "Показати фільтр"
     hide_filter_tooltip: "Сховати фільтр"
@@ -43,3 +38,5 @@ uk:
     query_saved_message: "Збережуваний фільтр збережено."
     select_all: "Виділити все"
     deselect_all: "Забрати виділення"
+    expand: Розгорнути
+    collapse: Згорнути

data/config/locales/zh.yml

@@ -1,9 +1,4 @@
 zh:
-  date:
-    order:
-      - :year
-      - :month
-      - :day
   wice_grid:
     show_filter_tooltip: 显示过滤
     hide_filter_tooltip: 隐藏过滤
@@ -43,3 +38,5 @@ zh:
     query_saved_message: 查询已储存
     select_all: 全选
     deselect_all: 全清
+    expand: 擴大
+    collapse: 坍方

data/gemfiles/rails_5.0.gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ..
   specs:
-    wice_grid (4.0.1)
+    wice_grid (4.1.0)
       coffee-rails (> 3.2)
-      kaminari (~> 0.16)
+      kaminari (~> 1.1)
       rails (~> 5.0, < 5.3)
 
 GEM
@@ -57,12 +57,14 @@ GEM
       sass (~> 3.2)
     builder (3.2.3)
     byebug (10.0.2)
-    capybara (2.2.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+    capybara (3.13.2)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
     capybara-screenshot (1.0.21)
       capybara (>= 1.0, < 4)
       launchy
@@ -111,9 +113,18 @@ GEM
     jquery-ui-themes (0.0.12)
       httparty
     json (1.8.6)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.19)
@@ -123,27 +134,23 @@ GEM
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     method_source (0.9.0)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
     mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     nio4r (2.3.1)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    poltergeist (1.9.0)
-      capybara (~> 2.1)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    poltergeist (1.18.1)
+      capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
-    rack (2.0.5)
+    rack (2.0.6)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.7)
@@ -176,6 +183,7 @@ GEM
     rdoc (4.2.2)
       json (~> 1.4)
     ref (2.0.0)
+    regexp_parser (1.3.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -249,8 +257,8 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
     yard (0.8.7.6)
 
 PLATFORMS
@@ -261,7 +269,7 @@ DEPENDENCIES
   bootstrap-sass (= 3.1.1.1)
   bundler (~> 1.3)
   byebug
-  capybara (~> 2.2.0)
+  capybara (~> 3.13.2)
   capybara-screenshot (~> 1.0.11)
   coderay (~> 1.1.0)
   faker (~> 1.8.7)
@@ -271,7 +279,7 @@ DEPENDENCIES
   jquery-rails (~> 4.3.3)
   jquery-ui-rails (~> 5.0.5)
   jquery-ui-themes (~> 0.0.11)
-  poltergeist (~> 1.9.0)
+  poltergeist (~> 1.18.0)
   rails (~> 5.0.0)
   rake (~> 10.1)
   rdoc (~> 4.2.0)
@@ -288,4 +296,4 @@ DEPENDENCIES
   yard (~> 0.8)
 
 BUNDLED WITH
-   1.16.2
+   1.17.2

data/gemfiles/rails_5.1.gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ..
   specs:
-    wice_grid (4.0.1)
+    wice_grid (4.1.0)
       coffee-rails (> 3.2)
-      kaminari (~> 0.16)
+      kaminari (~> 1.1)
       rails (~> 5.0, < 5.3)
 
 GEM
@@ -57,12 +57,14 @@ GEM
       sass (~> 3.2)
     builder (3.2.3)
     byebug (10.0.2)
-    capybara (2.2.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+    capybara (3.13.2)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
     capybara-screenshot (1.0.21)
       capybara (>= 1.0, < 4)
       launchy
@@ -111,9 +113,18 @@ GEM
     jquery-ui-themes (0.0.12)
       httparty
     json (1.8.6)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.19)
@@ -123,28 +134,24 @@ GEM
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     method_source (0.9.0)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
     mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     nio4r (2.3.1)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    poltergeist (1.9.0)
-      capybara (~> 2.1)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    poltergeist (1.18.1)
+      capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
-    rack (2.0.5)
-    rack-test (1.0.0)
+    rack (2.0.6)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.1.6)
       actioncable (= 5.1.6)
@@ -176,6 +183,7 @@ GEM
     rdoc (4.2.2)
       json (~> 1.4)
     ref (2.0.0)
+    regexp_parser (1.3.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -249,8 +257,8 @@ GEM
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
     yard (0.8.7.6)
 
 PLATFORMS
@@ -261,7 +269,7 @@ DEPENDENCIES
   bootstrap-sass (= 3.1.1.1)
   bundler (~> 1.3)
   byebug
-  capybara (~> 2.2.0)
+  capybara (~> 3.13.2)
   capybara-screenshot (~> 1.0.11)
   coderay (~> 1.1.0)
   faker (~> 1.8.7)
@@ -271,7 +279,7 @@ DEPENDENCIES
   jquery-rails (~> 4.3.3)
   jquery-ui-rails (~> 5.0.5)
   jquery-ui-themes (~> 0.0.11)
-  poltergeist (~> 1.9.0)
+  poltergeist (~> 1.18.0)
   rails (~> 5.1.0)
   rake (~> 10.1)
   rdoc (~> 4.2.0)
@@ -288,4 +296,4 @@ DEPENDENCIES
   yard (~> 0.8)
 
 BUNDLED WITH
-   1.16.2
+   1.17.2

data/gemfiles/rails_5.2.gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: ..
   specs:
-    wice_grid (4.0.1)
+    wice_grid (4.1.0)
       coffee-rails (> 3.2)
-      kaminari (~> 0.16)
+      kaminari (~> 1.1)
       rails (~> 5.0, < 5.3)
 
 GEM
@@ -61,12 +61,14 @@ GEM
       sass (~> 3.2)
     builder (3.2.3)
     byebug (10.0.2)
-    capybara (2.2.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+    capybara (3.13.2)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
     capybara-screenshot (1.0.21)
       capybara (>= 1.0, < 4)
       launchy
@@ -74,9 +76,9 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     cliver (0.3.2)
     coderay (1.1.2)
-    coffee-rails (4.2.2)
+    coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0)
+      railties (>= 5.2.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -115,9 +117,18 @@ GEM
     jquery-ui-themes (0.0.12)
       httparty
     json (1.8.6)
-    kaminari (0.17.0)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
+    kaminari (1.1.1)
+      activesupport (>= 4.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
+      actionview
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
+      activerecord
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.19)
@@ -129,29 +140,25 @@ GEM
     marcel (0.3.2)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     nio4r (2.3.1)
-    nokogiri (1.8.3)
-      mini_portile2 (~> 2.3.0)
-    poltergeist (1.9.0)
-      capybara (~> 2.1)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    poltergeist (1.18.1)
+      capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
-      multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.2)
-    rack (2.0.5)
-    rack-test (1.0.0)
+    rack (2.0.6)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.0)
       actioncable (= 5.2.0)
@@ -184,6 +191,7 @@ GEM
     rdoc (4.2.2)
       json (~> 1.4)
     ref (2.0.0)
+    regexp_parser (1.3.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)
       rspec-expectations (~> 3.6.0)
@@ -257,8 +265,8 @@ GEM
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
     yard (0.8.7.6)
 
 PLATFORMS
@@ -269,7 +277,7 @@ DEPENDENCIES
   bootstrap-sass (= 3.1.1.1)
   bundler (~> 1.3)
   byebug
-  capybara (~> 2.2.0)
+  capybara (~> 3.13.2)
   capybara-screenshot (~> 1.0.11)
   coderay (~> 1.1.0)
   faker (~> 1.8.7)
@@ -279,7 +287,7 @@ DEPENDENCIES
   jquery-rails (~> 4.3.3)
   jquery-ui-rails (~> 5.0.5)
   jquery-ui-themes (~> 0.0.11)
-  poltergeist (~> 1.9.0)
+  poltergeist (~> 1.18.0)
   rails (~> 5.2.0)
   rake (~> 10.1)
   rdoc (~> 4.2.0)
@@ -296,4 +304,4 @@ DEPENDENCIES
   yard (~> 0.8)
 
 BUNDLED WITH
-   1.16.2
+   1.17.2

data/lib/wice/active_record_column_wrapper.rb

@@ -115,6 +115,16 @@ module Wice
       @column.model
     end
 
+    def array?
+      if @column.sql_type_metadata.respond_to? :array
+        @column.sql_type_metadata.array
+      else
+        @column.sql_type_metadata.sql_type.index('[]')
+      end
+    rescue
+      false
+    end
+
     def alias_or_table_name(table_alias) #:nodoc:
       table_alias || @column.model.table_name
     end

data/lib/wice/columns/column_custom_dropdown.rb

@@ -83,17 +83,23 @@ module Wice
         end
         opts = (opts.is_a?(Array) && opts.size == 1) ? opts[0] : opts
 
+        column_name =
+            "#{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name}"
         if opts.is_a?(Array)
           opts_with_special_values, normal_opts = opts.partition { |v| ::Wice::GridTools.special_value(v) }
 
           conditions_ar = if normal_opts.size > 0
-            [" #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} IN ( " + (['?'] * normal_opts.size).join(', ') + ' )'] + normal_opts
+            if @column_wrapper.array?
+              [(["? = ANY(#{column_name})"] * normal_opts.size).join(' OR ')] + normal_opts
+            else
+              [" #{column_name} IN ( " + (['?'] * normal_opts.size).join(', ') + ' )'] + normal_opts
+            end
           else
             []
           end
 
           if opts_with_special_values.size > 0
-            special_conditions = opts_with_special_values.collect { |v| " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} is " + v }.join(' or ')
+            special_conditions = opts_with_special_values.collect { |v| " #{column_name} is " + v }.join(' or ')
             if conditions_ar.size > 0
               conditions_ar[0] = " (#{conditions_ar[0]} or #{special_conditions} ) "
             else
@@ -103,9 +109,13 @@ module Wice
           conditions_ar
         else
           if ::Wice::GridTools.special_value(opts)
-            " #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} is " + opts
+            " #{column_name} is " + opts
           else
-            [" #{@column_wrapper.alias_or_table_name(table_alias)}.#{@column_wrapper.name} = ?", opts]
+            if @column_wrapper.array?
+              [" ? = ANY(#{column_name})", opts]
+            else
+              [" #{column_name} = ?", opts]
+            end
           end
         end
       end

data/lib/wice/grid_renderer.rb

@@ -106,7 +106,7 @@ module Wice
     def csv_export_icon #:nodoc:
       content_tag(
         :div,
-        content_tag(:i, '', class: 'fa fa-file-excel-o'),
+        content_tag(:i, '', class: 'fa fa-file-csv'),
         title: NlMessage['csv_export_tooltip'],
         class: 'clickable export-to-csv-button'
       )
@@ -119,13 +119,13 @@ module Wice
 
       if panel.nil?
         if render_csv_button
-          "<tr><td colspan=\"#{number_of_columns}\"></td><td>#{csv_export_icon}</td></tr>"
+          "<tr><td colspan=\"#{number_of_columns}\"></td><td class=\"csv_export\">#{csv_export_icon}</td></tr>"
         else
           ''
         end
       else
         if render_csv_button
-          "<tr><td colspan=\"#{number_of_columns}\">#{panel}</td><td>#{csv_export_icon}</td></tr>"
+          "<tr><td colspan=\"#{number_of_columns}\">#{panel}</td><td class=\"csv_export\">#{csv_export_icon}</td></tr>"
         else
           "<tr><td colspan=\"#{number_of_columns + 1}\">#{panel}</td></tr>"
         end

data/lib/wice/table_column_matrix.rb

@@ -54,7 +54,8 @@ module Wice
     end
 
     def init_columns_of_table(model) #:nodoc:
-      self[model] = HashWithIndifferentAccess.new(model.columns.index_by(&:name))
+      self[model] =
+          HashWithIndifferentAccess.new(model.columns.map(&:dup).index_by(&:name))
       @by_table_names[model.table_name] = self[model]
       self[model].each_value { |c| c.model = model }
     end

data/lib/wice/wice_grid_controller.rb

@@ -115,7 +115,7 @@ module Wice
         temp_filename = temp_filename.strip
         filename = (grid.csv_file_name || grid.name) + '.csv'
         grid.csv_tempfile.close
-        send_file_rails2 temp_filename, filename: filename, type: "text/csv; charset=#{get_output_encoding grid.csv_encoding}"
+        send_file temp_filename, filename: filename, type: "text/csv; charset=#{get_output_encoding grid.csv_encoding}"
         grid.csv_tempfile = nil
         true
       else
@@ -170,55 +170,5 @@ module Wice
         csv_encoding.split(':').first
       end
     end
-
-    def send_file_rails2(path, options = {}) #:nodoc:
-      raise "Cannot read file #{path}" unless File.file?(path) && File.readable?(path)
-
-      options[:length] ||= File.size(path)
-      options[:filename] ||= File.basename(path) unless options[:url_based_filename]
-      send_file_headers_rails2! options
-
-      @performed_render = false
-
-      logger.info "Sending file #{path}" unless logger.nil?
-      File.open(path, 'rb') { |file| render status: options[:status], plain: file.read }
-    end
-
-    DEFAULT_SEND_FILE_OPTIONS_RAILS2 = { #:nodoc:
-      type:         'application/octet-stream'.freeze,
-      disposition:  'attachment'.freeze,
-      stream:       true,
-      buffer_size:  4096,
-      x_sendfile:   false
-    }.freeze
-
-    def send_file_headers_rails2!(options) #:nodoc:
-      options.update(DEFAULT_SEND_FILE_OPTIONS_RAILS2.merge(options))
-      [:length, :type, :disposition].each do |arg|
-        raise ArgumentError, ":#{arg} option required" if options[arg].nil?
-      end
-
-      disposition = options[:disposition].dup || 'attachment'
-
-      disposition <<= %(; filename="#{options[:filename]}") if options[:filename]
-
-      content_type = options[:type]
-      content_type = content_type.to_s.strip # fixes a problem with extra '\r' with some browsers
-
-      headers.merge!(
-        'Content-Length'            => options[:length].to_s,
-        'Content-Type'              => content_type,
-        'Content-Disposition'       => disposition,
-        'Content-Transfer-Encoding' => 'binary'
-      )
-
-      # Fix a problem with IE 6.0 on opening downloaded files:
-      # If Cache-Control: no-cache is set (which Rails does by default),
-      # IE removes the file it just downloaded from its cache immediately
-      # after it displays the "open/save" dialog, which means that if you
-      # hit "open" the file isn't there anymore when the application that
-      # is called for handling the download is run, so let's workaround that
-      headers['Cache-Control'] = 'private' if headers['Cache-Control'] == 'no-cache'
-    end
   end
 end

data/lib/wice_grid.rb

@@ -304,7 +304,7 @@ module Wice
         else
           @ar_options[:order] = arel_column_reference(@status[:order])
         end
-        if @ar_options[:order].is_a?(Arel::Attributes::Attribute)
+        if @ar_options[:order].is_a?(Arel::Attributes::Attribute) || @ar_options[:order].is_a?(Arel::Nodes::SqlLiteral)
           if @status[:order_direction] == 'desc'
             @ar_options[:order] = @ar_options[:order].desc
           else

data/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "wice-grid",
+  "version": "4.1.0",
+  "description": "WiceGrid is a Rails grid plugin",
+  "main": "vendor/assets/javascripts/wice_grid.js",
+  "repository": {
+    "type": "git",
+    "url": "/home/dima/devel/github/wice_grid"
+  },
+  "author": "Dmitry Kulikov",
+  "license": "MIT",
+  "directories": {
+    "lib": "lib"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  }
+}

data/spec/acceptance_helper.rb

@@ -16,6 +16,7 @@ else
   require 'capybara-screenshot/rspec'
   Capybara::Screenshot.prune_strategy = :keep_last_run
 end
+Capybara.server = :webrick
 
 # Slow down responses to help debug tests that have race conditions.
 if ENV['TEST_RESPONSE_DELAY']