administrate_exportable 0.1.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7290e0d143c8778841f5ab7a66582b2cb5c93d36bad718b2fe715b918f21f66c
-  data.tar.gz: ff79db8b3840e3db6fc79863d94642d139bc3db9030137b24d24f4f947a9fefe
+  metadata.gz: 3d9744acc6ec1cc1b8ca19110d71e953299593d2843291aeef6b008cdeb017be
+  data.tar.gz: b32df982094216cd7e748912ef4ea3aa431734e923a5e8ed0eaffd3506eb1248
 SHA512:
-  metadata.gz: 7e5fb82aa7007d995fd098e9c7668ca9b3778cb36b9f04f1f88e158e0caf9a1f19173f46a4f79fb6dda8af93450c9195b2d1b89e1911eb4ea0a90009999cab45
-  data.tar.gz: 41e667a0049aa408dcdfc73bf640881e9287e8554731ff93714804a4ae537085b43c3bd4a162b72d8ae2c44908d9cdd4bcfb28152a154b572b0d913dad4fb5d8
+  metadata.gz: 531eeed10c37bdb24df6a4f44e19bdf618f3602bb25fe84cc941592e5f5cce125d2f9e37725cb4108383f4a7154d2848fd5fe6358412f5275637c5be872955d4
+  data.tar.gz: bac05ea3431679fb7677d20c92d4fb479c4f88efae0de16724bec1c511a8ec04d306d161aa2da5f9b467e8ef451ad60d593b02966d4c7304762caf38716e985b

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.2

data/Gemfile.lock

@@ -1,108 +1,108 @@
 PATH
   remote: .
   specs:
-    administrate_exportable (0.1.0)
+    administrate_exportable (0.3.1)
       actionview (>= 5.2.2.1)
-      administrate (> 0.10.0)
+      administrate (>= 0.13.0)
       rails (>= 4.2)
       railties (>= 5.2.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.2.4.5)
+      actionpack (= 5.2.4.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailer (5.2.4.5)
+      actionpack (= 5.2.4.5)
+      actionview (= 5.2.4.5)
+      activejob (= 5.2.4.5)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (5.2.4.5)
+      actionview (= 5.2.4.5)
+      activesupport (= 5.2.4.5)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (5.2.4.5)
+      activesupport (= 5.2.4.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (5.2.4.5)
+      activesupport (= 5.2.4.5)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    activemodel (5.2.4.5)
+      activesupport (= 5.2.4.5)
+    activerecord (5.2.4.5)
+      activemodel (= 5.2.4.5)
+      activesupport (= 5.2.4.5)
       arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activestorage (5.2.4.5)
+      actionpack (= 5.2.4.5)
+      activerecord (= 5.2.4.5)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (5.2.4.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    administrate (0.11.0)
-      actionpack (>= 4.2, < 6.0)
-      actionview (>= 4.2, < 6.0)
-      activerecord (>= 4.2, < 6.0)
+    administrate (0.13.0)
+      actionpack (>= 4.2)
+      actionview (>= 4.2)
+      activerecord (>= 4.2)
       autoprefixer-rails (>= 6.0)
       datetime_picker_rails (~> 0.0.7)
       jquery-rails (>= 4.0)
       kaminari (>= 1.0)
       momentjs-rails (~> 2.8)
-      sass-rails (~> 5.0)
+      sassc-rails (~> 2.1)
       selectize-rails (~> 0.6)
     administrate-field-enumerate (0.0.1)
       administrate
       enumerate_it
       rails (>= 4.2, < 6.0)
     arel (9.0.0)
-    autoprefixer-rails (9.6.1)
+    autoprefixer-rails (10.2.4.0)
       execjs
-    builder (3.2.3)
+    builder (3.2.4)
     byebug (11.0.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
+    concurrent-ruby (1.1.8)
+    crass (1.0.6)
     datetime_picker_rails (0.0.7)
       momentjs-rails (>= 2.8.1)
     diff-lcs (1.3)
     enumerate_it (2.0.0)
       activesupport (>= 4.0.0)
-    erubi (1.8.0)
+    erubi (1.10.0)
     execjs (2.7.0)
-    ffi (1.11.1)
+    ffi (1.15.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.6.0)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.5)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    kaminari (1.1.1)
+    kaminari (1.2.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
-    loofah (2.2.3)
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
+    loofah (2.9.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -110,52 +110,51 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
     momentjs-rails (2.20.1)
       railties (>= 3.1)
-    nio4r (2.4.0)
-    nokogiri (1.10.3)
-      mini_portile2 (~> 2.4.0)
+    nio4r (2.5.7)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    rack (2.0.7)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (5.2.4.5)
+      actioncable (= 5.2.4.5)
+      actionmailer (= 5.2.4.5)
+      actionpack (= 5.2.4.5)
+      actionview (= 5.2.4.5)
+      activejob (= 5.2.4.5)
+      activemodel (= 5.2.4.5)
+      activerecord (= 5.2.4.5)
+      activestorage (= 5.2.4.5)
+      activesupport (= 5.2.4.5)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 5.2.4.5)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.1.0)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.4.5)
+      actionpack (= 5.2.4.5)
+      activesupport (= 5.2.4.5)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (12.3.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
+    rake (13.0.3)
     rb-readline (0.5.5)
     rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
@@ -174,40 +173,37 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    sass (3.7.4)
-      sass-listen (~> 4.0.0)
-    sass-listen (4.0.0)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sassc-rails (2.1.2)
+      railties (>= 4.0.0)
+      sassc (>= 2.0)
+      sprockets (> 3.0)
+      sprockets-rails
+      tilt
     selectize-rails (0.12.6)
-    sprockets (3.7.2)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
-    thor (0.20.3)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tilt (2.0.9)
-    tzinfo (1.2.5)
+    tilt (2.0.10)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  administrate
+  administrate (~> 0.13.0)
   administrate-field-enumerate
   administrate_exportable!
   byebug
@@ -218,7 +214,7 @@ DEPENDENCIES
   sqlite3
 
 RUBY VERSION
-   ruby 2.4.2p198
+   ruby 2.7.2p137
 
 BUNDLED WITH
-   1.17.1
+   2.1.4

data/README.md

@@ -20,7 +20,7 @@ For each resource you want to be exportable, add the following line to the their
 ```ruby
 include AdministrateExportable::Exporter
 ```
-and the following line in the `db/routes.rb` file, correctly nested on resources
+and the following line in the `config/routes.rb` file, correctly nested on resources
 ```ruby
 get :export, on: :collection
 ```
@@ -56,7 +56,7 @@ ATTRIBUTE_TYPES = {
 
 By default the gem adds the Export button to the view `views/admin/application/index.html.erb`. But if you have your own Administrate `index` views, you can add the link manually:
 ```ruby
-link_to('Export', [:export, namespace, page.resource_name.to_s.pluralize, { format: :csv }], class: 'button') if valid_action?(:export)
+link_to('Export', [:export, namespace, page.resource_name.to_s.pluralize, sanitized_order_params(page, :id).to_h.merge(format: :csv)], class: 'button') if valid_action?(:export)
 ```
 
 Example:
@@ -72,7 +72,12 @@ Example:
       [:new, namespace, page.resource_path],
       class: "button",
     ) if valid_action?(:new) && show_action?(:new, new_resource) %>
-    <%= link_to('Export', [:export, namespace, page.resource_name.to_s.pluralize, { format: :csv }], class: 'button') if valid_action?(:export) %>
+
+    <%= link_to(
+      'Export',
+      [:export, namespace, page.resource_name.to_s.pluralize, sanitized_order_params(page, :id).to_h.merge(format: :csv)],
+      class: 'button'
+    ) if valid_action?(:export) %>
   </div>
 ....
 ```

data/administrate_exportable.gemspec

@@ -32,7 +32,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_dependency 'administrate','> 0.10.0'
+  spec.add_development_dependency "pry-byebug", "~> 3.0"
+  spec.add_dependency 'administrate','>= 0.13.0'
   spec.add_dependency 'rails', '>= 4.2'
   spec.add_dependency 'actionview', '>= 5.2.2.1'
   spec.add_dependency 'railties', '>= 5.2.2.1'

data/app/views/admin/application/index.html.erb

@@ -42,14 +42,14 @@ It renders the `_table` partial to display details about the resources.
         "administrate.actions.new_resource",
         name: page.resource_name.titleize.downcase
       ),
-      [:new, namespace, page.resource_path],
+      [:new, namespace, page.resource_path.to_sym],
       class: "button",
     ) if valid_action?(:new) && show_action?(:new, new_resource) %>
     <%= link_to(
       'Export',
-      [:export, namespace, page.resource_name.to_s.pluralize, { format: :csv }],
+      [:export, namespace, page.resource_name.to_s.pluralize.to_sym, sanitized_order_params(page, :id).to_h.merge(format: :csv)],
       class: 'button'
-    ) if valid_action?(:export) %>
+    ) if valid_action?(:export) && show_action?(:export, resource_name) %>
   </div>
 </header>
 
@@ -63,5 +63,5 @@ It renders the `_table` partial to display details about the resources.
     table_title: "page-title"
   ) %>
 
-  <%= paginate resources %>
+  <%= paginate resources, param_name: AdministrateExportable::PAGE_PARAM %>
 </section>

data/lib/administrate_exportable.rb

@@ -1,8 +1,11 @@
 require "administrate_exportable/version"
 require "administrate_exportable/exporter_service"
 require "administrate_exportable/exporter"
+require "administrate/version"
 
 module AdministrateExportable
+  PAGE_PARAM = Gem::Version.create(Administrate::VERSION) >= Gem::Version.create('0.15.0') ? '_page' : 'page'
+
   class Engine < ::Rails::Engine
   end
 end

data/lib/administrate_exportable/exporter.rb

@@ -9,7 +9,14 @@ module AdministrateExportable
     class_methods do
       def exportable
         define_method(:export) do
-          csv_data = ExporterService.csv(dashboard, resource_class)
+          search_term = params[:search].to_s.strip
+          resources = Administrate::Search.new(scoped_resource,
+                                               dashboard_class,
+                                               search_term).run
+          resources = apply_collection_includes(resources)
+          resources = order.apply(resources)
+
+          csv_data = ExporterService.csv(dashboard, resource_class, resources)
 
           respond_to do |format|
             format.csv { send_data csv_data, filename: "#{resource_name.to_s.pluralize}-#{Date.today}.csv" }

data/lib/administrate_exportable/exporter_service.rb

@@ -2,13 +2,14 @@ require 'csv'
 
 module AdministrateExportable
   class ExporterService
-    def self.csv(dashboard, resource_class)
-      new(dashboard, resource_class).csv
+    def self.csv(dashboard, resource_class, resources)
+      new(dashboard, resource_class, resources).csv
     end
 
-    def initialize(dashboard, resource_class)
+    def initialize(dashboard, resource_class, resources)
       @dashboard = dashboard
       @resource_class = resource_class
+      @resources = resources
     end
 
     def csv
@@ -26,7 +27,7 @@ module AdministrateExportable
 
     private
 
-    attr_reader :dashboard, :resource_class, :sanitizer
+    attr_reader :dashboard, :resource_class, :resources, :sanitizer
 
     def record_attribute(record, attribute_key, attribute_type)
       field = attribute_type.new(attribute_key, record.send(attribute_key), 'index', resource: record)
@@ -43,6 +44,8 @@ module AdministrateExportable
         field.data.count if field.data
       when Administrate::Field::DateTime.to_s
         field.datetime if field.data
+      when Administrate::Field::Date.to_s
+        field.date if field.data
       when Administrate::Field::Email.to_s, Administrate::Field::Select.to_s
         field.data
       when Administrate::Field::Password.to_s, Administrate::Field::String.to_s, Administrate::Field::Text.to_s
@@ -80,12 +83,7 @@ module AdministrateExportable
     end
 
     def collection
-      relation = resource_class.default_scoped
-      resource_includes = dashboard.collection_includes
-
-      return relation if resource_includes.empty?
-
-      relation.includes(*resource_includes)
+      resources
     end
   end
 end

data/lib/administrate_exportable/version.rb

@@ -1,3 +1,3 @@
 module AdministrateExportable
-  VERSION = "0.1.2"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: administrate_exportable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Jônatas Rancan
 - Andrei Bondarev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-14 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,20 +53,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: administrate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -118,6 +132,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".tool-versions"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -136,7 +151,7 @@ homepage: https://github.com/SourceLabsLLC/administrate_exportable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,8 +166,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Simple plugin to add CSV export feature to Administrate
 test_files: []