catarse_moip 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e99de7a819ac9836c6d658c18e108e37868401d
-  data.tar.gz: 9ee3cb1b0cc851ccc3ed2be27c7db9a0a0962dc9
+  metadata.gz: 0811dcffbaee61f008354134da29c803b69ff685
+  data.tar.gz: 62f383c1a7a7f31305d0db05f4863a034f2b6b1f
 SHA512:
-  metadata.gz: 1a32faf8498c4036e1d6f3222ff4dbdbc6e5e4e33596d00c0af9110d044e917b8c57b5c0780d00f4db9775d45f84c34f5e180f99b4c46280abfc7cb9058c1dd8
-  data.tar.gz: b433c5651a8ac3155566ac423d5eeda2fb76135e03679dc341c1f8da41dae86e0da29b6b2dfef0f5cd2f9531d67b1a588975f35f0bd1031c6d82d2490362f522
+  metadata.gz: 1ddb507b48e6df49cde0b726d5aa1f6c0931af462cd49da913c4f310ecb246eda0b54fc80997e1ed5445404c161e9c7b1f59d494d56187d47dddc8d220e51bd3
+  data.tar.gz: f24434f53c251a7436a092922677d65e47b4c63e7a4f0401749984231770917eb9fdd823a8c24b4bc6a828cbfad52a5d752cd44b0155aa991196585e02fca6f6

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    catarse_moip (3.1.1)
+    catarse_moip (3.2.0)
       enumerate_it
       httparty
       libxml-ruby (~> 2.8.0)
@@ -49,7 +49,7 @@ GEM
     builder (3.2.2)
     database_cleaner (1.3.0)
     diff-lcs (1.2.5)
-    enumerate_it (1.2.4)
+    enumerate_it (1.2.6)
       activesupport (>= 3.0.0)
     erubis (2.7.0)
     factory_girl (4.5.0)
@@ -57,7 +57,6 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    hike (1.2.3)
     httparty (0.12.0)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
@@ -66,10 +65,9 @@ GEM
     libxml-ruby (2.8.0)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
+    mime-types (2.5)
     mini_portile (0.6.0)
     minitest (5.4.2)
-    multi_json (1.10.1)
     multi_xml (0.5.5)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
@@ -105,18 +103,14 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.0.3)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
     sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
     thread_safe (0.3.4)
-    tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 

data/app/controllers/catarse_moip/moip_controller.rb

@@ -5,30 +5,9 @@ module CatarseMoip
   class MoipController < ApplicationController
     attr_accessor :contribution
 
-    class TransactionStatus < ::EnumerateIt::Base
-      associate_values(
-        :authorized =>      1,
-        :started =>         2,
-        :printed_boleto =>  3,
-        :finished =>        4,
-        :canceled =>        5,
-        :process =>         6,
-        :written_back =>    7,
-        :refunded => 9
-      )
-    end
-
     skip_before_filter :force_http
     layout :false
 
-    def create_notification
-      @contribution = PaymentEngines.find_payment key: params[:id_transacao]
-      process_moip_message if @contribution.payment_method == 'MoIP' || @contribution.payment_method.nil?
-      return render :nothing => true, :status => 200
-    rescue Exception => e
-      return render :text => "#{e.inspect}: #{e.message} recebemos: #{params}", :status => 422
-    end
-
     def js
       tries = 0
       begin
@@ -120,37 +99,5 @@ module CatarseMoip
         end
       end
     end
-
-    def process_moip_message
-      contribution.with_lock do
-        first_update_contribution if contribution.payment_method.nil?
-        payment_notification = PaymentEngines.create_payment_notification contribution_id: contribution.id, extra_data: JSON.parse(params.to_json.force_encoding('iso-8859-1').encode('utf-8'))
-        payment_id = (contribution.payment_id.gsub(".", "").to_i rescue 0)
-
-        if payment_id <= params[:cod_moip].to_i
-          contribution.update_attributes payment_id: params[:cod_moip]
-
-          if (params[:valor].to_i/100.0) < contribution.value && params[:valor]
-            return contribution.invalid! unless contribution.invalid_payment?
-          end
-
-          case params[:status_pagamento].to_i
-          when TransactionStatus::PROCESS
-            payment_notification.deliver_process_notification
-          when TransactionStatus::AUTHORIZED, TransactionStatus::FINISHED
-            contribution.confirm! unless contribution.confirmed?
-          when TransactionStatus::WRITTEN_BACK, TransactionStatus::REFUNDED
-            contribution.refund! unless contribution.refunded?
-          when TransactionStatus::CANCELED
-            unless contribution.canceled?
-              contribution.cancel!
-              if contribution.payment_choice.downcase == 'boletobancario'
-                payment_notification.deliver_slip_canceled_notification
-              end
-            end
-          end
-        end
-      end
-    end
   end
 end

data/app/controllers/catarse_moip/notifications_controller.rb

@@ -0,0 +1,73 @@
+require 'enumerate_it'
+require 'moip_transparente'
+
+module CatarseMoip
+  class NotificationsController < ApplicationController
+    attr_accessor :payment
+
+    class TransactionStatus < ::EnumerateIt::Base
+      associate_values(
+        :authorized =>      1,
+        :started =>         2,
+        :printed_boleto =>  3,
+        :finished =>        4,
+        :canceled =>        5,
+        :process =>         6,
+        :written_back =>    7,
+        :refunded => 9
+      )
+    end
+
+    skip_before_filter :force_http
+    layout :false
+
+    def create
+      process_moip_message
+      return render :nothing => true, :status => 200
+    rescue Exception => e
+      return render :text => "#{e.inspect}: #{e.message} recebemos: #{params}", :status => 422
+    end
+
+    def payment
+      @payment ||= PaymentEngines.find_payment key: params[:id_transacao]
+    end
+
+    def process_moip_message
+      payment.with_lock do
+        payment_notification = payment.payment_notifications.create({
+          contribution: payment.contribution,
+          extra_data: JSON.parse(
+            params.to_json.force_encoding('iso-8859-1').encode('utf-8'))
+        })
+
+        payment_id = (payment.gateway_id.gsub(".", "").to_i rescue 0)
+
+        if payment_id <= params[:cod_moip].to_i
+          payment.update_attributes payment_id: params[:cod_moip]
+
+          if (params[:valor].to_i/100.0) < payment.value && params[:valor]
+            #return payment.invalid! unless payment.invalid_payment?
+            return
+          end
+
+          case params[:status_pagamento].to_i
+          when TransactionStatus::PROCESS
+            payment_notification.deliver_process_notification
+          when TransactionStatus::AUTHORIZED, TransactionStatus::FINISHED
+            payment.pay! unless payment.paid?
+          when TransactionStatus::WRITTEN_BACK, TransactionStatus::REFUNDED
+            payment.refund! unless payment.refunded?
+          when TransactionStatus::CANCELED
+            unless payment.refused?
+              payment.refuse!
+              if payment.slip_payment?
+                payment_notification.deliver_slip_canceled_notification
+              end
+            end
+          end
+        end
+      end
+    end
+
+  end
+end

data/app/models/catarse_moip/v2/refund.rb

@@ -5,15 +5,15 @@ module CatarseMoip
 
       base_uri ::MOIP_V2_ENDPOINT
 
-      attr_accessor :contribution, :refund_options
+      attr_accessor :payment, :refund_options
 
-      def self.start(contribution)
-        _instance = new(contribution)
+      def self.start(payment)
+        _instance = new(payment)
         _instance.refund
       end
 
-      def initialize(contribution)
-        self.contribution = contribution
+      def initialize(payment)
+        self.payment = payment
         self.refund_options = define_refund_options
       end
 
@@ -66,7 +66,7 @@ module CatarseMoip
       end
 
       def bank_account
-        self.contribution.user.bank_account
+        self.payment.user.bank_account
       end
 
       def bank_account_document_type
@@ -83,14 +83,14 @@ module CatarseMoip
 
       def amount_to_refund
         if already_expired_refund_deadline?
-          ((self.contribution.value - self.contribution.payment_service_fee.to_f) * 100).to_i
+          ((self.payment.value - self.payment.gateway_fee.to_f) * 100).to_i
         else
-          self.contribution.price_in_cents
+          (self.payment.value * 100).round
         end
       end
 
       def refund_method
-        if already_expired_refund_deadline? || !self.contribution.is_credit_card?
+        if already_expired_refund_deadline? || !self.payment.is_credit_card?
           'BANK_ACCOUNT'
         else
           'CREDIT_CARD'
@@ -98,7 +98,7 @@ module CatarseMoip
       end
 
       def already_expired_refund_deadline?
-        self.contribution.confirmed_at < 170.days.ago
+        self.payment.paid_at < 170.days.ago
       end
 
       def basic_auth_params
@@ -114,7 +114,7 @@ module CatarseMoip
       end
 
       def parsed_payment_id
-        contribution.payment_id.gsub('.', '')
+        payment.gateway_id.gsub('.', '')
       end
     end
   end

data/config/routes.rb

@@ -1,7 +1,7 @@
 CatarseMoip::Engine.routes.draw do
   resources :moip, only: [], path: 'payment/moip' do
     collection do
-      post 'notifications' => "moip#create_notification"
+      post 'notifications' => "notifications#create"
       get 'js'
     end
     member do

data/lib/catarse_moip/payment_engine.rb

@@ -17,8 +17,8 @@ module CatarseMoip
       true
     end
 
-    def direct_refund contribution
-      ::CatarseMoip::V2::Refund.start(contribution)
+    def direct_refund payment
+      ::CatarseMoip::V2::Refund.start(payment)
     end
 
   end

data/lib/catarse_moip/version.rb

@@ -1,3 +1,3 @@
 module CatarseMoip
-  VERSION = "3.1.1"
+  VERSION = "3.2.0"
 end

data/spec/controllers/catarse_moip/moip_controller_spec.rb

@@ -50,166 +50,6 @@ describe CatarseMoip::MoipController do
     contribution.stub(:with_lock).and_yield
   end
 
-  describe "POST create_notification" do
-    describe "payment notifications" do
-
-      context "when payment status is processing (6)" do
-
-        let(:payment_notification) do
-          pn = mock()
-          pn.stub(:deliver_process_notification).and_return(true)
-          pn
-        end
-
-        before do
-          contribution.stub(:payment_id).and_return('123')
-          contribution.stub(:update_attributes).and_return(true)
-
-          payment_notification.should_receive(:deliver_process_notification)
-        end
-
-        it("should satisfy expectations") do
-          post :create_notification, {:cod_moip => 125, :id_transacao => contribution.key, :use_route => 'catarse_moip', :status_pagamento => 6}
-        end
-      end
-
-      context "when payment status is canceled and payment is made with Boleto" do
-        let(:payment_notification) do
-          pn = mock()
-          pn.stub(:deliver_slip_canceled_notification).and_return(true)
-          pn
-        end
-
-        context "when contribution is made with Boleto" do
-          before do
-            contribution.stub(:payment_choice).and_return('BoletoBancario')
-            contribution.stub(:payment_id).and_return('123')
-            contribution.stub(:update_attributes).and_return(true)
-          end
-
-          context "when is not canceled yet" do
-            before do
-              contribution.stub(:canceled?).and_return(false)
-
-              payment_notification.should_receive(:deliver_slip_canceled_notification)
-            end
-
-            it("should satisfy expectations") do
-              post :create_notification, {:cod_moip => 125, :id_transacao => contribution.key, :use_route => 'catarse_moip', :status_pagamento => 5}
-            end
-          end
-
-          context "when is already canceled" do
-            before do
-              payment_notification.should_not_receive(:deliver_slip_canceled_notification)
-            end
-
-            it("should satisfy expectations") do
-              post :create_notification, {:cod_moip => 125, :id_transacao => contribution.key, :use_route => 'catarse_moip', :status_pagamento => 5}
-            end
-          end
-        end
-      end
-    end
-
-    context "when we search for a non-existant contribution" do
-      before do
-        PaymentEngines.should_receive(:find_payment).with(key: "non-existant contribution key").and_raise('error')
-        post :create_notification, {:id_transacao => "non-existant contribution key", :use_route => 'catarse_moip'}
-      end
-
-      its(:status){ should == 422 }
-      its(:body){ should == "#<RuntimeError: error>: error recebemos: {\"id_transacao\"=>\"non-existant contribution key\", \"controller\"=>\"catarse_moip/moip\", \"action\"=>\"create_notification\"}" }
-    end
-
-    context "when we seach for an existing contribution" do
-      before do
-        controller.stub(:params).and_return({:id_transacao =>contribution.key, :controller => "catarse_moip/moip", :action => "create_notification"})
-        PaymentEngines.should_receive(:find_payment).with(key: contribution.key).and_return(contribution)
-        controller.should_receive(:process_moip_message)
-        post :create_notification, {:id_transacao => contribution.key, :use_route => 'catarse_moip'}
-      end
-
-      its(:body){ should == ' ' }
-      its(:status){ should == 200 }
-      it("should assign contribution"){ assigns(:contribution).should == contribution }
-    end
-
-    context "when receive ordered notification for contribution" do
-      before do
-        controller.stub(:params).and_return({:cod_moip => 125, :id_transacao =>contribution.key, :controller => "catarse_moip/moip", :action => "create_notification", :status_pagamento => 5})
-        contribution.stub(:payment_id).and_return('123')
-
-        controller.should_receive(:process_moip_message).and_call_original
-        contribution.should_receive(:update_attributes).with(payment_id: 125)
-        post :create_notification, {:id_transacao => contribution.key, :use_route => 'catarse_moip'}
-      end
-
-      its(:body){ should == ' ' }
-      its(:status){ should == 200 }
-      it("should assign contribution"){ assigns(:contribution).should == contribution }
-    end
-
-    context "when we receive a notification with the same payment id but with another status" do
-      before do
-        controller.stub(:params).and_return({:cod_moip => 123, :id_transacao =>contribution.key, :controller => "catarse_moip/moip", :action => "create_notification", :status_pagamento => 1})
-        contribution.stub(:payment_id).and_return('123')
-
-        controller.should_receive(:process_moip_message).and_call_original
-        contribution.should_receive(:update_attributes).with(payment_id: 123)
-        post :create_notification, {:id_transacao => contribution.key, :use_route => 'catarse_moip'}
-      end
-
-      its(:body){ should == ' ' }
-      its(:status){ should == 200 }
-      it("should assign contribution"){ assigns(:contribution).should == contribution }
-    end
-
-    context "when receive a unordered notification for contribution" do
-      before do
-        controller.stub(:params).and_return({:cod_moip => 122, :id_transacao =>contribution.key, :controller => "catarse_moip/moip", :action => "create_notification", :status_pagamento => 5})
-        contribution.stub(:payment_id).and_return('123')
-
-        controller.should_receive(:process_moip_message).and_call_original
-        contribution.should_not_receive(:update_attributes).with(payment_id: 122)
-        post :create_notification, {:id_transacao => contribution.key, :use_route => 'catarse_moip'}
-      end
-
-      its(:body){ should == ' ' }
-      its(:status){ should == 200 }
-      it("should assign contribution"){ assigns(:contribution).should == contribution }
-    end
-
-    context "when contribution payment_method is PayPal" do
-      before do
-        controller.stub(:params).and_return({:cod_moip => 125, :id_transacao =>contribution.key, :controller => "catarse_moip/moip", :action => "create_notification", :status_pagamento => 5})
-        contribution.stub(:payment_method).and_return('PayPal')
-
-        controller.should_not_receive(:process_moip_message)
-        post :create_notification, {:id_transacao => contribution.key, :use_route => 'catarse_moip'}
-      end
-
-      its(:body){ should == ' ' }
-      its(:status){ should == 200 }
-      it("should assign contribution"){ assigns(:contribution).should == contribution }
-    end
-
-    context "when contribution payment_id is null" do
-      before do
-        controller.stub(:params).and_return({:cod_moip => 122, :id_transacao =>contribution.key, :controller => "catarse_moip/moip", :action => "create_notification", :status_pagamento => 5})
-        contribution.stub(:payment_id).and_return(nil)
-
-        controller.should_receive(:process_moip_message).and_call_original
-        contribution.should_receive(:update_attributes).with(payment_id: 122)
-        post :create_notification, {:id_transacao => contribution.key, :use_route => 'catarse_moip'}
-      end
-
-      its(:body){ should == ' ' }
-      its(:status){ should == 200 }
-      it("should assign contribution"){ assigns(:contribution).should == contribution }
-    end
-  end
-
   describe "GET js" do
     let(:file){ double('js_file') }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_moip
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,6 +135,7 @@ files:
 - app/assets/javascripts/catarse_moip/payment_slip.js
 - app/assets/javascripts/catarse_moip/user_document.js
 - app/controllers/catarse_moip/moip_controller.rb
+- app/controllers/catarse_moip/notifications_controller.rb
 - app/models/catarse_moip/v2/refund.rb
 - app/views/catarse_moip/moip/_terms.html.slim
 - app/views/catarse_moip/moip/review.html.slim
@@ -215,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: MoIP integration with Catarse