zertico 2.0.0.alpha.3 → 2.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11c1692e1a912ed1299b06de71336e7fa7074e01
-  data.tar.gz: 474b9270363f5a8873af6bab6b489823c700d3fa
+  metadata.gz: 4d8785ae84211d21c303d594ef6afbe8838c56b8
+  data.tar.gz: c0bfdc7220e402fb48f16d0e4574a96bf43aa12c
 SHA512:
-  metadata.gz: 47f60cb1d5b3f3ca8a3f5a814752f3dfde063d046e97bce0a30eb5893353cc55a743fbf9c73e98235260c1890237cfe07d5fd64a2f719d6c513deb3967e74bac
-  data.tar.gz: cd6fbe21a296e58b43a54075a888c06d70e21aa9638cf5a78484f89d128fb6833aafd764c5cff56af88ba8bf88734412cb465bc9aca46bfb22067d64babb8fe2
+  metadata.gz: a52137055dd954360280d921f46e4c671e75636221fc3acb7143c08993a0eeaca0fe882b6653c3f7a857a5d230385a00f1cb3bb71e8487fb2d839896a2ea9e31
+  data.tar.gz: 36b346023b38222766121096cb3994084f213faf1c9780c16558fe1b0e731cb1e76fc478d95c671ada8575ad7d55548b0f1706c4c2671745b7438b012a745bb5

data/lib/zertico/controller.rb

@@ -2,9 +2,12 @@ require 'action_controller'
 
 module Zertico
   class Controller < ActionController::Base
-    attr_reader :service
+    attr_reader :service, :permitted_params
+
+    before_filter :initialize_permitted_params, :only => [:create, :update]
 
     def initialize
+      raise Zertico::Exceptions::MissingApplicationResponder unless defined?(ApplicationResponder)
       initialize_service
       set_responder
       super
@@ -31,14 +34,12 @@ module Zertico
     end
 
     def create
-      permitted_params = "::#{self.class.name.chomp('Controller').concat('PermittedParams')}".constantize.new(params).create rescue params[service.interface_name.to_sym]
-      instance_variable_set("@#{service.interface_name}", service.create(permitted_params))
+      instance_variable_set("@#{service.interface_name}", service.create(permitted_params.create))
       respond_with(instance_variable_get("@#{service.interface_name}"), responder.create_options(self))
     end
 
     def update
-      permitted_params = "::#{self.class.name.chomp('Controller').concat('PermittedParams')}".constantize.new(params).update rescue params[service.interface_name.to_sym]
-      instance_variable_set("@#{service.interface_name}", service.update(permitted_params))
+      instance_variable_set("@#{service.interface_name}", service.update(params, permitted_params.update))
       respond_with(instance_variable_get("@#{service.interface_name}"), responder.update_options(self))
     end
 
@@ -55,10 +56,16 @@ module Zertico
       @service = Zertico::Service.new(self.class.name)
     end
 
+    def initialize_permitted_params
+      @permitted_params = "::#{self.class.name.chomp('Controller').concat('PermittedParams')}".constantize.new(params)
+    rescue NameError
+      @permitted_params = Zertico::PermittedParams.new(params)
+    end
+
     def set_responder
       self.class.responder = "::#{self.class.name.gsub('Controller', 'Responder')}".constantize
     rescue NameError
-      self.class.responder = Zertico::Responder
+      self.class.responder = ::ApplicationResponder
     end
   end
 end

data/lib/zertico/exceptions/missing_application_responder.rb

@@ -0,0 +1,9 @@
+module Zertico
+  module Exceptions
+    class MissingApplicationResponder < Exception
+      def initialize
+        super('You must define an ApplicationResponder!')
+      end
+    end
+  end
+end

data/lib/zertico/exceptions.rb

@@ -1,5 +1,6 @@
 module Zertico
   module Exceptions
+    autoload :MissingApplicationResponder, 'zertico/exceptions/missing_application_responder'
     autoload :MissingStrongParameters, 'zertico/exceptions/missing_strong_parameters'
     autoload :RollbackException, 'zertico/exceptions/rollback_exception'
   end

data/lib/zertico/permitted_params.rb

@@ -11,6 +11,14 @@ end
 module Zertico
   class PermittedParams < Delegator
     alias_method :params, :interface
+
+    def create
+      params[self.class.interface_class.name.underscore.to_sym]
+    end
+
+    def update
+      params[self.class.interface_class.name.underscore.to_sym]
+    end
     
     def self.interface_class
       name.chomp('PermittedParams').singularize.constantize

data/lib/zertico/service/instance_methods.rb

@@ -17,9 +17,9 @@ module Zertico
         instance_variable_set("@#{interface_name}", resource_source.create(params))
       end
 
-      def update(params)
-        show(params)
-        instance_variable_get("@#{interface_name}").update_attributes(params)
+      def update(params, instance_params)
+        instance_variable_set("@#{interface_name}", resource_source.find(params[interface_id.to_sym]))
+        instance_variable_get("@#{interface_name}").update_attributes(instance_params)
         instance_variable_get("@#{interface_name}")
       end
 

data/lib/zertico/version.rb

@@ -1,3 +1,3 @@
 module Zertico
-  VERSION = '2.0.0.alpha.3'
+  VERSION = '2.0.0.beta.1'
 end

data/spec/fake_app/app/permitted_params/users_permitted_params.rb

@@ -1,9 +1,9 @@
 class UsersPermittedParams < Zertico::PermittedParams
   def create
-    params.require(:user).permit(:name)
+    params.require(:user).permit(:first_name)
   end
 
   def update
-    params.require(:user).permit(:id)
+    params.require(:user).permit(:last_name)
   end
 end

data/spec/fake_app/app/responders/application_responder.rb

@@ -0,0 +1,2 @@
+class ApplicationResponder < Zertico::Responder
+end

data/spec/fake_app/app/responders/users_responder.rb

@@ -1,4 +1,6 @@
-class UsersResponder < Zertico::Responder
+require "#{File.join(File.dirname(__FILE__), '/application_responder')}"
+
+class UsersResponder < ApplicationResponder
   include Pjax
 
   self.update_options = lambda { |controller| { :location => user_path(controller.user) } }

data/spec/zertico/controller_integration_spec.rb

@@ -54,8 +54,8 @@ describe UsersController, :type => :controller do
     end
 
     it 'should pass the right parameters to the model' do
-      expect(User).to receive(:create).with(:name => 'name').and_return(user)
-      post :create, :user => { :name => 'name' }
+      expect(User).to receive(:create).with(:first_name => 'name').and_return(user)
+      post :create, :user => { :first_name => 'name' }
     end
 
     it 'should create a new user' do
@@ -67,12 +67,12 @@ describe UsersController, :type => :controller do
     before :each do
       allow(User).to receive(:find).and_return(user)
       allow(user).to receive(:id).and_return(3)
-      put :update, :id => 1, :user => { :id => 23 }
+      put :update, :id => 1, :user => { :last_name => 'teste' }
     end
 
     it 'should pass the right parameters to the model' do
-      expect(user).to receive(:update_attributes).with('id' => '23').and_return(true)
-      put :update, :id => 1, :user => { :id => 23 }
+      expect(user).to receive(:update_attributes).with('last_name' => 'teste').and_return(true)
+      put :update, :id => 1, :user => { :last_name => 'teste' }
     end
 
     it 'should update an user' do

data/spec/zertico/controller_spec.rb

@@ -37,4 +37,26 @@ describe Zertico::Controller do
       expect(users_controller.responder).to be == UsersResponder
     end
   end
+
+  context 'without a custom permitted_params' do
+    before :each do
+      allow(zertico_controller).to receive(:params).and_return({})
+      zertico_controller.send(:initialize_permitted_params)
+    end
+
+    it 'should initialize Zertico::PermittedParams' do
+      expect(zertico_controller.permitted_params).to be_an_instance_of(Zertico::PermittedParams)
+    end
+  end
+
+  context 'with a custom permitted_params' do
+    before :each do
+      allow(users_controller).to receive(:params).and_return({})
+      users_controller.send(:initialize_permitted_params)
+    end
+
+    it 'should initialize it!' do
+      expect(users_controller.permitted_params).to be_an_instance_of(UsersPermittedParams)
+    end
+  end
 end

data/spec/zertico/permitted_params_spec.rb

@@ -2,18 +2,37 @@ require 'spec_helper'
 
 describe Zertico::PermittedParams do
   let(:user) { User.new }
-  let(:params) { ActionController::Parameters.new(:user => { :id => 1, :name => "name" }) }
+  let(:params) { ActionController::Parameters.new(:id => 1,
+                                                  :user => { :first_name => "first_name",
+                                                             :last_name => "last_name" }) }
   let(:user_permitted_params) { UsersPermittedParams.new(params) }
+  let(:zertico_permitted_params) { Zertico::PermittedParams.new(:zertico => { :id => 1, :name => "name" }) }
 
   describe '#create' do
-    it "should ignore the id" do
-      expect(user_permitted_params.create).to eq({ 'name' => 'name' })
+    context 'on a custom PermittedParams' do
+      it "should ignore the id" do
+        expect(user_permitted_params.create).to eq({ 'first_name' => 'first_name' })
+      end
+    end
+
+    context 'on Zertico::PermittedParams' do
+      it "should accept all attributes of the hash" do
+        expect(zertico_permitted_params.create).to eq({ :id => 1, :name => 'name' })
+      end
     end
   end
 
   describe '#update' do
-    it "should ignore the name" do
-      expect(user_permitted_params.update).to eq({ 'id' => 1 })
+    context 'on a custom PermittedParams' do
+      it "should accept id and a hash of attributes" do
+        expect(user_permitted_params.update).to eq({ "last_name" => "last_name" })
+      end
+    end
+
+    context 'on Zertico::PermittedParams' do
+      it "should accept all attributes of the hash" do
+        expect(zertico_permitted_params.update).to eq({ :id => 1, :name => 'name' })
+      end
     end
   end
 

data/spec/zertico/service/instance_methods_spec.rb

@@ -70,11 +70,11 @@ describe Zertico::Service do
 
   describe '#update' do
     it 'should search for an user' do
-      expect(users_service.update({ :id => 1, :user => {} })).to eq(user)
+      expect(users_service.update({ :user => { :id => 1, :user => {} }}, { :id => 1, :user => {} })).to eq(user)
     end
 
     before :each do
-      users_service.update({ :id => 1, :user => {} })
+      users_service.update({ :user => { :id => 1, :user => {} }}, { :id => 1, :user => {} })
     end
 
     it 'should update the user' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zertico
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.3
+  version: 2.0.0.beta.1
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -120,6 +120,7 @@ files:
 - lib/zertico/controller.rb
 - lib/zertico/delegator.rb
 - lib/zertico/exceptions.rb
+- lib/zertico/exceptions/missing_application_responder.rb
 - lib/zertico/exceptions/missing_strong_parameters.rb
 - lib/zertico/exceptions/rollback_exception.rb
 - lib/zertico/interactor.rb
@@ -154,6 +155,7 @@ files:
 - spec/fake_app/app/organizers/buy_product_organizer.rb
 - spec/fake_app/app/organizers/register_organizer.rb
 - spec/fake_app/app/permitted_params/users_permitted_params.rb
+- spec/fake_app/app/responders/application_responder.rb
 - spec/fake_app/app/responders/users_responder.rb
 - spec/fake_app/app/services/admin/user_service.rb
 - spec/fake_app/app/services/person/gifts_service.rb
@@ -230,6 +232,7 @@ test_files:
 - spec/fake_app/app/organizers/buy_product_organizer.rb
 - spec/fake_app/app/organizers/register_organizer.rb
 - spec/fake_app/app/permitted_params/users_permitted_params.rb
+- spec/fake_app/app/responders/application_responder.rb
 - spec/fake_app/app/responders/users_responder.rb
 - spec/fake_app/app/services/admin/user_service.rb
 - spec/fake_app/app/services/person/gifts_service.rb