bitfield 0.9.3 → 0.9.4

data/Rakefile

@@ -4,7 +4,7 @@ spec = Gem::Specification.new do |spec|
   spec.name              = 'bitfield'
   spec.platform          = Gem::Platform::RUBY
   spec.extensions        = FileList["ext/**/extconf.rb"]
-  spec.version           = '0.9.3'
+  spec.version           = '0.9.4'
   spec.date              = Time.now.strftime "%Y-%m-%d"
   spec.author            = 'Fabian Becker'
   spec.email             = 'halfdan@xnorfz.de'

data/ext/bitfield/bitfield.cpp

@@ -205,7 +205,7 @@ static VALUE bf_bit_get(VALUE self, VALUE position)
                     if(i < 0 || i >= ptr->data.size()) {
                         rb_ary_push(range_ary, Qnil);
                     } else {
-                        rb_ary_push(range_ary, INT2NUM(ptr->data[i]));
+                        rb_ary_push(range_ary, LONG2NUM(ptr->data[i]));
                     }
                 }
         }
@@ -219,7 +219,7 @@ static VALUE bf_bit_get(VALUE self, VALUE position)
         if(pos < 0 || pos >= ptr->data.size()) {
             return Qnil;
         } else {
-            return INT2NUM(ptr->data[pos]);
+            return LONG2NUM(ptr->data[pos]);
         }
     }
 }
@@ -242,6 +242,52 @@ static VALUE bf_to_s(VALUE self)
     return rb_str_new2(buffer.c_str());
 }
 
+
+/*
+ * call-seq:
+ *   each {|item| block } -> ary
+ *   each -> an_enumerator
+ *
+ * Calls block once for each element in +self+, passing that
+ * element as a parameter. If no block is given, an
+ * enumerator is returned instead.
+ */
+static VALUE bf_each(VALUE self)
+{
+    long i, size;
+    BitField *ptr;
+    Data_Get_Struct(self, BitField, ptr);
+    size = ptr->data.size();
+
+    RETURN_ENUMERATOR(self, 0, 0);
+    for (i=0; i<size; i++) {
+        rb_yield(bf_bit_get(self, LONG2NUM(i)));
+    }
+    return self;
+}
+
+/*
+ * call-seq:
+ *   each_index {|item| block } -> ary
+ *   each_index -> an_enumerator
+ *
+ * Same as BitField#each, but passes the index of the element
+ * instead of the element itself.
+ */
+static VALUE bf_each_index(VALUE self)
+{
+    long i, size;
+    BitField *ptr;
+    Data_Get_Struct(self, BitField, ptr);
+    size = ptr->data.size();
+
+    RETURN_ENUMERATOR(self, 0, 0);
+    for (i=0; i<size; i++) {
+        rb_yield(LONG2NUM(i));
+    }
+    return self;
+}
+
 static VALUE bf_initialize_clone(VALUE self, VALUE orig)
 {
     BitField *ptr, *ptr2;
@@ -275,8 +321,8 @@ extern "C" {
     void Init_bitfield()
     {
         rb_cBitField = rb_define_class("BitField", rb_cObject);
-
         rb_define_alloc_func(rb_cBitField, BitField_allocate);
+        rb_include_module(rb_cBitField, rb_mEnumerable);
 
         /* We do the same for .clone and .dup */
         rb_define_method(
@@ -335,6 +381,18 @@ extern "C" {
             RUBY_METHOD_FUNC(bf_count),
             0
         );
+        rb_define_method(
+            rb_cBitField,
+            "each",
+            RUBY_METHOD_FUNC(bf_each),
+            0
+        );
+        rb_define_method(
+            rb_cBitField,
+            "each_index",
+            RUBY_METHOD_FUNC(bf_each_index),
+            0
+        );
     }
 }
 

data/spec/bitfield_spec.rb

@@ -26,6 +26,14 @@ describe BitField do
     BitField.new(10).should respond_to(:count)
   end
 
+  it "has an each method" do
+    BitField.new(10).should respond_to(:each)
+  end
+
+  it "has an each_index method" do
+    BitField.new(10).should respond_to(:each_index)
+  end
+
   it "has a [] method" do
     BitField.new(10).should respond_to(:[])
   end
@@ -37,6 +45,10 @@ describe BitField do
   it "has an initialize_clone method" do
     BitField.new(10).should respond_to(:initialize_clone)
   end
+
+  it "is an Enumerable" do
+    BitField.include? Enumerable
+  end
 end
 
 describe BitField, "#[]" do
@@ -122,3 +134,17 @@ describe BitField, "#count" do
     obj.count.should == 5
   end
 end
+
+describe BitField, "#each" do
+  it "returns an enumerator if no block is given" do
+    obj = BitField.new 10
+    obj.each.is_a? Enumerator
+  end
+end
+
+describe BitField, "#each_index" do
+  it "returns an enumerator if no block is given" do
+    obj = BitField.new 10
+    obj.each_index.is_a? Enumerator
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitfield
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-29 00:00:00.000000000Z
+date: 2011-10-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &83808550 !ruby/object:Gem::Requirement
+  requirement: &81756290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *83808550
+  version_requirements: *81756290
 description: ! "This C extension wraps boost::dynamic_bitset and makes it available\n
   \                        as a native Ruby class. The bitset behaves like an an array
   allowing\n                         only values of 0 and 1."