blacksheep 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5e427c080e5f5eaf01f76d9436ff18a36e183318acb2b942105566b34be7c03
-  data.tar.gz: 22221c3900e3dd7d09c796e15e14d765c07cd307add2bbb39696b0767a17f088
+  metadata.gz: 84572df9e128c7565cfb17bfb7135451b33bc3b3d12ef97a2c3a3f319843f4d2
+  data.tar.gz: 79884c76bd997723295b04efaf0d5e32b086dd6a281f648bcbe6d01412710690
 SHA512:
-  metadata.gz: cf17a2e2d7732162e0578567d8f04206da221f63d766294670c8b549126e24dd43d5a56451eabb4af6a8a37889ea4aa483a9c77b85c85b38308aec6fe76550c0
-  data.tar.gz: 02cfecdffd2c6d09c3dca2440b6f130e33ae564ab6ba06ba729733f1c2bcc0d9c6605e8db2ef86e307cce4f7bc9250da0f133cb24551b2ad32337ac7d1e23f54
+  metadata.gz: 8819a2a83c63b4c3c6d6c9aaf3ccfcab848ebe70dc49b81033dea1df578626905577dcb18ef80a5c7af0e7b34685c3de90d88a4f3a532a1ea35caa0b7468d590
+  data.tar.gz: b31d65fedd9a8f0870b4be19baeb7ebe8f9941071a030f8d9ba97fab16d0be46a9613960c0600ef582702aeba4b0bbc1e587cd09fd5b6ffe69d90ccb0adfec45

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    blacksheep (0.3.2)
+    blacksheep (0.4.0)
       dry-matcher
 
 GEM

data/lib/blacksheep/action_result.rb

@@ -3,12 +3,16 @@ module Blacksheep
 
     attr_reader :data, :status
 
+    @render_http_status = true
+
     def initialize(data, status)
       @data = data
       @status = status
     end
 
     class << self
+      attr_accessor :render_http_status
+
       def success(message)
         json = {
           _meta: {
@@ -51,19 +55,32 @@ module Blacksheep
       @status == :ok
     end
 
-    def render_json(json_wrap: 'data')
-      {
-        json:   wrap(@data, json_wrap: json_wrap),
-        status: status
-      }
+    def render_http_status
+      self.class.render_http_status
     end
 
-    private
+    def render_json(json_wrap: 'data', render_http_status: self.render_http_status, to: nil)
+      if to.nil?
+        return {
+          json: wrap_json(json_wrap)
+        }
+      end
 
-    def wrap(json, json_wrap:)
-      wrap = success? ? json_wrap : nil
+      if to.respond_to?(:render)
+        if render_http_status
+          to.render json: wrap_json(json_wrap), status: status
+        else
+          to.render json: wrap_json(json_wrap)
+        end
+      else
+        raise ArgumentError, "render target #{to.class} does not respond to #render"
+      end
+    end
+
+    private
 
-      wrap.present? ? { wrap => json } : json
+    def wrap_json(json_wrap)
+      json_wrap.present? && success? ? { json_wrap => @data } : @data
     end
 
   end

data/lib/blacksheep/decorators/json_transformer.rb

@@ -10,11 +10,9 @@ module Blacksheep
 
         transformed_params = self.transform_params(params)
 
-        json = super(transformed_params, **options)
+        result = super(transformed_params, **options)
 
-        transformed_json = transform_result(json)
-
-        ActionResult.new(transformed_json, :ok)
+        as_transformed_action_result(result)
       end
 
       def perform(params, current_user: nil, **options, &block)
@@ -22,11 +20,9 @@ module Blacksheep
 
         transformed_params = self.transform_params(params)
 
-        json = super(transformed_params, current_user: current_user, **options, &block)
-
-        transformed_json = transform_result(json)
+        result = super(transformed_params, current_user: current_user, **options, &block)
 
-        ActionResult.new(transformed_json, :ok)
+        as_transformed_action_result(result)
       end
 
 
@@ -50,16 +46,15 @@ module Blacksheep
       # Transform the obj with key in snake_case to the source case.
       # NOTE: leading underscored are preserved (e.g. _my_laptop => _myLaptop)
       #
-      # @param obj [Array, Hash] A result structure
+      # @param obj [Array, Hash, ActionResult] A result structure
       # @return [Array, Hash] The rsult structure with keys converted to source caseing
       # @see #camelize_keys
-      def transform_result(obj)
+      def as_transformed_action_result(obj)
         is_action_result, data = if obj.kind_of?(Blacksheep::ActionResult)
           [ true, obj.data ]
         else
           [ false, obj ]
         end
-
         converted_data = case @case
           when 'snake', 'as_is'
             data
@@ -69,7 +64,7 @@ module Blacksheep
             raise Blacksheep::Error, "unknown_case #{@case}"
         end
 
-        is_action_result ? obj.set_data(converted_data) : converted_data
+        is_action_result ? obj.set_data(converted_data) : ActionResult.new(converted_data, :ok)
       end
 
       #

data/lib/blacksheep/version.rb

@@ -1,3 +1,3 @@
 module Blacksheep
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacksheep
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Martin Schweizer
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-matcher
@@ -101,7 +101,7 @@ licenses:
 metadata:
   homepage_uri: http://verticonaut.me
   source_code_uri: https://github.com/verticonaut/blacksheep
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -116,8 +116,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: Support for API acrtions
 test_files: []