cyrax 0.3.5 → 0.3.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWRlYWZmNDkxMWJiNGI4NzNiM2FmZWY5YWViMTk4Y2YwY2VhYzQ3NA==
+    ZDUwZDAwMmI2ZDA0ODYwMmRjMGFhMzZmN2EyMzBmYjc4N2QyNWQxZA==
   data.tar.gz: !binary |-
-    MTEwZjQ4OGQ4YmFjZWMwNDQyOTdiNTUxOGMxZTFkZTJmMjM5MmQ0ZA==
+    MGIyYmJhMWJlMjIyN2NlYmI3ZWVkYzBiMGY0MzMwNGFmMWU2MGEzMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjRhYWI0ZmZlNmY1NDBlYTQ0MmI0NDAxOTdhZTFlMjdlMmYwYzY3MjkzMDc4
-    ZWZiNDc3OTRmMTI3N2NjODZkN2VkZGQwZmZmMGI1MjM4ZmY4OTVjNWMwYjBi
-    YWI3ZGExN2UyYjdjOGVlMDNkNmQ2ODlhZDFjYjc3Y2FiMjBhZGI=
+    N2Q3YTIyOTM2MzdkNzRiZjhiYTRjNzY3MGFiNDQ0NTU5ZjBiYjcxYzk4ODli
+    MzgyMDZkMWZmOGRmZTNmZTJmOGNmNzZjNTc5MTNiMDFiMDBkNjhjZjQwZjlh
+    NDg5Zjg1ZTQwMDZmNjBlODIxMzdhZmY1MmIwZmU3MzdjNzViNWQ=
   data.tar.gz: !binary |-
-    NTI1NTFmOWVlYzBmYzFkODMzZGNiYzMxODgzMjk4YmMzZjlmYzhiZGUwMjgz
-    ZDUxZTlkYThjNzJmYWJlMmE2M2ZlNzNhMGVmYTAwZjhhYjdhZDUyMjBhZmU5
-    ZmM1M2NjZjI4YTNhNTU4YWU1NTExNDk2Y2NjNmQxZTliZGMwNTU=
+    MDBkMWQwY2Y5ZWRkMWMwYWUyZTYyZDlhZmMyMzU5OTUzMjEyY2RlZjdmMDk0
+    ZDVkMGYyNDBmMTM5ZDE0NzQ2MDU3ZDIzMzgwMDA1YTQ5MTI0ZGU0MmU5MGJj
+    ZDcxN2NhMmE5MzBhZGMxZDM1YTZmNzRlNWIxNjhmOTgxZjVmZWU=

data/lib/cyrax/extensions/has_response.rb

@@ -47,7 +47,7 @@ module Cyrax::Extensions
         options = {serializer: serializer_class}.merge(options)
       end
       result = Cyrax::Presenter.present(result, options)
-      response = Cyrax::Response.new(name, result)
+      response = Cyrax::Response.new(name, result, options)
       response.message = @_message
       response.errors = @_errors
       response.assignments = @_assignments

data/lib/cyrax/helpers/controller.rb

@@ -14,7 +14,15 @@ module Cyrax::ControllerHelper
       result = response.result
       result = result.to_model if result.respond_to?(:to_model)
 
-      super(result, default_options.merge(options || {}))
+      super(result, default_options.merge(options || {})) do |format|
+        format.json do
+          if result.respond_to?(:errors) && result.errors.present?
+            render json: { errors: result.errors }
+          else
+            render json: response.as_json
+          end
+        end
+      end
     else
       super(*args)
     end

data/lib/cyrax/presenters/base_collection.rb

@@ -20,14 +20,6 @@ module Cyrax::Presenters
       end
     end
 
-    def as_json(*args)
-      if options[:serializer]
-        options[:serializer].new(presented_collection).serialize
-      else
-        presented_collection.as_json
-      end
-    end
-
     def method_missing(method, *args, &block)
       return super unless collection.respond_to?(method)
       collection.send(method, *args, &block)

data/lib/cyrax/response.rb

@@ -1,9 +1,11 @@
 class Cyrax::Response
-  attr_accessor :message, :errors, :assignments, :result, :resource_name
+  attr_accessor :message, :errors, :assignments, 
+    :result, :resource_name, :options
 
-  def initialize(resource_name, result)
+  def initialize(resource_name, result, options)
     @resource_name = resource_name
     @result = result
+    @options = options
     @message = nil
     @errors = []
     @assignments = {}
@@ -40,7 +42,11 @@ class Cyrax::Response
   end
 
   def as_json(*args)
-    result.as_json(*args)
+    if options[:serializer]
+      options[:serializer].new(result).serialize
+    else
+      result.as_json
+    end
   end
 
   def method_missing(method, *args, &block)

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Droidlabs