ifin24-client 1.1.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.3.0

data/bin/ifin24

@@ -12,6 +12,7 @@ require 'optparse'
 require 'ostruct'
 
 require 'ifin24'
+include Ifin24
 
 class LoginError < StandardError
 end
@@ -30,15 +31,15 @@ class App
   def run
     parse_options!
 
-    config = Ifin24::Configuration.instance
+    config = Configuration.instance
     login = @options.login || config[:login]
     password = @options.password || config[:password]
 
     begin
-      client = Ifin24::Client.new(login, password)
+      client = Client.new(login, password)
       client.login or raise LoginError
 
-      console = Ifin24::Console.new(client)
+      console = Console.new(client)
       console.main_menu
     rescue LoginError
       puts "Zły login lub hasło."

data/lib/ifin24/client.rb

@@ -1,12 +1,13 @@
 require 'mechanize'
 
 class Ifin24::Client
+  include Ifin24::Models
 
-  LOGIN_FORM_URL = 'https://www.ifin24.pl/logowanie'
-  ENTRY_FORM_URL = 'https://www.ifin24.pl/zarzadzanie-finansami/transakcje/dodaj-wydatek'
+  LOGIN_FORM_URL = 'https://www.ifin24.pl/logowanie'.freeze
+  ENTRY_FORM_URL = 'https://www.ifin24.pl/zarzadzanie-finansami/transakcje/dodaj-wydatek'.freeze
   
-  LIST_URL = 'https://www.ifin24.pl/zarzadzanie-finansami/transakcje/lista'
-  LIMITS_URL = 'https://www.ifin24.pl/zarzadzanie-finansami/kontrola-wydatkow'
+  LIST_URL = 'https://www.ifin24.pl/zarzadzanie-finansami/transakcje/lista'.freeze
+  LIMITS_URL = 'https://www.ifin24.pl/zarzadzanie-finansami/kontrola-wydatkow'.freeze
 
   def initialize(login, password)
     @login, @password = login, password
@@ -54,7 +55,7 @@ class Ifin24::Client
       entry_elements = entry_row_element.search('td')
       next if entry_elements.size != 5
 
-      entry = Ifin24::Models::Entry.new
+      entry = Entry.new
 
       title_column = entry_elements[2]
       entry.title = title_column.children[0].text.strip
@@ -64,7 +65,7 @@ class Ifin24::Client
       entry.date = date_column.text.strip
 
       category_column = entry_elements[3]
-      sub_category = Ifin24::Models::Category.new(:name => category_column.children[0].text.strip)
+      sub_category = Category.new(:name => category_column.children[0].text.strip)
       entry.sub_category = sub_category
         
       entry.tags = category_column.search('span').text.strip
@@ -77,14 +78,20 @@ class Ifin24::Client
     return entries, total_pages
   end
 
-  def fetch_limits
-    page = agent.get(LIMITS_URL)
+  def fetch_limits(date = nil)
+    limits_url = "#{LIMITS_URL}"
+    if date
+      date = date.is_a?(Date) ? date.strftime("%Y-%m") : date
+      limits_url << "?data=#{date}"
+    end
+
+    page = agent.get(limits_url)
 
     limits = []
 
     table = page.search('table#expenses-tracking-limits tbody')
     table.search('tr').each do |tr|
-      limit = Ifin24::Models::Limit.new
+      limit = Limit.new
       columns = tr.search('td')
 
       name_column = columns[0]
@@ -132,14 +139,14 @@ class Ifin24::Client
       next if category_without_children
 
       category_name = category_elem.children[0].text.strip
-      category = Ifin24::Models::Category.new(:name => category_name)
+      category = Category.new(:name => category_name)
       children_element = category_elem.children[1].children.search('li')
 
       children_element.each do |child_elem|
         child_id = child_elem.attributes['rel'].value
         child_name = child_elem.text.strip
 
-        child = Ifin24::Models::Category.new(:id => child_id, :name => child_name)
+        child = Category.new(:id => child_id, :name => child_name)
         category.children << child
       end
 
@@ -159,7 +166,7 @@ class Ifin24::Client
       next if id == '0' # skip the prompt
       name = account_elem.text.strip
 
-      accounts << Ifin24::Models::Account.new(:id => id, :name => name)
+      accounts << Account.new(:id => id, :name => name)
     end
 
     return accounts

data/lib/ifin24/commands/add_expense.rb

@@ -1,34 +1,24 @@
 # encoding: utf-8
 
 class Ifin24::Commands::AddExpense < Ifin24::Commands::Base
+  include Ifin24::Models
 
   def execute
     entry = get_entry
 
-    catch :all_ok do
-      loop do
-        choose do |menu|
-          menu.index = :letter
-          menu.index_suffix = ") "
-
-          menu.choice("Nazwa: #{entry.title}") { get_title_for(entry) }
-          menu.choice("Data: #{entry.date}") { get_date_for(entry) }
-          menu.choice("Konto: #{entry.account.name}") { get_account_for(entry) }
-          menu.choice("Kategoria: #{entry.category_full_name}") { get_category_for(entry) }
-          menu.choice("Kwota: #{entry.amount}") { get_amount_for(entry) }
-          menu.choice("Tagi: #{entry.tags}") { get_tags_for(entry) }
-          menu.choice("Opis: #{entry.note}") { get_note_for(entry) }
-
-          menu.choice("Powrót do głównego menu") do
-            throw :all_ok
-          end
-
-          menu.choice("Wyślij") do
-            puts "Wysyłanie danych..."
-            @client.send_entry(entry)
-            throw :all_ok
-          end
-        end
+    console_menu('Powrót do głównego menu') do |menu|
+      menu.choice("Nazwa: #{entry.title}") { get_title_for(entry) }
+      menu.choice("Data: #{entry.date}") { get_date_for(entry) }
+      menu.choice("Konto: #{entry.account.name}") { get_account_for(entry) }
+      menu.choice("Kategoria: #{entry.category_full_name}") { get_category_for(entry) }
+      menu.choice("Kwota: #{entry.amount}") { get_amount_for(entry) }
+      menu.choice("Tagi: #{entry.tags}") { get_tags_for(entry) }
+      menu.choice("Opis: #{entry.note}") { get_note_for(entry) }
+
+      menu.choice("Wyślij") do
+        puts "Wysyłanie danych..."
+        @client.send_entry(entry)
+        throw :exit
       end
     end
   end
@@ -36,7 +26,7 @@ class Ifin24::Commands::AddExpense < Ifin24::Commands::Base
   private
 
   def get_entry
-    entry = Ifin24::Models::Entry.new
+    entry = Entry.new
 
     get_title_for(entry)
     get_date_for(entry)
@@ -54,9 +44,24 @@ class Ifin24::Commands::AddExpense < Ifin24::Commands::Base
   end
 
   def get_date_for(entry)
-    curr_date = Date.today
-    entry.date = ask('Data: ') do |q|
-      q.default = curr_date
+    choose do |menu|
+      menu.prompt = 'Data: '
+
+      today = Date.today
+      menu.choice(today) do
+        entry.date = today
+      end
+
+      yesterday = today - 1
+      menu.choice(yesterday) do
+        entry.date = yesterday
+      end
+
+      menu.choice('Inna data') do
+        entry.date = ask('Data: ') do |q|
+          q.default = Date.today
+        end
+      end
     end
   end
 

data/lib/ifin24/commands/base.rb

@@ -1,4 +1,5 @@
 class Ifin24::Commands::Base
+  include Ifin24::Helpers::Menu
   include Ifin24::Helpers::Printer
 
   def initialize(client)

data/lib/ifin24/commands/list_entries.rb

@@ -7,28 +7,19 @@ class Ifin24::Commands::ListEntries < Ifin24::Commands::Base
     list, pages = @client.fetch_entries(current_page)
     print_entries(list)
 
-    catch :exit do
-      loop do
-        choose do |menu|
-          menu.index = :letter
-          menu.index_suffix = ") "
+    console_menu('Powrót do głównego menu') do |menu|
+      menu.choice("Poprzednia strona") do
+        current_page -= 1 if current_page > 1
 
-          menu.choice("Poprzednia strona") do
-            current_page -= 1 if current_page > 1
-
-            list, pages = @client.fetch_entries(current_page)
-            print_entries(list)
-          end
-
-          menu.choice("Następna strona") do
-            current_page += 1 if current_page < pages
+        list, pages = @client.fetch_entries(current_page)
+        print_entries(list)
+      end
 
-            list, pages = @client.fetch_entries(current_page)
-            print_entries(list)
-          end
+      menu.choice("Następna strona") do
+        current_page += 1 if current_page < pages
 
-          menu.choice("Powrót do głównego menu") { throw :exit }
-        end
+        list, pages = @client.fetch_entries(current_page)
+        print_entries(list)
       end
     end
   end

data/lib/ifin24/commands/list_limits.rb

@@ -1,21 +1,52 @@
 # encoding: utf-8
 
 class Ifin24::Commands::ListLimits < Ifin24::Commands::Base
-  LIMIT_BAR_SIZE = 50
+  LIMIT_BAR_SIZE = 64
 
   def execute
-    limits = @client.fetch_limits
+    curr_date = Date.today
+    limits = @client.fetch_limits(curr_date)
+    print_report(limits)
+
+    console_menu('Powrót do głównego menu') do |menu|
+      menu.choice("Poprzedni miesiąc") do
+        curr_date = curr_date << 1
+
+        limits = @client.fetch_limits(curr_date)
+        print_report(limits)
+      end
+
+      menu.choice("Następny miesiąc") do
+        curr_date = curr_date >> 1
+
+        limits = @client.fetch_limits(curr_date)
+        print_report(limits)
+      end
+    end
+  end
+
+  private
+
+  def print_report(limits)
+    widest_name_size = limits.inject(0) { |max, limit| limit.name.size >= max ? limit.name.size : max }
+
     limits.each do |limit|
-      widest_name_size = limits.map { |l| l.name }.inject(0) { |max, name| name.size >= max ? name.size : max }
       name = limit.name.ljust(widest_name_size)
       limit_bar = make_limit_bar(limit.amount, limit.max)
-      amount = "#{limit.amount}zł z #{limit.max}zł"
+      amount_summary = "#{limit.amount}zł z #{limit.max}zł"
 
-      puts "#{name} #{limit_bar} #{amount}"
+      puts "#{name} #{limit_bar} #{amount_summary}"
     end
-  end
 
-  private
+    total_amount = limits.inject(0) { |sum, limit| sum += limit.amount }
+    total_max = limits.inject(0) { |sum, limit| sum += limit.max }
+
+    total_name = 'Podsumowanie:'.ljust(widest_name_size)
+    total_limit_bar = make_limit_bar(total_amount, total_max)
+    total_amount_summary = "#{total_amount}zł z #{total_max}zł"
+
+    puts "\n#{total_name} #{total_limit_bar} #{total_amount_summary}"
+  end
 
   def make_limit_bar(amount, max)
     limit_exceeded = amount >= max

data/lib/ifin24/console.rb

@@ -1,44 +1,38 @@
 # encoding: utf-8
 
 class Ifin24::Console
+  include Ifin24
+  include Helpers::Menu
 
   def initialize(client)
     @client = client
   end
 
   def main_menu
-    catch :exit do
-      loop do
-        choose do |menu|
-          menu.header = "Menu główne"
-          menu.index = :letter
-          menu.index_suffix = ") "
-
-          menu.choice("Dodaj wydatek") { add_expense }
-          menu.choice("Lista kont") { list_accounts }
-          menu.choice("Lista ostatnich transakcji") { list_entries }
-          menu.choice("Kontrola wydatków") { list_limits }
-
-          menu.choice("Koniec") { throw :exit }
-        end
-      end
+    console_menu('Koniec') do |menu|
+      menu.header = "Menu główne"
+
+      menu.choice("Dodaj wydatek") { add_expense }
+      menu.choice("Lista kont") { list_accounts }
+      menu.choice("Lista ostatnich transakcji") { list_entries }
+      menu.choice("Kontrola wydatków") { list_limits }
     end
   end
 
   def add_expense
-    execute_command(Ifin24::Commands::AddExpense)
+    execute_command(Commands::AddExpense)
   end
 
   def list_accounts
-    execute_command(Ifin24::Commands::ListAccounts)
+    execute_command(Commands::ListAccounts)
   end
 
   def list_entries
-    execute_command(Ifin24::Commands::ListEntries)
+    execute_command(Commands::ListEntries)
   end
 
   def list_limits
-    execute_command(Ifin24::Commands::ListLimits)
+    execute_command(Commands::ListLimits)
   end
 
   private

data/lib/ifin24/helpers.rb

@@ -1,5 +1,6 @@
 module Ifin24::Helpers
 
+  autoload :Menu, 'ifin24/helpers/menu'
   autoload :Printer, 'ifin24/helpers/printer'
 
 end

data/lib/ifin24/helpers/menu.rb

@@ -0,0 +1,20 @@
+module Ifin24::Helpers
+  module Menu
+
+    def console_menu(exit_prompt)
+      catch :exit do
+        loop do
+          choose do |menu|
+            menu.index = :letter
+            menu.index_suffix = ") "
+
+            yield menu
+
+            menu.choice(exit_prompt) { throw :exit }
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/ifin24/models/base.rb

@@ -1,11 +1,9 @@
 class Ifin24::Models::Base
 
   def initialize(attributes = {})
-
     attributes.each do |key, value|
       send(:"#{key}=", value)
     end
-    
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ifin24-client
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 27
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 3
   - 0
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - "\xC5\x81ukasz Bandzarewicz"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2010-10-22 00:00:00 +02:00
 default_executable: ifin24
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,6 +120,7 @@ files:
 - lib/ifin24/configuration.rb
 - lib/ifin24/console.rb
 - lib/ifin24/helpers.rb
+- lib/ifin24/helpers/menu.rb
 - lib/ifin24/helpers/printer.rb
 - lib/ifin24/models.rb
 - lib/ifin24/models/account.rb