zertico 1.3.0 → 2.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1295fd48c55975eb821b72ef4aecbf18718a1ba8
-  data.tar.gz: 42084f48151b1c217ba9f06457f88b891957559c
+  metadata.gz: 612a9f684881747d1a85ca57c61e15ee06e2b9ca
+  data.tar.gz: 09f94e32870ed318a59852e560ede7816026c4ec
 SHA512:
-  metadata.gz: ee89cd13512c57ee180a2c77740066dfdcb310642b7d77af31e54a8d5e353fe6b5fee1cf6f033815f7f500bcb8f8d018c249387b8b4112efdde121639da185e3
-  data.tar.gz: 9a9dc13bb60edc54a4d84e982e7e7c15c1b8ba626cf9c6c1880f2500529b7e77fa3c75641e0a6f97ca5112354953b235e2ed07ae05f05fdae2566906f7be2fea
+  metadata.gz: 9edf88ad4dbe5c8a8c48ec01e2b02b776c62a35345e60444ea8adba06b7278be112ef2c8b8b629641263ccca771000c61a2d710288c2fe5feb9981aac2117655
+  data.tar.gz: a07da191a75726a209a6cc15bb0eecb51caa7dca8a16ccff860eeb4805f1f229f6b0681abb4c043a987b10c58b950e21218fb10ab0371fd758596fe0ba953404

data/.gitignore

@@ -15,4 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-.coveralls.yml
+.coveralls.yml
+gemfiles/*.lock

data/.hound.yml

@@ -0,0 +1,17 @@
+MethodCalledOnDoEndBlock:
+  Enabled: true
+
+Metrics/LineLength:
+  Max: 100
+
+Style/HashSyntax:
+  EnforcedStyle: hash_rockets
+
+Style/TrailingWhitespace:
+  Enabled: false
+
+Style/SpaceInsideBrackets:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: true

data/.travis.yml

@@ -1,27 +1,40 @@
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
-  - ree
-  - jruby
-gemfile:
-  - gemfiles/Gemfile.rails3.1
-  - gemfiles/Gemfile.rails3.2
-  - gemfiles/Gemfile.rails4.0
-  - gemfiles/Gemfile.rails4.1
 matrix:
-  exclude:
+  include:
     - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.rails4.0
-    - rvm: ree
-      gemfile: gemfiles/Gemfile.rails4.0
+      gemfile: gemfiles/Gemfile.rails3-ruby1.8.7
     - rvm: 1.9.2
-      gemfile: gemfiles/Gemfile.rails4.0
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile.rails4.1
+      gemfile: gemfiles/Gemfile.rails3-ruby1.9.2+
+      env: COVERAGE=true
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.rails3-ruby1.9.2+
+      env: COVERAGE=true
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.rails4-ruby1.9.2+
+      env: COVERAGE=true
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.rails3-ruby1.9.2+
+      env: COVERAGE=true
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile.rails4-ruby1.9.2+
+      env: COVERAGE=true
+    - rvm: 2.1.2
+      gemfile: gemfiles/Gemfile.rails3-ruby1.9.2+
+      env: COVERAGE=true
+    - rvm: 2.1.2
+      gemfile: gemfiles/Gemfile.rails4-ruby1.9.2+
+      env: COVERAGE=true
     - rvm: ree
-      gemfile: gemfiles/Gemfile.rails4.1
-    - rvm: 1.9.2
-      gemfile: gemfiles/Gemfile.rails4.1
+      gemfile: gemfiles/Gemfile.rails3-ruby1.8.7
+    - rvm: jruby
+      gemfile: gemfiles/Gemfile.rails3-ruby1.9.2+
+      env: COVERAGE=true
+    - rvm: jruby
+      gemfile: gemfiles/Gemfile.rails4-ruby1.9.2+
+      env: COVERAGE=true
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/edaa9e7b8d7812636188
+    on_success: always  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: true      # default: false

data/CHANGELOG.md

@@ -0,0 +1,103 @@
+# CHANGELOG
+
+## master
+
+* Changed Service to class. Exposed api methods to use instead of overwrite methods.
+* Fixed some bugs.
+* Improved Delegator, Interactor, Organizer.
+
+## v1.3.0
+
+* Deprecated Accessor in favor of Delegator.
+* Created Delegator.
+* Created Interactor and Organizer.
+
+## v1.2.0
+
+* Added ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.1, ree and jruby official support(Travis build).
+* Added rails 3.1, 3.2, 4.0, 4.1 support(Travis build).
+* Added support for Jquery Pjax on Responder
+
+## v1.1.1
+
+* Fixed Service instance variable name conflict with Devise.
+
+## v1.1.0
+
+* Improved Controller and Service code and behavior.
+
+## v1.0.0
+
+* Improved Controller by letting Service choose which params to work instead of pass as arguments.
+* Fixed Service instance variable name conflict with Rails one.
+* Improved Accessor logic.
+* Allowing full customization of Responder initialization params from Service.
+* Created Responder to force redirects and flash messages.
+
+## v0.6.1
+
+* Fixed params working on Controller to work depending on each case.
+
+## v0.6.0
+
+* Added support for nested resource on Service.
+
+## v0.5.6
+
+* Fixed Controller `#interface_class` when name is pluralized.
+
+## v0.5.5
+
+* Fixed Accessor `#interface_name` and `#interface_class` bugs on namespaced interfaces.
+
+## v0.5.4
+
+* Fixed Accessor `#interface_name` and `#interface_class` when interface is namespaced.
+
+## v0.5.3
+
+* Fixed Service `#interface_name` and `#interface_class` when interface is namespaced.
+
+## v0.5.2
+
+* Specified Rails minimum version.
+
+## v0.5.1
+
+* Fixed path definition on Controller.
+
+## v0.5.0
+
+* Added possibility to define path to redirect on Controller.
+
+## v0.4.0
+
+* Added possibility to define object passed to Responder.
+
+## v0.3.1
+
+* Fixed `.find` method from Accessor.
+
+## v0.3.0
+
+* Created Accessor to encapsulate logic over interfaces.
+
+## v0.2.0
+
+* Improved Service to find Interface from Namespace Controller.
+
+## v0.1.3
+
+* Fixed Controller Initialization by executing superclass initialization.
+
+## v0.1.2
+
+* Fixed `#interface_name` method from Service.
+
+## v0.1.1
+
+* Fixed `#modify` and `#delete` methods from Service.
+
+## v0.1.0
+
+* Created Controller and Service to improve default Rails Controller.

data/README.md

@@ -1,6 +1,6 @@
 # Zertico
 
-[![Gem Version](https://badge.fury.io/rb/zertico.png)](http://badge.fury.io/rb/zertico) [![Build Status](https://travis-ci.org/zertico/zertico.png)](https://travis-ci.org/zertico/zertico) [![Dependency Status](https://gemnasium.com/zertico/zertico.png)](https://gemnasium.com/zertico/zertico) [![Coverage Status](https://coveralls.io/repos/zertico/zertico/badge.png?branch=master)](https://coveralls.io/r/zertico/zertico) [![Code Climate](https://codeclimate.com/github/zertico/zertico.png)](https://codeclimate.com/github/zertico/zertico)
+[![Gem Version](https://badge.fury.io/rb/zertico.svg)](http://badge.fury.io/rb/zertico) [![Build Status](https://travis-ci.org/zertico/zertico.svg?branch=master)](https://travis-ci.org/zertico/zertico) [![Dependency Status](https://gemnasium.com/zertico/zertico.svg)](https://gemnasium.com/zertico/zertico) [![Coverage Status](https://img.shields.io/coveralls/zertico/zertico.svg?branch=master)](https://coveralls.io/r/zertico/zertico?branch=master) [![Code Climate](https://codeclimate.com/github/zertico/zertico.png)](https://codeclimate.com/github/zertico/zertico) [![Stories in Ready](https://badge.waffle.io/zertico/zertico.png?label=ready&title=Ready)](https://waffle.io/zertico/zertico)
 
 Increase your Rails development speed using patterns that will make your code even more easy to read and maintain.
 
@@ -32,15 +32,22 @@ The `Zertico::Controller` define behavior of a common Rails Controller. By Exten
 All you need to do is extend ith with you `ApplicationController` and you will get the benefit of it.     
       
 ```ruby
-class ApplicationController < ZerticoController
+class ApplicationController < Zertico::Controller
     respond_to :html
 end
-```      
+```  
+    
+After that all your controllers will look like this:
+    
+```ruby
+class CarsController < ApplicationController
+end
+```    
 
 ### Zertico::Delegator
 
 The `Zertico::Delegator` is a delegator with some extra tools to work with `ActiveRecord`. It will try to guess your model,
-    and initialize it.
+    and initialize it. It can be used as a Decorator.
     
 ```ruby
 class UserDelegator < Zertico::Delegator
@@ -48,14 +55,19 @@ class UserDelegator < Zertico::Delegator
         interface.name.downcase
     end
 end
-```
 
-In the above example, it will automatically load a `User` model.
+user = UserDelegator.find(2)
+puts user.interface.name
+puts user.name
+
+# 'User Name'
+# 'user name'
+```
 
 ### Zertico::Interactor
 
 The `Zertico::Interactor` defines a single call on a transaction at the ruby interpreter level. It can be used to define a
-    database call, api call, sending of an email, calculate some data based on another interactor.
+    database call, api call, sending of an email or calculate some data based on another interactor.
     
 ```ruby
 class CreateUserInteractor < Zertico::Interactor
@@ -73,7 +85,7 @@ It should define its `perform` logic and `rollback` logic in case some other int
 
 ### Zertico::Organizer
 
-The `Zertico::Organizer` is the responsible for calling a pack of interactors, and in case of some failure, send a
+The `Zertico::Organizer` is responsible for calling a pack of interactors, and in case of some failure, send a
     rollback signal for all other interactors already executed.
     
 ```ruby
@@ -113,22 +125,32 @@ class ApplicationController < ActionController::Base
 end
 ```
 
+To force a redirect do as follows:
+
+```ruby
+UsersController < ApplicationController
+    def create
+        @user = User.create(params[:user])
+        respond_with(@user, force_redirect: true) # It will redirect even on failure
+    end
+end
+```
+
 ### Zertico::Service
 
-`Zertico::Service` gives more flexibility to the `Zertico::Controller`. When using `Zertico::Controller` your controllers
-    will try to find a module with the same name as your controller. If it can't find, it will include `Zertico::Service`.
-    If you define a service, you can define which class to use on that controller and even more.
+When using `Zertico::Controller` your controllers will try to find a service with the same name as your controller. 
+    If it can't find, it will initialize and `Zertico::Service` class. Creating the service, you can define which class to use on that controller.
     
 ```ruby
 class AdminController < ApplicationController
 end
 
-module UsersService
-    include Zertico::Service
+class AdminService < Zertico::Service
+    use_interface User
+    # or
+    use_model User
     
-    def interface_class
-        User
-    end
+    use_as_variable_name 'epic_user'
 end
 ```
 
@@ -156,8 +178,6 @@ The `Interactor` and `Organizer` idea was taken from [interactor](https://github
 
 [@plribeiro3000](https://github.com/plribeiro3000)
 
-[@mfbmina](https://github.com/mfbmina)
-
 [@silviolrjunior](https://github.com/silviolrjunior)
 
 ## Contributing
@@ -166,4 +186,4 @@ The `Interactor` and `Organizer` idea was taken from [interactor](https://github
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/gemfiles/Gemfile.rails3-ruby1.8.7

@@ -0,0 +1,7 @@
+source :rubygems
+
+gem 'rails', '~> 3.1.0'
+gem 'rest-client', '~> 1.6.8'
+gem 'strong_parameters'
+
+gemspec :path => '../'

data/gemfiles/Gemfile.rails3-ruby1.9.2+

@@ -0,0 +1,6 @@
+source :rubygems
+
+gem 'rails', '~> 3.1.0'
+gem 'strong_parameters'
+
+gemspec :path => '../'

data/gemfiles/Gemfile.rails4-ruby1.9.2+

@@ -0,0 +1,5 @@
+source :rubygems
+
+gem 'rails', '~> 4.0.0'
+
+gemspec :path => '../'

data/lib/zertico.rb

@@ -8,6 +8,7 @@ module Zertico
   autoload :Exceptions, 'zertico/exceptions'
   autoload :Interactor, 'zertico/interactor'
   autoload :Organizer, 'zertico/organizer'
+  autoload :PermittedParams, 'zertico/permitted_params'
   autoload :Responder, 'zertico/responder'
   autoload :Service, 'zertico/service'
 end

data/lib/zertico/controller.rb

@@ -2,45 +2,53 @@ require 'action_controller'
 
 module Zertico
   class Controller < ActionController::Base
+    attr_reader :service
+
     def initialize
-      begin
-        extend "::#{self.class.name.chomp('Controller').concat('Service')}".constantize
-      rescue NameError
-        extend Zertico::Service
-      end
+      @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)
       super
     end
 
     def index
-      respond_with(all, options)
+      instance_variable_set("@#{service.interface_name.pluralize}", service.index)
+      respond_with(instance_variable_get("@#{service.interface_name.pluralize}"), responder.index_options(self))
     end
 
     def new
-      respond_with(build, options)
+      instance_variable_set("@#{service.interface_name}", service.new)
+      respond_with(instance_variable_get("@#{service.interface_name}"), responder.new_options(self))
     end
 
     def show
-      respond_with(find, options)
+      instance_variable_set("@#{service.interface_name}", service.show(params))
+      respond_with(instance_variable_get("@#{service.interface_name}"), responder.show_options(self))
     end
 
     def edit
-      respond_with(find, options)
+      instance_variable_set("@#{service.interface_name}", service.show(params))
+      respond_with(instance_variable_get("@#{service.interface_name}"), responder.edit_options(self))
     end
 
     def create
-      respond_with(generate, options)
+      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))
+      respond_with(instance_variable_get("@#{service.interface_name}"), responder.create_options(self))
     end
 
     def update
-      respond_with(modify, options)
+      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))
+      respond_with(instance_variable_get("@#{service.interface_name}"), responder.update_options(self))
     end
 
     def destroy
-      respond_with(delete, options)
-    end
-
-    def options
-      @options || {}
+      instance_variable_set("@#{service.interface_name}", service.destroy(params))
+      respond_with(instance_variable_get("@#{service.interface_name}"), responder.destroy_options(self))
     end
   end
 end

data/lib/zertico/delegator.rb

@@ -2,6 +2,11 @@ require 'delegate'
 
 module Zertico
   class Delegator < SimpleDelegator
+    def initialize(object = nil)
+      object ||= interface_class.new
+      super(object)
+    end
+
     def self.find(id)
       new(interface_class.find(id))
     end
@@ -10,6 +15,10 @@ module Zertico
       __getobj__
     end
 
+    def interface=(object)
+      __setobj__(object)
+    end
+
     protected
 
     def self.interface_name
@@ -17,11 +26,9 @@ module Zertico
     end
 
     def self.interface_class
-      begin
-        self.name.chomp('Delegator').constantize
-      rescue NameError
-        self.name.chomp('Delegator').split('::').last.constantize
-      end
+      self.name.chomp('Delegator').constantize
+    rescue NameError
+      self.name.chomp('Delegator').split('::').last.constantize
     end
 
     def interface_name