ecr_money 3.6.6 → 3.6.7

data/lib/money/formatter/currency_name.rb

@@ -0,0 +1,15 @@
+class Money::Formatter::CurrencyName
+  include Money::Formatter
+
+  def initialize(options)
+    @options = options
+  end
+
+  def class_format
+    "#{formatted} #{currency.to_s}" if rules[:with_currency]
+  end
+
+  def next_formatter
+    Money::Formatter::CurrencySymbol
+  end
+end

data/lib/money/formatter/currency_symbol.rb

@@ -0,0 +1,50 @@
+class Money::Formatter::CurrencySymbol
+  include Money::Formatter
+
+  def initialize(options)
+    @options = options
+    @symbol_value, @symbol_position = symbol_value(rules), symbol_position
+  end
+
+  def symbol_not_defined_by_user?
+    if rules.has_key? :symbol
+      return rules[:symbol] === false || rules[:symbol].nil? || rules[:symbol] == ''
+    end
+    true
+  end
+
+  def class_format
+    return formatted if symbol_not_defined_by_user?
+    add_symbol if @symbol_value && !@symbol_value.empty?
+  end
+
+  def next_formatter
+    Money::Formatter::DecimalMark
+  end
+
+  private
+  def add_symbol
+    place_symbol_in_correct_position
+  end
+
+  def place_symbol_in_correct_position
+    @symbol_position == :before ? "#{@symbol_value}#{formatted}" :
+      "#{formatted} #{@symbol_value}"
+  end
+
+  def symbol_value(rules)
+    return symbol_from_rule(rules[:symbol]) if rules.has_key?(:symbol)
+    return symbol
+  end
+
+  def symbol_from_rule(symbol_in_rule)
+    return symbol if symbol_in_rule === true
+    return symbol_in_rule if symbol_in_rule
+    return ''
+  end
+
+  def symbol_position
+    return :before if currency.symbol_first?
+    return :after
+  end
+end

data/lib/money/formatter/decimal_mark.rb

@@ -0,0 +1,38 @@
+class Money::Formatter::DecimalMark
+  include Money::Formatter
+
+  def initialize(options)
+    @options = options
+  end
+
+  def class_format
+    return formatted if rule_decimal_mark === false
+    return add_mark if cents > 0
+    return formatted
+  end
+
+  def next_formatter
+    Money::Formatter::DisplayFree
+  end
+
+  private
+  def mark_specified_by_user?
+    rule_decimal_mark && rule_decimal_mark != true
+  end
+
+  def rule_decimal_mark
+    return rules[:decimal_mark] if rules
+  end
+
+  def my_subunit
+    "#{subunit}".gsub!('.','')
+  end
+
+  def mark
+    (mark_specified_by_user? ? rule_decimal_mark : decimal_mark)
+  end
+
+  def add_mark
+    formatted.insert(formatted.index("#{unit}") + unit.length, mark)
+  end
+end

data/lib/money/formatter/display_free.rb

@@ -0,0 +1,19 @@
+class Money::Formatter::DisplayFree
+  include Money::Formatter
+
+  def initialize(options)
+    @options = options
+    @display_free = rules[:display_free] || false if rules
+  end
+
+  def class_format
+    return formatted if cents > 0
+    return @display_free if @display_free.respond_to?(:to_str)
+    return "free" if @display_free
+    return formatted
+  end
+
+  def next_formatter
+    Money::Formatter::ThousandSeparator
+  end
+end

data/lib/money/formatter/no_cents.rb

@@ -0,0 +1,18 @@
+class Money::Formatter::NoCents
+  include Money::Formatter
+
+  def initialize(options)
+    @options = options
+  end
+
+  def class_format
+    if rules
+      return unit if rules[:no_cents]
+    end
+    return formatted
+  end
+
+  def next_formatter
+    nil
+  end
+end

data/lib/money/formatter/thousand_separator.rb

@@ -0,0 +1,35 @@
+class Money::Formatter::ThousandSeparator
+  include Money::Formatter
+
+  def initialize(options)
+    @options = options
+  end
+
+  def class_format
+    return add_separator if rules.has_key? :thousands_separator
+    formatted
+  end
+
+  def next_formatter
+    Money::Formatter::NoCents
+  end
+
+  private
+  def separator
+    return thousands_separator if use_default_separator? 
+    return '' if separator_not_set?
+    return rules[:thousands_separator]
+  end
+
+  def add_separator
+    formatted.gsub(/(\d)(?=(?:\d{3})+(?:[^\d]|$))/, "\\1#{separator}")
+  end
+
+  def use_default_separator?
+    rules[:thousands_separator] === true
+  end
+
+  def separator_not_set?
+    rules[:thousands_separator] === false || rules[:thousands_separator].nil?
+  end
+end

data/lib/money/formatter.rb

@@ -0,0 +1,26 @@
+module Money::Formatter
+  def format
+    new_string = self.class_format
+    params = @options.dup.merge(:previous => self, :formatted_string => new_string)
+    return next_formatter.new(params).format if next_formatter
+    return new_string
+  end
+
+  def method_missing(method, *args, &block)
+    begin
+      @options[:previous].send(method, args, &block)
+    rescue
+      @options[:previous].send(method, &block)
+    end
+  end
+
+  def formatted
+    @options[:formatted_string]
+  end
+
+  def rules
+    @options[:rules] || {}
+  end
+end
+
+Dir.glob(File.dirname(__FILE__) + '/formatter/*', &method(:require))

data/lib/money/money.rb

@@ -22,6 +22,10 @@ class Money
 
   attr_reader :exact_number
 
+  attr_reader :unit
+
+  attr_reader :subunit
+
   # Class Methods
   class << self
     # Each Money object is associated to a bank object, which is responsible
@@ -392,6 +396,7 @@ class Money
     @cents = exact_number.round.to_i
     @currency = Currency.wrap(currency)
     @bank = bank
+    @unit, @subunit  = @exact_number.to_f.abs.divmod(@currency.subunit_to_unit).map{|o| o.to_s}
   end
 
   # Returns the value of the money in dollars,
@@ -841,6 +846,12 @@ class Money
   # @example
   #   s = Money.ca_dollar(570).format(:html => true, :with_currency => true)
   #   s #=>  "$5.70 <span class=\"currency\">CAD</span>"
+  def huh
+    rules = normalize_formatting_rules(rules)
+    puts rules.inspect
+    Money::Formatter::CurrencyName.new(:previous => self, :formatted_string => self.cents.to_s, :rules => rules).format
+  end
+
   def format(*rules)
     # support for old format parameters
     rules = normalize_formatting_rules(rules)
@@ -874,6 +885,9 @@ class Money
                 else
                   "#{self.to_s}"
                 end
+    if rules[:decimals] && !rules[:no_cents]
+      formatted = formatted + exact_number.to_f.to_s.split('.')[1]
+    end
 
     symbol_position =
       if rules.has_key?(:symbol_position)
@@ -888,9 +902,12 @@ class Money
       formatted = (symbol_position == :before ? "#{symbol_value}#{formatted}" : "#{formatted} #{symbol_value}")
     end
 
+    d_mark = decimal_mark
+
     if rules.has_key?(:decimal_mark) and rules[:decimal_mark] and
       rules[:decimal_mark] != decimal_mark
       formatted.sub!(decimal_mark, rules[:decimal_mark])
+      d_mark = rules[:decimal_mark]
     end
 
     thousands_separator_value = thousands_separator
@@ -904,7 +921,18 @@ class Money
     end
 
     # Apply thousands_separator
-    formatted.gsub!(/(\d)(?=(?:\d{3})+(?:[^\d]|$))/, "\\1#{thousands_separator_value}")
+    if (rules.has_key?(:decimal_mark) and rules[:decimal_mark]) or rules[:decimals]
+      decimals = rules[:decimals] || 2
+      integer, rational = formatted.split(d_mark)
+      rational, symbol = rational.split
+      integer.gsub!(/(\d)(?=(?:\d{3})+(?:[^\d]|$))/, "\\1#{thousands_separator_value}")
+      rational_slice = rational.slice(0, decimals) 
+      (decimals - rational_slice.length).times { rational_slice << '0' }
+      formatted = (integer + d_mark + rational_slice + " #{symbol}").strip
+    else
+      formatted.gsub!(/(\d)(?=(?:\d{3})+(?:[^\d]|$))/, "\\1#{thousands_separator_value}")
+    end
+
 
     if rules[:with_currency]
       formatted << " "
@@ -922,14 +950,14 @@ class Money
   # @example
   #   Money.ca_dollar(100).to_s #=> "1.00"
   def to_s
-    unit, subunit  = cents.abs.divmod(currency.subunit_to_unit).map{|o| o.to_s}
     if currency.decimal_places == 0
-      return "-#{unit}" if cents < 0
-      return unit
+      return "-#{@unit}" if exact_number.to_f < 0
+      return @unit
     end
-    subunit = (("0" * currency.decimal_places) + subunit)[(-1*currency.decimal_places)..-1]
-    return "-#{unit}#{decimal_mark}#{subunit}" if cents < 0
-    "#{unit}#{decimal_mark}#{subunit}"
+    subunit = (("0" * currency.decimal_places) + @subunit.to_i.to_s)[(-1*currency.decimal_places)..-1]
+
+    return "-#{@unit}#{decimal_mark}#{subunit}" if exact_number.to_f < 0
+    "#{@unit}#{decimal_mark}#{subunit}"
   end
 
   # Return the amount of money as a float. Floating points cannot guarantee

data/lib/money.rb

@@ -25,3 +25,5 @@ require 'i18n' rescue LoadError
 require 'money/currency'
 require 'money/money'
 require 'money/core_extensions'
+require 'money/formatter'
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 6
-  - 6
-  version: 3.6.6
+  - 7
+  version: 3.6.7
 platform: ruby
 authors: 
 - "Alberto Pe\xC3\xB1a"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +00:00
+date: 2011-02-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,6 +88,13 @@ files:
 - lib/money/bank/variable_exchange.rb
 - lib/money/core_extensions.rb
 - lib/money/currency.rb
+- lib/money/formatter/currency_name.rb
+- lib/money/formatter/currency_symbol.rb
+- lib/money/formatter/decimal_mark.rb
+- lib/money/formatter/display_free.rb
+- lib/money/formatter/no_cents.rb
+- lib/money/formatter/thousand_separator.rb
+- lib/money/formatter.rb
 - lib/money/money.rb
 - lib/money.rb
 - CHANGELOG.md