papapi 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc85d50e2012ff738a2165d92fb3e2c7ae232544
-  data.tar.gz: 2103a176b9c2a7c31e48220e3772f8421e88180d
+  metadata.gz: ba0680e86df3b482fad2cc37335b613a5ab72654
+  data.tar.gz: 0528020605432d2f6646b0a0a816a7aac9fc5507
 SHA512:
-  metadata.gz: 638975743a0870dbf58f79e13d75998f2bf883af840783648815ede897e378650901511b0ff4473696e6818f7d3773a8ae5c3e1471f5f958ee32ddae3ab6dd9d
-  data.tar.gz: c639a66f4fb61ddd496409ba1a523b84098720c8778ea10ae35540ca321a9a044fb5386480b9914fc9961738b32a72dcd9667eafe2a32eb98caeecb2896c4922
+  metadata.gz: 91d7f5553d326427ba370c1488944ee23a2510f942286a5150cc3303cc3ecffbb91cac03c0aa086da1b252ea7cc23439b737792ffa85474f2f93889357475f97
+  data.tar.gz: c887130ee1303121b9380760f9f358a5b7b3be856dfcaa0173ff6ce0c1d02c8ce7c26d7ee4810d143a551c692e3e4a77e1086957d0ca50dbaefc8e00473cd9e5

data/lib/papapi/affiliate.rb

@@ -5,18 +5,33 @@ module Papapi
 
     def initialize(session, response = nil)
       @session = session
-      raise "Affiliate session is required" if !@session.is_affiliate?
+      if @session.is_affiliate?
+        @class = 'Pap_Affiliates_Profile_PersonalDetailsForm'
+      else
+        @class = 'Pap_Signup_AffiliateForm'
+      end
       @response = response
+      @user_id = nil
     end
 
     def load
-      request = Papapi::FormRequest.new('Pap_Affiliates_Profile_PersonalDetailsForm', 'load', @session)
+      request = Papapi::FormRequest.new(@class, 'load', @session)
+
+      unless @user_id.nil?
+        request.set_field("Id", @user_id)
+        request.set_field("userid", @user_id)
+      end
+
       @response = request.send
       self
     end
 
     def id
-      @response ? @response[:userid] : nil
+      @response ? @response[:userid] : @user_id
+    end
+
+    def id=(user_id)
+      @user_id = user_id
     end
 
     def [] (key)

data/lib/papapi/grid_response.rb

@@ -15,6 +15,12 @@ module Papapi
       parsed['rows'].slice(1, parsed['rows'].count-1)
     end
 
+    def [] (key)
+      if rows[key.to_i]
+        return Hash[*attributes.zip(rows[key.to_i]).flatten]
+      end
+    end
+
     def each
       rows.each do |row|
         yield Hash[*attributes.zip(row).flatten]

data/lib/papapi/merchant.rb

@@ -32,10 +32,6 @@ module Papapi
       request.set_fields(request_fields)
       response = request.send
       response
-      #affiliate = Papapi::Affiliate.new(Papapi::Session.new(@session.url).
-      #                          login(request_fields[:username], request_fields[:rpassword], Papapi::Session::AFFILIATE))
-      #affiliate.load
-      #affiliate
     end
 
     def remove_affiliate(affiliate_id)
@@ -103,6 +99,21 @@ module Papapi
       affiliates
     end
 
+    def affiliate_by_username(username)
+      request = Papapi::GridRequest.new("Pap_Merchants_User_AffiliatesGridSimple", "getRows", @session)
+      request.add_filter('username', Papapi::Filter::EQUALS, username)
+
+      response = request.send
+      if response.count > 0
+        user = response[0]
+        affiliate = Papapi::Affiliate.new(@session)
+        affiliate.id = user['userid']
+        affiliate.load
+        return affiliate
+      end
+
+    end
+
     def id
       @response ? @response[:authid] : nil
     end

data/lib/papapi/version.rb

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

data/spec/affiliate_spec.rb

@@ -9,4 +9,14 @@ RSpec.describe Papapi::Affiliate::Commission do
     expect(affiliate.id).to eq('11111111')
     expect(affiliate[:username]).to eq('affiliate@example.com')
   end
+
+  it "#load - 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')
+    expect(affiliate[:username]).to eq('affiliate@example.com')
+  end
+
 end

data/spec/merchant_spec.rb

@@ -57,4 +57,15 @@ RSpec.describe Papapi::Affiliate::Commission do
     expect(affiliates[0]['username']).to eq('affiliate@example.com')
 
   end
+
+
+  it "#affiliate_by_username" do
+    session = Papapi::Session.new(script_url).login(merchant_login, merchant_password)
+    merchant = Papapi::Merchant.new(session)
+
+    affiliate = merchant.affiliate_by_username('affiliate@example.com')
+
+    expect(affiliate[:username]).to eq('affiliate@example.com')
+    expect(affiliate.id).to eq('11111111')
+  end
 end

metadata

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