yodatra 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7349a147b6bcf971ec9513001df3c40bb0045a64
-  data.tar.gz: e6493a087ec7c5245a164f0b6c296dea59f78fef
+  metadata.gz: 581ebcb300386a581d11626427193627caefcced
+  data.tar.gz: 32373f7bfc1606cc44bca3368e1fa4204058f733
 SHA512:
-  metadata.gz: 0d0c05c695b12c24ff569537560f2d7202325848d091b010155951fb1649f89ae7718bcdc8beb3d0d45c70a2fba0853b9a618c8277f1f36a2371b3e013caada2
-  data.tar.gz: ebb0f1ba3bacbbd2d76a90dfb63720cffadd22b7ebe06632b34859a44a3c7ff2aa58c7cbaef177dc6394c360892c868ce48fad1bc1d214fe24fb7508c2048766
+  metadata.gz: 8501f66cb7f3f40a9c7b325543a4af79cae4e74f1b01ff801f0c5622376bfa333913b2ab03ae61223835d1f5165f1c50f4bb2f0617c8eda87363bdf4f5bf92fd
+  data.tar.gz: 111d95bb8d5c5ca04eddf54238f72d7d3bd57c217a2bc1b6e42bc954d13a3a0e8c32de49c4777797b80a7ef006cf8b125b58b3b5e0968e0113e6646a3cddd343

data/lib/yodatra/models_controller.rb

@@ -184,7 +184,7 @@ module Yodatra
 
         # Check access to the resource
         method = "limit_#{action}_for".to_sym
-        resource = model.send(method, resource, current_user) if model.respond_to?(method) && !current_user.nil?
+        resource = self.class.send(method, resource, current_user) if self.class.respond_to?(method) && !current_user.nil?
 
         # ONE resource else COLLECTION
         one_id = nested? ? params[:captures].fourth : params[:captures].second if params[:captures].length == 4
@@ -203,12 +203,14 @@ module Yodatra
       resources = nil
       begin
         parent_model = params[:captures].first.classify.constantize
+        parent_controller = "#{parent_model}sController".constantize
       rescue NameError
         parent_model = nil
+        parent_controller = nil
       end
 
       unless parent_model.nil?
-        parent_model = parent_model.limit_read_for parent_model, current_user if parent_model.respond_to?(:limit_read_for) && !current_user.nil?
+        parent_model = parent_controller.limit_read_for parent_model, current_user if parent_controller.respond_to?(:limit_read_for) && !current_user.nil?
         parent = parent_model.find params[:captures].second
         if parent.respond_to? :reflections
           # This is AR 4.0.x compatibility

data/lib/yodatra/version.rb

@@ -1,3 +1,3 @@
 module Yodatra
-  VERSION = '0.3.9'
+  VERSION = '0.3.10'
 end

data/spec/spec_helper.rb

@@ -11,6 +11,10 @@ require 'rspec'
 require File.expand_path '../../lib/yodatra.rb', __FILE__
 require File.expand_path '../../lib/yodatra/api_formatter.rb', __FILE__
 require File.expand_path '../../lib/yodatra/models_controller.rb', __FILE__
+# dirty Hack for testing
+class ModelsController < Yodatra::ModelsController
+end
+
 require File.expand_path '../data/ar_models_controller.rb', __FILE__
 
 module RSpecMixin

data/spec/unit/models_controller_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path '../../active_record/connection_adapters/fake_adapter.r
 require File.expand_path '../../data/model.rb', __FILE__
 require File.expand_path '../../data/ar_model.rb', __FILE__
 
-describe 'Model controller' do
+describe Yodatra::ModelsController do
 
   before do
     @errors = ['error']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yodatra
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - Paul Bonaud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack