fix a bunch of rubymine's style suggestions.

Author: mattraibert

src/fund.rb

@@ -86,7 +86,7 @@ def transactions
     transaction_dates.map { |date| row_for date }
   end
 
-  def price_per_share date
+  def price_per_share(date)
     contribution_for(date) / delta_units_for(date)
   end
 
@@ -113,7 +113,7 @@ def gvis
       function drawChart() {
         var data = new google.visualization.DataTable();
         data.addColumn('date', 'Date');
-        data.addColumn('number','#{@name}');
+        data.addColumn('number','#@name');
         data.addColumn('string', 'title1');
         data.addColumn('string', 'text1');
         data.addRows([#{rows}]);

src/interesting_statement_factory.rb

@@ -5,7 +5,7 @@
 require 'investments'
 
 class InterestingStatementFactory
-  def read_file filename, statement, interesting = InterestingStatementLines.new
+  def read_file(filename, statement, interesting = InterestingStatementLines.new)
     interesting.parse_date filename
     statement.items_following(/Ending Balance/) do |lines|
       interesting.parse_balances lines[0]
@@ -23,19 +23,19 @@ def read_file filename, statement, interesting = InterestingStatementLines.new
     interesting
   end
 
-  def extract_balances file, fund_data
+  def extract_balances(file, fund_data)
     file.funds.zip(file.balances) do |fund_name, balance|
       fund_data.fund(fund_name).write_balance(file.date, balance)
     end
   end
 
-  def extract_contributions file, fund_data
+  def extract_contributions(file, fund_data)
     file.funds.zip(file.contributions) do |fund_name, contribution|
       fund_data.fund(fund_name).write_contribution(file.date, contribution)
     end
   end
 
-  def extract_units file, fund_data
+  def extract_units(file, fund_data)
     file.units_funds.zip(file.units).each do |fund_name, units|
       fund_data.fund(fund_name).write_units(file.date, units)
     end
@@ -51,7 +51,7 @@ def read_statements
     end
   end
 
-  def build_investments interesting_statements
+  def build_investments(interesting_statements)
     fund_data = Investments.new
     interesting_statements.each do |file|
       extract_balances file, fund_data

src/interesting_statement_lines.rb

@@ -1,47 +1,47 @@
 require 'date'
 require 'bigdecimal'
 
-def convert_money_line money_line
-  money_line.split(" ").map {|money_string| money_string.gsub(/\$|,/,"").to_f }
+def convert_money_line(money_line)
+  money_line.split(" ").map { |money_string| money_string.gsub(/\$|,/, "").to_f }
 end
 
 class InterestingStatementLines
   attr_reader :balances, :funds, :date, :contributions, :units, :units_funds
 
-  def parse_funds funds_line
+  def parse_funds(funds_line)
     @funds = split_funds funds_line
     @funds << "TOTAL"
   end
 
-  def split_funds funds_line
+  def split_funds(funds_line)
     funds_line.strip
     funds_line.gsub!("iShares", "XXXiShares")
     funds_line.gsub!("Vanguard", "XXXVanguard")
-    funds_line.gsub!("SPDR","XXXSPDR")
-    funds_line.sub!("XXX","")
-    funds_line.split("XXX").map {|f| f.strip }
+    funds_line.gsub!("SPDR", "XXXSPDR")
+    funds_line.sub!("XXX", "")
+    funds_line.split("XXX").map { |f| f.strip }
   end
 
-  def parse_balances balances_line
+  def parse_balances(balances_line)
     @balances = convert_money_line balances_line
   end
 
-  def parse_date filename
-    @date = Date.parse(filename.sub(".txt",""))
+  def parse_date(filename)
+    @date = Date.parse(filename.sub(".txt", ""))
   end
 
-  def parse_contributions contributions_line
+  def parse_contributions(contributions_line)
     @contributions = convert_money_line contributions_line
     first = @contributions.size / 3
     last = 2 * first - 1
     @contributions = @contributions[first..last]
   end
 
-  def parse_units_funds line
-    @units_funds = split_funds line.gsub(/(^| )\d\d? /," ")
+  def parse_units_funds(line)
+    @units_funds = split_funds line.gsub(/(^| )\d\d? /, " ")
   end
 
-  def parse_units line
-    @units = line.split(" ").map {|unit| unit.to_f}
+  def parse_units(line)
+    @units = line.split(" ").map { |unit| unit.to_f }
   end
 end

src/investments.rb

@@ -12,7 +12,7 @@ def fund_names
   end
 
   def csv
-    csv = [(["Date"] + fund_names).join(', ')]
+    csv = [(%w(Date) + fund_names).join(', ')]
     csv += fund("TOTAL").dates.map do |date|
       ([date] + fund_names.map {|name| fund(name).balance_for(date) }).join(', ')
     end

src/units.rb

@@ -1,27 +1,27 @@
 class Units
   attr_reader :value
 
-  def initialize value
+  def initialize(value)
     @value = (value * 1000).to_i
   end
 
   def self.zero
     @zero ||= Units.new(0)
   end
 
-  def + addend
+  def +(addend)
     Units.new((value + addend.value) / 1000.0)
   end
 
-  def - subtrahend
+  def -(subtrahend)
     Units.new((value - subtrahend.value) / 1000.0)
   end
 
-  def == comparable
+  def ==(comparable)
     value == comparable.value
   end
 
-  def <=> comparable
+  def <=>(comparable)
     value <=> comparable.value
   end
 

src/util.rb

@@ -1,6 +1,6 @@
 class Array
-  def items_following test
-    index = self.index {|item| test === item }
+  def items_following(test)
+    index = self.index { |item| test === item }
     first = index + 1
     yield self[first..-1]
   end

test/fund_test.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'fund'
+require '../src/fund'
 require 'date'
 require 'active_support/core_ext'
 

test/interesting_statement_factory_test.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'interesting_statement_factory'
+require '../src/interesting_statement_factory'
 require 'grasshopper'
 
 class InterestingStatementFactoryTest < MiniTest::Unit::TestCase
@@ -32,7 +32,7 @@ def test_can_extract_the_right_lines_from_a_statement
   end
 
   def test_build_investments
-    fund_names = ["fund1", "fund2", "TOTAL"]
+    fund_names = %w(fund1 fund2 TOTAL)
     stmt_stub1 = StatementStub.new(fund_names, [99.2, 25.6, 100], [1.1, 2.2, 3.3], [], [], Date.new(2011, 2, 1))
     stmt_stub2 = StatementStub.new(fund_names, [12.2, 4.6, 100], [1.4, 2.4, 3.8], [], [], Date.new(2011, 2, 2))
 
@@ -56,7 +56,7 @@ def test_build_units
 class StatementStub
   attr_reader :funds, :balances, :date, :contributions, :units_funds, :units
 
-  def initialize funds, balances, contributions, units_funds, units, date
+  def initialize(funds, balances, contributions, units_funds, units, date)
     @funds = funds
     @balances = balances
     @date = date

test/interesting_statement_lines_test.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'interesting_statement_lines'
+require '../src/interesting_statement_lines'
 
 class InterestingStatementLinesTest < MiniTest::Unit::TestCase
   def test_parse_funds

test/investments_test.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'investments'
+require '../src/investments'
 require 'date'
 require 'active_support/core_ext'
 

test/units_test.rb

@@ -1,5 +1,5 @@
 require 'minitest/autorun'
-require 'units'
+require '../src/units'
 
 class UnitsTest < MiniTest::Unit::TestCase
   def test_units

test/util_test.rb

@@ -1,9 +1,9 @@
 require 'minitest/autorun'
-require 'util'
+require '../src/util'
 
 class UtilTest < MiniTest::Unit::TestCase
   def test_items_following
-    data = ["I", "want", "text", "that", "follows", "this", "THESE", "TWO", "NOT", "THIS"]
+    data = %w(I want text that follows this THESE TWO NOT THIS)
     result = []
     data.items_following(/this/) do |items|
       result << items[0]