active_list 6.3.0 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b6136c1c8ed0257199d260b952bb1144c90ed30
-  data.tar.gz: a0342006b4e06592f9efe63a8da22d43576c6008
+  metadata.gz: 15b7f570bc7be9be7cc8d4d85298013fc9d6ab7c
+  data.tar.gz: f6f3d47b93dd58c8b4ea9abcbe78b6978ea6654d
 SHA512:
-  metadata.gz: d0acc55d33cffd6906c6eab21e88e9f012f4ee8ee68f2a64ca9f41adc626389fb454fa9cce3dc0eeb575a6de490fedf837af157e81312dcce96eabbf00881631
-  data.tar.gz: e3b1a2e94be340a8665fdbfa9ac64fb5eb53d37a4290ba0e6dcf546e606e395df84e16455c0085db02b3e25c2d0ec2b3cafa8fa4499df208df0cb08b23fc9dd0
+  metadata.gz: 30e98a470dbee1cfa245f89855f7301dce63f3d261e5d545aed13aab0430f2d5754bfc5270d8038e175e9ff994f85892992069bef8167ed686263eda83084b61
+  data.tar.gz: 4bf502e22df399ae3e5da6c9f546b5b41f2a619e09f68939aa527ece984808f67799f85317889935921fd7de01f3754327313835093038342bfc37d6ed9864c0

data/README.rdoc

@@ -3,7 +3,6 @@
 {<img src="https://api.travis-ci.org/ekylibre/active_list.png?branch=master"/>}[https://travis-ci.org/ekylibre/active_list]
 {<img src="https://gemnasium.com/ekylibre/active_list.png"/>}[https://gemnasium.com/ekylibre/active_list]
 {<img src="https://codeclimate.com/github/ekylibre/active_list.png" />}[https://codeclimate.com/github/ekylibre/active_list]
-{<img src="https://coveralls.io/repos/ekylibre/active_list/badge.png?branch=master" alt="Coverage Status" />}[https://coveralls.io/r/ekylibre/active_list]
 
 ActiveList is a simple list widget. It permits to create a controller 
 method and view helper to displays lists.

data/lib/active_list/definition/association_column.rb

@@ -67,8 +67,10 @@ module ActiveList
       end
 
       def sort_expression
-        if table.reflections.select{|r| r.table_name == @reflection.table_name}.size > 1
-          "#{@reflection.name.to_s.pluralize}_#{@reflection.class_name.constantize.table_name}.#{@sort_column}"
+        same_table_reflections = table.reflections.select{|r| r.table_name == @reflection.table_name}
+        if same_table_reflections.size > 1 and same_table_reflections.index{|r| r.name == @reflection.name } > 0
+          # "#{@reflection.name.to_s.pluralize}_#{@reflection.class_name.constantize.table_name}.#{@sort_column}"
+          "#{@reflection.name.to_s.pluralize}_#{table.model.table_name}.#{@sort_column}"
         else
           "#{@reflection.class_name.constantize.table_name}.#{@sort_column}"
         end

data/lib/active_list/definition/table.rb

@@ -81,7 +81,7 @@ module ActiveList
       # Compute includes Hash
       def reflections
         hash = []
-        for column in self.columns
+        self.columns.each do |column|
           if column.respond_to?(:reflection)
             unless hash.detect{|r| r.name == column.reflection.name }
               hash << column.reflection

data/lib/active_list/generator.rb

@@ -20,8 +20,8 @@ module ActiveList
       else
         @table.load_default_columns
       end
-      @parameters = {:sort => :to_s, :dir => :to_s}
-      @parameters.merge!(:page => :to_i, :per_page => :to_i) if @table.paginate?
+      @parameters = {sort: :to_s, dir: :to_s}
+      @parameters.merge!(page: :to_i, per_page: :to_i) if @table.paginate?
     end
 
     def collection?

data/lib/active_list/generator/finder.rb

@@ -9,7 +9,7 @@ module ActiveList
       # Check order
       unless @table.options.keys.include?(:order)
         columns = @table.table_columns
-        @table.options[:order] = (columns.size > 0 ? columns.first.name.to_sym : {id: :desc}) # "#{@table.model.table_name}.id DESC"
+        @table.options[:order] = (columns.any? ? columns.first.name.to_sym : {id: :desc})
       end
 
       class_name = @table.model.name

data/lib/active_list/renderers/simple_renderer.rb

@@ -7,18 +7,18 @@ module ActiveList
 
 
       DATATYPE_ABBREVIATION = {
-        :binary => :bin,
-        :boolean => :bln,
-        :date => :dat,
-        :datetime => :dtt,
-        :decimal => :dec,
-        :measure => :dec,
-        :float => :flt,
-        :integer => :int,
-        :string => :str,
-        :text => :txt,
-        :time => :tim,
-        :timestamp => :dtt
+        binary:    :bin,
+        boolean:   :bln,
+        date:      :dat,
+        datetime:  :dtt,
+        decimal:   :dec,
+        measure:   :dec,
+        float:     :flt,
+        integer:   :int,
+        string:    :str,
+        text:      :txt,
+        time:      :tim,
+        timestamp: :dtt
       }
 
       def remote_update_code
@@ -30,9 +30,9 @@ 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 << "  render(inline: '<%=#{generator.view_method_name}-%>')\n"
         code << "end\n"
         return code
       end

data/lib/active_list/version.rb

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

data/test/test_helper.rb

@@ -28,3 +28,7 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
 # Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+
+
+# TODO: Adds integration test
+# TODO: Adds test on list with double join on same table

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.3.1
 platform: ruby
 authors:
 - Brice Texier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: arel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: code_string
   requirement: !ruby/object:Gem::Requirement