isomorfeus-ferret 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 958c051fa7f771e25ee1fb29c47aad9ab1cd7a570750f73450ae582474ef6fb5
-  data.tar.gz: beba6b22ba7493f324be38997fee4f4a56efc896281fcbb2f3521ebef6795029
+  metadata.gz: 19cfca9e5508c89a931678c23a5b0b32d8759d0d1839ac0ecf0b043d93cd1ddf
+  data.tar.gz: 5999edb4c8ce46718264abdfac47cdd2bcc0f8e0ddf46a0af69bfba1ec024a1c
 SHA512:
-  metadata.gz: 98bef5c79e3d4e8854d6a4cb68e2cb796c6f27bbaf1c7b7669ab895e8656d12d033651f8d8b29ac8d7504b46dba7567aa52f2ac297285ff2c6c62e52c48d0019
-  data.tar.gz: 165497f356ab32cdc6250b3eada43d9ec36d61ee992114bffa9c38372c7894455caeb95aa789cf025c2538c7f9e1eddafe87e66b58536424a4c8e116a123af88
+  metadata.gz: e8ab5a9574a3b610b4d554a94ecbdf3252a77d7947f81fdd21bdd0c87ed6bd0940f4842091f0bec793b4e061fe218706d0e16ef64ab19d85ca48d825a1867beb
+  data.tar.gz: 474d0d57a321f3eaf47e372f76c7102592b85c7d0bf2e8506e7e3baf6ad3cbba2b5628296b5a3cf50b9bdba3031a2712225234143343cb9dbf80bc3781d00faa

data/LICENSE

@@ -139,32 +139,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-lib/isomorfeus/ferret/monitor.rb originally taken from the gem 'monitor':
-
-Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
 The following licenses apply to files, which are distributed within the repo
 but not distributed with the gem and not used at runtime:
 

data/lib/isomorfeus/ferret/index/index.rb

@@ -4,7 +4,7 @@ module Isomorfeus
       # This is a simplified interface to the index. See the TUTORIAL for more
       # information on how to use this class.
       class Index
-        include Isomorfeus::Ferret::MonitorMixin
+        include MonitorMixin
         include Isomorfeus::Ferret::Store
         include Isomorfeus::Ferret::Search
 

data/lib/isomorfeus/ferret/version.rb

@@ -1,5 +1,5 @@
 module Isomorfeus
   module Ferret
-    VERSION = '0.13.3'
+    VERSION = '0.13.4'
   end
 end

data/lib/isomorfeus-ferret.rb

@@ -2,7 +2,7 @@ require 'isomorfeus_ferret_ext'
 require 'isomorfeus/ferret/version'
 require 'isomorfeus/ferret/field_symbol'
 require 'isomorfeus/ferret/stdlib_patches'
-require 'isomorfeus/ferret/monitor'
+require 'monitor'
 require 'isomorfeus/ferret/index/field_infos'
 require 'isomorfeus/ferret/index/index'
 require 'isomorfeus/ferret/document'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-ferret
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Jan Biedermann
@@ -360,7 +360,6 @@ files:
 - lib/isomorfeus/ferret/field_symbol.rb
 - lib/isomorfeus/ferret/index/field_infos.rb
 - lib/isomorfeus/ferret/index/index.rb
-- lib/isomorfeus/ferret/monitor.rb
 - lib/isomorfeus/ferret/stdlib_patches.rb
 - lib/isomorfeus/ferret/version.rb
 homepage: https://isomorfeus.com

data/lib/isomorfeus/ferret/monitor.rb

@@ -1,323 +0,0 @@
-# frozen_string_literal: false
-# = monitor.rb
-#
-# Copyright (C) 2001  Shugo Maeda <shugo@ruby-lang.org>
-#
-# This library is distributed under the terms of the Ruby license.
-# You can freely distribute/modify this library.
-#
-
-#
-# In concurrent programming, a monitor is an object or module intended to be
-# used safely by more than one thread.  The defining characteristic of a
-# monitor is that its methods are executed with mutual exclusion.  That is, at
-# each point in time, at most one thread may be executing any of its methods.
-# This mutual exclusion greatly simplifies reasoning about the implementation
-# of monitors compared to reasoning about parallel code that updates a data
-# structure.
-#
-# You can read more about the general principles on the Wikipedia page for
-# Monitors[http://en.wikipedia.org/wiki/Monitor_%28synchronization%29]
-#
-# == Examples
-#
-# === Simple object.extend
-#
-#   require 'monitor.rb'
-#
-#   buf = []
-#   buf.extend(MonitorMixin)
-#   empty_cond = buf.new_cond
-#
-#   # consumer
-#   Thread.start do
-#     loop do
-#       buf.synchronize do
-#         empty_cond.wait_while { buf.empty? }
-#         print buf.shift
-#       end
-#     end
-#   end
-#
-#   # producer
-#   while line = ARGF.gets
-#     buf.synchronize do
-#       buf.push(line)
-#       empty_cond.signal
-#     end
-#   end
-#
-# The consumer thread waits for the producer thread to push a line to buf
-# while <tt>buf.empty?</tt>.  The producer thread (main thread) reads a
-# line from ARGF and pushes it into buf then calls <tt>empty_cond.signal</tt>
-# to notify the consumer thread of new data.
-#
-# === Simple Class include
-#
-#   require 'monitor'
-#
-#   class SynchronizedArray < Array
-#
-#     include MonitorMixin
-#
-#     def initialize(*args)
-#       super(*args)
-#     end
-#
-#     alias :old_shift :shift
-#     alias :old_unshift :unshift
-#
-#     def shift(n=1)
-#       self.synchronize do
-#         self.old_shift(n)
-#       end
-#     end
-#
-#     def unshift(item)
-#       self.synchronize do
-#         self.old_unshift(item)
-#       end
-#     end
-#
-#     # other methods ...
-#   end
-#
-# +SynchronizedArray+ implements an Array with synchronized access to items.
-# This Class is implemented as subclass of Array which includes the
-# MonitorMixin module.
-#
-module Isomorfeus
-  module Ferret
-    module MonitorMixin
-      #
-      # FIXME: This isn't documented in Nutshell.
-      #
-      # Since MonitorMixin.new_cond returns a ConditionVariable, and the example
-      # above calls while_wait and signal, this class should be documented.
-      #
-      class ConditionVariable
-        class Timeout < Exception; end
-
-        #
-        # Releases the lock held in the associated monitor and waits; reacquires the lock on wakeup.
-        #
-        # If +timeout+ is given, this method returns after +timeout+ seconds passed,
-        # even if no other thread doesn't signal.
-        #
-        def wait(timeout = nil)
-          Thread.handle_interrupt(Exception => :never) do
-            @monitor.__send__(:mon_check_owner)
-            count = @monitor.__send__(:mon_exit_for_cond)
-            begin
-              Thread.handle_interrupt(Exception => :immediate) do
-                @cond.wait(@monitor.instance_variable_get(:@mon_mutex), timeout)
-              end
-              return true
-            ensure
-              @monitor.__send__(:mon_enter_for_cond, count)
-            end
-          end
-        end
-
-        #
-        # Calls wait repeatedly while the given block yields a truthy value.
-        #
-        def wait_while
-          while yield
-            wait
-          end
-        end
-
-        #
-        # Calls wait repeatedly until the given block yields a truthy value.
-        #
-        def wait_until
-          until yield
-            wait
-          end
-        end
-
-        #
-        # Wakes up the first thread in line waiting for this lock.
-        #
-        def signal
-          @monitor.__send__(:mon_check_owner)
-          @cond.signal
-        end
-
-        #
-        # Wakes up all threads waiting for this lock.
-        #
-        def broadcast
-          @monitor.__send__(:mon_check_owner)
-          @cond.broadcast
-        end
-
-        private
-
-        def initialize(monitor)
-          @monitor = monitor
-          @cond = Thread::ConditionVariable.new
-        end
-      end
-
-      def self.extend_object(obj)
-        super(obj)
-        obj.__send__(:mon_initialize)
-      end
-
-      #
-      # Attempts to enter exclusive section.  Returns +false+ if lock fails.
-      #
-      def mon_try_enter
-        if @mon_owner != Thread.current
-          unless @mon_mutex.try_lock
-            return false
-          end
-          @mon_owner = Thread.current
-          @mon_count = 0
-        end
-        @mon_count += 1
-        return true
-      end
-      # For backward compatibility
-      alias try_mon_enter mon_try_enter
-
-      #
-      # Enters exclusive section.
-      #
-      def mon_enter
-        if @mon_owner != Thread.current
-          @mon_mutex.lock
-          @mon_owner = Thread.current
-          @mon_count = 0
-        end
-        @mon_count += 1
-      end
-
-      #
-      # Leaves exclusive section.
-      #
-      def mon_exit
-        mon_check_owner
-        @mon_count -=1
-        if @mon_count == 0
-          @mon_owner = nil
-          @mon_mutex.unlock
-        end
-      end
-
-      #
-      # Returns true if this monitor is locked by any thread
-      #
-      def mon_locked?
-        @mon_mutex.locked?
-      end
-
-      #
-      # Returns true if this monitor is locked by current thread.
-      #
-      def mon_owned?
-        @mon_mutex.locked? && @mon_owner == Thread.current
-      end
-
-      #
-      # Enters exclusive section and executes the block.  Leaves the exclusive
-      # section automatically when the block exits.  See example under
-      # +MonitorMixin+.
-      #
-      def mon_synchronize
-        # Prevent interrupt on handling interrupts; for example timeout errors
-        # it may break locking state.
-        Thread.handle_interrupt(Exception => :never){ mon_enter }
-        begin
-          yield
-        ensure
-          Thread.handle_interrupt(Exception => :never){ mon_exit }
-        end
-      end
-      alias synchronize mon_synchronize
-
-      #
-      # Creates a new MonitorMixin::ConditionVariable associated with the
-      # receiver.
-      #
-      def new_cond
-        return ConditionVariable.new(self)
-      end
-
-      private
-
-      # Use <tt>extend MonitorMixin</tt> or <tt>include MonitorMixin</tt> instead
-      # of this constructor.  Have look at the examples above to understand how to
-      # use this module.
-      def initialize(*args)
-        super
-        mon_initialize
-      end
-
-      # Initializes the MonitorMixin after being included in a class or when an
-      # object has been extended with the MonitorMixin
-      def mon_initialize
-        if defined?(@mon_mutex) && @mon_mutex_owner_object_id == object_id
-          raise ThreadError, "already initialized"
-        end
-        @mon_mutex = Thread::Mutex.new
-        @mon_mutex_owner_object_id = object_id
-        @mon_owner = nil
-        @mon_count = 0
-      end
-
-      def mon_check_owner
-        if @mon_owner != Thread.current
-          raise ThreadError, "current thread not owner"
-        end
-      end
-
-      def mon_enter_for_cond(count)
-        @mon_owner = Thread.current
-        @mon_count = count
-      end
-
-      def mon_exit_for_cond
-        count = @mon_count
-        @mon_owner = nil
-        @mon_count = 0
-        return count
-      end
-    end
-
-    # Use the Monitor class when you want to have a lock object for blocks with
-    # mutual exclusion.
-    #
-    #   require 'monitor'
-    #
-    #   lock = Monitor.new
-    #   lock.synchronize do
-    #     # exclusive access
-    #   end
-    #
-    class Monitor
-      include MonitorMixin
-      alias try_enter try_mon_enter
-      alias enter mon_enter
-      alias exit mon_exit
-    end
-  end
-end
-
-# Documentation comments:
-#  - All documentation comes from Nutshell.
-#  - MonitorMixin.new_cond appears in the example, but is not documented in
-#    Nutshell.
-#  - All the internals (internal modules Accessible and Initializable, class
-#    ConditionVariable) appear in RDoc.  It might be good to hide them, by
-#    making them private, or marking them :nodoc:, etc.
-#  - RDoc doesn't recognise aliases, so we have mon_synchronize documented, but
-#    not synchronize.
-#  - mon_owner is in Nutshell, but appears as an accessor in a separate module
-#    here, so is hard/impossible to RDoc.  Some other useful accessors
-#    (mon_count and some queue stuff) are also in this module, and don't appear
-#    directly in the RDoc output.
-#  - in short, it may be worth changing the code layout in this file to make the
-#    documentation easier