zertico 2.0.0.alpha.1 → 2.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 612a9f684881747d1a85ca57c61e15ee06e2b9ca
-  data.tar.gz: 09f94e32870ed318a59852e560ede7816026c4ec
+  metadata.gz: bf85d369e45deaff1313840e328a09daa12e988b
+  data.tar.gz: b9f61dc7c92ce62866353d0ef3ecb9956d224928
 SHA512:
-  metadata.gz: 9edf88ad4dbe5c8a8c48ec01e2b02b776c62a35345e60444ea8adba06b7278be112ef2c8b8b629641263ccca771000c61a2d710288c2fe5feb9981aac2117655
-  data.tar.gz: a07da191a75726a209a6cc15bb0eecb51caa7dca8a16ccff860eeb4805f1f229f6b0681abb4c043a987b10c58b950e21218fb10ab0371fd758596fe0ba953404
+  metadata.gz: 41fe10373503f628f382ce7c68c73a41ce98a3860c44942c329b856162b8d1e24c481b251a3904fcf72caf96a55b83ab3df8efbee61724fa67c781ff6acbb8fe
+  data.tar.gz: 17e58d0959b8a3191f9e6f4df0d990f0490bc58473314608a2caeee6e75996e80889cfa1e888879503c35ac601f9ea327847a79f9c6f00f59f1b9eff4ca8b660

data/lib/zertico/controller.rb

@@ -5,12 +5,8 @@ module Zertico
     attr_reader :service
 
     def initialize
-      @service = Zertico::Service.new
-      custom_service_name = "::#{self.class.name.gsub('Controller', 'Service')}"
-      @service = custom_service_name.constantize.new if defined?(custom_service_name)
-      self.class.responder = Zertico::Responder
-      custom_responder_name = "::#{self.class.name.gsub('Controller', 'Responder')}"
-      self.class.responder = custom_responder_name.constantize if defined?(custom_responder_name)
+      initialize_service
+      set_responder
       super
     end
 
@@ -50,5 +46,19 @@ module Zertico
       instance_variable_set("@#{service.interface_name}", service.destroy(params))
       respond_with(instance_variable_get("@#{service.interface_name}"), responder.destroy_options(self))
     end
+
+    private
+
+    def initialize_service
+      @service = "::#{self.class.name.gsub('Controller', 'Service')}".constantize.new
+    rescue NameError
+      @service = Zertico::Service.new
+    end
+
+    def set_responder
+      self.class.responder = "::#{self.class.name.gsub('Controller', 'Responder')}".constantize
+    rescue NameError
+      self.class.responder = Zertico::Responder
+    end
   end
 end

data/lib/zertico/service/instance_methods.rb

@@ -32,29 +32,6 @@ module Zertico
       def resource_source
         self.class.resource_source || interface_class
       end
-
-      def interface_id
-        return self.class.interface_id if self.class.interface_id
-        if self.class.name.chomp('Controller').split('::').size > 1
-          "#{interface_name.gsub('/', '_')}_id"
-        else
-          'id'
-        end
-      rescue NameError
-        'id'
-      end
-
-      def interface_name
-        return self.class.interface_name if self.class.interface_name
-        interface_class.name.singularize.underscore
-      end
-
-      def interface_class
-        return self.class.interface_class if self.class.interface_class
-        self.class.name.chomp('Service').singularize.constantize
-      rescue NameError
-        self.class.name.chomp('Service').split('::').last.singularize.constantize
-      end
     end
   end
 end

data/lib/zertico/service.rb

@@ -1,9 +1,38 @@
 module Zertico
   class Service
+    attr_reader :interface_class, :interface_name, :interface_id
+
     autoload :ClassMethods, 'zertico/service/class_methods'
     autoload :InstanceMethods, 'zertico/service/instance_methods'
 
     extend ClassMethods
     include InstanceMethods
+
+    def initialize(options = {})
+      @interface_class = options.fetch(:interface_class, self.class.interface_class)
+      @interface_class ||= custom_interface_class
+      @interface_name = options.fetch(:interface_name, self.class.interface_name)
+      @interface_name ||= interface_class.name.singularize.underscore
+      @interface_id = options.fetch(:interface_id, self.class.interface_id)
+      @interface_id ||= custom_interface_id
+    end
+
+    private
+
+    def custom_interface_class
+      self.class.name.chomp('Service').singularize.constantize
+    rescue NameError
+      self.class.name.chomp('Service').split('::').last.singularize.constantize
+    end
+
+    def custom_interface_id
+      if self.class.name.chomp('Controller').split('::').size > 1
+        "#{interface_name.gsub('/', '_')}_id"
+      else
+        'id'
+      end
+    rescue NameError
+      'id'
+    end
   end
 end

data/lib/zertico/version.rb

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

data/spec/fake_app/app/controllers/cars_controller.rb

@@ -0,0 +1,2 @@
+class CarsController < ApplicationController
+end

data/spec/fake_app/app/interfaces/gift.rb

@@ -0,0 +1,2 @@
+class Gift
+end

data/spec/zertico/controller_spec.rb

@@ -1,19 +1,28 @@
 require 'spec_helper'
 
 describe Zertico::Controller do
-  let(:controller) { UsersController.new }
+  let(:users_controller) { UsersController.new }
+  let(:cars_controller) { CarsController.new }
   let(:zertico_controller) { Zertico::Controller.new }
   let(:service) { Zertico::Service.new }
 
   context 'without a custom service' do
-    it 'should initialize Zertico::Service' do
-      expect(zertico_controller.service).to be_an_instance_of(Zertico::Service)
+    context 'on Zertico::Controller' do
+      it 'should initialize Zertico::Service' do
+        expect(zertico_controller.service).to be_an_instance_of(Zertico::Service)
+      end
+    end
+
+    context 'on a custom controller' do
+      it 'should initialize Zertico::Service' do
+        expect(cars_controller.service).to be_an_instance_of(Zertico::Service)
+      end
     end
   end
 
   context 'with a custom service' do
     it 'should initialize it!' do
-      expect(controller.service).to be_an_instance_of(UsersService)
+      expect(users_controller.service).to be_an_instance_of(UsersService)
     end
   end
 
@@ -25,7 +34,7 @@ describe Zertico::Controller do
 
   context 'with a custom responder' do
     it 'should initialize it!' do
-      expect(controller.responder).to be == UsersResponder
+      expect(users_controller.responder).to be == UsersResponder
     end
   end
 end

data/spec/zertico/service/instance_methods_spec.rb

@@ -121,98 +121,4 @@ describe Zertico::Service do
       end
     end
   end
-
-  describe '#interface_id' do
-    context 'on a pluralized service' do
-      it 'should return id' do
-        expect(users_service.send(:interface_id)).to eq('id')
-      end
-    end
-
-    context 'on a namespaced service and interface model' do
-      it 'should return id with the model name' do
-        expect(profile_service.send(:interface_id)).to eq('person_profile_id')
-      end
-    end
-
-    context 'on a namespaced service and non namespaced interface model' do
-      it 'should return id with the model name' do
-        expect(admin_service.send(:interface_id)).to eq('user_id')
-      end
-    end
-
-    context 'on a non namespaced service and non namespaced interface model' do
-      it 'should return id' do
-        expect(users_service.send(:interface_id)).to eq('id')
-      end
-    end
-
-    context 'on a namespaced service and an undefined interface model' do
-      it 'should return id' do
-        expect(gifts_service.send(:interface_id)).to eq('id')
-      end
-    end
-
-    context 'when defined on class' do
-      before :each do
-        gifts_service.class.instance_variable_set('@interface_id', 'abc')
-      end
-
-      it 'should return the defined value' do
-        expect(gifts_service.send(:interface_id)).to eq('abc')
-      end
-    end
-  end
-
-  describe '#interface_name' do
-    it 'should return the interface name' do
-      expect(users_service.send(:interface_name)).to eq('user')
-    end
-
-    context 'when defined on class' do
-      before :each do
-        gifts_service.class.instance_variable_set('@interface_name', 'abc')
-      end
-
-      it 'should return the defined value' do
-        expect(gifts_service.send(:interface_name)).to eq('abc')
-      end
-    end
-  end
-
-  describe '#interface_class' do
-    context 'on a pluralized service' do
-      it 'should find the interface model' do
-        expect(users_service.send(:interface_class)).to eq(User)
-      end
-    end
-
-    context 'on a namespaced service and interface model' do
-      it 'should find the interface model' do
-        expect(profile_service.send(:interface_class)).to eq(Person::Profile)
-      end
-    end
-
-    context 'on a namespaced service and non namespaced interface model' do
-      it 'should find the interface model' do
-        expect(admin_service.send(:interface_class)).to eq(User)
-      end
-    end
-
-    context 'on a non namespaced service and non namespaced interface model' do
-      it 'should find the interface model' do
-        expect(users_service.send(:interface_class)).to eq(User)
-      end
-    end
-
-    context 'when defined on class' do
-      before :each do
-        gifts_service.class.instance_variable_set('@interface_class', User)
-      end
-
-      it 'should return the defined value' do
-        expect(gifts_service.send(:interface_class)).to eq(User)
-      end
-    end
-  end
 end

data/spec/zertico/service_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+
+describe Zertico::Service do
+  let(:admin_service) { Admin::UserService.new }
+  let(:gifts_service) { Person::GiftsService.new }
+  let(:profile_service) { Person::ProfileService.new }
+  let(:object) { Object.new }
+  let(:users_service) { UsersService.new }
+  let(:user) { User.new }
+
+  describe '#interface_id' do
+    context 'when passed to initialize' do
+      before :each do
+        @gifts_service = Person::GiftsService.new(:interface_id => 'teste')
+      end
+
+      it 'should return it' do
+        expect(@gifts_service.send(:interface_id)).to eq('teste')
+      end
+    end
+
+    context 'on a pluralized service' do
+      it 'should return id' do
+        expect(users_service.send(:interface_id)).to eq('id')
+      end
+    end
+
+    context 'on a namespaced service and interface model' do
+      it 'should return id with the model name' do
+        expect(profile_service.send(:interface_id)).to eq('person_profile_id')
+      end
+    end
+
+    context 'on a namespaced service and non namespaced interface model' do
+      it 'should return id with the model name' do
+        expect(admin_service.send(:interface_id)).to eq('user_id')
+      end
+    end
+
+    context 'on a non namespaced service and non namespaced interface model' do
+      it 'should return id' do
+        expect(users_service.send(:interface_id)).to eq('id')
+      end
+    end
+
+    context 'when defined on class' do
+      before :each do
+        Person::GiftsService.instance_variable_set('@interface_id', 'abc')
+        @gifts_service = Person::GiftsService.new
+      end
+
+      it 'should return the defined value' do
+        expect(@gifts_service.send(:interface_id)).to eq('abc')
+      end
+    end
+  end
+
+  describe '#interface_name' do
+    context 'when passed to initialize' do
+      before :each do
+        @gifts_service = Person::GiftsService.new(:interface_name => 'teste')
+      end
+
+      it 'should return it' do
+        expect(@gifts_service.send(:interface_name)).to eq('teste')
+      end
+    end
+
+    it 'should return the interface name' do
+      expect(users_service.send(:interface_name)).to eq('user')
+    end
+
+    context 'when defined on class' do
+      before :each do
+        Person::GiftsService.instance_variable_set('@interface_name', 'abc')
+        @gifts_service = Person::GiftsService.new
+      end
+
+      it 'should return the defined value' do
+        expect(@gifts_service.send(:interface_name)).to eq('abc')
+      end
+    end
+  end
+
+  describe '#interface_class' do
+    context 'when passed to initialize' do
+      before :each do
+        @gifts_service = Person::GiftsService.new(:interface_class => User)
+      end
+
+      it 'should return it' do
+        expect(@gifts_service.send(:interface_class)).to eq(User)
+      end
+    end
+
+    context 'on a pluralized service' do
+      it 'should find the interface model' do
+        expect(users_service.send(:interface_class)).to eq(User)
+      end
+    end
+
+    context 'on a namespaced service and interface model' do
+      it 'should find the interface model' do
+        expect(profile_service.send(:interface_class)).to eq(Person::Profile)
+      end
+    end
+
+    context 'on a namespaced service and non namespaced interface model' do
+      it 'should find the interface model' do
+        expect(admin_service.send(:interface_class)).to eq(User)
+      end
+    end
+
+    context 'on a non namespaced service and non namespaced interface model' do
+      it 'should find the interface model' do
+        expect(users_service.send(:interface_class)).to eq(User)
+      end
+    end
+
+    context 'when defined on class' do
+      before :each do
+        Person::GiftsService.instance_variable_set('@interface_class', User)
+        @gifts_service = Person::GiftsService.new
+      end
+
+      it 'should return the defined value' do
+        expect(@gifts_service.send(:interface_class)).to eq(User)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zertico
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.1
+  version: 2.0.0.alpha.2
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
@@ -134,6 +134,7 @@ files:
 - lib/zertico/version.rb
 - spec/fake_app/app/controllers/admin/user_controller.rb
 - spec/fake_app/app/controllers/application_controller.rb
+- spec/fake_app/app/controllers/cars_controller.rb
 - spec/fake_app/app/controllers/person/gifts_controller.rb
 - spec/fake_app/app/controllers/person/profile_controller.rb
 - spec/fake_app/app/controllers/user_controller.rb
@@ -145,6 +146,7 @@ files:
 - spec/fake_app/app/interactors/create_product_interactor.rb
 - spec/fake_app/app/interactors/create_user_interactor.rb
 - spec/fake_app/app/interactors/send_welcome_email_interactor.rb
+- spec/fake_app/app/interfaces/gift.rb
 - spec/fake_app/app/interfaces/invoice.rb
 - spec/fake_app/app/interfaces/person/profile.rb
 - spec/fake_app/app/interfaces/product.rb
@@ -176,6 +178,7 @@ files:
 - spec/zertico/responder_spec.rb
 - spec/zertico/service/class_methods_spec.rb
 - spec/zertico/service/instance_methods_spec.rb
+- spec/zertico/service_spec.rb
 - zertico.gemspec
 homepage: 
 licenses:
@@ -207,6 +210,7 @@ test_files:
 - gemfiles/Gemfile.rails4-ruby1.9.2+
 - spec/fake_app/app/controllers/admin/user_controller.rb
 - spec/fake_app/app/controllers/application_controller.rb
+- spec/fake_app/app/controllers/cars_controller.rb
 - spec/fake_app/app/controllers/person/gifts_controller.rb
 - spec/fake_app/app/controllers/person/profile_controller.rb
 - spec/fake_app/app/controllers/user_controller.rb
@@ -218,6 +222,7 @@ test_files:
 - spec/fake_app/app/interactors/create_product_interactor.rb
 - spec/fake_app/app/interactors/create_user_interactor.rb
 - spec/fake_app/app/interactors/send_welcome_email_interactor.rb
+- spec/fake_app/app/interfaces/gift.rb
 - spec/fake_app/app/interfaces/invoice.rb
 - spec/fake_app/app/interfaces/person/profile.rb
 - spec/fake_app/app/interfaces/product.rb
@@ -249,3 +254,4 @@ test_files:
 - spec/zertico/responder_spec.rb
 - spec/zertico/service/class_methods_spec.rb
 - spec/zertico/service/instance_methods_spec.rb
+- spec/zertico/service_spec.rb