moip-assinaturas 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90319baed9474a2582902023e872851c91c7958c
-  data.tar.gz: 512e1e40e2f422da9eb2c8d8a5e64d2a9572e6db
+  metadata.gz: 76f00ea4681da01e03de533471378518d581fe6c
+  data.tar.gz: a842c2a3fb41f18b2bfe51c75f0f48a02c77d424
 SHA512:
-  metadata.gz: 00c8eda0d89c7cc94d9aab67173268ff8f2b005fda1838dbe647d476e43a09ef01dda639f7c7f1fbab063d9a4bca65e8a11761b846f8aeaf6e37d5d7d50abbca
-  data.tar.gz: fe233a408e013416d5924e5d42ee33149d70cf7bef8dc3600edf927725403bb9bcf93cbffef4a4c93df8645e66c1fc6d4385718720dafebc288e1ca8771f7ad4
+  metadata.gz: 011de40566401a5a5994a929aa7daa05a8873b1104a3f952802e8c0002f80307a4dd6936d96b6221db7e8c31483b9bac24a33938998370e8e6ef97e30592d329
+  data.tar.gz: ae361bb9f2b9167ccf1fc4e2c6d7ffc68f99ccfe021539853e69ac21f8711d1bf16167ce391c5ece56dc0b64984b9aaf83678c07783bc069c3301da66ec8169a

data/lib/moip-assinaturas/client.rb

@@ -126,15 +126,22 @@ module Moip::Assinaturas
       end
 
       private
+        def oauth?(authorization_hash)
+          raise MissingTokenError.new if authorization_hash.nil? || !authorization_hash.downcase.include?("oauth")
+        end
 
         def prepare_options(custom_options, required_options)
           custom_options.merge!(required_options)
-
           if custom_options.include?(:moip_auth)
-            custom_options[:basic_auth] = {
-              username: custom_options[:moip_auth][:token],
-              password: custom_options[:moip_auth][:key]
-            }
+
+            if custom_options[:moip_auth][:token] && custom_options[:moip_auth][:key]
+              custom_options[:basic_auth] = {
+                username: custom_options[:moip_auth][:token],
+                password: custom_options[:moip_auth][:key]
+              }
+            elsif oauth? custom_options[:moip_auth][:oauth][:accessToken]
+              custom_options[:authorization] = "OAuth #{custom_options[:moip_auth][:oauth][:accessToken]}"
+            end
 
             if custom_options[:moip_auth].include?(:sandbox)
               if custom_options[:moip_auth][:sandbox]

data/lib/moip-assinaturas/version.rb

@@ -1,5 +1,5 @@
 module Moip
   module Assinaturas
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

data/spec/moip-assinaturas/payment_spec.rb

@@ -59,5 +59,13 @@ describe Moip::Assinaturas::Payment do
       request[:success].should        be_true
       request[:payment][:id].should   == 7
     end
+
+    it "should raise exception from invalid oauth" do
+      expect{ Moip::Assinaturas::Payment.details(7, moip_auth: { oauth: {accessToken: "sefghjrs"}, sandbox: true})}.to raise_error  Moip::Assinaturas::MissingTokenError
+    end
+
+    it "shoul raise exception from nil oauth" do
+      expect{ Moip::Assinaturas::Payment.details(7, moip_auth: { oauth: {accessToken: ""}, sandbox: true })}.to raise_error Moip::Assinaturas::MissingTokenError
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moip-assinaturas
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Warlley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby Gem para uso do serviço de assinaturas do Moip