nio 0.2.4 → 0.2.5

data/History.txt

@@ -1,3 +1,9 @@
+== 0.2.5
+
+* New features
+  - Constructor Fmt() and property setter [].
+  - More flexibility for missing parameters for mode, prec.
+
 == 0.2.4 2009-08-05
 
 * New features

data/README.txt

@@ -305,6 +305,18 @@ we would use, for example:
   puts 0.1234567.nio_write(fmt.prec(5))  -> 0.12346
   puts 0.1234567.nio_write(fmt)              -> 0.123
 
+We can use the constructor Fmt() instead of Fmt.default, and pass options to it:
+
+  fmt = Fmt(:ndig=>3, :dec_sep=>',')
+  fmt = Fmt(:ndig=>3) { |f|  f.sep! ',' }
+
+And the [] operator can be used not only to access predefined formats, but also to
+set individual properties easily, either applied to Fmt or to a format object:
+
+  fmt = Fmt[:dec_sep=>','].prec(3)[:all_digits=>true]
+
+Note that Fmt[...] is simply equivalent to Fmt(...).
+
 ===Exact and aproximate values
 
 Float and BigDecimal are approximate in the sense that

data/lib/nio/fmt.rb

@@ -428,7 +428,7 @@ module Nio
     end
     
     @@default_rounding_mode = :even
-    def initialize()
+    def initialize(options=nil)
       
       @dec_sep = '.'
       @grp_sep = ','
@@ -468,6 +468,7 @@ module Nio
       @nan_txt = 'NAN'
       @inf_txt = 'Infinity'
       
+      set! options if options
       yield self if block_given?
     end
     
@@ -524,8 +525,8 @@ module Nio
     #      (significance precision) is like :fix but using significant digits
     #   [<tt>:sci</tt>]
     #      (scientific) is the exponential form 1.234E2
-    # - <tt>precision</tt> (number of digits or :exact, only used for output)
-    #   [<tt>exact</tt>]
+    # - <tt>precision</tt> (optional), number of digits or :exact, only used for output
+    #   [<tt>:exact</tt>]
     #      means that as many digits as necessary to unambiguosly define the
     #      value are used; this is the default.
     #
@@ -556,22 +557,24 @@ module Nio
     #   zeros of exact types or non-signficative digits of inexact types.
     # - <tt>:nonsignficative_digits</tt> assigns a character to display
     #   insignificant digits, # by default
-    def mode(mode,precision=nil,options={})
+    def mode(mode, precision=nil, options={})
       dup.mode!(mode,precision,options)
     end
     # This is the mutator version of #mode().
-    def mode!(mode,precision=nil,options={})
+    def mode!(mode, precision=nil, options={})
+      precision, options = nil, precision if options.empty? && precision.is_a?(Hash)
       set! options.merge(:mode=>mode, :ndig=>precision)
     end
     
     # Defines the formatting mode like #mode() but using a different
     # order of the first two parameters parameters, which is useful
     # to change the precision only. Refer to #mode().
-    def prec(precision,mode=nil, options={})
+    def prec(precision, mode=nil, options={})
       dup.prec! precision, mode, options
     end
     # This is the mutator version of #prec().
-    def prec!(precision,mode=:gen, options={})
+    def prec!(precision, mode=nil, options={})
+      mode, options = nil, mode if options.empty? && mode.is_a?(Hash)
       set! options.merge(:mode=>mode, :ndig=>precision)
     end
     
@@ -1058,13 +1061,18 @@ module Nio
       return num
     end
     
+    def [](options)
+      dup.set! options
+    end
+    
     
     @@fmts = {
       :def=>Fmt.new.freeze
     }
     # Returns the current default format.
-    def self.default
+    def self.default(options=nil)
       d = self[:def]
+      d = d[options] if options
       if block_given?
         d = d.dup
         yield d
@@ -1079,10 +1087,15 @@ module Nio
     def self.[]=(tag,fmt_def)
       @@fmts[tag.to_sym]=fmt_def.freeze
     end
-    # Retrieves a named format from the repository.
+    # Retrieves a named format from the repository or constructs a new
+    # format with the passed options.
     def self.[](tag)
+    if tag.is_a?(Hash)
+      Fmt(tag)
+    else
       @@fmts[tag.to_sym]
     end
+    end
     
     protected
     
@@ -1105,15 +1118,15 @@ module Nio
      @@valid_properties ||= instance_variables.collect{|v| v[1..-1].to_sym}
      
 
+     aliased_properties = {}
      properties.each do |k,v|
        al = ALIAS_PROPERTIES[k]
-       if al
-         properties[al] = v
-         properties.delete k
-       elsif !@@valid_properties.include?(k)
+       if al.nil? && !@@valid_properties.include?(k)
          raise InvalidOption, "Invalid option: #{k}"
        end
+       aliased_properties[al || k] = v
      end
+     properties = aliased_properties
 
      
      if properties[:grp_sep].nil? && !properties[:dec_sep].nil? && properties[:dec_sep]!=@dec_sep && properties[:dec_sep]==@grp_sep
@@ -1267,6 +1280,10 @@ module Nio
   
   module_function
   
+  def Fmt(options=nil)
+    Fmt.default(options)
+  end
+  
   def nio_float_to_bigdecimal(x,prec) # :nodoc:
     if prec.nil?
       x = Fmt.convert(x,BigDecimal,:approx)

data/lib/nio/version.rb

@@ -2,7 +2,7 @@ module Nio #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/helper.rb

@@ -1,3 +1,4 @@
+$: << "." unless $:.include?(".") # for Ruby 1.9.2
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/nio'
 require File.dirname(__FILE__) + '/../lib/nio/sugar'

data/test/test_fmt.rb

@@ -7,7 +7,7 @@
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 
-require File.dirname(__FILE__) + '/helper.rb'
+require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 require 'test/unit'
 require 'flt/bigdecimal'
 include Nio
@@ -73,6 +73,27 @@ class TestFmt < Test::Unit::TestCase
       assert_equal "123456789.25",(Rational(123456789)+Rational(1,4)).nio_write
     end
   
+    def test_optional_mode_prec_parameters
+      x = 0.1
+      assert_equal '0.1000000000', x.nio_write(Fmt.prec(10,  :all_digits=>true))
+      assert_equal '1.000000000E-1', x.nio_write(Fmt.prec(10,  :sci, :all_digits=>true))
+      assert_equal '0.1', x.nio_write(Fmt.prec(10,  :all_digits=>false))
+      assert_equal '0.10000', x.nio_write(Fmt.prec(5).mode(:gen,  :all_digits=>true))
+      assert_equal '1.0000E-1', x.nio_write(Fmt.prec(5).mode(:sci,  :all_digits=>true))
+    end
+  
+    def test_fmt_constructor
+      x = 0.1
+      assert_equal '0.10000000000000001', x.nio_write(Fmt[:all_digits=>true])
+      assert_equal '0.1', x.nio_write(Fmt(:all_digits=>false))
+      assert_equal '0.10000000000000001', x.nio_write(Fmt(:all_digits=>true))
+      assert_equal '0.1', x.nio_write(Fmt.prec(5)[:all_digits=>false])
+      assert_equal '0.10000', x.nio_write(Fmt.prec(5)[:all_digits=>true])
+      assert_equal '0,1', x.nio_write(Fmt[:comma])
+      assert_equal '0.10000000000000001', x.nio_write(Fmt[:all_digits=>true])
+      assert_equal '0,10000000000000001', x.nio_write(Fmt[:comma][:all_digits=>true])
+    end
+  
     def test_basic_fmt_float
 
       assert_equal 2,Float::RADIX
@@ -367,7 +388,7 @@ class TestFmt < Test::Unit::TestCase
       assert_equal Fmt.convert(x_d,Float,:exact), x_f
       assert_equal Fmt.convert(x_d,Float,:approx), x_f
 
-      x_d = BigDecimal('355')/226
+      x_d = BigDecimal('355').div(226,20)
       x_f = Float(355)/226
       assert_equal Fmt.convert(x_d,Float,:exact), x_f
       assert_equal Fmt.convert(x_d,Float,:approx), x_f

data/test/test_repdec.rb

@@ -7,7 +7,7 @@
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
 
-#require File.dirname(__FILE__) + '/helper.rb'
+require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 require 'test/unit'
 include Nio
 require 'yaml'

data/test/test_rtnlzr.rb

@@ -1,6 +1,6 @@
 
 
-require File.dirname(__FILE__) + '/helper.rb'
+require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 include Nio
 require 'yaml'
 require 'flt'
@@ -12,8 +12,12 @@ require 'bigdecimal/math'
 
 require 'bigdecimal/math'
 
-module BgMth
-  extend BigMath
+if RUBY_VERSION>="1.9.2"
+  BgMth = BigMath
+else
+  module BgMth
+    extend BigMath
+  end
 end
 
 

data/test/test_tools.rb

@@ -1,5 +1,5 @@
 
-#require File.dirname(__FILE__) + '/helper.rb'
+require File.expand_path(File.join(File.dirname(__FILE__),'helper.rb'))
 require 'test/unit'
 
 require 'nio/repdec'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: nio
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Javier Goizueta
@@ -9,29 +14,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-05 00:00:00 +02:00
+date: 2010-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: flt
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 1
         version: 2.1.1
-    version: 
+  type: :development
+  version_requirements: *id002
 description: Numeric input/output
 email: javier@goizueta.info
 executables: []
@@ -97,21 +112,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: nio
-rubygems_version: 1.3.3
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Numeric input/output