simpleadmin 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e99cdb380006f15b9fd1984bcd3ef515dbc7a938
-  data.tar.gz: 5648457d8aa33e7e25160290609762c4d26ca2e6
+  metadata.gz: 82784c29c8c79b091658249fa53e8503d615edaf
+  data.tar.gz: b625444669f13b75da2d9a504be1ed348ed45e96
 SHA512:
-  metadata.gz: 1e76548b4c9b3a71daf4dd91101cd4b095356f53406f61730e727eb38c20b981f5faf5299e82ad4644677974910440edba8122186b8709122464a70646dec42e
-  data.tar.gz: bca47c1d1a2937231754d1e17996de32202569d1654907a1643dba3bcba9db2bb45fe30e32f64bc248b62e8b670e9e4089411aa5e404fba43158e19c71494317
+  metadata.gz: 920362a8d4c2cc4da2780f8dd59cb1da2483d1e928bccd72371fb627207db522a62f52f5a6878f2dc43ef150551a1c55c488209097490e0a8220dbeda4bc8073
+  data.tar.gz: fa6f5b7dcb16de7e10bebd14da74086be4cb81d7b85c78e9c5de75fead0c9f01dae8fa9079a52ad8bbe1fdecdb7765d31c9e219bb5c5c423005bbbe480d4d29b

data/app/controllers/simple_admin/resources_controller.rb

@@ -2,7 +2,9 @@ module SimpleAdmin
   class ResourcesController < BaseController
     def index
       resource_service = ResourcesService.new(params[:model_klass_name], params[:model_fields])
-                                         .index_action(params[:per_page], params[:page], params[:sort], params[:query], params[:model_attributes])
+                                         .index_action(params[:per_page], params[:page], params[:sort],
+                                                       params[:query], params[:model_attributes], params[:reflection_tables],
+                                                       params[:reflection_columns])
 
       render json: {
         resources: resource_service.resources,
@@ -21,7 +23,7 @@ module SimpleAdmin
     def show_by
       model_fields = params[:model_fields].map { |model_field| model_field['field_name'] }
 
-      resource = model_klass.find_by(params[:column_name] => params[:column_value] ).attributes.slice(*model_fields)
+      resource = model_klass.find_by(params[:column_name] => params[:column_value]).attributes.slice(*model_fields)
 
       render json: resource
     end

data/app/services/resources_service.rb

@@ -6,7 +6,7 @@ class ResourcesService
     @model_fields = model_fields.map { |field_attributes| field_attributes[:field_name] }
   end
 
-  def index_action(per_page, page, sort, query, model_attributes)
+  def index_action(per_page, page, sort, query, model_attributes, reflection_tables, reflection_columns)
     per_page = per_page.to_i
     page     = page.to_i if page.present?
 
@@ -14,6 +14,11 @@ class ResourcesService
 
     resources = model_klass.limit(per_page)
 
+    if reflection_tables.present?
+      resources = resources.includes(reflection_tables)
+      model_fields.push(*reflection_columns)
+    end
+
     if query.present?
       search_result = search(query, model_klass, model_attributes)
 
@@ -29,20 +34,8 @@ class ResourcesService
       resources.order(id: :asc)
                 end
 
-    resources = resources.map do |resource|
-      _resource = {}
-
-      resource.attributes.each do |attribute_name, attribute_value|
-        next unless model_fields.include?(attribute_name)
-
-        _resource[attribute_name] = attribute_value
-      end
-
-      _resource
-    end
-
     OpenStruct.new(
-      resources: resources,
+      resources: resources.pluck(*model_fields).map { |resource| model_fields.zip(resource).to_h },
       total: total
     )
   end

data/lib/simpleadmin/version.rb

@@ -1,3 +1,3 @@
 module Simpleadmin
-  VERSION = '1.2.4'.freeze
+  VERSION = '1.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simpleadmin
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Dmitriy Strukov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler