progressrus 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cbd4fa76b6a27688c4f385cb897bbd743a5e970
-  data.tar.gz: 0d51ce787ed6e0f5dcf5ab9b01992b84882bd490
+  metadata.gz: da06f31d91136e8fb18839704dd7fd49950de7ca
+  data.tar.gz: fb38d959dd85e11e03004db451ac17dced021f14
 SHA512:
-  metadata.gz: d6d9455550209e99c6d714184566f99c651a223b79d30aeeb11b3b80d017f0ded87507735c38215f974380419d82b6883050b06a6fae4b4b8a5e1769c718d675
-  data.tar.gz: c2dbc7c4f6f292f08dffe50cd5e159d57bf81926ada214a3f49d568b811f47a3f2cd2b8be8235fa939ac9d1851b56c69687da12a829cf2b7b02c15f210fe8bf6
+  metadata.gz: 5fd4c0fd5e258a5723f24494d234eef4d3ac451d5fb98b29855196fd029a7cfef2a335c7cbcd1df72235e49e57a95aaed107e05182e492d1a4f19530c0794071
+  data.tar.gz: 95bbe8161d40db2e10976aece2dc7b89584109b2eaf471d4f695cf03c0f77fb21d42c50cc055a924c08651d31306e5f17e4cc3df489a1bc1af419eca33101ffb

data/lib/progressrus.rb

@@ -28,7 +28,7 @@ class Progressrus
   end
 
   attr_reader :name, :scope, :total, :id, :params, :store, :count,
-    :started_at, :completed_at, :failed_at, :stores, :error_count
+    :started_at, :completed_at, :failed_at, :expires_at, :stores, :error_count
 
   alias_method :completed?, :completed_at
   alias_method :started?,   :started_at
@@ -39,7 +39,7 @@ class Progressrus
   def initialize(scope: "progressrus", total: nil, name: nil,
     id: SecureRandom.uuid, params: {}, stores: Progressrus.stores,
     completed_at: nil, started_at: nil, count: 0, failed_at: nil,
-    error_count: 0, persist: false)
+    error_count: 0, persist: false, expires_at: nil)
 
     raise ArgumentError, "Total cannot be zero or negative." if total && total <= 0
 
@@ -55,6 +55,7 @@ class Progressrus
     @started_at   = parse_time(started_at)
     @completed_at = parse_time(completed_at)
     @failed_at    = parse_time(failed_at)
+    @expires_at   = parse_time(expires_at)
 
     persist(force: true) if persist
   end
@@ -109,6 +110,7 @@ class Progressrus
       started_at:   started_at,
       completed_at: completed_at,
       failed_at:    failed_at,
+      expires_at:   expires_at,
       count:        count,
       total:        total,
       params:       params,
@@ -142,6 +144,10 @@ class Progressrus
     now + seconds_to_finished
   end
 
+  def expired?(now: Time.now)
+    expires_at && expires_at < now
+  end
+
   private
   def persist(force: false)
     stores.each { |store| store.persist(self, force: force) }

data/lib/progressrus/version.rb

@@ -1,3 +1,3 @@
 class Progressrus
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/progressrus_test.rb

@@ -152,7 +152,8 @@ class ProgressrusTest < Minitest::Unit::TestCase
       completed_at: nil,
       failed_at: nil,
       count: 0,
-      error_count: 0
+      error_count: 0,
+      expires_at: nil
     }
 
     assert_equal serialization, progress.to_serializeable
@@ -374,4 +375,35 @@ class ProgressrusTest < Minitest::Unit::TestCase
 
     assert @progress.running?
   end
+
+  def test_expired_returns_false_when_nil
+    progress = Progressrus.new(
+      id: 'oemg',
+      scope: ['walruses', 'forall']
+    )
+
+    refute progress.expired?
+  end
+
+  def test_expired_returns_true_if_expires_at_in_past
+    time = Time.now
+    progress = Progressrus.new(
+      id: 'oemg',
+      scope: ['walruses', 'forall'],
+      expires_at: time - 3600
+    )
+
+    assert progress.expired?(now: time)
+  end
+
+  def test_expired_returns_false_if_expires_at_in_the_future
+    time = Time.now
+    progress = Progressrus.new(
+      id: 'oemg',
+      scope: ['walruses', 'forall'],
+      expires_at: time + 3600
+    )
+
+    refute progress.expired?(now: time)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: progressrus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Simon Eskildsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis