Fix typo and incorrect methods (#37)

jokius · web-flow · commit 011ecb89c805 · 2021-05-14T12:23:58.000+03:00
* Fix typo and incorrect methods

* Bump version 1.0.5
diff --git a/lib/casbin-ruby/util/thread_lock.rb b/lib/casbin-ruby/util/thread_lock.rb
@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
 require 'singleton'
+require 'forwardable'
 
 class ThreadLock
   include Singleton
 
   class << self
-    delegate :thread=, :lock?, to: :instance
+    extend Forwardable
+    def_delegators :instance, :thread=, :thread, :lock?
   end
 
   attr_accessor :thread
 
   def lock?
     return false unless thread
 
-    thread.active?
+    thread.alive?
   end
 end
diff --git a/lib/casbin-ruby/version.rb b/lib/casbin-ruby/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Casbin
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end
diff --git a/spec/casbin/util/thread_lock_spec.rb b/spec/casbin/util/thread_lock_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'casbin-ruby/util/thread_lock'
+
+describe ThreadLock do
+  it '#lock? with no thread' do
+    expect(described_class).not_to be_lock
+  end
+
+  it '#lock? with thread' do
+    described_class.thread = Thread.new { loop }
+    expect(described_class).to be_lock
+    described_class.thread.exit
+    sleep 0.001 # waiting exit
+    expect(described_class).not_to be_lock
+  end
+end
