zertico 1.0.0 → 1.1.0

data/README.md

@@ -55,7 +55,8 @@ end
 
 Your service must be a module and include Zertico::Service to grant access to all the methods already defined.
 Then you will have to redefine all the methods you need. Each action of the controller is mapped to a method.
-The method has to return a hash. The key must be the name of the global variable you want to use on the views.
+The return of the method will be passed to respond_with.
+You can pass extra options to respond_with by defining @options, default to blank hash {}.
 
 Sometimes, the ActiveRecord models grow to much. It start to handle all kinds of logic. To make things simple,
 it should only concern about database access. To clean it, use the Zertico::Accessor. It is a wrapper that will

data/lib/zertico/controller.rb

@@ -12,38 +12,35 @@ module Zertico
     end
 
     def index
-      all
-      respond_with(@responder, @options)
+      respond_with(all, options)
     end
 
     def new
-      build
-      respond_with(@responder, @options)
+      respond_with(build, options)
     end
 
     def show
-      find
-      respond_with(@responder, @options)
+      respond_with(find, options)
     end
 
     def edit
-      find
-      respond_with(@responder, @options)
+      respond_with(find, options)
     end
 
     def create
-      generate
-      respond_with(@responder, @options)
+      respond_with(generate, options)
     end
 
     def update
-      modify
-      respond_with(@responder, @options)
+      respond_with(modify, options)
     end
 
     def destroy
-      delete
-      respond_with(@responder, @options)
+      respond_with(delete, options)
+    end
+
+    def options
+      @options || {}
     end
   end
 end

data/lib/zertico/service.rb

@@ -1,57 +1,53 @@
 module Zertico
   module Service
     def all
-      @responder = resource.all
-      instance_variable_set("@#{interface_name.pluralize}", @responder)
-      @options = {}
+      instance_variable_set("@#{interface_name.pluralize}", resource.all)
     end
 
     def build
-      @responder = resource.new
-      instance_variable_set("@#{interface_name}", @responder)
-      @options = {}
+      instance_variable_set("@#{interface_name}", resource.new)
     end
 
     def find
-      @responder = resource.find(params[interface_id.to_sym])
-      instance_variable_set("@#{interface_name}", @responder)
-      @options = {}
+      instance_variable_set("@#{interface_name}", resource.find(params[interface_id.to_sym]))
     end
 
     def generate
-      @responder = resource.create(params[interface_name.to_sym])
-      instance_variable_set("@#{interface_name}", @responder)
-      @options = {}
+      instance_variable_set("@#{interface_name}", resource.create(params[interface_name.to_sym]))
     end
 
     def modify
       find
-      @responder.update_attributes(params[interface_name.to_sym])
-      @options = {}
+      instance_variable_get("@#{interface_name}").update_attributes(params[interface_name.to_sym])
+      instance_variable_get("@#{interface_name}")
     end
 
     def delete
       find
-      @responder.destroy
-      @options = {}
+      instance_variable_get("@#{interface_name}").destroy
+      instance_variable_get("@#{interface_name}")
     end
 
     def resource
-      @resource ||= interface_class
+      @resource_object ||= interface_class
     end
 
     def resource=(resource_chain = [])
-      @resource = resource_chain.shift
-      @resource = @resource.constantize if @resource.respond_to?(:constantize)
+      @resource_object = resource_chain.shift
+      @resource_object = @resource_object.constantize if @resource_object.respond_to?(:constantize)
       resource_chain.each do |resource|
-        @resource = @resource.send(resource)
+        @resource_object = @resource_object.send(resource)
       end
     end
 
     protected
 
     def interface_id
-      return "#{interface_name}_id" if self.class.name.chomp('Controller').split('::').size > 1
+      begin
+        return "#{interface_name}_id" if self.class.name.chomp('Controller').split('::').size > 1
+      rescue NameError
+        'id'
+      end
       'id'
     end
 

data/lib/zertico/version.rb

@@ -1,3 +1,3 @@
 module Zertico
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/zertico/controller_spec.rb

@@ -35,14 +35,13 @@ describe Zertico::Controller do
 
   context 'actions' do
     before :each do
-      controller.instance_variable_set('@responder', 'responder')
       controller.instance_variable_set('@options', 'options')
       controller.stub(:respond_with).with('responder', 'options')
     end
 
     context '#index' do
       before :each do
-        controller.stub(:all)
+        controller.stub(:all => 'responder')
       end
 
       after :each do
@@ -60,7 +59,7 @@ describe Zertico::Controller do
 
     context '#new' do
       before :each do
-        controller.stub(:build)
+        controller.stub(:build => 'responder')
       end
 
       after :each do
@@ -78,7 +77,7 @@ describe Zertico::Controller do
 
     context '#show' do
       before :each do
-        controller.stub(:find)
+        controller.stub(:find => 'responder')
       end
 
       after :each do
@@ -96,7 +95,7 @@ describe Zertico::Controller do
 
     context '#edit' do
       before :each do
-        controller.stub(:find)
+        controller.stub(:find => 'responder')
       end
 
       after :each do
@@ -114,7 +113,7 @@ describe Zertico::Controller do
 
     context '#create' do
       before :each do
-        controller.stub(:generate)
+        controller.stub(:generate => 'responder')
       end
 
       after :each do
@@ -132,7 +131,7 @@ describe Zertico::Controller do
 
     context '#update' do
       before :each do
-        controller.stub(:modify)
+        controller.stub(:modify => 'responder')
       end
 
       after :each do
@@ -150,7 +149,7 @@ describe Zertico::Controller do
 
     context '#destroy' do
       before :each do
-        controller.stub(:delete)
+        controller.stub(:delete => 'responder')
       end
 
       after :each do

data/spec/zertico/service_spec.rb

@@ -41,12 +41,8 @@ describe Zertico::Service do
       controller.instance_variable_get('@users').should == []
     end
 
-    it 'should save the object on an instance variable to respond' do
-      controller.instance_variable_get('@responder').should == []
-    end
-
-    it 'should save a hash with options on an instance variable' do
-      controller.instance_variable_get('@options').should == {}
+    it 'should return a collection' do
+      controller.all.should == []
     end
   end
 
@@ -59,13 +55,9 @@ describe Zertico::Service do
     it 'should save an object on an instance variable' do
       controller.instance_variable_get('@user').should == object
     end
-    
-    it 'should save the object on an instance variable to respond' do
-      controller.instance_variable_get('@responder').should == object
-    end
 
-    it 'should save a hash with options on an instance variable' do
-      controller.instance_variable_get('@options').should == {}
+    it 'should return an object' do
+      controller.build.should == object
     end
   end
 
@@ -80,12 +72,8 @@ describe Zertico::Service do
       controller.instance_variable_get('@user').should == object
     end
 
-    it 'should save the object on an instance variable to respond' do
-      controller.instance_variable_get('@responder').should == object
-    end
-
-    it 'should save a hash with options on an instance variable' do
-      controller.instance_variable_get('@options').should == {}
+    it 'should return an object' do
+      controller.find.should == object
     end
   end
 
@@ -100,12 +88,8 @@ describe Zertico::Service do
       controller.instance_variable_get('@user').should == object
     end
 
-    it 'should save the object on an instance variable to respond' do
-      controller.instance_variable_get('@responder').should == object
-    end
-
-    it 'should save a hash with options on an instance variable' do
-      controller.instance_variable_get('@options').should == {}
+    it 'should return an object' do
+      controller.generate.should == object
     end
   end
 
@@ -121,12 +105,8 @@ describe Zertico::Service do
       controller.instance_variable_get('@user').should == object
     end
 
-    it 'should save the object on an instance variable to respond' do
-      controller.instance_variable_get('@responder').should == object
-    end
-
-    it 'should save a hash with options on an instance variable' do
-      controller.instance_variable_get('@options').should == {}
+    it 'should return an object' do
+      controller.modify.should == object
     end
   end
 
@@ -142,12 +122,8 @@ describe Zertico::Service do
       controller.instance_variable_get('@user').should == object
     end
 
-    it 'should save the object on an instance variable to respond' do
-      controller.instance_variable_get('@responder').should == object
-    end
-
-    it 'should save a hash with options on an instance variable' do
-      controller.instance_variable_get('@options').should == {}
+    it 'should return an object' do
+      controller.delete.should == object
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zertico
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 601803739773606042
+      hash: -898163586098864558
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 601803739773606042
+      hash: -898163586098864558
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25