fsfifo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1873cb49b135d37167ccf99dee689680af2db32e
-  data.tar.gz: 7f444b3acba163fcaf2a559c715531829bc36cc6
+  metadata.gz: b9dc3e26674507e180ce5280b2aa6c31c1db4e14
+  data.tar.gz: 45da0f1bae15b7929970b23d836ace16c2a1913c
 SHA512:
-  metadata.gz: c392f2a447179efda3885bef1599ba26826890fc5a326f000bfec3b46f96f3c0126312d23a78610e5562b8c3a3c4d08cccdee3b7f38ad10148609d67a0770cdb
-  data.tar.gz: f05d3151607942b4fceb4638e91200813140182ac67d8976fa672d3defe7ed0ec84d6b45e45fc1a88f8a1edfddb3e6c2f3dff6ae2e04d29735f6ed62a5e48109
+  metadata.gz: bd1a6df5f7946b5e8f6008212c980f22cefbb23909688a5b8458c5e0edd21ea2561d773eca5c650bd601b0fe5301f86ad70d36b724e602fd696b61289dd1e4b0
+  data.tar.gz: ffcd0b4dd87d295e8e2ced48d7743eec75d862765b1f4bac3dffb6f50afbdf57e4a5e171d095f53c3721d097a59ed89e3c9e98a649877c26248e031955648b64

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/fsfifo.gemspec

@@ -0,0 +1,59 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "fsfifo"
+  s.version = "0.0.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["YAMAMOTO, Masayuki"]
+  s.date = "2013-07-31"
+  s.description = "Fixed size FIFO, LIFO, and Array."
+  s.email = "martin.route66.blues+github@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "LICENSE.txt",
+    "Rakefile",
+    "ReadMe.md",
+    "VERSION",
+    "lib/fsfifo.rb",
+    "test/helper.rb",
+    "test/test_fsfifo.rb"
+  ]
+  s.homepage = "http://github.com/mephistobooks/fsfifo"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "2.0.6"
+  s.summary = "Fixed size FIFO."
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov-rcov>, [">= 0"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.12"])
+      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov-rcov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.12"])
+    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov-rcov>, [">= 0"])
+  end
+end
+

data/lib/fsfifo.rb

@@ -10,28 +10,36 @@
 #
 class FSArray < Array
 
+  FSARRAY_SIZE_DEFAULT = 1
   #
   # FSArray#new( n )
-  # FSArray#new( size: n, of_enbl: true, of_proc: Proc.new{...} )
+  # FSArray#new( size: n, of_enable: true, of_proc: Proc.new{...} )
   #
-  def initialize( args = {} )
-
-    if args.class == Fixnum
-      args = { size: args, wm_size: args }
-    end
-
+  def initialize( _size = FSARRAY_SIZE_DEFAULT,
+                  size: FSARRAY_SIZE_DEFAULT,
+                  of_enable: false, of_proc: Proc.new{ raise "Overflow!" },
+                  uf_enable: false, uf_proc: Proc.new{ raise "Underflow!" },
+                  push_enable: false, push_proc: Proc.new{},
+                  wm_size: 1,
+                  wm_enable: false, wm_proc: Proc.new{ raise "Reached WM!" }
+                )
+
+    raise "Watermark #{wm_size} is out of range[0,#{size}]" if
+      wm_size < 0 or wm_size > size
+
+    size = _size if _size != FSARRAY_SIZE_DEFAULT
     @opt = {
-      :size => 1,
-      :of_enbl => false,
-      :of_proc => Proc.new{},
-      :uf_enbl => false,
-      :uf_proc => Proc.new{},
-      :push_enbl => false, #TODO.
-      :push_proc => Proc.new{},
-      :wm_size => 1,
-      :wm_enbl => false,
-      :wm_proc => Proc.new{},
-    }.merge( args )
+      :size    => size,
+      :of_enable => of_enable,
+      :of_proc => of_proc,
+      :uf_enable => uf_enable,
+      :uf_proc => uf_proc,
+      :push_enable => push_enable, #TODO.
+      :push_proc => push_proc,
+      :wm_size => wm_size,
+      :wm_enable => wm_enable,
+      :wm_proc => wm_proc,
+    }
 
     @shifted = nil  #TODO.
 
@@ -41,19 +49,15 @@ class FSArray < Array
   end
 
   #
-  # Over/underflow callback methods getter/setter, etc.
+  # Over/Underflow callback methods getter/setter, etc.
   #
-  def of_proc; @opt[:of_proc]; end
-  def of_proc=( newp ); @opt[:of_proc] = newp; end
-  def of_enable; @opt[:of_enbl] = true; end
-  def of_disable; @opt[:of_enbl] = false; end
-  def of_enable?; @opt[:of_enbl] ; end
-
-  def uf_proc; @opt[:uf_proc]; end
-  def uf_proc=( newp ); @opt[:uf_proc] = newp; end
-  def uf_enable; @opt[:uf_enbl] = true; end
-  def uf_disable; @opt[:uf_enbl] = false; end
-  def uf_enable?; @opt[:uf_enbl] ; end
+  ["o", "u"].each{|which|
+    eval("def #{which}f_proc; @opt[:#{which}f_proc]; end")
+    eval("def #{which}f_proc=(newp); @opt[:#{which}f_proc] = newp; end")
+    eval("def #{which}f_enable?; @opt[:#{which}f_enable]; end")
+    eval("def #{which}f_enable; @opt[:#{which}f_enable]  = true; end")
+    eval("def #{which}f_disable; @opt[:#{which}f_enable] = false; end")
+  }
 
   #
   # FIFO and data size-related methods.
@@ -77,14 +81,11 @@ class FSArray < Array
   # shift and push - main methods of FSFIFO.
   #
   def shift
-    ret = shift_org
 
     # callback method when under flow is enabled.
-    if self.size == 0
-      if @opt[:uf_enbl]
-        @opt[:uf_proc].call
-      end
-    end
+    @opt[:uf_proc].call if self.size == 0 and @opt[:uf_enable]
+
+    ret = shift_org
 
     return ret
   end
@@ -93,7 +94,7 @@ class FSArray < Array
 
     #
     push_org( obj )
-   
+
     #
     of_called = false
     wm_called = false
@@ -102,13 +103,13 @@ class FSArray < Array
       shift_org
 
       # overflow callback.
-      if @opt[:of_enbl] and not(of_called)
+      if @opt[:of_enable] and not(of_called)
         @opt[:of_proc].call
         of_called = true
       end
 
       # TODO.watermark callback.
-      if @opt[:wm_enbl] and not(wm_called)
+      if @opt[:wm_enable] and not(wm_called)
         @opt[:wm_proc].call
         wm_called = true
       else

data/test/test_fsfifo.rb

@@ -4,9 +4,6 @@
 #
 
 # Unit Test Lib.
-#require "rubygems"
-#gem "test-unit"
-#require "test/unit"
 require 'helper'
 require 'test/unit'
 
@@ -26,8 +23,8 @@ class TestFSArray < Test::Unit::TestCase
     @of_proc_called = false
     @uf_proc_called = false
 
-    @fifo.of_proc = Proc.new { p "of called."; @of_proc_called ^= true }
-    @fifo.uf_proc = Proc.new { p "uf called."; @uf_proc_called ^= true }
+    @fifo.of_proc = Proc.new { p "of called."; @of_proc_called = true }
+    @fifo.uf_proc = Proc.new { p "uf called."; @uf_proc_called = true }
   end
 
   def teardown
@@ -42,6 +39,10 @@ class TestFSArray < Test::Unit::TestCase
     assert_equal(  0, ff.size )
     assert_equal( 10, ff.fifosize )
 
+    ff = FSFIFO.new( 2 )
+    assert_equal( 0, ff.size )
+    assert_equal( 2, ff.fifosize )
+
   end
 
   def test_size
@@ -159,9 +160,26 @@ class TestFSArray < Test::Unit::TestCase
   end
 
   ####
-  
+
+  def test_default_uo
+
+    ff = FSFIFO.new( size: 3, of_enable: true, uf_enable: true )
+    assert_equal(  0, ff.size )
+    assert_equal( 3, ff.fifosize )
+
+    ff.push( 1 ); ff.push( 2 ); ff.push( 3 )
+    e = assert_raise( RuntimeError ){ ff.push( 4 ); }
+
+    3.times { ff.shift; }
+    e = assert_raise( RuntimeError ){ ff.shift; }
+
+  end
+
   def test_of
 
+    assert_equal( 0, @fifo.size )
+    assert_equal( 1, @fifo.fifosize )
+
     @fifo.of_enable
     assert_equal( true, @fifo.of_enable? )
 
@@ -169,10 +187,12 @@ class TestFSArray < Test::Unit::TestCase
     @fifo.push( 2 )
     assert_equal( true, @of_proc_called )
 
+    @of_proc_called = false
     @fifo.push( 3 )
-    assert_equal( false, @of_proc_called )
+    assert_equal( true, @of_proc_called )
 
     @fifo.of_disable
+    @of_proc_called = false
     @fifo.push( 4 )
     assert_equal( false, @of_proc_called )
 
@@ -180,17 +200,23 @@ class TestFSArray < Test::Unit::TestCase
 
   def test_uf
 
+    assert_equal( 0, @fifo.size )
+    assert_equal( 1, @fifo.fifosize )
+
     @fifo.uf_enable
     assert_equal( true, @fifo.uf_enable? )
 
+    @uf_proc_called = false
     @fifo.push( 1 )
     @fifo.shift
-    assert_equal( true, @uf_proc_called )
-
-    @fifo.push( 2 )
-    @fifo.shift
     assert_equal( false, @uf_proc_called )
 
+    @uf_proc_called = false
+    @fifo.push( 1 )
+    2.times{ @fifo.shift }
+    assert_equal( true, @uf_proc_called )
+
+    @uf_proc_called = false
     @fifo.push( 3 )
     @fifo.uf_disable
     @fifo.shift

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fsfifo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - YAMAMOTO, Masayuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -93,6 +93,7 @@ files:
 - Rakefile
 - ReadMe.md
 - VERSION
+- fsfifo.gemspec
 - lib/fsfifo.rb
 - test/helper.rb
 - test/test_fsfifo.rb
@@ -116,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.9
 signing_key: 
 specification_version: 4
 summary: Fixed size FIFO.