fsfifo 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1873cb49b135d37167ccf99dee689680af2db32e
-  data.tar.gz: 7f444b3acba163fcaf2a559c715531829bc36cc6
+SHA256:
+  metadata.gz: 8748caec92e8256a6c0aa81f7fa10ef2ea1a81597e2e87688faa355bd7fa1755
+  data.tar.gz: 2add29fd90ad7d7292ec5dbb3d8df5208bd19ecaef948092580bc08500494262
 SHA512:
-  metadata.gz: c392f2a447179efda3885bef1599ba26826890fc5a326f000bfec3b46f96f3c0126312d23a78610e5562b8c3a3c4d08cccdee3b7f38ad10148609d67a0770cdb
-  data.tar.gz: f05d3151607942b4fceb4638e91200813140182ac67d8976fa672d3defe7ed0ec84d6b45e45fc1a88f8a1edfddb3e6c2f3dff6ae2e04d29735f6ed62a5e48109
+  metadata.gz: 8a878c617f55ac3da93397e11724de0888470166d36a5bdc5ee91f4161a7622345bad3adb5f3f3a9c5726b8521e4ad1fb2183ad832cbf7389606774a3a70fbba
+  data.tar.gz: 06ba48adc9619477dd8d1a34651bba0582b7ae6eb9f1326f92504d538495cf9fcd0f1ebbb71529ff08d4bf3939ac8b8e53ba4d7948d83f2543c5046728d204df

data/Gemfile

@@ -7,8 +7,10 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.3.5"
-  gem "jeweler", "~> 1.8.4"
+  # gem "rdoc", "~> 6.3.1"
+  # gem "bundler", "~> 2.2.33"
+  gem "bundler", "~> 2.3.1"
+  gem "jeweler", "~> 2.3.9"
   gem "simplecov-rcov", ">= 0"
+  gem "test-unit", ">= 0"
 end

data/Rakefile

@@ -25,7 +25,9 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+# $stderr.puts "LOAD_PATH in Rakefile (size: #{$LOAD_PATH.size}): #{$LOAD_PATH}"
 require 'rake/testtask'
+require 'test-unit'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   #test.pattern = 'test/**/test_*.rb'

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.3

data/fsfifo.gemspec

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

data/lib/fsfifo.rb

@@ -10,28 +10,50 @@
 #
 class FSArray < Array
 
-  #
-  # FSArray#new( n )
-  # FSArray#new( size: n, of_enbl: true, of_proc: Proc.new{...} )
-  #
-  def initialize( args = {} )
-
-    if args.class == Fixnum
-      args = { size: args, wm_size: args }
-    end
-
+  FSARRAY_SIZE_DEFAULT = 1
+
+  # Fixed-size Array.
+  # ==== Args
+  # _size :: size of FSArray.
+  # size: :: same above.
+  # of_enable: :: Overflow proc enable: true (enable)/false (disable)
+  # of_proc: :: Overflow proc itself.
+  # uf_enable: :: Underflow proc enable: true (enable)/false (disable)
+  # uf_proc: :: Underflow proc itself.
+  # wm_size: Water mark ( <= fsarray size )
+  # wm_proc: Water mark proc.
+  # ==== Usage
+  # * FSArray#new( n )
+  # * FSArray#new( size: n, of_enable: true, of_proc: Proc.new{...} )
+  # * FSArray.new[ -1 ] :: newly pushed data.
+  # * FSArray.new[ 0 ] :: first-out data.
+  # ==== Return
+  # Object of FSArray.
+  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 +63,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 +95,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 +108,7 @@ class FSArray < Array
 
     #
     push_org( obj )
-   
+
     #
     of_called = false
     wm_called = false
@@ -102,13 +117,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/helper.rb

@@ -11,12 +11,14 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+# require 'test-unit'
 require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+# $stdout.puts "LOAD_PATH (size: #{$LOAD_PATH.size}): #{$LOAD_PATH}"
 require 'fsfifo'
+require 'test-unit'
 
 class Test::Unit::TestCase
 end

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
@@ -35,13 +32,17 @@ class TestFSArray < Test::Unit::TestCase
   end
 
   ####
-  
+
   def test_new
 
     ff = FSFIFO.new( size: 10 )
     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
@@ -76,6 +77,7 @@ class TestFSArray < Test::Unit::TestCase
     assert_equal( 1, @fifo.size )
     assert_equal( 1, @fifo.fifosize )
     assert_equal( 'a', @fifo[0] )
+    assert_equal( 'a', @fifo[-1] )
 
     ret = @fifo.shift
     assert_equal( 0, @fifo.size )
@@ -87,6 +89,7 @@ class TestFSArray < Test::Unit::TestCase
     assert_equal( 1, @fifo.size )
     assert_equal( 1, @fifo.fifosize )
     assert_equal( 'c', @fifo[0] )
+    assert_equal( 'c', @fifo[-1] )
 
   end
 
@@ -102,31 +105,39 @@ class TestFSArray < Test::Unit::TestCase
     assert_equal( 1, @fifo.size )
     assert_equal( 4, @fifo.fifosize )
     assert_equal( 'm', ret.join )
+    assert_equal( 'm', @fifo[-1] )
 
     @fifo.push( 'o' )
     assert_equal( 2, @fifo.size )
     assert_equal( 4, @fifo.fifosize )
     assert_equal( 'mo', @fifo.join )
+    assert_equal( 'o', @fifo[-1] )
 
     @fifo.push( 'e' )
     assert_equal( 3, @fifo.size )
     assert_equal( 4, @fifo.fifosize )
     assert_equal( 'moe', @fifo.join )
+    assert_equal( 'm', @fifo[0] )
+    assert_equal( 'e', @fifo[-1] )
 
     @fifo.push( 'm' )
     assert_equal( 4, @fifo.size )
     assert_equal( 4, @fifo.fifosize )
     assert_equal( 'moem', @fifo.join )
+    assert_equal( 'm', @fifo[0] )
+    assert_equal( 'm', @fifo[-1] )
 
     @fifo.push( 'o' )
     assert_equal( 4, @fifo.size )
     assert_equal( 4, @fifo.fifosize )
     assert_equal( 'oemo', @fifo.join )
+    assert_equal( 'o', @fifo[-1] )
 
     @fifo.push( 'e' )
     assert_equal( 4, @fifo.size )
     assert_equal( 4, @fifo.fifosize )
     assert_equal( 'emoe', @fifo.join )
+    assert_equal( 'e', @fifo[-1] )
 
   end
 
@@ -159,9 +170,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 +197,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 +210,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,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: fsfifo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - YAMAMOTO, Masayuki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2023-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   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: rdoc
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 2.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 2.3.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 2.3.9
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: test-unit
   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'
 description: Fixed size FIFO, LIFO, and Array.
@@ -86,13 +86,15 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE.txt
+- ReadMe.md
 files:
-- .document
+- ".document"
 - Gemfile
 - LICENSE.txt
 - Rakefile
 - ReadMe.md
 - VERSION
+- fsfifo.gemspec
 - lib/fsfifo.rb
 - test/helper.rb
 - test/test_fsfifo.rb
@@ -100,24 +102,23 @@ homepage: http://github.com/mephistobooks/fsfifo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Fixed size FIFO.
 test_files: []