unlock_moip 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d11cefc19d503db776320d7ce6dfa1b1525a5f7b
-  data.tar.gz: 1aec8ad2672bd9999e13d114ae8860dfa983b845
+  metadata.gz: cc03ae3313500f874e417d7619bc987909b4bcbb
+  data.tar.gz: d76184ef2694455bd5f0fadcf76cd36cf4f64447
 SHA512:
-  metadata.gz: ebd55075bc1c2ef113c5380644192d3abd71cfe5a0838867b22572ee0e3dae6ebd33c98e2bd47fcd39ed24d08426f54ab033b9cd97c2fbc8131010c0c3a5c3df
-  data.tar.gz: fe639d7124fc8a1a80a005d9b974f9ceefb3c7ee6cce95070a44a26fd8e3ebc31536a9af10d43f8f79838d08317c358570b02fdba3a33e3ae60f970181c0b02b
+  metadata.gz: 75581b94b79d765e89184c0f171931384b0d9c6d6bb1b5a1271cb788b5a5e24003b5dc38ebf67a0b33edd0548a3cd80518c838b8c8ee66b865d60561581938f7
+  data.tar.gz: bd85f97f2736af5f1ee49cd474c81650e97c4d5289b2e6de00846a8e34379901b9023a30321ec8da0ff7ed3d3ff49e0e71509080235d0dfd5d9d348ea241d5a0

data/app/assets/javascripts/unlock_moip.js.coffee

@@ -1,16 +1,13 @@
 $(document).ready ->
-  if action() == "new" and controller() == "contributions" and namespace() == "initiatives"
-    $('#contribution_value').maskMoney
-      thousands: ''
-      decimal: ''
-      precision: 0
   if action() == "edit" and controller() == "contributions" and namespace() == "unlockmoip"
-    $('#pay_form [type=submit]').on "click", (event) ->
+    $('#pay_form').on "submit", (event) ->
       event.preventDefault()
       event.stopPropagation()
-      billing_info_ok = false
-      form = $('#pay_form')
+      form = $(@)
       submit = form.find('[type=submit]')
+      return unless submit.is(':visible')
+      submit.hide()
+      billing_info_ok = false
       status = form.find('.gateway_data')
       terms = form.find('#terms')
       status.removeClass 'success'
@@ -20,14 +17,12 @@ $(document).ready ->
         status.addClass 'failure'
         status.html("<h4>Você precisa aceitar os termos de uso para continuar.</h4>")
         status.show()
+        submit.show()
       else
         status.html("<h4>Enviando dados de pagamento para o Moip...</h4><ul></ul>")
-        token = form.data('token')
-        plan_code = form.data('plan')
-        submit.hide()
         status.show()
         if MoipAssinaturas?
-          moip = new MoipAssinaturas(token)
+          moip = new MoipAssinaturas(form.data('token'))
           moip.callback (response) ->
             status.find('h4').html("#{response.message} (Moip)")
             unless response.has_errors()
@@ -36,22 +31,10 @@ $(document).ready ->
                 subscription = new Subscription()
                 subscription.with_code(form.data('subscription'))
                 subscription.with_customer(customer)
-                subscription.with_plan_code(plan_code)
+                subscription.with_plan_code(form.data('plan'))
                 moip.subscribe(subscription)
               else
-                next_invoice = "#{response.next_invoice_date.day}/#{response.next_invoice_date.month}/#{response.next_invoice_date.year}"
-                $.ajax
-                  url: form.data('activate'),
-                  type: 'PUT',
-                  dataType: 'json',
-                  success: (response) ->
-                    window.location.href = form.data('show')
-                  error: (response) ->
-                    status.find('h4').html("Não foi possível ativar sua assinatura")
-                    status.addClass 'failure'
-                    for error in response.responseJSON.errors
-                      status.find('ul').append("<li>#{error}</li>")
-                    submit.show()
+                $('form.edit_contribution').submit()
             else
               status.addClass 'failure'
               for error in response.errors

data/app/assets/stylesheets/unlock_moip/contributions/edit.sass

@@ -1,13 +1,7 @@
 body[data-action="edit"][data-controller="contributions"][data-namespace="unlockmoip"]
   article
-    width: 92%
-    +media($tablet)
-      width: 90%
-    +media($desktop)
-      width: 70%
-    margin-left: auto
-    margin-right: auto
     form
+      margin-top: 0
       .field
         float: left
         width: 100%

data/app/assets/stylesheets/unlock_moip/contributions/form.sass

@@ -1,4 +1,4 @@
-body[data-action="new"][data-controller="contributions"][data-namespace="initiatives"], body[data-action="create"][data-controller="contributions"][data-namespace="unlockmoip"]
+body[data-action="new"][data-controller="contributions"][data-namespace="initiatives"], body[data-action="create"][data-controller="contributions"]
   article
     form
       em

data/app/controllers/unlock_moip/contributions_controller.rb

@@ -1,14 +1,6 @@
 class UnlockMoip::ContributionsController < ::ApplicationController
 
-  inherit_resources
-  actions :create, :edit
-  custom_actions member: %i[activate suspend]
-  respond_to :html, except: [:activate, :suspend]
-  respond_to :json, only: [:activate, :suspend]
-
-  after_action :verify_authorized
-  after_action :verify_policy_scoped, only: %i[]
-  before_action :authenticate_user!, only: %i[edit]
+  is_unlock_gateway
 
   def create
 
@@ -17,14 +9,7 @@ class UnlockMoip::ContributionsController < ::ApplicationController
       params[:contribution][:user_attributes][:birthdate] = params[:pickadate_birthdate_submit]
     end
     
-    # Creating the contribution
-    @initiative = Initiative.find(contribution_params[:initiative_id])
-    @gateways = @initiative.gateways.without_state(:draft).order(:ordering)
-    @contribution = @initiative.contributions.new(contribution_params)
-    @contribution.gateway_state = @contribution.gateway.state
-    authorize @contribution
-
-    if @contribution.save
+    if create_contribution
 
       data = {}
       # Storing the customer_code and subscription_code
@@ -152,48 +137,8 @@ class UnlockMoip::ContributionsController < ::ApplicationController
       flash[:success] = "Apoio iniciado com sucesso! Agora é só realizar o pagamento :D"
       return redirect_to edit_moip_contribution_path(@contribution)
 
-    else
-      return render '/initiatives/contributions/new'
     end
     
   end
 
-  def edit
-    edit! { authorize resource }
-  end
-
-  def activate
-    transition_state("activate", :active)
-  end
-  
-  def suspend
-    transition_state("suspend", :suspended)
-  end
-
-  private
-
-  def transition_state(transition, state)
-    authorize resource
-    errors = []
-    if resource.send("can_#{transition}?")
-      begin
-        if resource.moip_state_name != state
-          response = Moip::Assinaturas::Subscription.send(transition.to_sym, resource.subscription_code, resource.moip_auth)
-          resource.send("#{transition}!") if response[:success]
-        else
-          resource.send("#{transition}!")
-        end
-      rescue
-        errors << "Não foi possível alterar o status de seu apoio."
-      end
-    else
-      errors << "Não é permitido alterar o status deste apoio."
-    end
-    render(json: {success: (errors.size == 0), errors: errors}, status: ((errors.size == 0) ? 200 : 422))
-  end
-  
-  def contribution_params
-    params.require(:contribution).permit(*policy(@contribution || Contribution.new).permitted_attributes)
-  end
-
 end

data/app/views/unlock_moip/contributions/_form.html.slim

@@ -1,23 +1,6 @@
 = form_for @contribution, url: moip_contributions_path, method: :post do |form|
-  - if gateway.sandbox?
-    .warning
-      h3 Atenção! Este unlock encontra-se em modo de testes (Sandbox) no Moip.
-      ul
-        li Nenhum apoio realizado neste modo será concretizado.
-        li Você pode testar livremente, sem medo de ser debitado.
-  - if @contribution.errors.any?
-    #error_explanation.warning
-      h3 = "#{pluralize(@contribution.errors.count, "erro impediu", "erros impediram")} que este apoio fosse salvo:"
-      ul
-        - @contribution.errors.full_messages.each do |msg|
-          li= msg
-  = form.hidden_field :user_id
-  = form.hidden_field :initiative_id
-  = form.hidden_field :gateway_id, value: gateway.id
-  h3 Com quanto você quer apoiar por mês?
-  = form.label :value
-  = form.text_field :value, class: "has_em"
-  em Assinatura mensal cobrada via cartão de crédito pelo meio de pagamentos #{link_to 'Moip', 'https://moip.com.br/', target: :_blank }. Você pode suspender #{ link_to 'a qualquer momento', my_contributions_path, target: :_blank }.
+  = render partial: 'initiatives/contributions/sandbox_warning', locals: { gateway: gateway }
+  = render partial: 'initiatives/contributions/base_form', locals: { form: form, gateway: gateway }
   h3 Preencha e revise os dados para pagamento
   = form.fields_for :user do |user_fields|
     = user_fields.hidden_field :id

data/app/views/unlock_moip/contributions/edit.html.slim

@@ -2,13 +2,9 @@
   = "Dados de pagamento"
 - content_for :external_js do
   script type="text/javascript" src="https://#{( @contribution.gateway.sandbox? ? 'sandbox' : 'api' )}.moip.com.br/moip-assinaturas.min.js"
-form#pay_form autocomplete="off" data-token=@contribution.gateway.settings["token"] data-plan=@contribution.plan_code data-customer=@contribution.customer_code data-subscription=@contribution.subscription_code data-activate=activate_moip_contribution_path data-show=initiative_contribution_path(@contribution.initiative.id, @contribution)
-  - if @contribution.gateway.sandbox?
-    .warning
-      h3 Atenção! Este unlock encontra-se em modo de testes (Sandbox) no Moip.
-      ul
-        li Nenhum apoio realizado neste modo será concretizado.
-        li Você pode testar livremente, sem medo de ser debitado.
+= form_for @contribution, url: activate_moip_contribution_path(@contribution), method: :put, html: { style: 'display: none'} do |form|
+form#pay_form autocomplete="off" data-token=@contribution.gateway.settings["token"] data-plan=@contribution.plan_code data-customer=@contribution.customer_code data-subscription=@contribution.subscription_code
+  = render partial: 'initiatives/contributions/sandbox_warning', locals: { gateway: @contribution.gateway }
   .field
     = label_tag :holder_name, "Nome escrito no cartão de crédito"
     = text_field_tag :holder_name, "", autocomplete: "off"

data/config/initializers/register.rb

@@ -1,4 +1 @@
-begin
-  Gateway.register 'UnlockMoip'
-rescue
-end
+UnlockGateway.register 'UnlockMoip'

data/lib/unlock_moip/models/contribution.rb

@@ -6,7 +6,13 @@ module UnlockMoip
 
       def moip_auth
         return {} unless self.gateway && self.gateway.settings
-        { moip_auth: { token: self.gateway.settings["token"], key: self.gateway.settings["key"], sandbox: self.gateway.sandbox? }}
+        { 
+          moip_auth: {
+            token: self.gateway.settings["token"], 
+            key: self.gateway.settings["key"], 
+            sandbox: self.gateway.sandbox?
+          }
+        }
       end
 
       def plan_code
@@ -33,7 +39,11 @@ module UnlockMoip
         end
       end
 
-      def moip_state_name
+      def gateway_identifier
+        self.gateway_data && self.gateway_data["subscription_code"]
+      end
+
+      def state_on_gateway
         begin
           response = Moip::Assinaturas::Subscription.details(self.subscription_code, self.moip_auth)
         rescue
@@ -50,15 +60,10 @@ module UnlockMoip
         end
       end
 
-      def update_state_from_gateway!
-        if self.state_name != self.moip_state_name
-          case self.moip_state_name
-            when :active
-              self.activate! if self.can_activate?
-            when :suspended
-              self.suspend! if self.can_suspend?
-          end
-        end
+      def update_state_on_gateway!(state)
+        transition = self.transition_by_state(state)
+        response = Moip::Assinaturas::Subscription.send(transition, self.subscription_code, self.moip_auth)
+        response[:success]
       end
 
     end

data/lib/unlock_moip/models/gateway.rb

@@ -16,6 +16,10 @@ module UnlockMoip
         "unlock_moip/logo.png"
       end
 
+      def url
+        "https://moip.com.br/"
+      end
+
       def path
         "/moip"
       end

data/lib/unlock_moip/version.rb

@@ -1,3 +1,3 @@
 module UnlockMoip
-  VERSION = "0.0.5"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unlock_moip
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Weinmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.1.6
 - !ruby/object:Gem::Dependency
-  name: moip-assinaturas
+  name: unlock_gateway
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: unlock_gateway
+  name: moip-assinaturas
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,6 @@ files:
 - app/assets/stylesheets/unlock_moip/unlock_moip.sass
 - app/controllers/unlock_moip/contributions_controller.rb
 - app/views/unlock_moip/contributions/_form.html.slim
-- app/views/unlock_moip/contributions/_gateway_data.html.slim
 - app/views/unlock_moip/contributions/edit.html.slim
 - config/initializers/moip_assinaturas.rb
 - config/initializers/register.rb

data/app/views/unlock_moip/contributions/_gateway_data.html.slim

@@ -1,5 +0,0 @@
-ul
-  li Seu código de assinatura é <strong>#{@contribution.subscription_code}</strong>
-  li Seu pagamento ainda será processado pelo <a href='https://www.moip.com.br/' target='_blank'>Moip</a>.
-  li Se você quiser suspender seu apoio, basta acessar o menu <a href='/my_contributions'>Unlocks apoiados</a> a qualquer momento.
-  li Sua próxima cobrança será realizada em #{@contribution.next_invoice_date}.