squeegee 0.1.0 → 0.1.1

data/lib/squeegee/account.rb

@@ -2,18 +2,15 @@ module Squeegee
   # Account
   #
   # Generic account with validations on specific parameters
-  class Account
-    attr_accessor :name, :amount, :due_at, :paid, :uid
+  class Account < Base
+    attr_accessor :name, :amount, :due_at, :paid, :uid, :number
     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)
+      @keys = %w(name uid amount due_at)
+      params(args)
+
+      args.each do |attribute, value|
+        send(:"#{attribute}=", value)
       end
-      @name = args[:name]
-      @amount = args[:amount]
-      @due_at = args[:due_at]
-      @paid = args[:paid]
-      @uid = args[:uid]
     end
   end
 end

data/lib/squeegee/base.rb

@@ -18,6 +18,7 @@ module Squeegee
       @agent.log = Logger.new 'squeegee.log'
       @agent.user_agent = "Mozilla/5.0 (Squeegee)"
       @agent.default_encoding = "utf8"
+      @agent.agent.http.ssl_version = :SSLv3
       @agent.get(url)
     end
   end

data/lib/squeegee/british_gas.rb

@@ -5,14 +5,14 @@ module Squeegee
   #
   class BritishGas < Base
     HOST = "https://www.britishgas.co.uk"
-    LOGIN_URL = "#{HOST}/Your_Account/Account_Details/"
-    ACCOUNTS_URL = "#{HOST}/AccountSummary/getAccountDetailsForSummary/"
-    ACCOUNT_URL = "#{HOST}/Your_Account/Account_Transaction/"
+    LOGIN_URL = "#{HOST}/Login/Login-Verify/"
+    ACCOUNTS_URL = "#{HOST}/apps/britishgas/components/GetAccountDetails/GET.servlet"
+    ACCOUNT_URL = "#{HOST}/YourAccount/PaymentHistory"
 
     attr_accessor :accounts
 
     FIELD = {
-      email: "userName",
+      email: "emailAddress",
       password: "password"
     }
 
@@ -32,35 +32,34 @@ module Squeegee
 
     def authenticate!
       page = get(LOGIN_URL)
-      form = page.form_with(action: '/Online_User/Account_Summary/')
+      form = page.form_with(name: 'userlogin')
 
       form[FIELD[:email]] = @email
       form[FIELD[:password]] = @password
-
       page = @agent.submit(form, form.buttons.first)
-      #raise Error::Unauthorized, "Account details could be wrong" if page.at('.error')
+      raise Error::Unauthorized, "Account details could be wrong" if page.at('.error')
     end
 
     def get_accounts
       page = get(ACCOUNTS_URL)
-      accounts = JSON.parse(page.body)
+      accounts = JSON.parse(page.body).first
       #account_ids = page.search("table#tableSelectAccount td > strong").collect {|row| row.content.to_i}
-      accounts.each do |account|
-        response = get_account(account['accountReferenceNumber'])
+      accounts['activeProducts'].each do |account|
+        response = get_account(account['accountNumber'])
         @accounts << Squeegee::Account.new(response)
       end
     end
 
     def get_account(id)
       response = {}
-      url = "#{Squeegee::BritishGas::ACCOUNT_URL}?accountnumber=#{id}"
+      url = "#{Squeegee::BritishGas::ACCOUNT_URL}?accountNumber=#{id}"
       page = get(url)
-      table = page.search("div#divHistoryTable table tbody")
+      table = page.search("table.table-history 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]
+            tds[0].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,
@@ -78,7 +77,8 @@ module Squeegee
         end
       end
       response[:uid] = Digest::MD5.hexdigest("BritishGas#{id}")
-      response[:name] = "BritishGas (#{id.to_s[-4..-1]})"
+      response[:name] = "British Gas (#{id.to_s[-4..-1]})"
+      response[:number] = id.to_i
       response
     end
 

data/lib/squeegee/bskyb.rb

@@ -67,6 +67,7 @@ module Squeegee
         amount: amount,
         due_at: due_at,
         paid: paid,
+        number: account_id,
         uid: uid
       )
 

data/lib/squeegee/orange_uk.rb

@@ -18,6 +18,11 @@ module Squeegee
       @keys = %w(username password)
       @accounts = []
 
+      @agent = Mechanize.new
+
+      # NOTE: Orange websites redirects though insecure servers.
+      @agent.agent.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
       params(args)
       @username = args.delete(:username)
       @password = args.delete(:password)
@@ -37,12 +42,13 @@ module Squeegee
 
       page = @agent.submit(form, form.buttons.first)
 
-      if page.uri == LOGIN_POST_URL && !page.search('.error').nil?
+      if page.uri.to_s == LOGIN_POST_URL && !page.search('.error').nil?
         raise Squeegee::Error::Unauthenticated
       end
     end
 
     def get_statement
+
       page = get(BILLS_URL)
 
       last_bill = page.search("#eBillMainContent .eBillStandardTable").first
@@ -51,12 +57,14 @@ module Squeegee
 
       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
+      number = page.at("#accountSelectorLilp")['value'].to_i
       #@paid = balance || balance[0].to_i >= 0
-      uid = Digest::MD5.hexdigest("OrangeUK#{@username}")
+      uid = Digest::MD5.hexdigest("OrangeUK#{number}")
 
       @accounts << Squeegee::Account.new(due_at: due_at,
-                                         name: "Orange UK",
+                                         name: "Orange UK (#{number.to_s[-4..-1]})",
                                          uid: uid,
+                                         number: number,
                                          amount: amount)
     end
   end

data/lib/squeegee/version.rb

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

data/spec/squeegee/account_spec.rb

@@ -17,27 +17,27 @@ describe Squeegee::Account do
     attr.delete(:name)
     expect{
       subject.new(attr)
-    }.to raise_error(ArgumentError, "missing attribute `name`")
+    }.to raise_error(Squeegee::Error::InvalidParams, "missing parameters `name` ")
   end
 
   it "validates presence of amount" do
     attr.delete(:amount)
     expect{
       subject.new(attr)
-    }.to raise_error(ArgumentError, "missing attribute `amount`")
+    }.to raise_error(Squeegee::Error::InvalidParams, "missing parameters `amount` ")
   end
 
   it "validates presence of uid" do
     attr.delete(:uid)
     expect{
       subject.new(attr)
-    }.to raise_error(ArgumentError, "missing attribute `uid`")
+    }.to raise_error(Squeegee::Error::InvalidParams, "missing parameters `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`")
+    }.to raise_error(Squeegee::Error::InvalidParams, "missing parameters `due_at` ")
   end
 end

data/spec/squeegee/base_spec.rb

@@ -31,6 +31,11 @@ describe Squeegee::Base do
       Logger.should_receive(:new).with('squeegee.log').and_return(logger)
       mechanize.should_receive(:log=).with(logger)
       mechanize.should_receive(:get).with("http://google.com")
+      agent = stub(:agent)
+      mechanize.should_receive(:agent).and_return(agent)
+      http = stub(:http)
+      agent.should_receive(:http).and_return(http)
+      http.should_receive(:ssl_version=).with(:SSLv3)
 
       subject.get("http://google.com")
     end

data/spec/squeegee/british_gas_spec.rb

@@ -6,11 +6,9 @@ describe Squeegee::BritishGas do
   let(:form) {mock('form')}
   let(:button) {mock('button')}
   let(:json) {[
-            {
-              'accountReferenceNumber' => 850046061940,
-              'Amount' => 70.00,
-              'Paymenttype' => ""
-            }
+            'activeProducts' => [
+              {'accountNumber' => 850046061940}
+            ]
           ].to_json}
 
   subject {Squeegee::BritishGas}
@@ -77,25 +75,26 @@ describe Squeegee::BritishGas do
         #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)
+        mechanize.stub(:at)
       end
       it "navigates to login URL" do
         mechanize.should_receive(:get).with(
-          "https://www.britishgas.co.uk/Your_Account/Account_Details/"
+          "https://www.britishgas.co.uk/Login/Login-Verify/"
         ).and_return(mechanize)
 
         subject.new({})
       end
 
-      it "finds by form action" do
+      it "finds by form name" do
         mechanize.should_receive(:form_with).with(
-          action: '/Online_User/Account_Summary/'
+          :name => 'userlogin'
         ).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('emailAddress', 'test@test.com')
         form.should_receive(:[]=).with('password', 'superduper')
 
         subject.new(email: "test@test.com", password: "superduper")
@@ -137,7 +136,7 @@ describe Squeegee::BritishGas do
 
       it "finds paid bill" do
         mechanize.should_receive(:search).
-          with("div#divHistoryTable table tbody").
+          with("table.table-history tbody").
           and_return(node)
         node.should_receive(:search).
           with('tr').
@@ -156,7 +155,7 @@ describe Squeegee::BritishGas do
 
       it "finds debt" do
         mechanize.should_receive(:search).
-          with("div#divHistoryTable table tbody").
+          with("table.table-history tbody").
           and_return(node)
         node.should_receive(:search).
           with('tr').

data/spec/squeegee/orange_uk_spec.rb

@@ -106,10 +106,12 @@ describe Squeegee::OrangeUK do
           stub(:inner_text => "£25.50")
         ]
       )
+      mechanize.stub(:at).with('#accountSelectorLilp').and_return({'value' => '1234'})
       Squeegee::Account.should_receive(:new).
         with(amount: 2550,
-             name: "Orange UK",
-             uid: "0a24082a818a019adfbe7d0b77d5448d",
+             name: "Orange UK (1234)",
+             uid: "06a0a787d8267fcb1a2887dc7baf4de1",
+             :number => 1234,
              due_at: Date.parse('2012-05-15'))
       subject.new
     end

data/squeegee.gemspec

@@ -2,12 +2,12 @@
 require File.expand_path('../lib/squeegee/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Kyle Welsby", "Chuck Hardy"]
-  gem.email         = ["app@britishruby.com"]
+  gem.authors       = ["Kyle Welsby"]
+  gem.email         = ["kyle@mekyle.com"]
   gem.description   = %q{A collection of strategies to get bill dates and amounts
   from a growing range of accounts.}
   gem.summary       = %q{Returns bill dates and amounts form utility accounts.}
-  gem.homepage      = "http://github.com/britruby/squeegee"
+  gem.homepage      = "http://github.com/kylewelsby/squeegee"
 
   gem.add_runtime_dependency 'mechanize'
   gem.add_runtime_dependency 'logger'

metadata

@@ -1,20 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: squeegee
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
 - Kyle Welsby
-- Chuck Hardy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-21 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &70160111404560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160111404560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logger
-  requirement: &70160111403560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70160111403560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gem-release
-  requirement: &70160111402880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160111402880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70160111402040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160111402040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70160111401320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160111401320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70160111400600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,11 +101,16 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70160111400600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! "A collection of strategies to get bill dates and amounts\n  from a
   growing range of accounts."
 email:
-- app@britishruby.com
+- kyle@mekyle.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -109,7 +138,7 @@ files:
 - spec/squeegee/bskyb_spec.rb
 - spec/squeegee/orange_uk_spec.rb
 - squeegee.gemspec
-homepage: http://github.com/britruby/squeegee
+homepage: http://github.com/kylewelsby/squeegee
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -129,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Returns bill dates and amounts form utility accounts.