activewepay 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzk2OThkM2Y4YmQzOTM4YTJjYzM0NmRiY2QzMGM0YzhhYjczNmRmYw==
+    NjI3ZWM3YjBiZjUyZDFjZWRhOTlkMjNmOTk5NTk0ZmU3NTNhZmU5ZA==
   data.tar.gz: !binary |-
-    ZmI0OTY1MzEyZjNmOGEzYWQwZWI0N2U2MGE1NTgzYjQ0MmZkNjZlZA==
+    MjNjYmZiMGRmZDg0NjMwNzQ4ZTFjMmU0MWUxZDU2NDk2Mzg3N2NmZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGQ5NjIxZjA3NzUyMTRmNTQxYjVmODAxMWZlMWU2OTdmNDJkZjYwMTJhZDc4
-    NjFlMDkyYzJlNTNkYmYwNmNkZTc2ZGYxYmU5N2QxNTBhZTAwNmE4ZjdhMjYx
-    YjcyNThjYWMwZWNhMGVkODMzMmI1OTczNmEyODk1ZTk5ZmQ1MmQ=
+    MmI1MzliNjIzNGJiOWYxNWZhMWQwMmNjZjViNzlmZjM3MjNjZjE4NjhmYWU0
+    ZjhhMzQxYTVkNTZmOWJiZTQxMzZiYjhlNzU1M2RlMzhjOTUxZjI5NDQwYzhm
+    Y2VhMDg4NWY1NzNiOTdjNzEzZWRjYTQyZDUxODVhYTQ5MDE5OWM=
   data.tar.gz: !binary |-
-    M2NiMTYyOWIxYTM3NjI1Yzc1NjdkZWFiNWMwOWMxZGRlNjU1MmRhN2E5ZWZm
-    YmQyZjA4NDVhOTVjMmMyNzQ2Nzk3ZjEwMTJmMzJhNGM3MzI3NTMxNGZiNjQw
-    MTkwMzg0ZGMyYzQzMjQ4ODQ3ODA1OTEwNjNhZjNiZjBjZjZkYzg=
+    Zjk2MjBkM2Q4MGQ1MjQwYjI0NDE2ZTkxYTlhZjg5YWU0ZmYzZTA4YWYyNzIz
+    NmM2MzI3NmY2YTJkOGE3NjA2OGM2ZTQ2YWU0M2IwODIwZmY2ODk4M2NlYzhk
+    MGU4YTRkMjBjMzAxY2I3ZDdkOGRiZDZkMTQwZjEyYjFlNGY2MWU=

data/lib/activewepay/version.rb

@@ -1,3 +1,3 @@
 module Activewepay
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/activewepay.rb

@@ -5,13 +5,18 @@ require 'json'
 require 'net/http'
 require 'net/https'
 require 'cgi'
+require 'active_model'
  
 module ActiveWepay
   class Base
     extend ActiveModel::Translation
-     
-    attr_accessor :options, :id, :oauth_token
-    attr_reader :response, :errors
+    extend ActiveModel::Callbacks
+    include ActiveModel::Validations
+
+    validate :validate_response
+
+    attr_reader :errors, :oauth_token, :id, :amount, :account_id, :redirect_uri, :callback_uri, :response
+
    
     STAGE_API_ENDPOINT = "https://stage.wepayapi.com/v2"
     STAGE_UI_ENDPOINT = "https://stage.wepay.com/v2"
@@ -19,9 +24,16 @@ module ActiveWepay
     PRODUCTION_API_ENDPOINT = "https://wepayapi.com/v2"
     PRODUCTION_UI_ENDPOINT = "https://www.wepay.com/v2"
      
-    def initialize
+    def initialize(options)
       @errors = ActiveModel::Errors.new(self)
-      @options ||= {}
+
+      options[:oauth_token]  ? @oauth_token = options[:oauth_token] : false
+      options[:amount]       ? @amount = options[:amount] : false
+      options[:account_id]   ? @account_id = options[:account_id] : false
+      options[:redirect_uri] ? @redirect_uri = options[:redirect_uri] : false
+      options[:callback_uri] ? @callback_uri = options[:callback_uri] : false
+      options[:id]           ? @id = options[:id] : false
+      options[:name]         ? @name = options[:name] :false
     end
      
     # make a call to the WePay API
@@ -53,15 +65,17 @@ module ActiveWepay
       # returns JSON response as ruby hash
       @response = JSON.parse(response.body, :symbolize_names => true)
   
+      self
+    end
+
+    def validate_response
       if @response[:error]
         @errors.add(@response[:error].to_sym, @response[:error_description])
       end
-     
-      self
     end
-     
+
     def method_missing(method_name, *args, &block)
-      if @response.keys.include? method_name.to_sym
+      if @response and @response.keys.include? method_name.to_sym
         @response[method_name.to_sym]
       else 
        super
@@ -70,13 +84,15 @@ module ActiveWepay
   end
 
   class Account < Base
-    def self.create(oauth_token, name)
-      @account = self.new
-      @account.options[:oauth_token] = oauth_token
+
+    validates_presence_of :oauth_token, :name
+    
+    def self.create(options)
+      @account = self.new(options)
 
       theme = { name: 'Black and White', primary_color: 'FFFFFF', secondary_color: '000000', background_color: 'FFFFFF', button_color: 'FFFFFF' }
-      @account.call('/account/create', @account.options[:oauth_token], {
-        :name => name,
+      @account.call('/account/create', @account.oauth_token, {
+        :name => @name,
         :description => 'Automatically generated by Vocalem',
         :theme_object => theme 
       })
@@ -84,43 +100,50 @@ module ActiveWepay
   end
 
   class Checkout < Base
-    def self.create(options = {})
-      @checkout = self.new
-      @checkout.options = options
-      @checkout.call('/checkout/create', @checkout.options[:oauth_token], {
-        account_id: @checkout.options[:account_id],
-        amount: @checkout.options[:amount],
+
+    validates_presence_of :oauth_token 
+
+    def self.create(options)
+
+      @checkout = self.new(options)
+      @checkout.call('/checkout/create', @checkout.oauth_token, {
+        account_id: @checkout.account_id,
+        amount: @checkout.amount,
         short_description: 'Payment',
         type: 'DONATION',
         mode: 'iframe',
-        app_fee: @checkout.options[:amount] * 0.021,
-        redirect_uri: @checkout.options[:redirect_uri],
-        callback_uri: @checkout.options[:callback_uri] 
+        app_fee: @checkout.amount * 0.021,
+        redirect_uri: @checkout.redirect_uri,
+        callback_uri: @checkout.callback_uri 
       })
     end
   
-    def self.find(id, oauth_token)
-      @checkout = self.new
-      @checkout.id = id
-      @checkout.options[:oauth_token] = oauth_token
+    def self.find(options)
+      @checkout = self.new(options)
       @checkout.information
     end
   
     def information
-      call('/checkout/', @options[:oauth_token], {
+      validates_presence_of :id
+
+      call('/checkout/', @oauth_token, {
         checkout_id: @id
       })
     end
     
     def cancel
-      self.call('/checkout/cancel/', @options[:oauth_token], {
+      validates_presence_of :id
+ 
+      self.call('/checkout/cancel/', @oauth_token, {
         checkout_id: @id,
         cancel_reason: 'Refund'
       })
     end
   
     def refund
-      call('/checkout/refund', @options[:oauth_token], {
+      validates_presence_of :id
+
+      call('/checkout/refund', @oauth_token, {
         checkout_id: @id,
         refund_reason: 'Refunded'
       })
@@ -128,51 +151,55 @@ module ActiveWepay
   end
 
   class Preapproval < Base
-    attr_accessor :options, :id
+
+    validates_presence_of :oauth_token
   
-    def self.create(options = {})
-      @recurring = self.new
-      @recurring.options = options
-      @recurring.call('/preapproval/create', @recurring.options[:oauth_token], {
+    def self.create(options)
+
+      validates_presence_of :account_id, :amount, :redirect_uri, :callback_uri
+
+      @recurring = self.new(options)
+      @recurring.call('/preapproval/create', @recurring.oauth_token, {
         short_description: 'Vocalem plan change',
-        account_id: @recurring.options[:account_id],
-        amount: @recurring.options[:amount],
+        account_id: @recurring.account_id,
+        amount: @recurring.amount,
         period: 'monthly',
-        redirect_uri: @recurring.options[:redirect_uri],
-        callback_uri: @recurring.options[:callback_uri], 
+        redirect_uri: @recurring.redirect_uri,
+        callback_uri: @recurring.callback_uri, 
         auto_recur: true,
         mode: 'iframe'
-        }) 
+      }) 
     end
   
-    def self.find(id, oauth_token)
-      @recurring = self.new
-      @recurring.options[:oauth_token] = oauth_token
-      @recurring.id = id
+    def self.find(options)
+      validates_presence_of :id
+
+      @recurring = self.new(options)
   
-      @recurring.call('/preapproval/', @recurring.options[:oauth_token], {
+      @recurring.call('/preapproval/', @recurring.oauth_token, {
           preapproval_id: id
-        })
+      })
     end
   
     def cancel
-  
-      call('/preapproval/cancel', @options[:oauth_token], {
+      validates_presence_of :id
+
+      call('/preapproval/cancel', @oauth_token, {
         preapproval_id: @id
       })
     end
   end
 
   class Withdrawal < Base
-    attr_accessor :options, :id, :oauth_token
   
-    def self.create(options = {})
-      @withdrawal = self.new
-      @withdrawal.options = options
+    validates_presence_of :oauth_token, :account_id, :redirect_uri
+   
+    def self.create(options)
+      @withdrawal = self.new(options)
   
-      @withdrawal.call('/withdrawal/create', @withdrawal.options[:oauth_token], {
-        account_id: @withdrawal.options[:account_id],
-        redirect_uri: @withdrawal.options[:redirect_uri],
+      @withdrawal.call('/withdrawal/create', @withdrawal.oauth_token, {
+        account_id: @withdrawal.account_id,
+        redirect_uri: @withdrawal.redirect_uri,
         mode: 'iframe'
       })
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activewepay
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Asher Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel