squeegee 0.0.1 → 0.1.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Kyle Welsby
+Copyright (c) 2012 BritRuby LTD
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/squeegee/account.rb

@@ -0,0 +1,19 @@
+module Squeegee
+  # Account
+  #
+  # Generic account with validations on specific parameters
+  class Account
+    attr_accessor :name, :amount, :due_at, :paid, :uid
+    def initialize(args={})
+      %w(name uid amount due_at).each do |key|
+        raise Squeegee::Error::InvalidParams,
+          "missing attribute `#{key}`" unless args.has_key?(key.to_sym)
+      end
+      @name = args[:name]
+      @amount = args[:amount]
+      @due_at = args[:due_at]
+      @paid = args[:paid]
+      @uid = args[:uid]
+    end
+  end
+end

data/lib/squeegee/british_gas.rb

@@ -6,45 +6,9 @@ module Squeegee
   class BritishGas < Base
     HOST = "https://www.britishgas.co.uk"
     LOGIN_URL = "#{HOST}/Your_Account/Account_Details/"
-    ACCOUNTS_URL = "#{HOST}/Account_History/Transactions_Account_List/"
+    ACCOUNTS_URL = "#{HOST}/AccountSummary/getAccountDetailsForSummary/"
     ACCOUNT_URL = "#{HOST}/Your_Account/Account_Transaction/"
 
-    # British Gas Account information Extration
-    # Example:
-    #     BritishGas::Account("8500", Mecanize.new)
-    #
-    class Account < BritishGas
-      attr_accessor :paid, :due_at, :amount
-
-      def initialize(id, agent)
-        @agent = agent
-        url = "#{Squeegee::BritishGas::ACCOUNT_URL}?accountnumber=#{id}"
-        page = get(url)
-        table = page.search("div#divHistoryTable table tbody")
-        rows = table.search("tr").map do |row|
-          tds = row.search("td")
-          _row = {
-            date: Date.parse(
-              tds.first.inner_text.match(/\d{2}\s\w{3}\s\d{4}/)[0]
-            ),
-            type: tds[1].inner_text.match(/[A-Za-z]{2,}\s?[A-Za-z]?{2,}/)[0],
-            debit: tds[2].inner_text.to_f,
-            credit: tds[3].inner_text.to_f,
-            balance: tds[4].inner_text.to_f
-          }
-          _row
-        end
-        @paid = !!(rows[0][:balance] = 0)
-        rows.each do |row|
-          if row[:debit] > 0
-            @amount = row[:debit].to_s.gsub(/\.|,/,'').to_i
-            @due_at = row[:date]
-            break
-          end
-        end
-      end
-    end
-
     attr_accessor :accounts
 
     FIELD = {
@@ -58,9 +22,10 @@ module Squeegee
       params(args)
       @email = args.delete(:email)
       @password = args.delete(:password)
+      @accounts = []
 
       authenticate!
-      get_statements
+      get_accounts
     end
 
     private
@@ -76,12 +41,45 @@ module Squeegee
       #raise Error::Unauthorized, "Account details could be wrong" if page.at('.error')
     end
 
-    def get_statements
+    def get_accounts
       page = get(ACCOUNTS_URL)
-      account_ids = page.search("table#tableSelectAccount td > strong").collect {|row| row.content.to_i}
-      @accounts = account_ids.map do |account_id|
-        Account.new(account_id, @agent)
+      accounts = JSON.parse(page.body)
+      #account_ids = page.search("table#tableSelectAccount td > strong").collect {|row| row.content.to_i}
+      accounts.each do |account|
+        response = get_account(account['accountReferenceNumber'])
+        @accounts << Squeegee::Account.new(response)
+      end
+    end
+
+    def get_account(id)
+      response = {}
+      url = "#{Squeegee::BritishGas::ACCOUNT_URL}?accountnumber=#{id}"
+      page = get(url)
+      table = page.search("div#divHistoryTable table tbody")
+      rows = table.search("tr").map do |row|
+        tds = row.search("td")
+        _row = {
+          date: Date.parse(
+            tds.first.inner_text.match(/\d{2}\s\w{3}\s\d{4}/)[0]
+          ),
+            type: tds[1].inner_text.match(/[A-Za-z]{2,}\s?[A-Za-z]?{2,}/)[0],
+            debit: tds[2].inner_text.to_f,
+            credit: tds[3].inner_text.to_f,
+            balance: tds[4].inner_text.to_f
+        }
+        _row
+      end
+      response[:paid] = !!(rows[0][:balance] = 0)
+      rows.each do |row|
+        if row[:debit] > 0
+          response[:amount] = row[:debit].to_s.gsub(/\.|,/,'').to_i
+          response[:due_at] = row[:date]
+          break
+        end
       end
+      response[:uid] = Digest::MD5.hexdigest("BritishGas#{id}")
+      response[:name] = "BritishGas (#{id.to_s[-4..-1]})"
+      response
     end
 
   end

data/lib/squeegee/bskyb.rb

@@ -11,7 +11,7 @@ module Squeegee
       password: 'password'
     }
 
-    attr_accessor :due_at, :amount, :paid
+    attr_accessor :accounts
 
     def initialize(args = {})
       @keys = %w(username password)
@@ -20,6 +20,8 @@ module Squeegee
       @username = args.delete(:username)
       @password = args.delete(:password)
 
+      @accounts = []
+
       authenticate!
       get_statement
     end
@@ -38,24 +40,38 @@ module Squeegee
 
     def get_statement
       page = get(ACCOUNT_URL)
-      amount = page.search(
+
+      account_id = page.search("#account_management_nav .account-number").
+        inner_text.match(/\d{4,}/)[0].to_i
+
+      amount_html = page.search(
         "#outstanding_balance_total span.money-left"
       ).inner_text.gsub(/\.|,/,'').match(/\d{1,}/)
 
-      @amount = amount[0].to_i if amount
+      amount = amount_html[0].to_i if amount_html
 
-      due_at = page.search(
+      due_at_html = page.search(
         "#outstanding_balance_box_label h5 span"
       ).inner_text.match(/(\d{2})\/(\d{2})\/(\d{2})/)
 
-      @due_at = Date.parse("20#{due_at[3]}-#{due_at[2]}-#{due_at[1]}")if due_at
+      due_at = Date.parse("20#{due_at_html[3]}-#{due_at_html[2]}-#{due_at_html[1]}") if due_at_html
 
-      @paid = page.search(
+      paid = page.search(
         "#payments .bill .desc"
       ).inner_text.downcase.include?("received")
 
-    rescue NoMethodError => e
-      raise Error::PageMissingContent, "Can't find something on the page"
+      uid = Digest::MD5.hexdigest("BSkyB#{account_id}")
+
+      @accounts << Squeegee::Account.new(
+        name: "Sky (#{account_id.to_s[-4..-1]})",
+        amount: amount,
+        due_at: due_at,
+        paid: paid,
+        uid: uid
+      )
+
+    #rescue NoMethodError => e
+      #raise Error::PageMissingContent, "Can't find something on the page"
     end
   end
 end

data/lib/squeegee/orange_uk.rb

@@ -12,10 +12,11 @@ module Squeegee
       password: 'PASSWORD'
     }
 
-    attr_accessor :paid, :amount, :due_at
+    attr_accessor :accounts, :account_id, :paid, :amount, :due_at
 
     def initialize(args = {})
       @keys = %w(username password)
+      @accounts = []
 
       params(args)
       @username = args.delete(:username)
@@ -33,6 +34,7 @@ module Squeegee
 
       form[FIELD[:username]] = @username
       form[FIELD[:password]] = @password
+
       page = @agent.submit(form, form.buttons.first)
 
       if page.uri == LOGIN_POST_URL && !page.search('.error').nil?
@@ -47,9 +49,15 @@ module Squeegee
 
       balance = page.search("#paymBalanceIncVAT").inner_text.gsub(/\.|,/,'').match(/\d{1,}/)
 
-      @due_at = Date.parse(last_bill.search("td")[0].inner_text)
-      @amount = last_bill.search('td')[2].inner_text.gsub(/\.|,/,'').match(/\d{1,}/)[0].to_i
+      due_at = Date.parse(last_bill.search("td")[0].inner_text)
+      amount = last_bill.search('td')[2].inner_text.gsub(/\.|,/,'').match(/\d{1,}/)[0].to_i
       #@paid = balance || balance[0].to_i >= 0
+      uid = Digest::MD5.hexdigest("OrangeUK#{@username}")
+
+      @accounts << Squeegee::Account.new(due_at: due_at,
+                                         name: "Orange UK",
+                                         uid: uid,
+                                         amount: amount)
     end
   end
 end

data/lib/squeegee/version.rb

@@ -1,3 +1,3 @@
 module Squeegee
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/squeegee.rb

@@ -1,8 +1,10 @@
 require 'mechanize'
 require 'logger'
+require 'json'
 require 'squeegee/version'
 require 'squeegee/error'
 require 'squeegee/base'
+require 'squeegee/account'
 
 require 'squeegee/british_gas'
 require 'squeegee/bskyb'

data/spec/spec_helper.rb

@@ -9,8 +9,6 @@ require 'rspec'
 require 'webmock'
 require 'squeegee'
 
-CONFIGS = YAML::load(File.open('spec/support/configs.yml'))
-
 RSpec.configure do |config|
   config.order = :rand
   config.color_enabled = true

data/spec/squeegee/account_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Squeegee::Account do
+  let(:attr){{
+    name:'',
+    uid:'',
+    amount:'',
+    due_at:''
+  }}
+  subject {Squeegee::Account}
+  it {subject.new(attr).should respond_to(:name)}
+  it {subject.new(attr).should respond_to(:amount)}
+  it {subject.new(attr).should respond_to(:due_at)}
+  it {subject.new(attr).should respond_to(:paid)}
+
+  it "validates presence of name" do
+    attr.delete(:name)
+    expect{
+      subject.new(attr)
+    }.to raise_error(ArgumentError, "missing attribute `name`")
+  end
+
+  it "validates presence of amount" do
+    attr.delete(:amount)
+    expect{
+      subject.new(attr)
+    }.to raise_error(ArgumentError, "missing attribute `amount`")
+  end
+
+  it "validates presence of uid" do
+    attr.delete(:uid)
+    expect{
+      subject.new(attr)
+    }.to raise_error(ArgumentError, "missing attribute `uid`")
+  end
+
+  it "validates presence of due_at" do
+    attr.delete(:due_at)
+    expect{
+      subject.new(attr)
+    }.to raise_error(ArgumentError, "missing attribute `due_at`")
+  end
+end

data/spec/squeegee/british_gas_spec.rb

@@ -5,46 +5,30 @@ describe Squeegee::BritishGas do
   let(:node) {mock('node')}
   let(:form) {mock('form')}
   let(:button) {mock('button')}
+  let(:json) {[
+            {
+              'accountReferenceNumber' => 850046061940,
+              'Amount' => 70.00,
+              'Paymenttype' => ""
+            }
+          ].to_json}
 
   subject {Squeegee::BritishGas}
 
-  context "classes" do
     before do
-      Mechanize.any_instance.stub(get: mechanize)
-    end
-    subject {Squeegee::BritishGas::Account.new(1, mechanize.as_null_object)}
-    it "should get single account" do
-      pending
-      Mechanize.any_instance.should_receive(:get).at_least(:once).with(
-        "https://www.britishgas.co.uk/Your_Account/Account_Transaction/?accountnumber=1"
-      ).and_return(mechanize.as_null_object)
-
-      subject
-    end
-    it "should build array of data" do
-      mechanize.should_receive(:search).with(
-        "div#divHistoryTable table tbody"
-      ).and_return(node)
-
-      node.should_receive(:search).with("tr").and_return([node])
-      node.should_receive(:search).with("td").and_return(
-        [
-          stub(inner_text: "12 Feb 2012"),
-          stub(inner_text: "Payment Received"),
-          stub(inner_text: ""),
-          stub(inner_text: "30.50"),
-          stub(inner_text: "0.00")
-        ]
-      )
-
-      subject.paid.should be_true
+      subject.any_instance.stub(:params)
+      subject.any_instance.stub(:authenticate!)
+      subject.any_instance.stub(:get_accounts)
+
+      Mechanize.stub(:new => mechanize.as_null_object)
+      mechanize.stub(:get => mechanize)
+
     end
-  end
+
 
   context "Parameters" do
     before do
-      subject.any_instance.stub(:authenticate!)
-      subject.any_instance.stub(:get_statements)
+      subject.any_instance.unstub(:params)
     end
     it "raises InvalidParams when email is missing" do
       expect{
@@ -66,20 +50,15 @@ describe Squeegee::BritishGas do
       }.to_not raise_error
     end
   end
-  context "calls" do
-    before do
-      subject.any_instance.stub(:params)
-      subject.any_instance.stub(:authenticate!)
-      subject.any_instance.stub(:get_statements)
-    end
 
+  context "calls" do
     it "calls authenticate!" do
       subject.any_instance.should_receive(:authenticate!)
       subject.new
     end
 
     it "calls get_accounts" do
-      subject.any_instance.should_receive(:get_statements)
+      subject.any_instance.should_receive(:get_accounts)
       subject.new
     end
 
@@ -90,66 +69,110 @@ describe Squeegee::BritishGas do
     end
   end
 
-  context "Authentication" do
-    before do
-      subject.any_instance.stub(:params)
-      #subject.any_instance.stub(get: mechanize.as_null_object)
-      #Mechanize.any_instance.stub(get: mechanize.as_null_object)
-      Mechanize.should_receive(:new).and_return(mechanize.as_null_object)
-      mechanize.stub(form_with: form.as_null_object)
-    end
-    it "navigates to login URL" do
-      mechanize.should_receive(:get).with(
-        "https://www.britishgas.co.uk/Your_Account/Account_Details/"
-      ).and_return(mechanize)
-
-      subject.new({})
-    end
-
-    it "finds by form action" do
-      mechanize.should_receive(:form_with).with(
-        action: '/Online_User/Account_Summary/'
-      ).and_return(form.as_null_object)
+  context "Private" do
+    describe "authenticate!" do
+      before do
+        subject.any_instance.unstub(:authenticate!)
+        #subject.any_instance.stub(get: mechanize.as_null_object)
+        #Mechanize.any_instance.stub(get: mechanize.as_null_object)
+        Mechanize.should_receive(:new).and_return(mechanize.as_null_object)
+        mechanize.stub(form_with: form.as_null_object)
+      end
+      it "navigates to login URL" do
+        mechanize.should_receive(:get).with(
+          "https://www.britishgas.co.uk/Your_Account/Account_Details/"
+        ).and_return(mechanize)
+
+        subject.new({})
+      end
+
+      it "finds by form action" do
+        mechanize.should_receive(:form_with).with(
+          action: '/Online_User/Account_Summary/'
+        ).and_return(form.as_null_object)
 
-      subject.new
-    end
-
-    it "fills in form inputs" do
-      form.should_receive(:[]=).with('userName', 'test@test.com')
-      form.should_receive(:[]=).with('password', 'superduper')
-
-      subject.new(email: "test@test.com", password: "superduper")
-    end
-
-    it "submits with first button" do
-      form.should_receive(:buttons).and_return([button])
-      mechanize.should_receive(:submit).with(form, button)
-
-      subject.new(email: "test")
-    end
-  end
+        subject.new
+      end
 
-  context "get_accounts" do
-    before do
-      subject.any_instance.stub(:params)
-      Mechanize.any_instance.stub(get: mechanize)
-      subject.any_instance.stub(:authenticate!)
-      mechanize.stub(search: [stub(content: "  1  ")])
-      subject::Account.stub(:new, mechanize)
-    end
+      it "fills in form inputs" do
+        form.should_receive(:[]=).with('userName', 'test@test.com')
+        form.should_receive(:[]=).with('password', 'superduper')
 
-    it "navigates to account list URL" do
-      Mechanize.any_instance.should_receive(:get).with(
-        "https://www.britishgas.co.uk/Account_History/Transactions_Account_List/"
-      ).and_return(mechanize)
-      subject.new
-    end
+        subject.new(email: "test@test.com", password: "superduper")
+      end
+
+      it "submits with first button" do
+        form.should_receive(:buttons).and_return([button])
+        mechanize.should_receive(:submit).with(form, button)
+
+        subject.new(email: "test")
+      end
+    end
+
+    describe "get_accounts" do
+      before do
+        subject.any_instance.unstub(:get_accounts)
+        subject.any_instance.stub(:get_account)
+        Squeegee::Account.stub(:new)
+      end
+      it "finds account ID's" do
+        mechanize.should_receive(:body).and_return(json)
+        subject.any_instance.should_receive(:get_account).
+          with(850046061940)
+        subject.new
+      end
+    end
+
+    describe "get_account" do
+      let(:row) {stub(:row)}
+      let(:column) {stub(:column)}
+      before do
+        subject.any_instance.unstub(:get_accounts)
+        #subject.any_instance.unstub(:get_account)
+        mechanize.stub(:body).and_return(json)
+        mechanize.stub(:search).and_return(stub.as_null_object)
+        row.stub(:search).and_return(stub.as_null_object)
+        Squeegee::Account.stub(:new)
+      end
+
+      it "finds paid bill" do
+        mechanize.should_receive(:search).
+          with("div#divHistoryTable table tbody").
+          and_return(node)
+        node.should_receive(:search).
+          with('tr').
+          and_return([row])
+        row.should_receive(:search).
+          with('td').
+          and_return([
+            stub(inner_text: "12 Jun 2012"),
+            stub(inner_text: "Payment Received"),
+            stub(inner_text: "0.00"),
+            stub(inner_text: "10.00"),
+            stub(inner_text: "0.00")
+          ])
+        subject.new
+      end
+
+      it "finds debt" do
+        mechanize.should_receive(:search).
+          with("div#divHistoryTable table tbody").
+          and_return(node)
+        node.should_receive(:search).
+          with('tr').
+          and_return([row])
+        row.should_receive(:search).
+          with('td').
+          and_return([
+            stub(inner_text: "12 Jun 2012"),
+            stub(inner_text: "Debt"),
+            stub(inner_text: "20.00"),
+            stub(inner_text: "0.00"),
+            stub(inner_text: "20.00")
+          ])
+        subject.new
+      end
 
-    it "initialises a new account" do
-      pending
-      #mechanize.stub(search: [stub(content: "  1  ")])
-      #subject::Account.should_receive(:new).with(1, Mechanize.new())
-      #subject.new
     end
   end
 end

data/spec/squeegee/bskyb_spec.rb

@@ -87,22 +87,22 @@ describe Squeegee::BSkyB do
       mechanize.should_receive(:search).with(
         "#outstanding_balance_total span.money-left"
       ).and_return(node)
+      mechanize.should_receive(:search).with(
+        "#account_management_nav .account-number"
+      ).and_return(stub(:inner_text => "Account Number: 85000"))
       node.should_receive(:inner_text).and_return("£65.32")
       subject.new
     end
     it "finds the balance due date" do
-      mechanize.should_receive(:search).with(
-        "#outstanding_balance_total span.money-left"
-      ).and_return(node)
+      mechanize.stub(:search => stub.as_null_object)
       mechanize.should_receive(:search).with(
         "#outstanding_balance_box_label h5 span"
       ).and_return(node)
-      node.should_receive(:inner_text).twice.and_return("Payment due \r\n 13/03/12")
+      node.should_receive(:inner_text).and_return("Payment due \r\n 13/03/12")
       subject.new
     end
     it "finds the payment received" do
-      mechanize.stub(:search => node)
-      node.stub(:inner_text => "£62.58")
+      mechanize.stub(:search => stub.as_null_object)
 
       mechanize.should_receive(:search).with(
         '#payments .bill .desc'
@@ -113,6 +113,7 @@ describe Squeegee::BSkyB do
     end
 
     it "raises PageMissingContent error when something is not correct" do
+      pending "not implemented missing content rescue"
       mechanize.should_receive(:search).and_raise(NoMethodError)
       expect{
         subject.new

data/spec/squeegee/orange_uk_spec.rb

@@ -106,11 +106,12 @@ describe Squeegee::OrangeUK do
           stub(:inner_text => "£25.50")
         ]
       )
-      orange = subject.new
-      orange.amount.should be_a Integer
-      orange.due_at.should be_a Date
-      orange.amount.should eql 2550
-      orange.due_at.should eql Date.parse('2012-05-15')
+      Squeegee::Account.should_receive(:new).
+        with(amount: 2550,
+             name: "Orange UK",
+             uid: "0a24082a818a019adfbe7d0b77d5448d",
+             due_at: Date.parse('2012-05-15'))
+      subject.new
     end
   end