dec_number 0.1.6 → 0.2.0

data/README

@@ -1,20 +1,14 @@
-WARNING! Pre-release, not finished.
-
 DecNumber is a wrapper around ICU-decNumber (Copyright (c) IBM Corporation)
 that subclasses Numeric.
 
 The main benefit over BigDecimal and other things is that each instance carries it's own context around with it in a DecContext object. The context is what dertimines the precision and rounding behavior.
 
-An example of this in use might be a gas station where there are pump prices with 10ths of cents and store prices with only cents. The register sets a precision of 2 rounding up, and it can use the prices reported from the pump without incident.
-
-Another example is a database with Decimal columns with differing precision and where you can't accept using Floats.
-
-Another use case would be bitcoin, where you need an arbitrary precision, mixed with dollars.
+An example is a database with Decimal columns with differing precision and where you can't accept using Floats.
 
 I don't expect to instantiate these object directly, instead I will bind them to SQL Decimal in an ORM, or using some sort of Money class.
 
 If you'd like to help out, please write tests!
 
-Currently they are not very good citizens of the Numeric family and try to give you back DecNumber objects whenever used. This is intentional. It might be a better idea in a Money class than returned from a db, however.
+Currently they try to give you back DecNumber objects whenever used, including as the rval with another Numeric.
 
 TODO: Most of the methods should accept a context as an argument. Currently the context is attached to the receiver.

data/dec_number.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s| # -*-ruby-*-
   s.name        = "dec_number"
-  s.version     = '0.1.6'
+  s.version     = '0.2.0'
   s.authors     = ["Paris Sinclair"]
   s.email       = ["paris@rubypanther.com"]
   s.summary     = "ICU-decNumber wrapper for arbitrary precision math with context objects"

data/ext/dec_number/dec_number.c

@@ -1,5 +1,6 @@
 #include "ruby.h"
 #define DECNUMDIGITS 34
+#define DECSUBSET 0
 #include "decNumber.h"
 #include <stdio.h>
 
@@ -54,6 +55,9 @@ VALUE cDecContext;
   result = rb_funcall( cDecNumber, rb_intern("new"), 0 );		\
   Data_Get_Struct(result,  decNumber, result_ptr)
 
+/*****
+      DecContext
+ *****/
 static VALUE con_alloc(VALUE klass) {
   decContext self_struct, *self_ptr;
   VALUE self;
@@ -62,21 +66,108 @@ static VALUE con_alloc(VALUE klass) {
   return self;
 }
 
+static VALUE con_set_digits(VALUE self, VALUE new_value) {
+  decContext *self_ptr;
+  Data_Get_Struct(self, decContext, self_ptr);
+  self_ptr->digits = FIX2INT(new_value);
+  return INT2FIX(self_ptr->digits);
+}
+
 static VALUE con_initialize(int argc, VALUE *argv, VALUE self) {
   decContext *self_ptr;
-  VALUE from;
-  rb_scan_args( argc, argv, "01", &from );
+  VALUE digits;
+  rb_scan_args( argc, argv, "01", &digits );
 
   Data_Get_Struct(self, decContext, self_ptr);
   decContextDefault(self_ptr, DEC_INIT_BASE);
   self_ptr->traps = 0; // no traps TODO: error handling
-  self_ptr->digits = DECNUMDIGITS;
+
+  if ( NIL_P(digits) ) {
+    self_ptr->digits = DECNUMDIGITS;
+  } else {
+    con_set_digits(self,digits);
+  }
 
   // TODO: Handle arguments
 
   return self;
 }
 
+static VALUE con_get_rounding(VALUE self) {
+  decContext *self_ptr;
+  enum rounding round;
+  VALUE name_sym, rounding_names;
+  Data_Get_Struct(self, decContext, self_ptr);
+  round = decContextGetRounding(self_ptr);
+  rounding_names = rb_const_get( cDecContext, rb_intern("ROUNDING_NAMES") );
+  name_sym = rb_hash_aref( rounding_names, INT2FIX(round) );
+  return name_sym;
+}
+
+static VALUE con_set_rounding(VALUE self, VALUE new_rounding) {
+  decContext *self_ptr;
+  enum rounding round;
+  VALUE rounding_numbers;
+
+  Data_Get_Struct(self, decContext, self_ptr);
+
+  if ( SYMBOL_P( new_rounding ) ) {
+    rounding_numbers = rb_const_get( cDecContext, rb_intern("ROUNDING_NUMBERS") );
+    new_rounding = rb_hash_aref( rounding_numbers, new_rounding );
+  }
+  if( ! FIXNUM_P( new_rounding ) ) {
+    rb_raise(rb_eTypeError, "wrong argument type");
+  }
+
+  round = FIX2INT(new_rounding);
+  decContextSetRounding(self_ptr,round);
+  return new_rounding;
+}
+
+static VALUE con_get_digits(VALUE self) {
+  decContext *self_ptr;
+  int digits;
+  VALUE r_fixnum;
+
+  Data_Get_Struct(self, decContext, self_ptr);
+  digits = self_ptr->digits;
+  r_fixnum = INT2FIX(digits);
+
+  return r_fixnum;
+}
+
+static VALUE con_get_emin(VALUE self) {
+  decContext *self_ptr;
+  Data_Get_Struct(self, decContext, self_ptr);
+  return INT2FIX(self_ptr->emin);
+}
+
+static VALUE con_set_emin(VALUE self, VALUE new_value) {
+  decContext *self_ptr;
+  Data_Get_Struct(self, decContext, self_ptr);
+  self_ptr->emin = FIX2INT(new_value);
+  return INT2FIX(self_ptr->emin);
+}
+
+static VALUE con_get_emax(VALUE self) {
+  decContext *self_ptr;
+  Data_Get_Struct(self, decContext, self_ptr);
+  return INT2FIX(self_ptr->emax);
+}
+
+static VALUE con_set_emax(VALUE self, VALUE new_value) {
+  decContext *self_ptr;
+  Data_Get_Struct(self, decContext, self_ptr);
+  self_ptr->emax = FIX2INT(new_value);
+  return INT2FIX(self_ptr->emax);
+}
+// /DecContext
+
+
+/*****
+      DecNumber
+ *****/
+
 static VALUE num_alloc(VALUE klass) {
   decNumber self_struct, *self_ptr;
   decContext context;
@@ -92,10 +183,10 @@ static VALUE num_alloc(VALUE klass) {
 static VALUE num_initialize(int argc, VALUE *argv, VALUE self) {
   decNumber *self_ptr;
   decContext *context_ptr;
-  VALUE from, r_str, context;
+  VALUE from, r_str, context, digits;
 
-  rb_scan_args( argc, argv, "01", &from );
-  context = rb_funcall( cDecContext, rb_intern("new"), 0 );
+  rb_scan_args( argc, argv, "02", &from, &digits );
+  context = rb_funcall( cDecContext, rb_intern("new"), 1, digits );
   rb_iv_set( self, "@context", context );
   Data_Get_Struct(context, decContext, context_ptr);
   Data_Get_Struct(self, decNumber, self_ptr);
@@ -447,12 +538,69 @@ static VALUE num_power(VALUE self, VALUE rval) {
   return result;
 }
 
+void con_setup_rounding_constant( VALUE rounding_names, VALUE rounding_numbers, const char *sym_name, const char *const_name, enum rounding round ) {
+  VALUE round_num, round_sym;
+  round_num = INT2FIX(round);
+  round_sym = ID2SYM(rb_intern(sym_name));
+  rb_define_const( cDecContext, const_name, round_num );
+  rb_hash_aset( rounding_names, round_num, round_sym );
+  rb_hash_aset( rounding_numbers, round_sym, round_num );
+  return;
+}
+
 void Init_dec_number() {
+  /****
+       DecContext
+   ****/
+
+  // *** constants and enums
+  enum rounding round;
+  VALUE rounding_names, rounding_numbers, round_default_num;
   cDecContext = rb_define_class("DecContext", rb_cObject);
+  rounding_names = rb_hash_new();
+  rb_define_const( cDecContext, "ROUNDING_NAMES", rounding_names );
+  rounding_numbers = rb_hash_new();
+  rb_define_const( cDecContext, "ROUNDING_NUMBERS", rounding_numbers );
+  con_setup_rounding_constant( rounding_names, rounding_numbers,
+			       "ceil",      "ROUND_CEIL",   DEC_ROUND_CEILING );
+  con_setup_rounding_constant( rounding_names, rounding_numbers,
+			       "down",      "ROUND_DOWN",      DEC_ROUND_DOWN );
+  con_setup_rounding_constant( rounding_names, rounding_numbers,
+			       "floor",     "ROUND_FLOOR",     DEC_ROUND_FLOOR );
+  con_setup_rounding_constant( rounding_names, rounding_numbers,
+			       "half_down", "ROUND_HALF_DOWN", DEC_ROUND_HALF_DOWN );
+  con_setup_rounding_constant( rounding_names, rounding_numbers,
+			       "half_even", "ROUND_HALF_EVEN", DEC_ROUND_HALF_EVEN );
+  con_setup_rounding_constant( rounding_names, rounding_numbers,
+			       "half_up",   "ROUND_HALF_UP",   DEC_ROUND_HALF_UP );
+  con_setup_rounding_constant( rounding_names, rounding_numbers,
+			       "up",        "ROUND_UP",        DEC_ROUND_UP );
+  con_setup_rounding_constant( rounding_names, rounding_numbers,
+			       "up05",      "ROUND_05UP",      DEC_ROUND_05UP );
+  // DEC_ROUND_DEFAULT is a macro with an extra ; so be careful
+  round = DEC_ROUND_DEFAULT;
+  round_default_num = INT2FIX(round);
+  rb_hash_aset( rounding_numbers, ID2SYM(rb_intern("default")), round_default_num );
+  rb_define_const( cDecContext, "ROUND_DEFAULT", round_default_num );
+
+  // *** methods
   rb_define_alloc_func(cDecContext, con_alloc);
   rb_define_method(cDecContext, "initialize", con_initialize, -1);
+  rb_define_method(cDecContext, "rounding", con_get_rounding, 0);
+  rb_define_method(cDecContext, "rounding=", con_set_rounding, 1);
+  rb_define_method(cDecContext, "digits", con_get_digits, 0);
+  rb_define_method(cDecContext, "digits=", con_set_digits, 1);
+  rb_define_method(cDecContext, "emin", con_get_emin, 0);
+  rb_define_method(cDecContext, "emin=", con_set_emin, 1);
+  rb_define_method(cDecContext, "emax", con_get_emax, 0);
+  rb_define_method(cDecContext, "emax=", con_set_emax, 1);
+
+  /****
+       DecNumber
+   ****/
   cDecNumber = rb_define_class("DecNumber", rb_cNumeric );
   rb_define_alloc_func(cDecNumber, num_alloc);
+  rb_define_attr(  cDecNumber, "context", 1, 1);
   rb_define_method(cDecNumber, "initialize", num_initialize, -1);
   rb_define_method(cDecNumber, "to_s", num_to_s, 0);
   rb_define_method(cDecNumber, "to_i", num_to_i, 0);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dec_number
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000 Z
+date: 2011-11-21 00:00:00.000000000 Z
 dependencies: []
 description: Wrapper for ICU-decNumber library
 email: