unlock_gateway 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cb7317f716d9074645b160bbbb03c2ad4b35a6e
-  data.tar.gz: a4352f39986625f4148ddc8696bf007f8bae8956
+  metadata.gz: 0b7d3e76866d073fc15d237fb08ede032a3fa5c6
+  data.tar.gz: 9c8e0ff9164d5c89b4e31b0666eafe5bf67e6db9
 SHA512:
-  metadata.gz: cac357585717cc0a38b2122b5cee94222c9e1995ea1aa55e2b42a23becffc9f48bb6b6f2de7af92baab08fdfe75509080f313047f9dd3ee4e0a60562ee5efac2
-  data.tar.gz: bf90f5df27a2fa31a799bee3dbc98a248c0411f4fc059a4557678c05b4db24f1363d4f89843d23e750d4751579389a4ba36331029226c370af0a87912e9820a8
+  metadata.gz: 10b84ad2e9cda745ea085785ce2a195f57872484c57f3d3bd6f3c48fb871d113fb0166a2a65dfe41d5bab165bcd1275604050c00780c9b2b4b0f05daf9a26eb7
+  data.tar.gz: 07035e0ebb9daa53ccd713f0fef5e4fa784871a5a3c4d79df5dea72fd3eb7efe2b43210dae25f5bbb2333ce8056e13487c872dd77c5a30429667188a43dc6c58

data/lib/unlock_gateway/controller.rb

@@ -9,9 +9,8 @@ module UnlockGateway
       def self.extended(base)
         base.class_eval do
 
-          inherit_resources
+          before_action :set_contribution, only: %i[edit activate suspend]
 
-          actions :create, :edit
           respond_to :html
 
           after_action :verify_authorized
@@ -25,25 +24,26 @@ module UnlockGateway
 
     # A second step or final checkout should use this action
     def edit
-      edit! { authorize resource }
+      authorize @contribution
     end
 
     # This action will be used when the user requests to activate/reactivate a contribution
     def activate
-      respond_to do |format|
-        format.html { transition_state(:active) }
-      end
+      transition_state(:active)
     end
     
     # This action will be used when the user requests to suspend a contribution
     def suspend
-      respond_to do |format|
-        format.html { transition_state(:suspended) }
-      end
+      transition_state(:suspended)
     end
 
     private
 
+    # Sets @contribution
+    def set_contribution
+      @contribution = Contribution.find(params[:id])
+    end
+
     # Creates the contribution, sets session[:gateway_id], returns true if successful and renders new action if not
     def create_contribution
 
@@ -63,48 +63,44 @@ module UnlockGateway
 
     end
 
-    # This method authorizes the resource, checks if the contribution can be transitioned to the desired state, calls Contribution#update_state_on_gateway!, transition the contribution's state, and return the proper JSON for Unlock's AJAX calls
+    # This method authorizes @contribution, checks if the contribution can be transitioned to the desired state, calls Contribution#update_state_on_gateway!, transition the contribution's state, and return the proper JSON for Unlock's AJAX calls
     def transition_state(state)
-      authorize resource
-      @initiative = resource.initiative
-      @user = resource.user
+      authorize @contribution
+      @initiative = @contribution.initiative
+      @user = @contribution.user
       state = state.to_sym
-      transition = resource.transition_by_state(state)
-      initial_state = resource.state_name
-      if resource.send("can_#{transition}?")
+      transition = @contribution.transition_by_state(state)
+      initial_state = @contribution.state_name
+      resource_name = @contribution.class.model_name.human
+      if @contribution.send("can_#{transition}?")
         begin
-          if resource.state_on_gateway != state
-            if resource.update_state_on_gateway!(state)
-              resource.send("#{transition}!")
+          if @contribution.state_on_gateway != state
+            if @contribution.update_state_on_gateway!(state)
+              @contribution.send("#{transition}!")
             else
-              flash[:failure] = "Não foi possível alterar o status de seu apoio."
+              flash[:alert] = t('flash.actions.update.alert', resource_name: resource_name)
             end
           else
-            resource.send("#{transition}!")
+            @contribution.send("#{transition}!")
           end
         rescue
-          flash[:failure] = "Ooops, ocorreu um erro ao alterar o status de seu apoio."
+          flash[:alert] = t('flash.actions.update.alert', resource_name: resource_name)
         end
       else
-        flash[:failure] = "Não foi permitido alterar o status deste apoio."
+        flash[:alert] = t('flash.actions.update.alert', resource_name: resource_name)
       end
-      if flash[:failure].present?
+      if flash[:alert].present?
         render 'initiatives/contributions/show'
       else
         if initial_state == :pending
-          flash[:success] = "Apoio realizado com sucesso!"
+          flash[:notice] = t('flash.actions.create.notice', resource_name: resource_name)
         else
-          flash[:success] = "Status do apoio alterado com sucesso!"
+          flash[:notice] = t('flash.actions.update.notice', resource_name: resource_name)
         end
-        redirect_to initiative_contribution_path(resource.initiative.id, resource)
+        redirect_to initiative_contribution_path(@contribution.initiative.id, @contribution)
       end
     end
 
-    # Strong parameters for Contribution. This duplication is due to a inherited_resources problem that requires both
-    def permitted_params
-      params.permit(contribution: policy(@contribution || Contribution.new).permitted_attributes)
-    end
-
     # Strong parameters for Contribution    
     def contribution_params
       params.require(:contribution).permit(*policy(@contribution || Contribution.new).permitted_attributes)

data/lib/unlock_gateway/version.rb

@@ -1,3 +1,3 @@
 module UnlockGateway
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unlock_gateway
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Weinmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails