rails-rapido 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8079b4a3ece5e94b2fa951274c441c3437a28321c4e1f54370cbd2e61b95ee56
-  data.tar.gz: c79473dbc46bf84d5a2f2f1fe6fee79f971b952e5039b479045934604217033b
+  metadata.gz: c62492980ddb246461582385eb1c9fa069b025ccbd39c4ae94189d33bafc836a
+  data.tar.gz: 14eb7a3269938509bb01ca8517cf68398445f05b6b93c92e918516e8c7c2aabd
 SHA512:
-  metadata.gz: 68807070271128ff75d21b40c5dd19f86599ea19fed463ef1ae7d02823b713a9492d5a7db43c9c4541c02104c02e2139a63d8db3e46750d4bb3109eadd4b85cf
-  data.tar.gz: 9137c452b85f17dc26743be3e1f9276559ff64319be00107fd761849dc43f045d7b70067799c5d4db958ad1165cc9bd7a2180caf9853cc4c2486d38ad969c96f
+  metadata.gz: 05e5f8e6d38877005df077ab7b767c890158ba7a0be2f48130e0e16a41e5973f1ae4f16e40291f56481c9218425b9548707f22aeab2125b543515264d12f54eb
+  data.tar.gz: 26916c6b6672d778eec56db5fb1b52d1a03c805655a80322de84c5c8137a7ddc606c73d8bd7ad4a432aa557f849e0be2dcb01a56276a3459d399c8663210bf93

data/.rubocop.yml

@@ -283,7 +283,7 @@ Lint/UselessAccessModifier:
 Lint/UselessAssignment:
   Enabled: true
 
-Lint/UselessComparison:
+Lint/BinaryOperatorWithIdenticalOperands:
   Enabled: true
 
 Lint/UselessElseWithoutRescue:

data/lib/rapido/api_controller.rb

@@ -22,19 +22,19 @@ module Rapido
 
     def index
       return if performed?
-      render json: present_resource_collection(resource_collection)
+      render json: resource_collection_presenter
     end
 
     def show
       return if performed?
       if request.format.to_sym == :json
-        render json: present_resource(resource)
+        render json: resource_presenter
       elsif request.format.to_sym == :xml
-        render xml: present_resource(resource)
-      elsif request.format.to_s.starts_with?("text/")
-        render plain: present_resource(resource).send("to_#{request.format.to_sym.to_s}")
+        render xml: resource_presenter
+      elsif request.format.to_sym == :csv
+        render plain: resource_presenter.send("to_csv")
       else
-        render json: present_resource(resource)
+        render json: resource_presenter
       end
     end
 
@@ -46,7 +46,7 @@ module Rapido
       if new_resource.save
         after_create_success(new_resource)
         return if performed?
-        render json: present_resource(new_resource), status: :created
+        render json: resource_presenter(new_resource), status: :created
       else
         after_create_failure(new_resource)
         return if performed?
@@ -56,7 +56,7 @@ module Rapido
 
     def destroy
       return if performed?
-      resource_before_destruction = present_resource(resource)
+      resource_before_destruction = resource_presenter
       before_destroy
       resource.destroy
       after_destroy_success
@@ -72,7 +72,7 @@ module Rapido
       if resource.save
         after_update_success
         return if performed?
-        render json: present_resource(resource)
+        render json: resource_presenter
       else
         after_update_failure
         return if performed?
@@ -117,17 +117,28 @@ module Rapido
       head :unauthorized unless allowed_actions.include?(params[:action].to_sym)
     end
 
-    def present_resource(resource)
-      args = presenter_args.nil? ? nil : presenter_args.map { |arg| params[arg] }
-      return presenter.new(resource, *args) if presenter
-      resource.to_h
+    def resource_presenter(new_resource = nil)
+      @resource_presenter ||= begin
+        args = presenter_args.nil? ? nil : presenter_args.map { |arg| params[arg] }
+        if presenter
+          presenter.new(new_resource || resource, *args)
+        else
+          (new_resource || resource).to_h
+        end
+      end
     end
 
-    def present_resource_collection(resource_collection)
-      args = collection_presenter_args.nil? ? nil : collection_presenter_args.map { |arg| params[arg] }
-      return collection_presenter.new(resource_collection, *args).as_json if collection_presenter
-      return resource_collection.map { |r| presenter.new(r).as_json } if presenter
-      resource_collection.map(&:to_h)
+    def resource_collection_presenter
+      @resource_collection_presenter ||= begin
+        args = collection_presenter_args.nil? ? nil : collection_presenter_args.map { |arg| params[arg] }
+        if collection_presenter
+          collection_presenter.new(resource_collection, *args)
+        elsif presenter
+          resource_collection.map { |r| presenter.new(r) }
+        else
+          resource_collection.map(&:to_h)
+        end
+      end
     end
   end
 end

data/lib/rapido/version.rb

@@ -1,3 +1,3 @@
 module Rapido
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-rapido
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Jonathan Kirst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler