zertico 2.0.0.alpha.2 → 2.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf85d369e45deaff1313840e328a09daa12e988b
-  data.tar.gz: b9f61dc7c92ce62866353d0ef3ecb9956d224928
+  metadata.gz: 11c1692e1a912ed1299b06de71336e7fa7074e01
+  data.tar.gz: 474b9270363f5a8873af6bab6b489823c700d3fa
 SHA512:
-  metadata.gz: 41fe10373503f628f382ce7c68c73a41ce98a3860c44942c329b856162b8d1e24c481b251a3904fcf72caf96a55b83ab3df8efbee61724fa67c781ff6acbb8fe
-  data.tar.gz: 17e58d0959b8a3191f9e6f4df0d990f0490bc58473314608a2caeee6e75996e80889cfa1e888879503c35ac601f9ea327847a79f9c6f00f59f1b9eff4ca8b660
+  metadata.gz: 47f60cb1d5b3f3ca8a3f5a814752f3dfde063d046e97bce0a30eb5893353cc55a743fbf9c73e98235260c1890237cfe07d5fd64a2f719d6c513deb3967e74bac
+  data.tar.gz: cd6fbe21a296e58b43a54075a888c06d70e21aa9638cf5a78484f89d128fb6833aafd764c5cff56af88ba8bf88734412cb465bc9aca46bfb22067d64babb8fe2

data/lib/zertico/controller.rb

@@ -52,7 +52,7 @@ module Zertico
     def initialize_service
       @service = "::#{self.class.name.gsub('Controller', 'Service')}".constantize.new
     rescue NameError
-      @service = Zertico::Service.new
+      @service = Zertico::Service.new(self.class.name)
     end
 
     def set_responder

data/lib/zertico/service/instance_methods.rb

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

data/lib/zertico/service.rb

@@ -1,6 +1,6 @@
 module Zertico
   class Service
-    attr_reader :interface_class, :interface_name, :interface_id
+    attr_reader :name
 
     autoload :ClassMethods, 'zertico/service/class_methods'
     autoload :InstanceMethods, 'zertico/service/instance_methods'
@@ -8,31 +8,8 @@ module Zertico
     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'
+    def initialize(controller_name = nil)
+      @name = (controller_name or self.class.name).gsub('Controller', 'Service')
     end
   end
 end

data/lib/zertico/version.rb

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

data/spec/zertico/service/instance_methods_spec.rb

@@ -121,4 +121,125 @@ describe Zertico::Service do
       end
     end
   end
+
+  describe '#interface_id' do
+    context 'with a custom controller without a custom service' do
+      before :each do
+        @service = Zertico::Service.new('UserController')
+      end
+
+      it 'should return id' do
+        expect(@service.send(:interface_id)).to eq('id')
+      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 'with a custom controller without a custom service' do
+      before :each do
+        @service = Zertico::Service.new('Person::GiftsController')
+      end
+
+      it 'should return it' do
+        expect(@service.send(:interface_name)).to eq('gift')
+      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 'with a custom controller without a custom service' do
+      before :each do
+        @service = Zertico::Service.new('Person::Gifts')
+      end
+
+      it 'should return it' do
+        expect(@service.send(:interface_class)).to eq(Gift)
+      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

data/spec/zertico/service_spec.rb

@@ -1,130 +1,16 @@
 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')
+  describe '#initialize' do
+    context 'with a custom controller' do
+      it 'should save the name based on the controller name' do
+        expect(Zertico::Service.new('UsersController').name).to eq('UsersService')
       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)
+    context 'without a custom controller' do
+      it 'should save the name of the service' do
+        expect(Zertico::Service.new.name).to eq('Zertico::Service')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zertico
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.2
+  version: 2.0.0.alpha.3
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro