v2d 0.0.1 → 0.0.2

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('v2d', '0.0.1') do |p|
+Echoe.new('v2d', '0.0.2') do |p|
   p.description    = "2D Vector implemented as Ruby extension"
   p.url            = "http://github.com/cypok/v2d"
   p.author         = "Vladimir Parfinenko"

data/ext/v2d.c

@@ -5,8 +5,13 @@ VALUE cV2D;
 
 ID ix, iy;
 
-/* DEFINITIONS */
+/* DEFINITION */
 
+typedef struct _V2D {
+    double x, y;
+} V2D;
+
+VALUE v2d_alloc(VALUE klass);
 /*VALUE v2d_initialize(VALUE self);*/
 VALUE v2d_initialize_with_x_and_y(VALUE self, VALUE x, VALUE y);
 VALUE v2d_square_brackets(VALUE klass, VALUE x, VALUE y);
@@ -24,6 +29,7 @@ VALUE v2d_equals(VALUE self, VALUE other);
 void Init_v2d() {
     cV2D = rb_define_class("V2D", rb_cObject);
 
+    rb_define_alloc_func(cV2D, v2d_alloc);
     /*rb_define_method(cV2D, "initialize", v2d_initialize, 0);*/
     rb_define_method(cV2D, "initialize", v2d_initialize_with_x_and_y, 2);
     rb_define_singleton_method(cV2D, "[]", v2d_square_brackets, 2);
@@ -44,13 +50,20 @@ void Init_v2d() {
 
 /* IMPLEMENTATION */
 
+VALUE v2d_alloc(VALUE klass) {
+    V2D *v = (V2D *)xmalloc(sizeof(V2D));
+    return Data_Wrap_Struct(klass, NULL, xfree, v);
+}
+
 /*VALUE v2d_initialize(VALUE self) {*/
     /*return self;*/
 /*}*/
 
 VALUE v2d_initialize_with_x_and_y(VALUE self, VALUE x, VALUE y) {
-    rb_ivar_set(self, ix, x);
-    rb_ivar_set(self, iy, y);
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    v->x = NUM2DBL(x);
+    v->y = NUM2DBL(y);
     return self;
 }
 
@@ -60,77 +73,84 @@ VALUE v2d_square_brackets(VALUE klass, VALUE x, VALUE y) {
 }
 
 VALUE v2d_get_x(VALUE self) {
-    return rb_ivar_get(self, ix);
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    return rb_float_new(v->x);
 }
 
 VALUE v2d_get_y(VALUE self) {
-    return rb_ivar_get(self, iy);
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    return rb_float_new(v->y);
 }
 
 VALUE v2d_set_x(VALUE self, VALUE x) {
-    return rb_ivar_set(self, ix, x);
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    v->x = NUM2DBL(x);
+    return x;
 }
 
 VALUE v2d_set_y(VALUE self, VALUE y) {
-    return rb_ivar_set(self, iy, y);
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    v->y = NUM2DBL(y);
+    return y;
 }
 
 VALUE v2d_add(VALUE self, VALUE other) {
-    double left_x = NUM2DBL(rb_ivar_get(self, ix));
-    double left_y = NUM2DBL(rb_ivar_get(self, iy));
-    double right_x = NUM2DBL(rb_ivar_get(other, ix));
-    double right_y = NUM2DBL(rb_ivar_get(other, iy));
-    VALUE args[] = {
-        rb_float_new(left_x + right_x),
-        rb_float_new(left_y + right_y)
-    };
-    return rb_class_new_instance(2, args, cV2D);
+    V2D *v1, *v2;
+    Data_Get_Struct(self, V2D, v1);
+    Data_Get_Struct(other, V2D, v2);
+
+    V2D *res = (V2D*)xmalloc(sizeof(V2D));
+    res->x = v1->x + v2->x;
+    res->y = v1->y + v2->y;
+    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
 }
 
 VALUE v2d_sub(VALUE self, VALUE other) {
-    double left_x = NUM2DBL(rb_ivar_get(self, ix));
-    double left_y = NUM2DBL(rb_ivar_get(self, iy));
-    double right_x = NUM2DBL(rb_ivar_get(other, ix));
-    double right_y = NUM2DBL(rb_ivar_get(other, iy));
-    VALUE args[] = {
-        rb_float_new(left_x - right_x),
-        rb_float_new(left_y - right_y)
-    };
-    return rb_class_new_instance(2, args, cV2D);
+    V2D *v1, *v2;
+    Data_Get_Struct(self, V2D, v1);
+    Data_Get_Struct(other, V2D, v2);
+
+    V2D *res = (V2D*)xmalloc(sizeof(V2D));
+    res->x = v1->x - v2->x;
+    res->y = v1->y - v2->y;
+    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
 }
 
 VALUE v2d_mul(VALUE self, VALUE multiplier) {
-    double left_x = NUM2DBL(rb_ivar_get(self, ix));
-    double left_y = NUM2DBL(rb_ivar_get(self, iy));
-    double right  = NUM2DBL(multiplier);
-    VALUE args[] = {
-        rb_float_new(left_x * right),
-        rb_float_new(left_y * right)
-    };
-    return rb_class_new_instance(2, args, cV2D);
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    double m = NUM2DBL(multiplier);
+
+    V2D *res = (V2D*)xmalloc(sizeof(V2D));
+    res->x = v->x * m;
+    res->y = v->y * m;
+    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
 }
 
 VALUE v2d_div(VALUE self, VALUE divisor) {
-    double left_x = NUM2DBL(rb_ivar_get(self, ix));
-    double left_y = NUM2DBL(rb_ivar_get(self, iy));
-    double right  = NUM2DBL(divisor);
-    VALUE args[] = {
-        rb_float_new(left_x / right),
-        rb_float_new(left_y / right)
-    };
-    return rb_class_new_instance(2, args, cV2D);
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    double d = NUM2DBL(divisor);
+
+    V2D *res = (V2D*)xmalloc(sizeof(V2D));
+    res->x = v->x / d;
+    res->y = v->y / d;
+    return Data_Wrap_Struct(cV2D, NULL, xfree, res);
 }
 
 VALUE v2d_abs(VALUE self) {
-    double x = NUM2DBL(rb_ivar_get(self, ix));
-    double y = NUM2DBL(rb_ivar_get(self, iy));
-    return rb_float_new(sqrt(x*x + y*y));
+    V2D *v;
+    Data_Get_Struct(self, V2D, v);
+    return rb_float_new(sqrt(v->x*v->x + v->y*v->y));
 }
 
 VALUE v2d_equals(VALUE self, VALUE other) {
-    double left_x = NUM2DBL(rb_ivar_get(self, ix));
-    double left_y = NUM2DBL(rb_ivar_get(self, iy));
-    double right_x = NUM2DBL(rb_ivar_get(other, ix));
-    double right_y = NUM2DBL(rb_ivar_get(other, iy));
-    return (left_x == right_x && left_y == right_y) ? Qtrue : Qfalse;
+    V2D *v1, *v2;
+    Data_Get_Struct(self, V2D, v1);
+    Data_Get_Struct(other, V2D, v2);
+    return (v1->x == v2->x && v1->y == v2->y) ? Qtrue : Qfalse;
 }

data/spec/v2d_spec.rb

@@ -3,12 +3,10 @@ require 'v2d'
 describe V2D do
   it "#new should create with arguments" do
     v = V2D.new(1,2)
-    v.x.should == 1
   end
 
   it "#[] should create with arguments" do
     v = V2D[1, 2]
-    v.x.should == 1
   end
 
   it "#x should return first coordinate" do
@@ -25,7 +23,7 @@ describe V2D do
     v.should == V2D[3, 2]
   end
 
-  it "#y should set second coordinate" do
+  it "#y= should set second coordinate" do
     v = V2D[1, 2]
     v.y = 3
     v.should == V2D[1, 3]
@@ -59,6 +57,12 @@ describe V2D do
       it "should return new vector as quotient" do
         (@v1/2).should == V2D[0.5, 1]
       end
+
+      it "should return new vector as quotient even with zero divisor" do
+        r = @v1/0
+        r.x.should be_infinite
+        r.y.should be_infinite
+      end
     end
 
     describe "#abs" do

data/v2d.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{v2d}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Parfinenko"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: v2d
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Vladimir Parfinenko

metadata.gz.sig

@@ -1 +1,3 @@
-K]��"HYQݤ���0�[���\^�r9�d
+^J�owd��5*��GY��+����m�Y���h/�LR��r���f
+՟��J"�A�����i*�U��n�W����ʠN�.
+-#�