zertico 0.6.0 → 0.6.1

data/lib/zertico/controller.rb

@@ -22,12 +22,12 @@ module Zertico
     end
 
     def show
-      initialize_object find(params[:id])
+      initialize_object find(params[interface_id.to_sym])
       respond_with(instance_variable_get('@responder'))
     end
 
     def edit
-      initialize_object find(params[:id])
+      initialize_object find(params[interface_id.to_sym])
       respond_with(instance_variable_get('@responder'))
     end
 
@@ -41,7 +41,7 @@ module Zertico
     end
 
     def update
-      initialize_object modify(params[:id], params[interface_name.to_sym])
+      initialize_object modify(params[interface_id.to_sym], params[interface_name.to_sym])
       if instance_variable_defined?('@location')
         respond_with(instance_variable_get('@responder'), :location => instance_variable_get('@location'))
       else
@@ -50,7 +50,7 @@ module Zertico
     end
 
     def destroy
-      initialize_object delete(params[:id])
+      initialize_object delete(params[interface_id.to_sym])
       if instance_variable_defined?('@location')
         respond_with(instance_variable_get('@responder'), :location => instance_variable_get('@location'))
       else

data/lib/zertico/service.rb

@@ -42,6 +42,11 @@ module Zertico
 
     protected
 
+    def interface_id
+      return "#{interface_name}_id" if self.class.name.chomp('Controller').split('::').size > 1
+      'id'
+    end
+
     def interface_name
       self.interface_class.name.singularize.underscore
     end

data/lib/zertico/version.rb

@@ -1,3 +1,3 @@
 module Zertico
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/spec/zertico/controller_spec.rb

@@ -3,6 +3,19 @@ require 'spec_helper'
 describe Zertico::Controller do
   let(:controller) { Zertico::Controller.new }
   let(:user_controller) { UserController.new }
+  let(:admin_controller) { Admin::UserController.new }
+
+  context 'not being nested' do
+    it 'should find on the correct id' do
+      user_controller.send(:interface_id).should  == 'id'
+    end
+  end
+
+  context 'being nested' do
+    it 'should find on the correct id' do
+      admin_controller.send(:interface_id).should  == 'user_id'
+    end
+  end
 
   context 'without a custom service' do
     it 'should extend Zertico::Service' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zertico
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3191919241399243181
+      hash: 3377979383132618450
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3191919241399243181
+      hash: 3377979383132618450
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25