cyrax 0.5.1.beta5 → 0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDVkZDFkMDI4MWM3YWUwNjUzMDcwNGYxOTQ4ZjAxNjIyNjIyMDkxNA==
+    MjFlNjRkMDcxZjQ4NDZhNjA1YzllYTczNzU0YjUyM2NiMThkMDIwYg==
   data.tar.gz: !binary |-
-    MmY0YzA2YWNkMWYxN2NhMzZmOTA1OWRhYzY5ZWEzNGQ3NGMxZmRlYQ==
+    MjcwMjAwMWFkM2U3MmI2ZWU1NGExNjE5MDRiNmQ0MDg3YTM3MzM5Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTI3ZTkwOWFlYWNhYTdkMTMyMWRlNDlmNGE5N2RmNmE3NjNmYzc1NmZmYWVi
-    NThlNjU1NWFkOGZkYzZlYjEyOTE0YjkyZDVkNDFhYzlkNWRhZTU2ZDFhNzVl
-    NzU2MTI5ZjIxNjA3M2ViNTYxNzBjZGQyODQyZTY5MTA3NGI0MTA=
+    ZGNlMDIwYzVmMTZjMzEwMzMwNTU5OGQ0YTY5YjZmMDczMGExZjg3ZWEzY2Fl
+    M2E0ODIyMDAyODc3NTY1ODQwMTc5MGMzODdhYjNmMzljMGY0YzU5YTVhMDBh
+    MmE4MmUwMDllMTg3ZWM1ZDBkMzkwNTEzYWU5NTE3N2Y3NjNhNGE=
   data.tar.gz: !binary |-
-    ZThlOTFiNDQyZjM0YTVkYTc2MzIzYmI3ZjI1NzU4MDJmZGZiZmE1MGQyOWM5
-    Y2QxNDBhNjdkOTc5MzYxYzMwMjE3MzFkOGZkYTMzODQ0MTk3ZWM1OThkZDI5
-    ZWQyN2ZiZjJmYjBkMmEwZWJlMzNhMTk5MTEwN2MxYmRkNTQ5MWU=
+    ODkxM2RmNWQ4ZGZlZGNjNWYwZDEwN2FkOTJmY2RhNDhkNTVjOTk3M2VkODRk
+    OGQxNDFjMzJmZjI3NzdlM2Y0ZjBmNGY2MDk5YTA5MjBkYWU0ZTZlOTBjMDkx
+    MjI2MTZhODExNDFmYjg0MGUxYjNkZWU0ZWI5YWM2OTVhNzVlNWU=

data/lib/cyrax/extensions/has_response.rb

@@ -35,10 +35,12 @@ module Cyrax::Extensions
 
     def sync_errors_with(model)
       model = model.to_model if model.respond_to?(:to_model)
-      if model && model.errors.messages.present?
-        (@_errors || {}).each do |key, value|
-          model.errors.add key, value unless model.errors.include?(key)
-        end
+      return unless model
+      (@_errors || {}).each do |key, value|
+        next unless model.respond_to?(key)
+        model.errors.add key, value unless model.errors.include?(key)
+      end
+      if model.errors.messages.present?
         model.errors.messages.each do |key, value|
           add_error key, value
         end

data/lib/cyrax/extensions/has_service.rb

@@ -4,19 +4,24 @@ module Cyrax::Extensions
 
     # Builds and returns a collection response for Rails
     # @return [Cyrax::Response] response
-    def collection
-      respond_with build_collection, name: collection_name, present: :collection
+    def read_all(&block)
+      authorize_resource!(:read_all, resource_class)
+      collection = build_collection
+      block.call(collection) if block_given?
+      respond_with collection, name: collection_name, present: :collection
     end
     # Overrides collection with read_all
-    alias_method :read_all, :collection
-    alias_method :read_all!, :collection
+    alias_method :read_all!, :read_all
 
     # Builds a new resource without saving to DB
     # Runs Model.new (before saving)
     # Used for :new action in controller
     # @return [Cyrax::Response] response
-    def build
-      respond_with build_resource(nil)
+    def build(&block)
+      resource = build_resource(nil)
+      authorize_resource!(:build, resource)
+      block.call(resource) if block_given?
+      respond_with resource
     end
     alias_method :build!, :build
 
@@ -25,6 +30,7 @@ module Cyrax::Extensions
     # @return [Cyrax::Response] response
     def create(custom_attributes = nil, &block)
       resource = build_resource(nil, custom_attributes||resource_attributes)
+      authorize_resource!(:create, resource)
       transaction do
         if save_resource(resource)
           set_message(:created)
@@ -52,6 +58,7 @@ module Cyrax::Extensions
     # @return [Cyrax::Response] response
     def update(custom_attributes = nil, &block)
       resource = build_resource(resource_params_id, custom_attributes||resource_attributes)
+      authorize_resource!(:update, resource)
       transaction do
         if save_resource(resource)
           set_message(:updated)
@@ -67,6 +74,7 @@ module Cyrax::Extensions
     # @return [Cyrax::Response] response
     def destroy(&block)
       resource = find_resource(resource_params_id)
+      authorize_resource!(:destroy, resource)
       transaction do
         delete_resource(resource)
         block.call(resource) if block_given?
@@ -109,6 +117,15 @@ module Cyrax::Extensions
       resource.destroy
     end
 
+    # Authorize a resource
+    # Should be called on each service method and should be implemented on each resource.
+    # Implementation may raise an exception which may be handled by controller.
+    # @param action [Symbol] The action to authorize
+    # @param resource [object] The resource to authorize
+    def authorize_resource!(action, resource)
+      # raise AuthorizationError
+    end
+
     # Returns a collection of the resource we are calling.
     #
     # If you want your resource to return something interesting, you should override the resource_scope method.

data/lib/cyrax/version.rb

@@ -1,3 +1,3 @@
 module Cyrax
-  VERSION = "0.5.1.beta5"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyrax
 version: !ruby/object:Gem::Version
-  version: 0.5.1.beta5
+  version: 0.5.2
 platform: ruby
 authors:
 - Droidlabs
@@ -132,9 +132,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.5