array_collapse 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 087a4d086fa6b69926231193c797f4f065405f2a
-  data.tar.gz: 555e9172fa51385cf739a5197e57956866991060
+  metadata.gz: bc8d9055f4a22a1da3a2ccd1a719be77bb10538a
+  data.tar.gz: 32674b90af90ebe7576d3a35ea87753446503aef
 SHA512:
-  metadata.gz: 3e58275c48bd89224d59d4486f2bea1dfbaa7eca69fff407c4e67fd2ea82aec70d9135b8a7b0bd39e56b3b701595181160ded9a99e1b561684fcc604f776143c
-  data.tar.gz: 8d02a79814e045348a0dac515fc2a653b8c0271e7f3f57771a727ec11c2f7084e089cdef4beddea41c0b46e06fc8a1f4ebb9ef93b9d8968c986843017a193854
+  metadata.gz: 51a5ffe149f4156d336966cfb94d6a15d65d10cfffc0d8ef994a6dc4ee1d45ceef97c16ed692ab90fe512285deed8a775dfbe30384c9fe7f8e2be177825ce4f3
+  data.tar.gz: b068a250dfab3841830bf01d7d536515329b7391e5182efd66da2333d683179e03163ad467e85feea8f56b06adeeb50a2218f6f7cbcc5eb104ff9eb320236a8c

data/ext/array_collapse/array_collapse.c

@@ -6,6 +6,10 @@ VALUE method_collapse(VALUE self, VALUE args) {
   long len = RARRAY_LEN(self);
   VALUE result = rb_ary_new2(len);
   VALUE stack = rb_ary_new();
+  st_table *seen_nodes;
+  st_data_t id;
+  seen_nodes = st_init_numtable();
+  st_insert(seen_nodes, (st_data_t)self, (st_data_t)Qtrue);
 
 #ifdef LOGGING
   FILE *f = fopen("clog.txt", "w");
@@ -23,8 +27,14 @@ VALUE method_collapse(VALUE self, VALUE args) {
     long i;
     for(i = 0; i < RARRAY_LEN(array); i++) {
       VALUE e = RARRAY_AREF(array,i);
+      id = (st_data_t)e;
+      if (st_lookup(seen_nodes, id, 0)) {
+        // drop recursive node
+        break;
+      }
       switch (TYPE(e)) {
         case T_ARRAY:
+          st_insert(seen_nodes, id, (st_data_t)Qtrue);
           rb_ary_push(stack, e);
           break;
         default:
@@ -38,7 +48,7 @@ VALUE method_collapse(VALUE self, VALUE args) {
       }
     }
   }
-
+  st_free_table(seen_nodes);
   return result;
 }
 

data/spec/array_collapse_spec.rb

@@ -1,21 +1,28 @@
 require 'array_collapse'
 
-RSpec.describe 'Array#collapse' do
-  it 'lives on Array' do
-    expect([1].respond_to?(:collapse)).to eq(true)
-  end
-  it 'applies a block to every element' do
-    expect([1, 2].collapse { |e| e * 2 }).to eq([2, 4])
-  end
-  it 'flattens a nested array' do
-    expect([1, [2]].collapse).to eq([1, 2])
-  end
-  it 'flattens and maps' do
-    expect([1, [2, [3]]].collapse { |e| e * 2 }).to eq([2, 4, 6])
-  end
-  it 'drops nils' do
-    expect([nil, 1, [2]].collapse).to eq([1, 2])
-    expect([1, nil, [2, [3, nil]]].collapse { |e| e.nil? ? e : e * 2 }).
-      to eq([2, 4, 6])
+RSpec.describe Array do
+  describe '#collapse' do
+    it 'lives on Array' do
+      expect([1].respond_to?(:collapse)).to eq(true)
+    end
+    it 'applies a block to every element' do
+      expect([1, 2].collapse { |e| e * 2 }).to eq([2, 4])
+    end
+    it 'flattens a nested array' do
+      expect([1, [2]].collapse).to eq([1, 2])
+    end
+    it 'flattens and maps' do
+      expect([1, [2, [3]]].collapse { |e| e * 2 }).to eq([2, 4, 6])
+    end
+    it 'drops nils' do
+      expect([nil, 1, [2]].collapse).to eq([1, 2])
+      expect([1, nil, [2, [3, nil]]].collapse { |e| e.nil? ? e : e * 2 }).
+        to eq([2, 4, 6])
+    end
+    it 'handles recursive arrays' do
+      rec_a = [1, [2, [3]]]
+      rec_a << rec_a
+      expect(rec_a.collapse).to eq([1, 2, 3])
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: array_collapse
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alex Moore-Niemi
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Array#collapse