activewepay 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a43bfcd3790b8051af2423ab0b0170d72ed50106
-  data.tar.gz: 22f6dee954fb1a9dd66261a92e0fe2d4d259dcee
+  metadata.gz: f68d55d385d5dd9e010b81dd7c358b9ea80e9ea1
+  data.tar.gz: 9189370a7c07c48269b75214540131a1e204d11d
 SHA512:
-  metadata.gz: f1f69826f108e4fd3032d2e0d5a4d773b186188318e628f8517a6c5af80c8af5dddc50311203184aece8f384d0dc68a7f243e672c6042fd31e62a476fc2d3e55
-  data.tar.gz: 95edb67598fe04accac159cc3620364a3bf0d80c82f75090c46107216d5710eb2b68a2c46f499200b5dcb8d0c58820f5af39f6533f5c537fcd2bafcc5d3cd54e
+  metadata.gz: 4e13dff3fc5f48c8a3cdc20a30f1d9335a4060106f5795154c7b23abc5820943288c69fdd70c1f115702520a96a5ade9a8bb34582a4e0f8786f83b97f905bb09
+  data.tar.gz: 9db4070c3c851be4ea86165086d1fb9675ce5000b91034e467ed895fb08eaebeddaf2196480fe6c3a8a327e285e13772c496b49bcf878ea12c233b96634e70c5

data/lib/activewepay.rb

@@ -9,19 +9,18 @@ require 'active_model'
  
 module ActiveWepay
   class Base
-    extend ActiveModel::Model
     include ActiveModel::Model
 
-    validate :validate_response
-
-    attr_reader :errors, :oauth_token, :id, :amount, :redirect_uri, :callback_uri, :response, :name
+    attr_accessor :oauth_token
+    attr_reader :errors, :id, :amount, :redirect_uri, :callback_uri, :response, :name
 
-   
     STAGE_API_ENDPOINT = "https://stage.wepayapi.com/v2"
     STAGE_UI_ENDPOINT = "https://stage.wepay.com/v2"
   
     PRODUCTION_API_ENDPOINT = "https://wepayapi.com/v2"
     PRODUCTION_UI_ENDPOINT = "https://www.wepay.com/v2"
+
+    validate :validate_response
      
     def initialize(options)
       @errors = ActiveModel::Errors.new(self)
@@ -37,49 +36,42 @@ module ActiveWepay
     end
      
     # make a call to the WePay API
-    def call(call, access_token = false, params = false)
-      if Rails.env == 'development'
-        @api_endpoint = STAGE_API_ENDPOINT
-        @ui_endpoint = STAGE_UI_ENDPOINT
+    def call(path, access_token = false, params = false)
+      if Rails.env == 'development' || Rails.env == 'test'
+        api_endpoint = STAGE_API_ENDPOINT
+        ui_endpoint = STAGE_UI_ENDPOINT
       else
-        @api_endpoint = PRODUCTION_API_ENDPOINT
-        @ui_endpoint = PRODUCTION_UI_ENDPOINT
+        api_endpoint = PRODUCTION_API_ENDPOINT
+        ui_endpoint = PRODUCTION_UI_ENDPOINT
       end
          
       # get the url
-      url = URI.parse(@api_endpoint + call)
-      p url
+      url = URI.parse(api_endpoint + path)
       # construct the call data and access token
       call = Net::HTTP::Post.new(url.path, initheader = {'Content-Type' =>'application/json', 'User-Agent' => 'WePay Ruby SDK'})
       if params
         call.body = params.to_json
       end
+
       if access_token
-        call.add_field('Authorization: Bearer', access_token);
+        call.add_field('Authorization: Bearer', access_token)
       end
+
       # create the request object
       request = Net::HTTP.new(url.host, url.port)
       request.use_ssl = true
       # make the call
       response = request.start {|http| http.request(call) }
       # returns JSON response as ruby hash
-      @response = JSON.parse(response.body, :symbolize_names => true)
+      @response = JSON.parse!(response.body, :symbolize_names => true)
       
-      set_instance_variables(response)
-  
       self
     end
 
     private 
-
-    def set_instance_variables(hash)
-      hash.each do |key, value|
-        instance_variable_set "@#{key}".to_sym, value rescue false
-      end
-    end
   
     def validate_response
-      if @response[:error]
+      if @response && @response[:error]
         @errors.add(@response[:error].to_sym, @response[:error_description])
       end
     end
@@ -100,11 +92,11 @@ module ActiveWepay
     validates_presence_of :oauth_token
     
     def self.create(options)
-      @account = self.new(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.oauth_token, {
-        :name => @account.name,
+      account.call('/account/create', account.oauth_token, {
+        :name => account.name,
         :description => 'Automatically generated by Vocalem',
         :theme_object => theme 
       })
@@ -116,25 +108,24 @@ module ActiveWepay
     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,
+      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.amount * 0.021,
-        redirect_uri: @checkout.redirect_uri,
-        callback_uri: @checkout.callback_uri 
+        app_fee: checkout.amount * 0.021,
+        redirect_uri: checkout.redirect_uri,
+        callback_uri: checkout.callback_uri 
       })
     end
   
     def self.find(options)
-      @checkout = self.new(options)
-      @checkout.information
+      checkout = self.new(options)
+      checkout.information
     end
-  
+   
     def information
       validates_presence_of :id
 
@@ -170,14 +161,14 @@ module ActiveWepay
 
       validates_presence_of :account_id, :amount, :redirect_uri, :callback_uri
 
-      @recurring = self.new(options)
-      @recurring.call('/preapproval/create', @recurring.oauth_token, {
+      recurring = self.new(options)
+      recurring.call('/preapproval/create', recurring.oauth_token, {
         short_description: 'Vocalem plan change',
-        account_id: @recurring.account_id,
-        amount: @recurring.amount,
+        account_id: recurring.account_id,
+        amount: recurring.amount,
         period: 'monthly',
-        redirect_uri: @recurring.redirect_uri,
-        callback_uri: @recurring.callback_uri, 
+        redirect_uri: recurring.redirect_uri,
+        callback_uri: recurring.callback_uri, 
         auto_recur: true,
         mode: 'iframe'
       }) 
@@ -186,10 +177,10 @@ module ActiveWepay
     def self.find(options)
       validates_presence_of :id
 
-      @recurring = self.new(options)
+      recurring = self.new(options)
   
-      @recurring.call('/preapproval/', @recurring.oauth_token, {
-          preapproval_id: @recurring.id
+      recurring.call('/preapproval/', recurring.oauth_token, {
+          preapproval_id: recurring.id
       })
     end
   
@@ -207,11 +198,11 @@ module ActiveWepay
     validates_presence_of :oauth_token, :account_id, :redirect_uri
    
     def self.create(options)
-      @withdrawal = self.new(options)
+      withdrawal = self.new(options)
   
-      @withdrawal.call('/withdrawal/create', @withdrawal.oauth_token, {
-        account_id: @withdrawal.account_id,
-        redirect_uri: @withdrawal.redirect_uri,
+      withdrawal.call('/withdrawal/create', withdrawal.oauth_token, {
+        account_id: withdrawal.account_id,
+        redirect_uri: withdrawal.redirect_uri,
         mode: 'iframe'
       })
     end

data/lib/activewepay/version.rb

@@ -1,3 +1,3 @@
 module Activewepay
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: activewepay
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Asher Cohen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ActiveModel style WePay interface.
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -77,18 +77,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
-summary: '{ActiveModel style WePay interface.}'
+summary: "{ActiveModel style WePay interface.}"
 test_files: []