it-logica-application-backbone 1.3.22 → 1.3.23

data/VERSION

@@ -1 +1 @@
-1.3.22
+1.3.23

data/it-logica-application-backbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.3.22"
+  s.version = "1.3.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2013-05-06"
+  s.date = "2013-08-05"
   s.description = "longer description of your gem"
   s.email = "ladislav.smola@it-logica.cz"
   s.extra_rdoc_files = [

data/lib/controller_mixins/csv_instance_methods.rb

@@ -35,16 +35,42 @@ module ControllerMixins
       data_for_csv = []
       header_of_names = []
       header_of_labels = []
+
+      excluded_columns = []
       settings[:columns].each do |c|
-        header_of_names << c[:name].to_s.encode(encoding, "UTF-8")
-        header_of_labels << c[:label].to_s.encode(encoding, "UTF-8")
+        excluded_columns << "#{c[:table]}_#{c[:name]}" if c[:csv_excluded] unless c.blank?
+      end
+
+      # add column names header
+      if settings[:csv].blank? || (!settings[:csv].blank? && !settings[:csv][:exclude_names])
+        settings[:columns].each do |c|
+
+          next if excluded_columns.include?("#{c[:table]}_#{c[:name]}")
+
+          header_of_names << c[:name].to_s.encode(encoding, "UTF-8")
+        end
+        data_for_csv << header_of_names
+      end
+
+      # add column labels header
+      if settings[:csv].blank? || (!settings[:csv].blank? && !settings[:csv][:exclude_labels])
+        settings[:columns].each do |c|
+
+          next if excluded_columns.include?("#{c[:table]}_#{c[:name]}")
+
+          header_of_labels << c[:label].to_s.encode(encoding, "UTF-8")
+        end
+        data_for_csv << header_of_labels
       end
-      data_for_csv << header_of_names
-      data_for_csv << header_of_labels
 
+      # add data without excluded columns
       settings[:data].each do |c|
         row = []
         c.each_pair do |name, value|
+
+          next if excluded_columns.include?(name.to_s)
+          next if name == 'row_id' && settings[:csv][:exclude_row_id] unless settings[:csv].blank?
+
           if value.kind_of?(Hash)
             val = value[:title].blank? ? "" : value[:title]
             row << val.to_s.encode(encoding, "UTF-8")
@@ -56,6 +82,7 @@ module ControllerMixins
         data_for_csv << row
       end
       data_for_csv
+
     end
 
 

data/lib/controller_mixins/renderer_instance_methods.rb

@@ -93,11 +93,13 @@ module ControllerMixins
           case export_method
             when "csv"
               @settings = class_obj.prepare_settings(logged_user, data, @settings, default_params, nil, 50000)
-              generate_and_return_csv(get_data_for_csv_from_settings(@settings))
+              generate_and_return_csv(get_data_for_csv_from_settings(@settings),
+                                      (@settings.blank? || @settings[:csv].blank? || @settings[:csv][:name].blank?) ? 'export.csv' : @settings[:csv][:name])
             when "csv_by_checkboxes"
               settings[:filter_method] = "only_by_checkboxes"
               @settings = class_obj.prepare_settings(logged_user, data, @settings, default_params)
-              generate_and_return_csv(get_data_for_csv_from_settings(@settings))
+              generate_and_return_csv(get_data_for_csv_from_settings(@settings),
+                                      (@settings.blank? || @settings[:csv].blank? || @settings[:csv][:name].blank?) ? 'export.csv' : @settings[:csv][:name])
             else
 
               settings = class_obj.prepare_settings(logged_user, data, settings, default_params)

data/lib/table_settings.rb

@@ -14,7 +14,7 @@ class TableSettings
   # @param [Symbol] model
   #
   def initialize(model)
-    @settings = {:columns => [], :row => {}, :default => {}}
+    @settings = {:columns => [], :row => {}, :default => {}, :csv => {}}
     @model = model
     @default_table = table_name_from_model(model)
 
@@ -171,6 +171,31 @@ class TableSettings
     @settings[:default][:per_page] = number
   end
 
+  # CSV export - filename
+  def csv_name(name = 'export.csv')
+    @settings[:csv][:name] = name
+
+    self
+  end
+
+  # CSV export - exclude header row with column names
+  def csv_exclude_names(exclude = true)
+    @settings[:csv][:exclude_names] = exclude
+    self
+  end
+
+  # CSV export - exclude header row with column labels
+  def csv_exclude_labels(exclude = true)
+    @settings[:csv][:exclude_labels] = exclude
+    self
+  end
+
+  # CSV export - exclude row_id column
+  def csv_exclude_row_id(exclude = true)
+    @settings[:csv][:exclude_row_id] = exclude
+    self
+  end
+
   def filter_path(path)
     @settings[:filter_path] = path
 

data/lib/table_settings/table_column.rb

@@ -115,6 +115,12 @@ class TableSettings
       @column_hash[:inactive_filter] = bool
       self
     end
+
+    # Set if column is excluded from csv export
+    def csv_excluded(bool = false)
+      @column_hash[:csv_excluded] = bool
+      self
+    end
   end
 
   class CustomColumn < Column

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.3.22
+  version: 1.3.23
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -668,7 +668,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 755924244209213329
+      hash: 985655048161230968
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: