zertico 0.5.2 → 0.5.3

data/lib/zertico/service.rb

@@ -31,11 +31,15 @@ module Zertico
     protected
 
     def interface_name
-      self.class.name.chomp('Controller').split('::').last.singularize.underscore
+      self.interface_class.name.singularize.underscore
     end
 
     def interface_class
-      self.interface_name.camelize.constantize
+      begin
+        self.class.name.chomp('Controller').constantize
+      rescue NameError
+        self.class.name.chomp('Controller').split('::').last.constantize
+      end
     end
   end
 end

data/lib/zertico/version.rb

@@ -1,3 +1,3 @@
 module Zertico
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/spec/fake_app/person/profile.rb

@@ -0,0 +1,4 @@
+module Person
+  class Profile
+  end
+end

data/spec/fake_app/person/profile_controller.rb

@@ -0,0 +1,4 @@
+module Person
+  class ProfileController < Zertico::Controller
+  end
+end

data/spec/fake_app/person/profile_service.rb

@@ -0,0 +1,5 @@
+module Person
+  module ProfileService
+    include Zertico::Service
+  end
+end

data/spec/zertico/service_spec.rb

@@ -3,18 +3,27 @@ require 'spec_helper'
 describe Zertico::Service do
   let(:controller) { UserController.new }
   let(:admin_controller) { Admin::UserController.new }
+  let(:profile_controller) { Person::ProfileController.new }
   let(:object) { Object.new }
 
-  context 'should find the interface class' do
-    it 'on a non namespaced controller' do
-      controller.send(:interface_class).should == User
+  context 'on a namespaced controller and interface model' do
+    it 'should find the interface model' do
+      profile_controller.send(:interface_class).should == Person::Profile
     end
+  end
 
-    it 'on a namespaced controller' do
+  context 'on a namespaced controller and non namespaced interface model' do
+    it 'should find the interface model' do
       admin_controller.send(:interface_class).should == User
     end
   end
 
+  context 'on a non namespaced controller and non namespaced interface model' do
+    it 'should find the interface model' do
+      controller.send(:interface_class).should == User
+    end
+  end
+
   context '#all' do
     before :each do
       controller.stub_chain(:interface_name, :pluralize, :to_sym).and_return(:users)
@@ -28,58 +37,58 @@ describe Zertico::Service do
 
   context '#build' do
     before :each do
-      controller.stub_chain(:interface_name, :to_sym).and_return(:user)
+      controller.stub_chain(:interface_name, :to_sym).and_return(:person)
       controller.stub_chain(:interface_class, :new).and_return(object)
     end
 
     it 'should return a new object' do
-      controller.build.should == { :user => object }
+      controller.build.should == { :person => object }
     end
   end
 
   context '#find' do
     before :each do
-      controller.stub_chain(:interface_name, :to_sym).and_return(:user)
+      controller.stub_chain(:interface_name, :to_sym).and_return(:person)
       controller.stub_chain(:interface_class, :find).with(1).and_return(object)
     end
 
     it 'should return the specified object' do
-      controller.find(1).should == { :user => object }
+      controller.find(1).should == { :person => object }
     end
   end
 
   context '#generate' do
     before :each do
-      controller.stub_chain(:interface_name, :to_sym).and_return(:user)
+      controller.stub_chain(:interface_name, :to_sym).and_return(:person)
       controller.stub_chain(:interface_class, :create).with({}).and_return(object)
     end
 
     it 'should return the created object' do
-      controller.generate({}).should == { :user => object }
+      controller.generate({}).should == { :person => object }
     end
   end
 
   context '#modify' do
     before :each do
-      controller.stub(:find).with(1).and_return({ :user => object })
+      controller.stub(:find).with(1).and_return({ :person => object })
       object.stub(:update_attributes).with({}).and_return(true)
-      controller.stub_chain(:interface_name, :to_sym).and_return(:user)
+      controller.stub_chain(:interface_name, :to_sym).and_return(:person)
     end
 
     it 'should return the updated object' do
-      controller.modify(1, {}).should == { :user => object }
+      controller.modify(1, {}).should == { :person => object }
     end
   end
 
   context '#delete' do
     before :each do
-      controller.stub(:find).with(1).and_return({ :user => object })
+      controller.stub(:find).with(1).and_return({ :person => object })
       object.stub(:destroy).and_return(true)
-      controller.stub_chain(:interface_name, :to_sym).and_return(:user)
+      controller.stub_chain(:interface_name, :to_sym).and_return(:person)
     end
 
     it 'should return the destroyed object' do
-      controller.delete(1).should == { :user => object }
+      controller.delete(1).should == { :person => object }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zertico
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,6 +84,9 @@ files:
 - lib/zertico/version.rb
 - spec/fake_app/admin/user_controller.rb
 - spec/fake_app/admin/user_service.rb
+- spec/fake_app/person/profile.rb
+- spec/fake_app/person/profile_controller.rb
+- spec/fake_app/person/profile_service.rb
 - spec/fake_app/user.rb
 - spec/fake_app/user_accessor.rb
 - spec/fake_app/user_controller.rb
@@ -107,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1469385443154703672
+      hash: -2336383762942507570
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -116,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1469385443154703672
+      hash: -2336383762942507570
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -128,6 +131,9 @@ test_files:
 - gemfiles/Gemfile.rails3.2
 - spec/fake_app/admin/user_controller.rb
 - spec/fake_app/admin/user_service.rb
+- spec/fake_app/person/profile.rb
+- spec/fake_app/person/profile_controller.rb
+- spec/fake_app/person/profile_service.rb
 - spec/fake_app/user.rb
 - spec/fake_app/user_accessor.rb
 - spec/fake_app/user_controller.rb