active_list 6.2.0 → 6.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 63c30efd24bc0da00cb562eae544b9c789675e36
+  data.tar.gz: bd68dc84832acfd12a000b985a869e719844623f
+SHA512:
+  metadata.gz: a8798375c0ef7aa377d987e4e594b4efe1de1cd5e230fbb194f5a2c34c3cce1ac2baf8809810baca6023f2dced4da150b09501689b0249018f8ad0ce3027696a
+  data.tar.gz: e63de4626bc4ec92a8965142a8c139d16d6cf301500e9b2f9ed16fe8b00f6841f4ea438553c1f947f04371e3d29d1fba73f1c7946047fd395159003864cab96f

data/lib/active_list.rb

@@ -1,7 +1,6 @@
 require 'csv'
 require 'action_dispatch'
 require 'rails'
-# require 'compass-rails'
 require 'code_string'
 require 'i18n-complements'
 

data/lib/active_list/definition/action_column.rb

@@ -96,21 +96,21 @@ module ActiveList
           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+"}"+
+              ", {class: '#{@name}'"+link_options+"}"+
               ")\n"
           end
 
           code = "if "+cases.join("elsif ")+"end"
         else
           url = @options[:url] ||= {}
-          url[:controller] ||= (@options[:controller] || "RECORD.class.name.tableize".c) # self.table.model.name.underscore.pluralize.to_s
+          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.delete_if{|k, v| v.nil?}
-          url = "{" + url.collect{|k, v| "#{k}: " + urlify(v, record)}.join(", ")+format+"}"
-          code = "{class: '#{@name}'" + link_options+"}"
-          code = "link_to(content_tag(:i) + h(' ' + '#{action}'.t(scope: 'rest.actions')), " + url + ", " + code + ")"
+          url = "{" + url.collect{|k, v| "#{k}: " + urlify(v, record)}.join(", ") + format + "}"
+          code = "{class: '#{@name}'" + link_options + "}"
+          code = "link_to(content_tag(:i) + h(' ' + :#{action}.t(scope: 'rest.actions')), " + url + ", " + code + ")"
         end
         if @options[:if]
           code = "if " + recordify!(@options[:if], record) + "\n" + code.dig + "end"

data/lib/active_list/definition/table.rb

@@ -123,7 +123,7 @@ module ActiveList
         if @model.reflect_on_association(name)
           options[:through] ||= name
           add :association, name, options
-        elsif @model.reflect_on_association(options[:through])
+        elsif options[:through] and @model.reflect_on_association(options[:through])
           options[:label_method] ||= name
           add :association, name, options
         else

data/lib/active_list/rails/engine.rb

@@ -1,15 +1,13 @@
 module ActiveList
   module Rails
-
     class Engine < ::Rails::Engine
       engine_name "active_list"
       initializer "active_list.integrate_methods" do |app|
         ::ActionController::Base.send(:include, ActiveList::Rails::Integration::ActionController)
         ::ActionView::Base.send(:include, ActiveList::Rails::Integration::ViewsHelper)
-        files = Dir[File.join(File.dirname(__FILE__), "..", "..", "..", "locales", "*.yml")]
+        files = Dir[File.join(File.dirname(__FILE__), "..", "..", "..", "config", "locales", "*.yml")]
         ::I18n.load_path.concat(files)
       end
     end
-
   end
 end

data/lib/active_list/version.rb

@@ -1,5 +1,5 @@
 module ActiveList
 
-  VERSION = "6.2.0"
+  VERSION = "6.2.1"
 
 end

data/test/dummy/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: ../..
   specs:
-    active_list (6.1.0)
+    active_list (6.2.0)
       code_string (>= 0.0.0)
       i18n-complements
-      rails (>= 3.2, < 4.1)
+      rails (>= 3.2, < 5)
       rubyzip (>= 1.0)
 
 GEM
@@ -48,13 +48,13 @@ GEM
       execjs
     coffee-script-source (1.7.0)
     erubis (2.7.0)
-    execjs (2.0.2)
+    execjs (2.2.1)
     hike (1.2.3)
     i18n (0.6.9)
     i18n-complements (0.0.10)
       i18n (>= 0.6)
     journey (1.0.4)
-    jquery-rails (3.1.0)
+    jquery-rails (3.1.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
@@ -63,8 +63,8 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.9.3)
-    polyglot (0.3.4)
+    multi_json (1.10.1)
+    polyglot (0.3.5)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -87,12 +87,12 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.1)
+    rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.5)
-    rubyzip (1.1.3)
-    sass (3.3.7)
+    rubyzip (1.1.6)
+    sass (3.3.9)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -112,7 +112,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.39)
-    uglifier (2.5.0)
+    uglifier (2.5.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 

metadata

@@ -1,100 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 6.2.0
-  prerelease: 
+  version: 6.2.1
 platform: ruby
 authors:
 - Brice Texier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: code_string
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: i18n-complements
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Generates action methods to provide clean tables.
@@ -140,8 +129,6 @@ files:
 - lib/active_list/renderers/abstract_renderer.rb
 - lib/active_list/renderers/simple_renderer.rb
 - lib/active_list/version.rb
-- locales/eng.yml
-- locales/fra.yml
 - test/active_list_test.rb
 - test/code_generation_test.rb
 - test/dummy/.gitignore
@@ -206,27 +193,26 @@ files:
 homepage: http://github.com/ekylibre/active_list
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple interactive tables for Rails app
 test_files:
 - test/active_list_test.rb

data/locales/eng.yml

@@ -1,26 +0,0 @@
-eng: &eng
-  list:
-    columns: "Columns"
-    export:
-      false_value: "FALSE"
-      formats:
-        csv: "CSV"
-        ods: "Spreadsheet ODF"
-        xcsv: "Excel CSV"
-      title: "Export"
-      true_value: "TRUE"
-    export_as: "Export as %{exported}..."
-    items_per_page: "Items per page"
-    menu: "Menu"
-    no_records: "No records"
-    pagination:
-      first: "First page"
-      last: "Last page"
-      next: "Next page"
-      previous: "Previous page"
-      showing_x_to_y_of_total: "Showing %{x} to %{y} of %{total}"
-      x_to_y_of_total: "%{x}-%{y} of %{total}"
-    x_per_page:
-      one: "%{count} per page"
-      other: "%{count} per page"
-en: *eng

data/locales/fra.yml

@@ -1,26 +0,0 @@
-fra: &fra
-  list:
-    columns: "Colonnes"
-    export:
-      false_value: "FAUX"
-      formats:
-        csv: "CSV"
-        ods: "Classeur ODF"
-        xcsv: "CSV Excel"
-      title: "Exporter"
-      true_value: "VRAI"
-    export_as: "Exporter en %{exported}"
-    items_per_page: "Éléments par page"
-    menu: "Menu"
-    no_records: "Aucun enregistrement"
-    pagination:
-      first: "Début"
-      last: "Fin"
-      next: "Suivant"
-      previous: "Précédent"
-      showing_x_to_y_of_total: "Enregistrements %{x} à %{y} sur %{total}"
-      x_to_y_of_total: "%{x}-%{y} sur %{total}"
-    x_per_page:
-      one: "%{count} par page"
-      other: "%{count} par page"
-fr: *fra