bio-bigwig 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0585eab5aa345929c023943bafc6e27955be406f79379f056a9c45ec5d0b1933'
-  data.tar.gz: 7ffd6b9bcce8e12382fad0fcfe26914f69da45a3db66b022c82007e9820abd9f
+  metadata.gz: 9fc197bd8ffd3edcbecd7c74e632b9b44d180b30540194e083aa23245822322d
+  data.tar.gz: 52075f2eccf948d9017e4b94ba5b4380cd66729610f8fbabe1a16732649ec5f6
 SHA512:
-  metadata.gz: 776424b2382940cc1b31242d527b3e468bc5abbfa7a98009fb662389cc79cd2693e49d365423263435db06ab09811d66e5634ca8c07b546ebd46ef1bfb243141
-  data.tar.gz: d245494b5f68359d66fdb80250ab1de08dd9fc21db17f28436e90997b94ca6a5c90f72e9048bcbcf0a4906a274a2785074e57b896def130ab6ebccaa62943881
+  metadata.gz: 27b8667fabdc77ef6e66544af79ccf9c2ea67c7a661649f7add0590f739ed82b0cc57026a6ffd23c7923faa1d9154146213d51fd6f2b56d6f43681b7f6fb00fb
+  data.tar.gz: 7a580a0ef61afdbcdb6eb56507de67c6a91bc610558e36892fae6ebca7b049aaec749012488613e40890a88d25d3c7370e467cbf691b47dca389caf278a69294

data/ext/bio/bigwig/bigwigext.c

@@ -89,12 +89,12 @@ bigwig_allocate(VALUE klass)
   return TypedData_Wrap_Struct(klass, &BigWig_type, bw);
 }
 
-//Return 1 if there are any entries at all
+// Return 1 if there are any entries at all
 int hasEntries(bigWigFile_t *bw)
 {
   if (bw->hdr->indexOffset != 0)
     return 1; // No index, no entries pyBigWig issue #111
-  //if(bw->hdr->nBasesCovered > 0) return 1;  // Sometimes headers are broken
+  // if(bw->hdr->nBasesCovered > 0) return 1;  // Sometimes headers are broken
   return 0;
 }
 
@@ -108,7 +108,7 @@ bigwig_init(VALUE self, VALUE rb_fname, VALUE rb_mode)
   fname = StringValueCStr(rb_fname);
   mode = StringValueCStr(rb_mode);
 
-  //Open the local/remote file
+  // Open the local/remote file
   if (strchr(mode, 'w') != NULL || bwIsBigWig(fname, NULL))
   {
     bw = bwOpen(fname, NULL, mode);
@@ -130,7 +130,7 @@ bigwig_init(VALUE self, VALUE rb_fname, VALUE rb_mode)
       goto error;
   }
 
-  //Set the data pointer
+  // Set the data pointer
   DATA_PTR(self) = bw;
 
   rb_ivar_set(self, rb_intern("@last_tid"), INT2NUM(-1));
@@ -498,7 +498,7 @@ bw_get_intervals(VALUE self, VALUE rb_chrom, VALUE rb_start, VALUE rb_end)
 
   tid = bwGetTid(bw, chrom);
 
-  //Sanity check
+  // Sanity check
   if (endl == (unsigned long)-1 && tid != (uint32_t)-1)
     endl = bw->cl->len[tid];
 
@@ -522,7 +522,7 @@ bw_get_intervals(VALUE self, VALUE rb_chrom, VALUE rb_start, VALUE rb_end)
     return rb_ary_new2(0);
   }
 
-  //Get the intervals
+  // Get the intervals
   intervals = bwGetOverlappingIntervals(bw, chrom, start, end);
   if (!intervals)
   {
@@ -589,7 +589,7 @@ bb_get_entries(VALUE self, VALUE rb_chrom, VALUE rb_start, VALUE rb_end, VALUE r
 
   tid = bwGetTid(bw, chrom);
 
-  //Sanity check
+  // Sanity check
   if (endl == (unsigned long)-1 && tid != (uint32_t)-1)
     endl = bw->cl->len[tid];
   if (tid == (uint32_t)-1 || startl > end || endl > end)
@@ -641,7 +641,8 @@ bb_get_entries(VALUE self, VALUE rb_chrom, VALUE rb_start, VALUE rb_end, VALUE r
   return ret;
 
 error:
-  bbDestroyOverlappingEntries(o);
+  if (o)
+    bbDestroyOverlappingEntries(o);
   rb_raise(rb_eRuntimeError, "An error occurred while constructing the output!\n");
   return Qnil;
 }
@@ -696,11 +697,17 @@ bw_get_file_type(VALUE self)
 }
 
 static VALUE
-bw_is_bigwig_q(VALUE self)
+bw_is_file_type(VALUE self, int type_check)
 {
   bigWigFile_t *bw = get_bigWigFile(self);
 
-  if (bw->type == 0)
+  if (!bw)
+  {
+    rb_raise(rb_eRuntimeError, "The bigWig file handle is not opened!");
+    return Qnil;
+  }
+
+  if (bw->type == type_check)
   {
     return Qtrue;
   }
@@ -711,18 +718,15 @@ bw_is_bigwig_q(VALUE self)
 }
 
 static VALUE
-bw_is_bigbed_q(VALUE self)
+bw_is_bigwig_q(VALUE self)
 {
-  bigWigFile_t *bw = get_bigWigFile(self);
+  return bw_is_file_type(self, 0); // 0 = BigWig
+}
 
-  if (bw->type == 1)
-  {
-    return Qtrue;
-  }
-  else
-  {
-    return Qfalse;
-  }
+static VALUE
+bw_is_bigbed_q(VALUE self)
+{
+  return bw_is_file_type(self, 1); // 1 = BigBed
 }
 
 void Init_bigwigext()

data/lib/bio/bigwig/version.rb

@@ -2,6 +2,6 @@
 
 module Bio
   class BigWig
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bio-bigwig
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - kojix2