pasrb 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.0.4. Changes:
+* Most operations return array of hashes now.
+
 v0.0.3. Changes:
 * get_member_tracker_stats no longer keeps three forms of keys.
   Now it only uses "identifier" => data scheme, because it was

data/Rakefile

@@ -1,5 +1,5 @@
 require 'echoe'
-Echoe.new('pasrb', '0.0.3') do |g|
+Echoe.new('pasrb', '0.0.4') do |g|
   g.description    = "PokerAffiliateSupport api querying via ruby"
   g.url            = "http://github.com/markiz/pasrb"
   g.author         = "Markiz"

data/lib/pas.rb

@@ -48,13 +48,9 @@ class PAS
   alias_method :all_members, :list_all_members
   
   def list_all_members!
-    members = (1..member_page_count).inject([]) {|result, page| result + member_page(page) }    
-    members.inject({}) do |result, member| 
-      result[member[:login]] = member
-      result
-    end
+    (1..member_page_count).inject([]) {|result, page| result + member_page(page) }    
   rescue
-    {}
+    []
   end
   
   # Returns member page count
@@ -103,16 +99,15 @@ class PAS
     end_date   = end_date.strftime("%Y-%m-%d")
     response = xml_to_hash(make_request("/publisher_members/#{member_id}/stats.xml", "GET", {:start_date => start_date, :end_date => end_date}))
     trackers = [response["statistics"]["member_trackers"]["member_tracker"]].flatten
-    trackers.inject({}) do |result, tracker|
-      id = tracker["id"].to_i
-      result[tracker["identifier"]] = {
+    trackers.inject([]) do |result, tracker|
+      result << {
+        :id            => tracker["id"].to_i,
         :identifier    => tracker["identifier"],
         :poker_room_id => tracker["poker_room_id"].to_i,
         :poker_room    => tracker["poker_room"],
         :mgr           => tracker["mgr"].to_f,
         :rakeback      => tracker["rakeback"].to_f
       }
-      result
     end
   rescue
     nil
@@ -120,7 +115,7 @@ class PAS
     
   def get_member_tracker_stats(member_id, tracker_id, start_date, end_date)
     trackers = get_member_trackers_stats(member_id, start_date, end_date)
-    trackers ? trackers[tracker_id] : nil
+    trackers ? trackers.detect {|t| t[:identifier] == tracker_id || t[:id] == tracker_id } : nil
   rescue
     nil
   end

data/pasrb.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pasrb}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Markiz"]

data/spec/pas_spec.rb

@@ -134,7 +134,7 @@ describe PAS do
   describe "#all_members" do
     before(:each) {
       stub_request('<?xml version="1.0" encoding="UTF-8"?>
-                    <members current_page="1" next_page="1" total_pages="2" total_entries="2">
+                    <members current_page="1" next_page="2" total_pages="2" total_entries="2">
                       <member>
                         <id>26371</id>
                         <outside_id></outside_id>
@@ -191,18 +191,13 @@ describe PAS do
       subject.all_members
     end
     
-    it "should return a hash inaccessible by member id" do
-      subject.all_members[26380].should be_nil
+    it "should return an array with members" do
+      subject.all_members[1][:first_name].should == "Dumbo"      
     end
     
-    it "should return a hash accessible by member login" do
-      subject.all_members["durachok"][:first_name].should == "Dumbo"
-      subject.all_members.should have_exactly(2).items
-    end
-    
-    it "should return empty hash on failures" do
+    it "should return empty array on failures" do
       stub_request("<invalid></xml>")
-      subject.all_members.should == {}
+      subject.all_members.should == []
     end
   end
   
@@ -298,11 +293,9 @@ describe PAS do
     
     it "should parse out members" do
       members = subject.get_member_trackers_stats(member_id, Date.parse("2010-08-01"), Date.parse("2010-08-18"))
-      members[6].should be_nil
-      members[2195].should be_nil
       members.should have_exactly(2).items
-      members["qq124"][:poker_room_id].should == 293
-      members["qq1244343"][:poker_room_id].should == 293
+      members[0][:poker_room_id].should == 293
+      members[1][:poker_room_id].should == 293
     end
     
     it "should return nil on terrible, terrible failures" do
@@ -310,6 +303,7 @@ describe PAS do
       subject.get_member_trackers_stats(member_id, Date.parse("2010-08-01"), Date.parse("2010-08-18")).should == nil
     end
   end
+
   describe "#get_member_tracker_stats" do
     before(:each) {
       stub_request('<?xml version="1.0" encoding="UTF-8"?>
@@ -342,6 +336,7 @@ describe PAS do
     
     it "should use members stats for specific member" do
       subject.get_member_tracker_stats(member_id, "qq124", Date.parse("2010-08-01"), Date.parse("2010-08-18"))[:rakeback].should == 218.21
+      subject.get_member_tracker_stats(member_id, 6, Date.parse("2010-08-01"), Date.parse("2010-08-18"))[:rakeback].should == 218.21
     end
    
     it "should return nil on terrible, terrible failures" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pasrb
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Markiz