active_list 6.3.1 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b7f570bc7be9be7cc8d4d85298013fc9d6ab7c
-  data.tar.gz: f6f3d47b93dd58c8b4ea9abcbe78b6978ea6654d
+  metadata.gz: aaf2824511973057df6951eb28a5ffbadc0d9595
+  data.tar.gz: 92cf5504fa0dbb9d29bc4547ea0cd5f4e37573bb
 SHA512:
-  metadata.gz: 30e98a470dbee1cfa245f89855f7301dce63f3d261e5d545aed13aab0430f2d5754bfc5270d8038e175e9ff994f85892992069bef8167ed686263eda83084b61
-  data.tar.gz: 4bf502e22df399ae3e5da6c9f546b5b41f2a619e09f68939aa527ece984808f67799f85317889935921fd7de01f3754327313835093038342bfc37d6ed9864c0
+  metadata.gz: 389b53b6ef12361b47aa78fd1392aec05ab63f4e308ed31084d20c77697d352de6cef78acfd99424b9f2cead16284dcc68adf428223dbed7cadf6fb7ade1c481
+  data.tar.gz: 9783dcfdd20bea2edab5478de41fdd37cf097d405ab018e55c12eb28f3795da39a7e4345aea9c8c9a5c5496a5b1d0f952efcf5a3b6b788a0534457ef22295ef7

data/app/assets/javascripts/active_list.jquery.js.coffee

@@ -13,6 +13,7 @@ ActiveList = {}
       page:     table.data("list-current-page")
       per_page: table.data("list-page-size")
       only:     "content"
+      redirect: list.data("list-redirect")
 
     $.extend parameters, options
     url = list.data("list-source")
@@ -28,6 +29,8 @@ ActiveList = {}
               .attr('checked', 'checked')
               .closest('tr').addClass('selected')
           AL.checkGlobalButtons list
+        list.trigger('page:change')
+        $(document).trigger('list:page:change')
         true
 
     false
@@ -82,12 +85,11 @@ ActiveList = {}
     if isNaN(page)
       page_attr = page
       page = element.attr(page_attr)
-      alert "Cannot define which page to load with attribute " + page_attr + ": " + page  if isNaN(page)
+      alert "Cannot define which page to load with attribute #{page_attr}: #{page}" if isNaN(page)
     AL.refresh element,
       page: page
     false
 
-  
   # Sort by one column
   $(document).on "click", "div[data-list-source] th[data-list-column][data-list-column-sort]", (event) ->
     sorter = $(this)
@@ -182,6 +184,5 @@ ActiveList = {}
     element.attr "title", element.html() unless title?
     return
 
-
   return
 ) jQuery, ActiveList

data/app/assets/stylesheets/active_list/background.scss

@@ -2,43 +2,43 @@
 //
 
 @function merge-color($color-1, $color-2) {
-   $col2: rgb(red($color-2), green($color-2), blue($color-2));
-   $percent: 100*alpha($color-2);
-   @return mix($col2, $color-1, $percent);
+  $col2: rgb(red($color-2), green($color-2), blue($color-2));
+  $percent: 100*alpha($color-2);
+  @return mix($col2, $color-1, $percent);
 }
 
 @function merge-colors($color, $color-1: rgba(0, 0, 0, 0), $color-2: rgba(0, 0, 0, 0), $color-3: rgba(0, 0, 0, 0), $color-4: rgba(0, 0, 0, 0), $color-5: rgba(0, 0, 0, 0), $color-6: rgba(0, 0, 0, 0), $color-7: rgba(0, 0, 0, 0), $color-8: rgba(0, 0, 0, 0), $color-9: rgba(0, 0, 0, 0), $color-10: rgba(0, 0, 0, 0)) {
-   @return merge-color(merge-color(merge-color(merge-color(merge-color(merge-color(merge-color(merge-color(merge-color(merge-color($color, $color-1), $color-2), $color-3), $color-4), $color-5), $color-6), $color-7), $color-8), $color-9), $color-10);
+  @return merge-color(merge-color(merge-color(merge-color(merge-color(merge-color(merge-color(merge-color(merge-color(merge-color($color, $color-1), $color-2), $color-3), $color-4), $color-5), $color-6), $color-7), $color-8), $color-9), $color-10);
 }
 
-$list-line-backgrounds:      ("&" rgba(#FFF, 0)) ("&.error, &.undone" rgba(red, 0.12)) ("&.warning, &.in_progress" rgba(orange, 0.12));
+$list-line-backgrounds:      ("&" rgba(#FFF, 0)) ("&.error, &.undone" rgba(red, 0.12)) ("&.warning, &.in_progress" rgba(orange, 0.12)) ("&.focus" rgba(yellow, 0.8));
 $list-column-backgrounds:    ("&" rgba(#FFF, 0)) ("&.act" rgba(#F90, 0.01)) ("&.sor" rgba(#05A, 0.05));
 $list-selection-backgrounds: ("&" rgba(#FFF, 0)) ("&.selected" rgba(yellow, 0.3));
 $list-hover-backgrounds:     ("&" rgba(#FFF, 0)) ("&:hover" rgba(blue, 0.05));
 
 @mixin list-colors($bgcolor: #000000, $selector: '&') {
-   tr {
-      #{$selector} {
-	 @each $line-background in $list-line-backgrounds {
-            #{nth($line-background, 1)} {
-	       @each $selection-background in $list-selection-backgrounds {
-		  #{nth($selection-background, 1)} {
-		     @each $hover-background in $list-hover-backgrounds {
-			#{nth($hover-background, 1)} {
-			   @each $col-background in $list-column-backgrounds {
-			      td {
-				 #{nth($col-background, 1)} {
-				    background-color: merge-colors($bgcolor, nth($line-background, 2), nth($col-background, 2), nth($selection-background, 2), nth($hover-background, 2));
-				 }
-			      }
-			   }
-			}
-		     }
-		  }
-               }
+  tr {
+    #{$selector} {
+      @each $line-background in $list-line-backgrounds {
+        #{nth($line-background, 1)} {
+          @each $selection-background in $list-selection-backgrounds {
+            #{nth($selection-background, 1)} {
+              @each $hover-background in $list-hover-backgrounds {
+                #{nth($hover-background, 1)} {
+                  @each $col-background in $list-column-backgrounds {
+                    td {
+                      #{nth($col-background, 1)} {
+                        background-color: merge-colors($bgcolor, nth($line-background, 2), nth($col-background, 2), nth($selection-background, 2), nth($hover-background, 2));
+                      }
+                    }
+                  }
+                }
+              }
             }
-	 }
+          }
+        }
       }
-   }
+    }
+  }
 }
 

data/lib/active_list/definition/action_column.rb

@@ -94,19 +94,24 @@ module ActiveList
           end
           cases = []
           for expected, url in @options[:actions]
-            cases << record+"."+@name.to_s+" == " + expected.inspect + "\nlink_to(content_tag(:i) + h(#{url[:action].inspect}.t(scope: 'rest.actions'))"+
-              ", {"+(url[:controller] ? 'controller: :'+url[:controller].to_s+', ' : '')+"action: '"+url[:action].to_s+"', id: "+record+".id"+format+"}"+
-              ", {class: '#{@name}'"+link_options+"}"+
+            url[:id] ||= "RECORD.id".c
+            url[:id] = "RECORD.id".c if url[:id] == ID_PLACEHOLDER
+            url[:redirect] ||= "params[:redirect]".c
+            url.delete_if{|k, v| v.nil?}
+            cases << "#{record}.#{@name} == #{expected.inspect}\nlink_to(content_tag(:i) + h(#{url[:action].inspect}.t(scope: 'rest.actions'))"+
+              ", {" + url.collect{|k, v| "#{k}: " + urlify(v, record)}.join(", ") + format + "}" +
+              ", {class: '#{@name}'" + link_options + "}"+
               ")\n"
           end
 
-          code = "if "+cases.join("elsif ")+"end"
+          code = "if " + cases.join("elsif ") + "end"
         else
           url = @options[:url] ||= {}
           url[:controller] ||= (@options[:controller] || "RECORD.class.name.tableize".c)
           url[:action] ||= @name.to_s
           url[:id] ||= "RECORD.id".c
           url[:id] = "RECORD.id".c if url[:id] == ID_PLACEHOLDER
+          url[:redirect] ||= "params[:redirect]".c
           url.delete_if{|k, v| v.nil?}
           url = "{" + url.collect{|k, v| "#{k}: " + urlify(v, record)}.join(", ") + format + "}"
           code = "{class: '#{@name}'" + link_options + "}"

data/lib/active_list/generator.rb

@@ -105,6 +105,8 @@ module ActiveList
         expr = "(#{expr} || #{@table.options[parameter]})" unless @table.options[parameter].blank?
         code << "#{var_name(:params)}[:#{parameter}] = #{expr}.#{convertor}\n"
       end
+      code << "params[:redirect] ||= request.fullpath unless request.xhr?\n"
+
       # Order
       code << "#{var_name(:order)} = #{@table.options[:order] ? @table.options[:order].inspect : 'nil'}\n"
       code << "if #{var_name(:col)} = {" + @table.sortable_columns.collect{|c| "'#{c.sort_id}' => '#{c.sort_expression}'"}.join(', ') + "}[#{var_name(:params)}[:sort]]\n"

data/lib/active_list/generator/finder.rb

@@ -27,25 +27,36 @@ module ActiveList
         query_code << ".references(#{expr})"
       end
 
-      code = ""
+      code  = ""
       code << "#{var_name(:count)} = #{query_code}.count\n"
+
+      query_code << ".reorder(#{var_name(:order)})"
+
       if paginate
         code << "#{var_name(:limit)}  = (#{var_name(:params)}[:per_page] || 25).to_i\n"
-        code << "#{var_name(:page)}   = (#{var_name(:params)}[:page] || 1).to_i\n"
+
+        code << "if params[:page]\n"
+        code << "  #{var_name(:page)} = (#{var_name(:params)}[:page] || 1).to_i\n"
+        code << "elsif params['#{table.name}-id'] and #{var_name(:index)} = #{query_code}.pluck(:id).index(params['#{table.name}-id'].to_i)\n"
+        # Find page of request element
+        code << "  #{var_name(:page)} = (#{var_name(:index)}.to_f / #{var_name(:limit)}).floor + 1\n"
+        code << "else\n"
+        code << "  #{var_name(:page)} = 1\n"
+        code << "end\n"
         code << "#{var_name(:page)}   = 1 if #{var_name(:page)} < 1\n"
+
         code << "#{var_name(:offset)} = (#{var_name(:page)} - 1) * #{var_name(:limit)}\n"
         code << "#{var_name(:last)}   = (#{var_name(:count)}.to_f / #{var_name(:limit)}).ceil.to_i\n"
         code << "#{var_name(:last)}   = 1 if #{var_name(:last)} < 1\n"
+        
+
         code << "return #{self.view_method_name}(options.merge(page: 1)) if 1 > #{var_name(:page)}\n"
         code << "return #{self.view_method_name}(options.merge(page: #{var_name(:last)})) if #{var_name(:page)} > #{var_name(:last)}\n"
+        query_code << ".offset(#{var_name(:offset)})"
+        query_code << ".limit(#{var_name(:limit)})"
       end
-      code << "#{self.records_variable_name} = #{query_code}"
-      code << ".reorder(#{var_name(:order)})"
-      if paginate
-        code << ".offset(#{var_name(:offset)})"
-        code << ".limit(#{var_name(:limit)})"
-      end
-      code << " || {}\n"
+
+      code << "#{self.records_variable_name} = #{query_code} || {}\n"
       return code
     end
 

data/lib/active_list/renderers/simple_renderer.rb

@@ -30,7 +30,7 @@ module ActiveList
         code << "  #{var_name(:params)}[:hidden_columns] << column if params[:visibility] == 'hidden'\n"
         code << "  head :ok\n"
         code << "elsif params[:only]\n"
-        code << "  render(inline: '<%=#{generator.view_method_name}(:only => params[:only])-%>')\n"
+        code << "  render(inline: '<%=#{generator.view_method_name}(only: params[:only])-%>')\n"
         code << "else\n"
         code << "  render(inline: '<%=#{generator.view_method_name}-%>')\n"
         code << "end\n"
@@ -46,19 +46,22 @@ module ActiveList
         extras = extras_code
 
         code  = generator.select_data_code
-        code << "#{var_name(:tbody)} = '<tbody data-total=\"'+#{var_name(:count)}.to_s+'\""
+        code << "#{var_name(:tbody)} = '<tbody data-total=\"' + #{var_name(:count)}.to_s + '\""
         if table.paginate?
-          code << " data-per-page=\"'+#{var_name(:limit)}.to_s+'\""
-          code << " data-pages-count=\"'+#{var_name(:last)}.to_s+'\""
+          code << " data-per-page=\"' + #{var_name(:limit)}.to_s + '\""
+          code << " data-pages-count=\"' + #{var_name(:last)}.to_s + '\""
         end
         code << ">'\n"
         code << "if #{var_name(:count)} > 0\n"
-        code << "  for #{record} in #{generator.records_variable_name}\n"
-        line_class = ""
+        code << "  #{generator.records_variable_name}.each do |#{record}|\n"
+        code << "    #{var_name(:attrs)} = {id: 'r' + #{record}.id.to_s}\n"
         if table.options[:line_class]
-          line_class = ", class: (" + recordify!(table.options[:line_class], record) + ").to_s"
+          code << "    #{var_name(:attrs)}[:class] = (#{recordify!(table.options[:line_class], record)}).to_s\n"
+          code << "    #{var_name(:attrs)}[:class] << ' focus' if params['#{table.name}-id'].to_i == #{record}.id\n"
+        else
+          code << "    #{var_name(:attrs)}[:class] = 'focus' if params['#{table.name}-id'].to_i == #{record}.id\n"
         end
-        code << "    #{var_name(:tbody)} << content_tag(:tr, id: 'r' + #{record}.id.to_s#{line_class}) do\n"
+        code << "    #{var_name(:tbody)} << content_tag(:tr, #{var_name(:attrs)}) do\n"
         code << columns_to_cells(:body, record: record).dig(3)
         code << "    end\n"
         # if table.options[:children].is_a? Symbol
@@ -95,7 +98,7 @@ module ActiveList
         code << "return #{var_name(:content)}.html_safe if options[:only] == 'content'\n"
 
         # Build whole
-        code << "return ('<div id=\"#{table.name}\" data-list-source=\"'+h(url_for(options.merge(:action => '#{generator.controller_method_name}')))+'\" class=\"active-list\">' + #{var_name(:content)} + '</div>').html_safe\n"
+        code << "return ('<div id=\"#{table.name}\" data-list-source=\"'+h(url_for(options.merge(:action => '#{generator.controller_method_name}')))+'\" data-list-redirect=\"' + params[:redirect].to_s + '\" class=\"active-list\">' + #{var_name(:content)} + '</div>').html_safe\n"
         return code
       end
 
@@ -172,10 +175,10 @@ module ActiveList
               elsif column.label_method.to_s.match(/(^|\_)country$/)  and column.datatype == :string
                 value_code = "(Nomen::Countries[#{value_code}]  ? (image_tag('countries/' + #{value_code}.to_s + '.png') + ' ' + Nomen::Countries[#{value_code}].human_name).html_safe : #{value_code})"
               else # if column.datatype == :string
-                value_code = "h(" + value_code + ".to_s)"
+                value_code = "h(#{value_code}.to_s)"
               end
 
-              value_code = "if #{record}\n" + value_code.dig + "end" if column.is_a?(ActiveList::Definition::AssociationColumn)
+              value_code = "if #{record}\n#{value_code.dig}end" if column.is_a?(ActiveList::Definition::AssociationColumn)
             end
           elsif column.is_a?(ActiveList::Definition::CheckBoxColumn)
             if nature == :body
@@ -367,7 +370,7 @@ module ActiveList
           classes << :unk
         end
         html = classes.join(' ').strip
-        if conds.size > 0
+        if conds.any?
           if without_interpolation
             html << "' + "
             html << conds.collect do |c|

data/lib/active_list/version.rb

@@ -1,5 +1,5 @@
 module ActiveList
 
-  VERSION = "6.3.1"
+  VERSION = "6.4.0"
 
 end

data/test/dummy/db/seeds.rb

@@ -3,4 +3,8 @@ Person.create! name: "Leonardo di ser Piero da Vinci", born_on: "1452-04-15"
 Person.create! name: "宮崎 駿", born_on: "1941-01-05"
 Person.create! name: "عَبْدَالله مُحَمَّد بِن مُوسَى اَلْخْوَارِزْمِي‎", born_on: Date.new(780, 8, 7)
 Person.create! name: "Περικλῆς", born_on: Date.new(-495, 9, 4)
+200.times do |index|
+  Person.create! name: "Human ##{index}", born_on: Date.new(1 + 11*index, 1 + index % 11, 1 + (7*index) % 27)
+end
+
 puts "#{Person.count} people"

data/test/people_controller_test.rb

@@ -12,9 +12,23 @@ class PeopleControllerTest < ActionController::TestCase
     get :list, :format => :ods
     assert_response :success
 
-    # get :list, :format => :xcsv
-    # assert_response :success
+  end
+
+  test "parameters" do
+    get :list, "people-id" => 10
+    assert_response :success
+
+    get :list, page: 0
+    assert_response :success
 
+    get :list, page: 5, per_page: 25
+    assert_response :success
+
+    get :list, page: 50, per_page: 25
+    assert_response :success
+
+    get :list, page: 500, per_page: 25
+    assert_response :success
   end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.4.0
 platform: ruby
 authors:
 - Brice Texier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails