expeditor 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e70f2027c7e07b2f647a1a82ff5de88ffb629181
-  data.tar.gz: 89ab6626708ef36170547b326a83cecb9f421d15
+  metadata.gz: 2380a72a4938ad53fc206f4e155805d90568477f
+  data.tar.gz: e5ee71ae7e689318b764c47e969e16983330846a
 SHA512:
-  metadata.gz: a75a2daa9350817b282523d8454d0072f85519e7c277467ba8201894f0a52165a77cd7b8065f9fadc2d25f1fc7deb6fed539e9798b9636feeba20226f8efe4c4
-  data.tar.gz: 320feb1dcd572e3f61436bef1ab49732bd8630030a319d1e68d021de8b99a8cf7a19da9cac9bc6f24413b46292946207a03084a9ab46b3de9db0fad2c7a3af43
+  metadata.gz: 157aeae73bb32ab82848b7a97f8fa38a7c3a3f56419e59c3b2d71002c5194d5fcd2b7dce86ad7be4cad1406f2844dacf2c8f630ecf3f5e0245b018c6717beb7f
+  data.tar.gz: 575962fba75f61364cf1f998c01c7636d100a10e0e345d68488871c6a9735ee371251e332f33221c3780987719cd8fdf725454bac56d268f1405c562934864dd

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.0
   - ruby-head
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.0
+- Add Expeditor::Service#current\_status [#9](https://github.com/cookpad/expeditor/issues/9)
+- Add Expeditor::Service#reset\_status! [#10](https://github.com/cookpad/expeditor/issues/10)
+- Add Expeditor::Service#fallback\_enabled [#11](https://github.com/cookpad/expeditor/issues/11)
+
 ## 0.3.0
 - Support concurrent-ruby 1.0.
 

data/README.md

@@ -77,6 +77,8 @@ command.start.get #=> error may be raised
 command_with_fallback.start.get #=> default_value if command is failed
 ```
 
+If you set `false` to `Expeditor::Service#fallback_enabled`, fallbacks do not occur. It is useful in test codes.
+
 ### timeout
 
 ```ruby
@@ -121,6 +123,11 @@ service = Expeditor::Service.new(
 command = Expeditor::Command.new(service: service) do
   ...
 end
+
+service.current_status
+# => #<Expeditor::Status:0x007fdeeeb18468 @break=0, @dependency=0, @failure=0, @rejection=0, @success=0, @timeout=0>
+
+service.reset_status!  # reset status in the service
 ```
 
 ### circuit breaker

data/lib/expeditor/command.rb

@@ -43,7 +43,7 @@ module Expeditor
     def get
       raise NotStartedError if not started?
       @normal_future.get_or_else do
-        if @fallback_var
+        if @fallback_var && @service.fallback_enabled?
           @fallback_var.wait
           if @fallback_var.rejected?
             raise @fallback_var.reason
@@ -65,7 +65,7 @@ module Expeditor
     def wait
       raise NotStartedError if not started?
       @normal_future.wait
-      @fallback_var.wait if @fallback_var
+      @fallback_var.wait if @fallback_var && @service.fallback_enabled?
     end
 
     # command.on_complete do |success, value, reason|

data/lib/expeditor/service.rb

@@ -3,19 +3,19 @@ require 'concurrent/executor/thread_pool_executor'
 module Expeditor
   class Service
     attr_reader :executor
+    attr_accessor :fallback_enabled
 
     def initialize(opts = {})
       @executor = opts.fetch(:executor) { Concurrent::ThreadPoolExecutor.new }
       @threshold = opts.fetch(:threshold, 0.5) # is 0.5 ok?
       @non_break_count = opts.fetch(:non_break_count, 100) # is 100 ok?
       @sleep = opts.fetch(:sleep, 1)
-      bucket_opts = {
+      @bucket_opts = {
         size: 10,
         per: opts.fetch(:period, 10).to_f / 10
       }
-      @bucket = Expeditor::Bucket.new(bucket_opts)
-      @breaking = false
-      @break_start = nil
+      reset_status!
+      @fallback_enabled = true
     end
 
     def success
@@ -42,6 +42,10 @@ module Expeditor
       @bucket.increment :dependency
     end
 
+    def fallback_enabled?
+      !!fallback_enabled
+    end
+
     # break circuit?
     def open?
       if @breaking
@@ -66,6 +70,16 @@ module Expeditor
       @executor.shutdown
     end
 
+    def current_status
+      @bucket.current
+    end
+
+    def reset_status!
+      @bucket = Expeditor::Bucket.new(@bucket_opts)
+      @breaking = false
+      @break_start = nil
+    end
+
     private
 
     def calc_open

data/lib/expeditor/services/default.rb

@@ -7,6 +7,7 @@ module Expeditor
       def initialize
         @executor = Concurrent.global_io_executor
         @bucket = nil
+        @fallback_enabled = true
       end
 
       def success

data/lib/expeditor/version.rb

@@ -1,3 +1,3 @@
 module Expeditor
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expeditor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - shohei-yasutake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -143,9 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Expeditor provides asynchronous execution and fault tolerance for microservices
 test_files: []
-has_rdoc: