catarse_moip 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83e89215563372e631f8e7ed7b820debbc3ba7aa
-  data.tar.gz: 41e6c16596b3ff5093e646f0e061bbd9efe84323
+  metadata.gz: c4b6b87c36747d772f7b9b7f7d3e3ea6227da474
+  data.tar.gz: e8964a173de2359f22ecc15de62a77edbb442a81
 SHA512:
-  metadata.gz: 2cab1523a7fc3aa5bf0b5cb9c4e65fb55660f5db91870fa3463d1983a7b8b3e932fc3d126d9da48b183e44d091ddf1bc64d7d35b3edaf0433a17f1c3c4f8924f
-  data.tar.gz: 992d107609239c1176c9743963d56cb99cba72b8e8abd7636e96fe4adc5afee85911ac899cd712a5f0b81918b10da7e1ff6c2bb1731cc603b637c8f625d1c050
+  metadata.gz: 7c88efa88b974a0c914f5152daa33ff6e093b7d4015ea213e3b11bf615ac113555f01cc6b7c722ed1533c481acdefb547601043b96b3e7443fbb02d318002116
+  data.tar.gz: d626a0c2b0db361985f8681167f556ee6047632b947f7297e71b5901853b8d3aa604108e5f0e8c0b8cd55b889901da20a9555641175321210a74aec2146695b8

data/Gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: .
   specs:
-    catarse_moip (2.0.1)
+    catarse_moip (2.0.2)
       libxml-ruby (~> 2.6.0)
       rails (~> 4.0)
 
@@ -63,7 +63,7 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.24)
+    mime-types (1.25)
     minitest (4.7.5)
     multi_json (1.7.9)
     nokogiri (1.5.10)

data/app/controllers/catarse_moip/moip_controller.rb

@@ -22,7 +22,7 @@ module CatarseMoip
 
     def create_notification
       @backer = PaymentEngines.find_payment key: params[:id_transacao]
-      process_moip_message(params)
+      process_moip_message
       return render :nothing => true, :status => 200
     rescue Exception => e
       return render :text => "#{e.inspect}: #{e.message} recebemos: #{params}", :status => 422
@@ -46,7 +46,7 @@ module CatarseMoip
 
     def moip_response
       @backer = PaymentEngines.find_payment id: params[:id], user_id: current_user.id
-      process_moip_message params[:response] unless params[:response]['StatusPagamento'] == 'Falha'
+      first_update_backer params[:response] unless params[:response]['StatusPagamento'] == 'Falha'
       render nothing: true, status: 200
     end
 
@@ -97,37 +97,36 @@ module CatarseMoip
       }
     end
 
-    def update_backer params = nil
-      unless params && params["CodigoMoIP"] && params["TaxaMoIP"]
-        response = ::MoIP.query(backer.payment_token)
-        if response && response["Autorizacao"]
-          params = response["Autorizacao"]["Pagamento"]
-          params = params.first unless params.respond_to?(:key)
-        end
-      end
-
-      if params
+    def first_update_backer
+      response = ::MoIP.query(backer.payment_token)
+      if response && response["Autorizacao"]
+        params = response["Autorizacao"]["Pagamento"]
+        params = params.first unless params.respond_to?(:key)
         backer.update_attributes({
           :payment_id => params["CodigoMoIP"],
           :payment_choice => params["FormaPagamento"],
           :payment_service_fee => params["TaxaMoIP"]
-        })
+        }) if params
       end
     end
 
-    def process_moip_message params
+    def process_moip_message
       PaymentEngines.create_payment_notification backer_id: backer.id, extra_data: JSON.parse(params.to_json.force_encoding('iso-8859-1').encode('utf-8'))
+
       backer.with_lock do
-        update_backer if backer.payment_id.nil?
-        case params[:status_pagamento].to_i
-        when TransactionStatus::AUTHORIZED
-          backer.confirm! unless backer.confirmed?
-        when TransactionStatus::WRITTEN_BACK, TransactionStatus::REFUNDED
-          backer.refund! unless backer.refunded?
-        when TransactionStatus::CANCELED
-          backer.cancel! unless backer.canceled?
-        else
-          backer.waiting! if backer.pending?
+        if backer.payment_id.gsub(".", "").to_i < params[:cod_moip].to_i
+          backer.update_attributes payment_id: params[:cod_moip]
+
+          case params[:status_pagamento].to_i
+          when TransactionStatus::AUTHORIZED
+            backer.confirm! unless backer.confirmed?
+          when TransactionStatus::WRITTEN_BACK, TransactionStatus::REFUNDED
+            backer.refund! unless backer.refunded?
+          when TransactionStatus::CANCELED
+            backer.cancel! unless backer.canceled?
+          else
+            backer.waiting! if backer.pending?
+          end
         end
       end
     end

data/lib/catarse_moip/version.rb

@@ -1,3 +1,3 @@
 module CatarseMoip
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/controllers/catarse_moip/moip_controller_spec.rb

@@ -6,13 +6,13 @@ describe CatarseMoip::MoipController do
 
   let(:get_token_response){{:status=>:fail, :code=>"171", :message=>"TelefoneFixo do endereço deverá ser enviado obrigatorio", :id=>"201210192052439150000024698931"}}
   let(:backer){ double('backer', {
-    id: 1, 
-    key: 'backer key', 
-    payment_id: 'payment id', 
-    project: project, 
-    pending?: false, 
-    value: 10, 
-    user: user, 
+    id: 1,
+    key: 'backer key',
+    payment_id: 'payment id',
+    project: project,
+    pending?: false,
+    value: 10,
+    user: user,
     payer_name: 'foo',
     payer_email: 'foo@bar.com',
     address_street: 'test',
@@ -22,7 +22,13 @@ describe CatarseMoip::MoipController do
     address_city: '123',
     address_state: '123',
     address_zip_code: '123',
-    address_phone_number: '123'
+    address_phone_number: '123',
+    confirmed?: true,
+    confirm!: true,
+    canceled?: true,
+    cancel!: true,
+    refunded?: true,
+    refund!: true
   }) }
 
   let(:user){ double('user', id: 1) }
@@ -53,8 +59,39 @@ describe CatarseMoip::MoipController do
 
     context "when we seach for an existing backer" do
       before do
+        controller.stub(:params).and_return({:id_transacao =>backer.key, :controller => "catarse_moip/moip", :action => "create_notification"})
         PaymentEngines.should_receive(:find_payment).with(key: backer.key).and_return(backer)
-        controller.should_receive(:process_moip_message).with({"id_transacao"=>backer.key, "controller"=>"catarse_moip/moip", "action"=>"create_notification"})
+        controller.should_receive(:process_moip_message)
+        post :create_notification, {:id_transacao => backer.key, :use_route => 'catarse_moip'}
+      end
+
+      its(:body){ should == ' ' }
+      its(:status){ should == 200 }
+      it("should assign backer"){ assigns(:backer).should == backer }
+    end
+
+    context "when receive ordered notification for backer" do
+      before do
+        controller.stub(:params).and_return({:cod_moip => 125, :id_transacao =>backer.key, :controller => "catarse_moip/moip", :action => "create_notification", :status_pagamento => 5})
+        backer.stub(:payment_id).and_return('123')
+
+        controller.should_receive(:process_moip_message).and_call_original
+        backer.should_receive(:update_attributes).with(payment_id: 125)
+        post :create_notification, {:id_transacao => backer.key, :use_route => 'catarse_moip'}
+      end
+
+      its(:body){ should == ' ' }
+      its(:status){ should == 200 }
+      it("should assign backer"){ assigns(:backer).should == backer }
+    end
+
+    context "when receive a unordered notification for backer" do
+      before do
+        controller.stub(:params).and_return({:cod_moip => 122, :id_transacao =>backer.key, :controller => "catarse_moip/moip", :action => "create_notification", :status_pagamento => 5})
+        backer.stub(:payment_id).and_return('123')
+
+        controller.should_receive(:process_moip_message).and_call_original
+        backer.should_not_receive(:update_attributes).with(payment_id: 122)
         post :create_notification, {:id_transacao => backer.key, :use_route => 'catarse_moip'}
       end
 
@@ -69,7 +106,7 @@ describe CatarseMoip::MoipController do
 
     context "when the content of get_javascript_url raises an error" do
       before do
-        controller.should_receive(:open).at_least(3).times.and_raise('error') 
+        controller.should_receive(:open).at_least(3).times.and_raise('error')
         ->{
           get :js, locale: :pt, use_route: 'catarse_moip'
         }.should raise_error('error')
@@ -79,7 +116,7 @@ describe CatarseMoip::MoipController do
 
     context "when the content of get_javascript_url is read without errors" do
       before do
-        controller.should_receive(:open).and_return(file) 
+        controller.should_receive(:open).and_return(file)
         file.should_receive(:set_encoding).and_return(file)
         file.should_receive(:read).and_return(file)
         file.should_receive(:encode).and_return('js content')
@@ -93,7 +130,7 @@ describe CatarseMoip::MoipController do
   describe "POST moip_response" do
     let(:processor){ double('moip processor') }
     before do
-      controller.should_receive(:process_moip_message)
+      controller.should_receive(:first_update_backer)
       post :moip_response, id: backer.id, response: {StatusPagamento: 'Sucesso'}, use_route: 'catarse_moip'
     end
 
@@ -109,32 +146,19 @@ describe CatarseMoip::MoipController do
     its(:body){ should == "{\"get_token_response\":{\"status\":\"fail\",\"code\":\"171\",\"message\":\"TelefoneFixo do endereço deverá ser enviado obrigatorio\",\"id\":\"201210192052439150000024698931\"},\"moip\":\"{}\",\"widget_tag\":{\"tag_id\":\"MoipWidget\",\"token\":null,\"callback_success\":\"checkoutSuccessful\",\"callback_error\":\"checkoutFailure\"}}" }
   end
 
-  describe "#update_backer" do
+  describe "#first_update_backer" do
     before do
       controller.stub(:backer).and_return(backer)
       backer.stub(:payment_token).and_return('token')
     end
 
-    context "with parameters containing CodigoMoIP and TaxaMoIP" do
-      let(:payment){ {"Status" => "Autorizado","Codigo" => "0","CodigoRetorno" => "0","TaxaMoIP" => "1.54","StatusPagamento" => "Sucesso","CodigoMoIP" => "18093844","Mensagem" => "Requisição processada com sucesso","TotalPago" => "25.00","url" => "https => //www.moip.com.br/Instrucao.do?token=R2W0N123E005F2A911V6O2I0Y3S7M4J853H0S0F0T0D044T8F4H4E9G0I3W8"} }
-      before do
-        MoIP.should_not_receive(:query)
-        backer.should_receive(:update_attributes).with({
-          payment_id: payment["CodigoMoIP"],
-          payment_choice: payment["FormaPagamento"],
-          payment_service_fee: payment["TaxaMoIP"]
-        })
-      end
-      it("should call update attributes but not call MoIP.query"){ controller.update_backer payment }
-    end
-
     context "with no response from moip" do
       let(:moip_query_response) { nil }
       before do
         MoIP.should_receive(:query).with(backer.payment_token).and_return(moip_query_response)
         backer.should_not_receive(:update_attributes)
       end
-      it("should never call update attributes"){ controller.update_backer }
+      it("should never call update attributes"){ controller.first_update_backer }
     end
 
     context "with an incomplete transaction" do
@@ -145,7 +169,7 @@ describe CatarseMoip::MoipController do
         MoIP.should_receive(:query).with(backer.payment_token).and_return(moip_query_response)
         backer.should_not_receive(:update_attributes)
       end
-      it("should never call update attributes"){ controller.update_backer }
+      it("should never call update attributes"){ controller.first_update_backer }
     end
 
     context "with a real data set that works for some cases" do
@@ -161,7 +185,7 @@ describe CatarseMoip::MoipController do
           payment_service_fee: payment["TaxaMoIP"]
         })
       end
-      it("should call update attributes"){ controller.update_backer }
+      it("should call update attributes"){ controller.first_update_backer }
     end
   end
 
@@ -173,57 +197,41 @@ describe CatarseMoip::MoipController do
       controller.stub(:update_backer)
     end
 
-    context "when we already have the payment_id in backers table" do
-      before do
-        backer.stub(:payment_id).and_return('test')
-        controller.should_not_receive(:update_backer)
-      end
-
-      it 'should never call update_backer' do
-        controller.process_moip_message post_moip_params.merge!({:id_transacao => backer.key, :status_pagamento => CatarseMoip::MoipController::TransactionStatus::AUTHORIZED})
-      end
-    end
-
-    context "when we still do not have the payment_id in backers table" do
-      before do
-        backer.stub(:payment_id).and_return(nil)
-        controller.should_receive(:update_backer)
-      end
-
-      it 'should call update_backer on the processor' do
-        controller.process_moip_message post_moip_params.merge!({:id_transacao => backer.key, :status_pagamento => CatarseMoip::MoipController::TransactionStatus::AUTHORIZED})
-      end
-    end
-
     context "when there is a written back request and backer is not refunded" do
       before do
+        controller.stub(:params).and_return(post_moip_params.merge!({:id_transacao => backer.key, :status_pagamento => CatarseMoip::MoipController::TransactionStatus::WRITTEN_BACK}))
         backer.stub(:refunded?).and_return(false)
         backer.should_receive(:refund!)
+        backer.should_receive(:update_attributes)
       end
 
       it 'should call refund!' do
-        controller.process_moip_message post_moip_params.merge!({:id_transacao => backer.key, :status_pagamento => CatarseMoip::MoipController::TransactionStatus::WRITTEN_BACK})
+        controller.process_moip_message
       end
     end
 
     context "when there is an authorized request" do
       before do
+        controller.stub(:params).and_return(post_moip_params.merge!({:id_transacao => backer.key, :status_pagamento => CatarseMoip::MoipController::TransactionStatus::AUTHORIZED}))
         backer.should_receive(:confirm!)
+        backer.should_receive(:update_attributes)
       end
 
       it 'should call confirm!' do
-        controller.process_moip_message post_moip_params.merge!({:id_transacao => backer.key, :status_pagamento => CatarseMoip::MoipController::TransactionStatus::AUTHORIZED})
+        controller.process_moip_message
       end
     end
 
     context "when there is a refund request" do
       before do
+        controller.stub(:params).and_return(post_moip_params.merge!({:id_transacao => backer.key, :status_pagamento => CatarseMoip::MoipController::TransactionStatus::REFUNDED}))
         backer.stub(:refunded?).and_return(false)
         backer.should_receive(:refund!)
+        backer.should_receive(:update_attributes)
       end
 
       it 'should mark refunded to true' do
-        controller.process_moip_message post_moip_params.merge!({:id_transacao => backer.key, :status_pagamento => CatarseMoip::MoipController::TransactionStatus::REFUNDED})
+        controller.process_moip_message
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_moip
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Antônio Roberto Silva
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: MoIP integration with Catarse