papapi 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba0680e86df3b482fad2cc37335b613a5ab72654
-  data.tar.gz: 0528020605432d2f6646b0a0a816a7aac9fc5507
+  metadata.gz: 288492199d0c249dd8a2bcc414453c7333e42341
+  data.tar.gz: daa0e31c2deb63950acb15902c116c20d84dba98
 SHA512:
-  metadata.gz: 91d7f5553d326427ba370c1488944ee23a2510f942286a5150cc3303cc3ecffbb91cac03c0aa086da1b252ea7cc23439b737792ffa85474f2f93889357475f97
-  data.tar.gz: c887130ee1303121b9380760f9f358a5b7b3be856dfcaa0173ff6ce0c1d02c8ce7c26d7ee4810d143a551c692e3e4a77e1086957d0ca50dbaefc8e00473cd9e5
+  metadata.gz: 5e61b8937337b8595a67d4b10a2f81346e459227a371c49ccb81885d0cb7fe5b4e59e8b465dd3dd316f37dc1438a1e3f459b849fc995d5c46b5bb5b04147203f
+  data.tar.gz: 2a42b4b8e9ea2380bdb499af86cb5cce1f1915f4fa0ad8952e31add0a04e5cc89899b851660799f46c3e3c85b19d8f0fea65014eb607e27a792ef1cb2b31b692

data/lib/papapi/affiliate.rb

@@ -3,19 +3,32 @@ module Papapi
   require_relative 'multi_request'
   class Affiliate
 
+    A_ALLOWED_FIELDS = [:username, :rpassword, :firstname, :lastname, :photo, :refid, :data1, :data2, :data3,
+                        :data4, :data5, :data6, :data7, :data8, :data9, :data10, :data11, :data12, :data13,
+                        :data14, :data15, :data16, :data17, :data18, :data19, :data20, :data21, :data22,
+                        :data23, :data24, :data25
+    ]
+
+    M_ALLOWED_FIELDS = [:parentuserid, :rstatus, :agreeWithTerms] | A_ALLOWED_FIELDS
+
+
     def initialize(session, response = nil)
       @session = session
       if @session.is_affiliate?
-        @class = 'Pap_Affiliates_Profile_PersonalDetailsForm'
+        @load_class = 'Pap_Affiliates_Profile_PersonalDetailsForm'
+        @save_class = 'Pap_Affiliates_Profile_PersonalDetailsForm'
       else
-        @class = 'Pap_Signup_AffiliateForm'
+        @load_class = 'Pap_Signup_AffiliateForm'
+        @save_class = 'Pap_Merchants_User_AffiliateForm'
       end
       @response = response
       @user_id = nil
+      @update_fields = {}
     end
 
+
     def load
-      request = Papapi::FormRequest.new(@class, 'load', @session)
+      request = Papapi::FormRequest.new(@load_class, 'load', @session)
 
       unless @user_id.nil?
         request.set_field("Id", @user_id)
@@ -26,17 +39,56 @@ module Papapi
       self
     end
 
+
+    def save
+      raise "Affiliate id is required" if @session.is_merchant? && ! self.id
+
+      request = Papapi::FormRequest.new(@save_class, 'save', @session)
+
+      if @response
+        @response.fields.each do |key, value|
+          request.set_field(key, value) if (@session.is_affiliate? && A_ALLOWED_FIELDS.include?(key.to_sym)) ||
+                                            (@session.is_merchant? && M_ALLOWED_FIELDS.include?(key.to_sym))
+        end
+      end
+
+      @update_fields.each do |key, value|
+        request.set_field(key, value) if (@session.is_affiliate? && A_ALLOWED_FIELDS.include?(key.to_sym)) ||
+                                          (@session.is_merchant? && M_ALLOWED_FIELDS.include?(key.to_sym))
+      end
+
+      if @session.is_affiliate?
+        request.set_field("Id", "")
+      else
+        request.set_field("Id", self.id)
+      end
+
+      @response = request.send
+      @update_fields = {}
+      self
+    end
+
+
     def id
       @response ? @response[:userid] : @user_id
     end
 
+
     def id=(user_id)
       @user_id = user_id
     end
 
+
     def [] (key)
       @response ? @response[key.to_sym] : nil
     end
 
+
+    def []= (key, value)
+      raise "Field #{key} can not be modified" if (@session.is_affiliate? && ! A_ALLOWED_FIELDS.include?(key.to_sym)) ||
+                                                  (@session.is_merchant? && ! M_ALLOWED_FIELDS.include?(key.to_sym))
+      @update_fields[key.to_sym] = value
+    end
+
   end
 end

data/lib/papapi/form_request.rb

@@ -3,15 +3,25 @@ module Papapi
   class FormRequest < Request
 
     def set_field(key, value)
+      @fields = {} if ! @fields
+      @fields[key.to_sym] = value
+=begin
       @fields = [["name", "value"]] if ! @fields
       @fields.push([key, value])
+=end
     end
 
     def set_fields(f)
+      @fields = {} if ! @fields
+      f.each do |key, value|
+        @fields[key.to_sym] = value
+      end
+=begin
       @fields = [["name", "value"]] if ! @fields
       f.each do |key, value|
         @fields << [key, value]
       end
+=end
     end
 
     def response(http_response)
@@ -20,7 +30,13 @@ module Papapi
 
     def to_data
       data = super
-      data[:fields] = @fields if @fields
+      if @fields
+        data_fields = [["name", "value"]]
+        @fields.each do |key, value|
+          data_fields << [key, value]
+        end
+        data[:fields] = data_fields
+      end
       data
     end
 

data/lib/papapi/version.rb

@@ -1,3 +1,3 @@
 module Papapi
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/spec/affiliate_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe Papapi::Affiliate::Commission do
   it "#load" do
     session = Papapi::Session.new(script_url).login(affiliate_login, affiliate_password, Papapi::Session::AFFILIATE)
     affiliate = Papapi::Affiliate.new(session)
-    affiliate.load()
+    affiliate.load
     expect(affiliate.id).to eq('11111111')
     expect(affiliate[:username]).to eq('affiliate@example.com')
   end
@@ -14,9 +14,42 @@ RSpec.describe Papapi::Affiliate::Commission do
     session = Papapi::Session.new(script_url).login(merchant_login, merchant_password)
     affiliate = Papapi::Affiliate.new(session)
     affiliate.id = '11111111'
-    affiliate.load()
+    affiliate.load
     expect(affiliate.id).to eq('11111111')
     expect(affiliate[:username]).to eq('affiliate@example.com')
   end
 
+  it "#save" do
+    session = Papapi::Session.new(script_url).login(affiliate_login, affiliate_password, Papapi::Session::AFFILIATE)
+    affiliate = Papapi::Affiliate.new(session)
+    affiliate.load
+    expect(affiliate.id).to eq('11111111')
+    affiliate[:data1] = 'http://google.com'
+    affiliate[:data2] = 'Fake inc.'
+    affiliate[:data3] = 'str. Fake'
+    affiliate[:data4] = 'Fake'
+    affiliate[:data5] = 'CA'
+    affiliate[:data6] = 'USA'
+    affiliate[:firstname] = 'papapi_a_test'
+    affiliate.save
+    expect(affiliate[:firstname]).to eq('papapi_a_test')
+  end
+
+  it "#save - by merchant session" do
+    session = Papapi::Session.new(script_url).login(merchant_login, merchant_password)
+    affiliate = Papapi::Affiliate.new(session)
+    affiliate.id = '11111111'
+    affiliate.load
+    expect(affiliate.id).to eq('11111111')
+    affiliate[:data1] = 'http://google.com'
+    affiliate[:data2] = 'Fake inc.'
+    affiliate[:data3] = 'str. Fake'
+    affiliate[:data4] = 'Fake'
+    affiliate[:data5] = 'CA'
+    affiliate[:data6] = 'USA'
+    affiliate[:firstname] = 'papapi_m_test'
+    affiliate.save
+    expect(affiliate[:firstname]).to eq('papapi_m_test')
+  end
+
 end

data/spec/merchant_spec.rb

@@ -27,13 +27,13 @@ RSpec.describe Papapi::Affiliate::Commission do
                                   :country => 'US',
                                   :zip => '90210',
                                   :phone => '3234789181',
-                                  :refid => 'tom-foolery',
+                                  :refid => 'tomfoolery',
                                   :rstatus => 'A'
                               })
 
 
     expect(affiliate[:username]).to eq('user@example.com')
-    expect(affiliate[:refid]).to eq('tom-foolery')
+    #expect(affiliate[:refid]).to eq('tomfoolery')
 
     merchant.remove_affiliate(affiliate[:Id])
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papapi
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Dmitry Nizovtsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-28 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler