cyrax 0.5.11 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5a7df346477f2df952f07d3aecb3424e19b13309
-  data.tar.gz: 1a68816f86ebeaf1690af84048f9f98b54b27848
+SHA256:
+  metadata.gz: ffa73afcc3fa3024643e425b5063022a1868c533b684db1b3051e0a5512ba02e
+  data.tar.gz: 51db666b13256c83848a69f9c62c5796749ff68113261870ad1552b6c73beabf
 SHA512:
-  metadata.gz: 2318b14712827861174e716805c80b7e57d2793c2b7ae73b8cb0555302d7fe5a4e6f84611686c62a23c00734c7c2180e1528cff069d2cad09097c4e91b19ea50
-  data.tar.gz: b1c2c7e0dc9df63514c7f768e138391f9124af658bea032b71b72246d8ead5347809d53de89ae72004ab9bac9118cebf08be7e899f560b0d261064b6c50abef9
+  metadata.gz: 926899dc59201b60ca43de71876abfbfca228b10a8622b89cde69fd5befc6cbd30f2583f6cbbe874c759f1304b96c44ffa0971cdc26f4753cec355a352d75abf
+  data.tar.gz: b42a00f20a319fdd645d539b069cc6849775014a77871c3465c23a4af6e76a959d553f0ef7ffd9602fbeb331419e041e5d0c668b2f22f7a2253865bb1b225c07

data/lib/cyrax/decorator.rb

@@ -1,4 +1,6 @@
 require 'active_model'
+# require 'active_model/serializers/xml'
+
 class Cyrax::Decorator < Cyrax::Wrapper
   include ActiveModel::Serialization
   include ActiveModel::Serializers::JSON

data/lib/cyrax/extensions/has_service.rb

@@ -36,7 +36,7 @@ module Cyrax::Extensions
         if save_resource(resource)
           set_message(:created)
           block.call(resource) if block_given?
-        else
+        elsif Cyrax.automatically_set_invalid_status
           set_status VALIDATION_ERROR_STATUS
         end
       end
@@ -66,7 +66,7 @@ module Cyrax::Extensions
         if save_resource(resource)
           set_message(:updated)
           block.call(resource) if block_given?
-        else
+        elsif Cyrax.automatically_set_invalid_status
           set_status VALIDATION_ERROR_STATUS
         end
       end

data/lib/cyrax/helpers/controller.rb

@@ -15,7 +15,7 @@ module Cyrax::ControllerHelper
       result = result.to_model if result.respond_to?(:to_model)
 
       respond_to do |format|
-        format.any do
+        format.html do
           # set flashes
           if response.success?
             flash[:notice] = options[:notice] if options[:notice].present?
@@ -24,11 +24,14 @@ module Cyrax::ControllerHelper
             flash.now[:error] = options[:error] if options[:error].present?
           end
           set_resource_from(response)
-          super(result, options, &block)
         end
         format.json do
           render json: MultiJson.dump(response.as_json), status: options[:status] || 200
         end
+        format.any do
+          set_resource_from(response)
+          super(response, options, &block)
+        end
       end
     else
       super(*args)

data/lib/cyrax/serializers/scope.rb

@@ -69,7 +69,8 @@ module Cyrax::Serializers
         result[attribute] = scope.serialize(value, options)
       end
       @assigned_attrs.map do |attribute, scope|
-        value = options[:assignments][attribute]
+        assignments = options[:assignments] || {}
+        value = assignments[attribute]
         result[attribute] = scope.serialize(value, options)
       end
       @namespace_attrs.map do |attribute, scope|

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.5.11"
+  VERSION = "0.5.14"
 end

data/lib/cyrax.rb

@@ -20,6 +20,7 @@ require "cyrax/serializer.rb"
 
 module Cyrax
   @@strong_parameters = true
+  @@automatically_set_invalid_status = true
 
   def self.strong_parameters
     @@strong_parameters
@@ -28,4 +29,12 @@ module Cyrax
   def self.strong_parameters=(value)
     @@strong_parameters = value
   end
+
+  def self.automatically_set_invalid_status
+    @@automatically_set_invalid_status
+  end
+
+  def self.automatically_set_invalid_status=(value)
+    @@automatically_set_invalid_status = value
+  end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.14
 platform: ruby
 authors:
 - Droidlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2022-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: has_active_logger
   requirement: !ruby/object:Gem::Requirement
@@ -150,19 +150,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Small library for adding service layer to Rails projects
 test_files:
-- spec/cyrax/base_spec.rb
-- spec/cyrax/decorator_spec.rb
-- spec/cyrax/extensions/has_decorator_spec.rb
 - spec/cyrax/extensions/has_resource_spec.rb
-- spec/cyrax/extensions/has_response_spec.rb
 - spec/cyrax/extensions/has_service_spec.rb
-- spec/cyrax/resource_spec.rb
+- spec/cyrax/extensions/has_decorator_spec.rb
+- spec/cyrax/extensions/has_response_spec.rb
 - spec/cyrax/response_spec.rb
 - spec/cyrax/serializer_spec.rb
+- spec/cyrax/resource_spec.rb
+- spec/cyrax/base_spec.rb
+- spec/cyrax/decorator_spec.rb
 - spec/spec_helper.rb