administrate_exportable 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7290e0d143c8778841f5ab7a66582b2cb5c93d36bad718b2fe715b918f21f66c
-  data.tar.gz: ff79db8b3840e3db6fc79863d94642d139bc3db9030137b24d24f4f947a9fefe
+SHA1:
+  metadata.gz: 35b8f7ad01eec64832238b828b49732ffa7180ba
+  data.tar.gz: 26a780ff2ed1b139d23846d58df47f55dca525aa
 SHA512:
-  metadata.gz: 7e5fb82aa7007d995fd098e9c7668ca9b3778cb36b9f04f1f88e158e0caf9a1f19173f46a4f79fb6dda8af93450c9195b2d1b89e1911eb4ea0a90009999cab45
-  data.tar.gz: 41e667a0049aa408dcdfc73bf640881e9287e8554731ff93714804a4ae537085b43c3bd4a162b72d8ae2c44908d9cdd4bcfb28152a154b572b0d913dad4fb5d8
+  metadata.gz: 35ce161fee48f84948d18d23875e97f48f8a8d939bceb47397ba182bade08fb47d0f092effebb328ce9562a80808b816ed159cc706aec283f495881868e77d05
+  data.tar.gz: 749519e9a9f5517e7da047801e0b6f4b0380a78eb3617bce11f7ff1efdcaac528cf63b247739074d5d3f8b6e33697d704514a75071693496d902c725f0cedb4f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    administrate_exportable (0.1.0)
+    administrate_exportable (0.1.3)
       actionview (>= 5.2.2.1)
       administrate (> 0.10.0)
       rails (>= 4.2)
@@ -51,23 +51,23 @@ GEM
       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.12.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 (9.6.4)
       execjs
     builder (3.2.3)
     byebug (11.0.1)
@@ -79,12 +79,12 @@ GEM
     diff-lcs (1.3)
     enumerate_it (2.0.0)
       activesupport (>= 4.0.0)
-    erubi (1.8.0)
+    erubi (1.9.0)
     execjs (2.7.0)
     ffi (1.11.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
@@ -102,7 +102,7 @@ GEM
       activerecord
       kaminari-core (= 1.1.1)
     kaminari-core (1.1.1)
-    loofah (2.2.3)
+    loofah (2.3.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -113,11 +113,11 @@ GEM
     mimemagic (0.3.3)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.12.2)
     momentjs-rails (2.20.1)
       railties (>= 3.1)
     nio4r (2.4.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -144,18 +144,15 @@ GEM
     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)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
     railties (5.2.3)
       actionpack (= 5.2.3)
       activesupport (= 5.2.3)
       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.0)
     rb-readline (0.5.5)
     rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
@@ -174,17 +171,14 @@ 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.2.1)
+      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)
       concurrent-ruby (~> 1.0)
@@ -196,7 +190,7 @@ GEM
     sqlite3 (1.4.1)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     websocket-driver (0.7.1)
@@ -207,7 +201,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  administrate
+  administrate (~> 0.12.0)
   administrate-field-enumerate
   administrate_exportable!
   byebug

data/README.md

@@ -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).to_h.merge(format: :csv)], class: 'button') if valid_action?(:export) %>
 ```
 
 Example:
@@ -72,7 +72,7 @@ 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).to_h.merge(format: :csv)], class: 'button') if valid_action?(:export) %>
   </div>
 ....
 ```

data/administrate_exportable.gemspec

@@ -32,6 +32,7 @@ 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_development_dependency "pry-byebug", "~> 3.0"
   spec.add_dependency 'administrate','> 0.10.0'
   spec.add_dependency 'rails', '>= 4.2'
   spec.add_dependency 'actionview', '>= 5.2.2.1'

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

@@ -45,11 +45,7 @@ It renders the `_table` partial to display details about the resources.
       [: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>
 </header>
 

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)
@@ -80,12 +81,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.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate_exportable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jônatas Rancan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-14 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,20 @@ 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
@@ -151,7 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simple plugin to add CSV export feature to Administrate