yodatra 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ce8fae3026a73118bcc2345e60dc4e1e93eabc
-  data.tar.gz: d6f0c9ac4382981d4fd48d8baec3864ed3018f0d
+  metadata.gz: 5e006ebdfb069d9c91cd2c9309627500a53292eb
+  data.tar.gz: b1985c1d88db58d34ddcea1ab36dd34cc5c28f53
 SHA512:
-  metadata.gz: 9ee95b6a0f7cf1b024c9a07a55e4babcc2381c1d408be1d4cfa2a51250ab9aab93dcafaf4241587428c99f231f2168617e9c50001b701e09061a42168a54bab2
-  data.tar.gz: a593575a605d5d1f134ad7a4c72b219b73d46e946a2957132a82d4a245b133c7aa183feb1fb72b59c608fd2aa457deb55292a1478d2b5be346e15a89f6e6552e
+  metadata.gz: e49e4b3968858f06e20ba0593bc9231f4f0e114d86f1c4b8668ff44b6270a4bcf4daa09a427afe59da5a13229cedcb911d6f77e7a8084bf9a468d3790b4650b6
+  data.tar.gz: f5ed3b5319b89f81b2977a583e625378b6c6e0139e1dc89ab6e3054a8938f72581795a8d39e5ce16d65861c86855f45656cdff165b220b4e35919fa79094d31c

data/README.md

@@ -1,6 +1,6 @@
 Yodatra 
 ===
-[![Build Status](https://travis-ci.org/squareteam/yodatra.png?branch=master)](https://travis-ci.org/squareteam/yodatra) [![Coverage Status](https://coveralls.io/repos/squareteam/yodatra/badge.png)](https://coveralls.io/r/squareteam/yodatra) [![Gem Version](https://badge.fury.io/rb/yodatra.png)](http://badge.fury.io/rb/yodatra) [![Code Climate](https://codeclimate.com/github/squareteam/yodatra.png)](https://codeclimate.com/github/squareteam/yodatra) [![Dependency Status](https://gemnasium.com/squareteam/di.coffee.png)](https://gemnasium.com/squareteam/di.coffee)
+[![Build Status](https://travis-ci.org/squareteam/yodatra.png?branch=master)](https://travis-ci.org/squareteam/yodatra) [![Coverage Status](https://coveralls.io/repos/squareteam/yodatra/badge.png)](https://coveralls.io/r/squareteam/yodatra) [![Gem Version](https://badge.fury.io/rb/yodatra.png)](http://badge.fury.io/rb/yodatra) [![Code Climate](https://codeclimate.com/github/squareteam/yodatra.png)](https://codeclimate.com/github/squareteam/yodatra) [![Dependency Status](https://gemnasium.com/squareteam/yodatra.png)](https://gemnasium.com/squareteam/yodatra)
 
 Backend development you shall do. And yodatra you shall use.
 

data/lib/yodatra/models_controller.rb

@@ -63,14 +63,14 @@ module Yodatra
     READ_ALL = :read_all
     get ALL_ROUTE do
       retrieve_resources READ_ALL do |resource|
-        resource.all.as_json(read_scope).to_json
+        resource.all.as_json(read_scope)
       end
     end
 
     READ_ONE = :read
     get ONE_ROUTE do
       retrieve_resources READ_ONE do |resource|
-        resource.as_json(read_scope).to_json
+        resource.as_json(read_scope)
       end
     end
 
@@ -82,9 +82,9 @@ module Yodatra
 
         if @one.id.nil?
           status 400
-          @one.errors.full_messages.to_json
+          @one.errors.full_messages
         else
-          @one.as_json(read_scope).to_json
+          @one.as_json(read_scope)
         end
       end
     end
@@ -94,10 +94,10 @@ module Yodatra
       retrieve_resources UPDATE_ONE do |resource|
         hash = self.send("#{model_name.underscore}_params".to_sym)
         if resource.update_attributes(hash)
-          resource.as_json(read_scope).to_json
+          resource.as_json(read_scope)
         else
           status 400
-          resource.errors.full_messages.to_json
+          resource.errors.full_messages
         end
       end
     end
@@ -106,10 +106,10 @@ module Yodatra
     delete ONE_ROUTE do
       retrieve_resources DELETE_ONE do |resource|
         if resource.destroy
-          resource.as_json(read_scope).to_json
+          resource.as_json(read_scope)
         else
           status 400
-          resource.errors.full_messages.to_json
+          resource.errors.full_messages
         end
       end
     end
@@ -157,7 +157,7 @@ module Yodatra
               end
 
               resource.where(search_terms.reduce(:or)).limit(100).
-                flatten.as_json(read_scope).to_json
+                flatten.as_json(read_scope)
             end
           end
         end
@@ -169,9 +169,10 @@ module Yodatra
     # Defines a nested route or not and retrieves the correct resource (or resources)
     # @param disables is the name to check if it was disabled
     # @param &block to be yield with the retrieved resource
-    def retrieve_resources(disables)
+    # @returns resource in json format
+    def retrieve_resources(action)
       pass unless involved?
-      no_route if disabled? disables
+      no_route if disabled? action
 
       model = model_name.constantize
       nested = nested_resources if nested?
@@ -179,13 +180,19 @@ module Yodatra
       if model.nil? || nested.nil? && nested?
         raise ActiveRecord::RecordNotFound
       else
-        model = nested if nested?
+        resource = nested? ? nested : model
+
+        # Check access to the resource
+        method = "prepare_#{action}"
+        resource = send(method, resource) if respond_to? method
+
+        # ONE resource else COLLECTION
         one_id = nested? ? params[:captures].fourth : params[:captures].second if params[:captures].length == 4
-        model = model.find one_id unless one_id.nil?
-        yield(model)
+        resource = resource.find one_id unless one_id.nil?
+        yield(resource).to_json
       end
     rescue ActiveRecord::RecordNotFound
-      record_not_found
+      record_not_found.to_json
     end
 
     def nested?
@@ -259,7 +266,7 @@ module Yodatra
 
     def record_not_found
       status 404
-      ['record not found'].to_json
+      ['record not found']
     end
 
   end

data/lib/yodatra/version.rb

@@ -1,3 +1,3 @@
 module Yodatra
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yodatra
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Paul Bonaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-06 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack