ba 0.0.7 → 0.0.8

data/README.md

@@ -19,23 +19,11 @@ And then execute:
 
     $ bundle
 
-Or install it yourself as:
-
-    $ gem install ba
-
 ## Usage
 
 ### Checkout the different commands by running
     $ ba
 
-### Install
-    Run the following command if you don't have any config/config.yml file in your local path
-
-    $ ba install
-
-### Modify the ~/config/config.yml with your bank info
-    $ vi ~/config/config.yml
-
 ### Run the command for your bank
     $ ba [BANK] balance
 
@@ -49,7 +37,6 @@ Or install it yourself as:
 
 ### Adding new Scripts
     - Follow the bank.sample.rb example
-    - Add the bank to the config/config.sample.yml
     - Push it!
 
 ## CONTRIBUTORS

data/lib/ba/banks/bancolombia.rb

@@ -1,24 +1,40 @@
 module Ba::Banks
   class Bancolombia < Thor
 
-    desc "balance", "Returns the Bancolombia account balance"
-    def balance
-      ##Login username page
-      agent.get("https://bancolombia.olb.todo1.com/olb/Init")
-      userLoginPage = agent.get("https://bancolombia.olb.todo1.com/olb/Login")
-      userLoginPage.form_with(:name => "authenticationForm") do |f|
-        f.userId = ask("Username: ")
-      end.click_button
-
-      ##Redirect to password page
-      passwordPage = agent.get("https://bancolombia.olb.todo1.com/olb/GetUserProfile")
-      passwordPageHtml = passwordPage.body
+    desc "balance optional: [username] [password]", "Returns the Bancolombia account balance"
+    def balance(username = nil , password = nil)
+      go_to_root
+      process_username_authentication(username)
+      process_password_authentication(password)
+      page = go_to_authentication_path
+      process_questions(page) if need_to_answer_banks_questions?(page)
+      balancePage = agent.get("/olb/BeginInitializeActionFromCM?from=pageTabs")
+      balance = balancePage.search(".contentTotalNegrita").last.children.text
+      puts "Your actual balance is: $#{balance}"
+    end
+
+    private
+
+    def go_to_authentication_path
+      agent.get("https://bancolombia.olb.todo1.com/olb/Authentication")
+    end
+
+    def need_to_answer_banks_questions?(page)
+      !get_question_form(page).nil?
+    end
+
+    def get_question_form(page)
+      @question_form ||= page.form_with(name: "checkChallQuestForm")
+    end
+
+    def process_password_authentication(password)
+      passwordPageHtml = get_password_path.body
       ##Insert \r for correct regex on password scripts
       passwordPageHtml.gsub!(/document.getElementById/, "\r\n\t document.getElementById")
       enc_password = ""
-      password = ask("Password: ") { |q| q.echo = "*" }
+      password = password || ask("Password: ")
       password.to_s.split('').each do |n|
-        passwordPageHtml.match(/\'td_#{n}\'\)\.addEventListener\(\'click\'\,\sfunction\(\)\{\S*\(\"(.*)\"\)\;\}/);
+        passwordPageHtml.match(/\'td_#{n}\'\)\.addEventListener\(\'click\'\,\sfunction\(\)\{\S*\(\"(.*)\"\)\;\}/)
         enc_password << $1
       end
 
@@ -27,31 +43,53 @@ module Ba::Banks
       secretHiddenField = $1
 
       ##Post encripted password and secret hidden field
-      passwordPage.form_with(:name => "authenticationForm") do |f|
+      form = get_password_path.form_with(name: "authenticationForm") do |f|
         f.userId = "0"
         f.password = enc_password
         f.add_field!(secretHiddenField, value = enc_password)
-      end.click_button
+      end
 
-      ##Get Balance
-      page = agent.get("https://bancolombia.olb.todo1.com/olb/Authentication")
-      process_questions(page) if page.forms_with(name: "checkChallQuestForm").any?
-      balancePage = agent.get("/olb/BeginInitializeActionFromCM?from=pageTabs")
-      balance = balancePage.search(".contentTotalNegrita").last.children.text
-      puts "Your actual balance is: $#{balance}"
+      form.click_button
     end
 
-    private
+    def process_username_authentication(username)
+      form = get_login_path.form_with(name: "authenticationForm") do |f|
+        f.userId = username || ask("Username: ")
+      end
 
+      form.click_button
+    end
+ 
+    def go_to_root
+      agent.get "https://bancolombia.olb.todo1.com/olb/Init"
+    end
+
+    def get_login_path
+      agent.get "https://bancolombia.olb.todo1.com/olb/Login"
+    end
+
+    def get_password_path
+      @password_path ||= agent.get("https://bancolombia.olb.todo1.com/olb/GetUserProfile")
+    end
+  
     def process_questions(page)
       puts "The answer for the following questions will not be saved"
-      answer_one = ask(page.search("#luserAnswer1").text.strip + " ") { |q| q.echo = "*" }
-      answer_two = ask(page.search("#luserAnswer2").text.strip + " ") { |q| q.echo = "*" }
-      form = page.form_with(name: "checkChallQuestForm") do |f|
-        f.userAnswer1 = answer_one
-        f.userAnswer2 = answer_two
+      first_question = first_question(page)
+      second_question = second_question(page)
+
+      form = get_question_form(page) do |f|
+        f.userAnswer1 = first_question
+        f.userAnswer2 = secound_question
       end
-      form.submit(form.buttons_with(name: "accept_btn").first)
+      agent.submit(form)
+    end
+
+    def first_question(page)
+      ask(page.search("#luserAnswer1").text.strip)
+    end
+
+    def second_question(page)
+      ask(page.search("#luserAnswer2").text.strip)
     end
 
     def agent

data/lib/ba/banks/bank.sample.rb

@@ -5,11 +5,5 @@
 #     def balance
 #       puts "Not yet Implemented"
 #     end
-# 
-#     private
-# 
-#     def config
-#       @config ||= YAML::load(File.open('config/config.yml'))["BANK"]
-#     end
 #   end
 # end

data/lib/ba/cli.rb

@@ -1,5 +1,4 @@
 require 'thor'
-require 'yaml'
 require 'mechanize'
 require 'highline/import'
 require 'ba/banks'

data/lib/ba/version.rb

@@ -1,3 +1,3 @@
 module Ba
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/lib/ba/cli_spec.rb

@@ -17,7 +17,7 @@ describe Ba::CLI do
 
   describe "#version" do
     it "returns the current application version" do
-      STDOUT.should_receive(:puts).with ("0.0.6")
+      STDOUT.should_receive(:puts).with ("0.0.8")
       subject.version
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ba
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors: