operation 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7e8a1eefcc41e4464a3c86e301dbcbae4b0f7ef
-  data.tar.gz: af2e7a02187ea51123404fb7e89279faba1a64ad
+  metadata.gz: 350d9462e55e2a29b24502967a4c5f96559bf41f
+  data.tar.gz: 31b2e4cdc6e21409be85a770a42fa93287e03c7b
 SHA512:
-  metadata.gz: 88838ab8ebb3bd7e56086d7947386f80c07d62efd74e3e87e36a1e40c31d4ee9e672bf4e5988f8cb335412cfff8946abc665e4f17522e8f754b7a9c5d9ef4764
-  data.tar.gz: 66506b9496bea6a25f47c67c7e5b9aaae966ff62c40e0b7006247a1bf40e0f4114ab2977c7869d67bec8d56189da3be7d0aa58e3cd964e879fbce2ef2011bbb3
+  metadata.gz: eac059b32ff9ee284ad0c024e742fdd6e95e469b5b239ddf3b1f7909408d75560a5aa8209bd5413f82d0f1e0281ba53d3ecd946536de0d1a9387e53355062854
+  data.tar.gz: 6aa9eea323fe338cf322fc4a0257c4e7aadc8807d98845a3d8637bd7b175b22dfd6b2c661d9cbd1a7b6bf62cd75198a68a09182ae02e46ace0104ce0f702edc4

data/lib/operation.rb

@@ -1,5 +1,4 @@
 require 'operation/deferrable'
-require 'operation/progress'
 require 'operation/core'
 require 'operations'
 

data/lib/operation/core.rb

@@ -1,5 +1,4 @@
 class Operation
-  include ::Operation::Deferrable
   attr_reader :metadata, :code
 
   def initialize(options = {})

data/lib/operation/deferrable.rb

@@ -2,6 +2,8 @@ class Operation
   module Deferrable
     attr_reader :arguments
 
+    # Public Callbacks
+
     def on_progress(&block)
       return unless block
       progressables.unshift block
@@ -30,6 +32,17 @@ class Operation
       self
     end
 
+    # Public State Getters
+
+    def status
+      @status ||= :unknown
+    end
+
+    def percent
+      return 100 if succeeded?
+      @percent ||= 0
+    end
+
     def succeeded?
       status == :succeeded
     end
@@ -38,12 +51,40 @@ class Operation
       status == :failed
     end
 
-    def status
-      @status ||= :unknown
+    # Public State Setters
+
+    def progress!(new_percent, code = nil)
+      return if succeeded? || failed?
+      @percent = new_percent.to_i
+      @status = code unless %i(succeeded failed).include?(code)
+
+      progressables.each do |callback|
+        callback.call self
+      end
+    end
+
+    def sub_progress!(from, till, sub)
+      if sub.percent.zero?
+        new_percent = 0
+      else
+        factor = (till.to_f - from.to_f) * (sub.percent.to_f / 100)
+        new_percent = from.to_i + factor.to_i
+      end
+      progress! new_percent, sub.status
+    end
+
+    def succeed!(*args)
+      set_status :succeeded, *args
+    end
+
+    def fail!(*args)
+      set_status :failed, *args
     end
 
+    # Status Setters
+
     def set_status(new_status, *args)
-      @arguments = args
+      @arguments = args unless args.empty?
       @status = new_status
 
       if succeeded? && !successables.empty?
@@ -60,25 +101,7 @@ class Operation
       end
     end
 
-    def progress(percent, code = nil)
-      return if succeeded? || failed?
-
-      progressables.each do |callback|
-        if percent.is_a?(::Operation::Progress)
-          callback.call percent
-        else
-          callback.call ::Operation::Progress.new(percent, code)
-        end
-      end
-    end
-
-    def succeed!(*args)
-      set_status :succeeded, *args
-    end
-
-    def fail!(*args)
-      set_status :failed, *args
-    end
+    # Internal Methods
 
     def successables
       @successables ||= []
@@ -94,3 +117,10 @@ class Operation
 
   end
 end
+
+class Operation
+  class Defer
+    include ::Operation::Deferrable
+  end
+end
+

data/lib/operation/version.rb

@@ -1,8 +1,8 @@
 class Operation
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 2
-    TINY  = 2
+    MINOR = 3
+    TINY  = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join '.'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: operation
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - halo
@@ -80,7 +80,6 @@ files:
 - lib/operation.rb
 - lib/operation/core.rb
 - lib/operation/deferrable.rb
-- lib/operation/progress.rb
 - lib/operation/version.rb
 - lib/operations.rb
 homepage: https://github.com/halo/operation

data/lib/operation/progress.rb

@@ -1,23 +0,0 @@
-class Operation
-  class Progress
-
-    def initialize(percent, code = nil)
-      @percent, @code = percent, code
-    end
-
-    def percent
-      @percent.to_i
-    end
-
-    def code
-      return if @code.to_s == ''
-      @code.to_s.to_sym
-    end
-
-    def of(total)
-      partial_percent = (percent.to_f / total.to_i).to_i
-      self.class.new partial_percent, code
-    end
-
-  end
-end