active_scaffold_export_vho 3.0.1 → 3.1.0

data/Rakefile

@@ -22,7 +22,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{Exporting Records with ActiveScaffold}
   gem.email = "activescaffold@googlegroups.com"
   gem.authors = ["Volker Hochstein"]
-  gem.add_runtime_dependency 'active_scaffold_vho', '~> 3.0'
+  gem.add_runtime_dependency 'active_scaffold_vho', '~> 3.1'
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'

data/active_scaffold_export_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_export_vho}
-  s.version = "3.0.1"
+  s.version = "3.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Volker Hochstein"]
-  s.date = %q{2011-02-01}
+  s.date = %q{2011-11-23}
   s.description = %q{Exporting Records with ActiveScaffold}
   s.email = %q{activescaffold@googlegroups.com}
   s.extra_rdoc_files = [
@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
     "README",
     "Rakefile",
     "active_scaffold_export_vho.gemspec",
-    "frontends/default/images/export.png",
-    "frontends/default/stylesheets/export-stylesheet-ie.css",
-    "frontends/default/stylesheets/export-stylesheet.css",
+    "app/assets/images/export.png",
+    "app/assets/stylesheets/active_scaffold_export.css.erb",
+    "app/assets/stylesheets/export-stylesheet-ie.css",
     "frontends/default/views/_export.csv.erb",
     "frontends/default/views/_export_form_body.html.erb",
     "frontends/default/views/_show_export.html.erb",
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "lib/active_scaffold/helpers/export_helpers.rb",
     "lib/active_scaffold_export.rb",
     "lib/active_scaffold_export/config/core.rb",
+    "lib/active_scaffold_export/engine.rb",
     "lib/active_scaffold_export/version.rb",
     "lib/active_scaffold_export_vho.rb"
   ]
@@ -49,24 +50,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_runtime_dependency(%q<active_scaffold_vho>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<active_scaffold_vho>, ["~> 3.1"])
     else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<active_scaffold_vho>, ["~> 3.0"])
+      s.add_dependency(%q<active_scaffold_vho>, ["~> 3.1"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<active_scaffold_vho>, ["~> 3.0"])
+    s.add_dependency(%q<active_scaffold_vho>, ["~> 3.1"])
   end
 end
 

data/{frontends/default/stylesheets/export-stylesheet.css → app/assets/stylesheets/active_scaffold_export.css.erb}

@@ -1,4 +1,5 @@
 .active-scaffold-header div.actions a.show_export {
+  background-image: url(<%= asset_path 'export.png' %>);
   background-image: url(../../../images/active_scaffold/default/export.png);
   background-position: 1px 50%;
   background-repeat: no-repeat;
@@ -25,3 +26,12 @@
 .active-scaffold div.show_export-view label #delimiter {
   font-family: monospace;
 }
+
+.as_touch .active-scaffold-header div.actions a.show_export {
+  padding: 7px 5px 7px 25px;
+}
+
+.as_touch .active-scaffold .active-scaffold-header div.actions > a.show_export {
+  padding: 7px 5px 7px 25px;
+  background-position: 5px 50%;
+}

data/frontends/default/views/_export.csv.erb

@@ -1,4 +1,6 @@
 <%
+  require 'csv' if RUBY_VERSION >= "1.9"
+
   fcsv_options = {
     :row_sep => "\n",
     :col_sep => params[:delimiter],
@@ -6,7 +8,8 @@
     :headers => @export_columns.collect { |column| format_export_column_header_name(column) }
   }
 
-  data = FasterCSV.generate(fcsv_options) do |csv|
+  csv_lib = Object.const_defined?('CSV') ? CSV : FasterCSV
+  data = csv_lib.generate(fcsv_options) do |csv|
     csv << fcsv_options[:headers] unless params[:skip_header] == 'true'
     @records.each do |record|
       csv << @export_columns.collect { |column|

data/lib/active_scaffold/actions/export.rb

@@ -66,6 +66,7 @@ module ActiveScaffold::Actions
       do_segment_search rescue nil
       unless params[:full_download] == 'true'
         find_options.merge!({
+          :pagination => active_scaffold_config.list.pagination,
           :per_page => active_scaffold_config.list.user.per_page,
           :page => active_scaffold_config.list.user.page
         })

data/lib/active_scaffold/helpers/export_helpers.rb

@@ -2,22 +2,6 @@ module ActiveScaffold
   module Helpers
     # Helpers that assist with the rendering of a Export Column
     module ExportHelpers
-      def self.included(base)
-        base.alias_method_chain :active_scaffold_stylesheets, :export
-        base.alias_method_chain :active_scaffold_ie_stylesheets, :export
-      end
-
-      # Provides stylesheets to include with +stylesheet_link_tag+
-      def active_scaffold_stylesheets_with_export(frontend = :default)
-        active_scaffold_stylesheets_without_export.to_a << ActiveScaffold::Config::Core.asset_path("export-stylesheet.css", frontend)
-      end
-      
-
-      # Provides stylesheets for IE to include with +stylesheet_link_tag+
-      def active_scaffold_ie_stylesheets_with_export(frontend = :default)
-        active_scaffold_ie_stylesheets_without_export.to_a << ActiveScaffold::Config::Core.asset_path("export-stylesheet-ie.css", frontend)
-      end
-
       ## individual columns can be overridden by defining
       # a helper method <column_name>_export_column(record)
       # You can customize the output of all columns by

data/lib/active_scaffold_export.rb

@@ -1,5 +1,8 @@
 ActiveScaffold rescue throw "should have included ActiveScaffold plug in first.  Please make sure that this plug-in comes alphabetically after the ActiveScaffold plug-in"
 
+require 'active_scaffold_export/engine'
+require 'active_scaffold_export/version'
+
 # Load our overrides
 require "active_scaffold_export/config/core.rb"
 
@@ -23,17 +26,4 @@ module ActiveScaffold
   end
 end
 
-ActionView::Base.send(:include, ActiveScaffold::Helpers::ExportHelpers)
-
-
-##
-## Run the install assets script, too, just to make sure
-## But at least rescue the action in production
-##
-Rails::Application.initializer("active_scaffold_export.install_assets", :after => "active_scaffold.install_assets") do
-  begin
-    ActiveScaffoldAssets.copy_to_public(ActiveScaffoldExport.root)
-  rescue
-    raise $! unless Rails.env == 'production'
-  end
-end if defined?(ACTIVE_SCAFFOLD_EXPORT_GEM)
+ActionView::Base.send(:include, ActiveScaffold::Helpers::ExportHelpers)

data/lib/active_scaffold_export/engine.rb

@@ -0,0 +1,8 @@
+module ActiveScaffoldExport
+  #do not use module Rails... cause Rails.logger will fail
+  # not sure if it is a must though...
+  #module Rails
+    class Engine < ::Rails::Engine
+    end
+  #end
+end

data/lib/active_scaffold_export/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffoldExport
   module Version
     MAJOR = 3
-    MINOR = 0
-    PATCH = 1
+    MINOR = 1
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_export_vho
 version: !ruby/object:Gem::Version 
-  hash: 5
   prerelease: false
   segments: 
   - 3
-  - 0
   - 1
-  version: 3.0.1
+  - 0
+  segments_generated: true
+  version: 3.1.0
 platform: ruby
 authors: 
 - Volker Hochstein
@@ -15,84 +15,52 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +01:00
+date: 2011-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: shoulda
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: jeweler
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  requirement: *id001
-  type: :development
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id002
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  requirement: *id003
-  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rcov
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
-  requirement: *id004
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: active_scaffold_vho
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
-        - 0
-        version: "3.0"
-  requirement: *id005
+        - 1
+        segments_generated: true
+        version: "3.1"
   type: :runtime
+  prerelease: false
+  version_requirements: *id003
 description: Exporting Records with ActiveScaffold
 email: activescaffold@googlegroups.com
 executables: []
@@ -108,9 +76,9 @@ files:
 - README
 - Rakefile
 - active_scaffold_export_vho.gemspec
-- frontends/default/images/export.png
-- frontends/default/stylesheets/export-stylesheet-ie.css
-- frontends/default/stylesheets/export-stylesheet.css
+- app/assets/images/export.png
+- app/assets/stylesheets/active_scaffold_export.css.erb
+- app/assets/stylesheets/export-stylesheet-ie.css
 - frontends/default/views/_export.csv.erb
 - frontends/default/views/_export_form_body.html.erb
 - frontends/default/views/_show_export.html.erb
@@ -121,6 +89,7 @@ files:
 - lib/active_scaffold/helpers/export_helpers.rb
 - lib/active_scaffold_export.rb
 - lib/active_scaffold_export/config/core.rb
+- lib/active_scaffold_export/engine.rb
 - lib/active_scaffold_export/version.rb
 - lib/active_scaffold_export_vho.rb
 has_rdoc: true
@@ -137,18 +106,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -1505145558479518699
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []