progressrus 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9443b1b626649e1d9e17aa2ed9ef9354312bc78
-  data.tar.gz: 4e9bd7b04d2f47975bfc9bbfa96f36ced10e3ccf
+  metadata.gz: 1b088dbba839ff6037add109dc9e9a9ea52074a4
+  data.tar.gz: 67204fed60013d7b12819474868562766fe17d41
 SHA512:
-  metadata.gz: f8093bed5b344ff65be4f5bc8b0ec207eb1984c4fb7f45ea629e0c6d7306f2a6fbfc0cf645bd7d73940b3ec8368ffb87235edac040c2805fe28c0113d70b9908
-  data.tar.gz: 71e0a98fc087451ad400f72c16d3c461873a93c75ba27ec90231dae1610ecc5b724e346603a51b06f6de64889360dc9769e441d3dec69c7130ff7500a8d38b49
+  metadata.gz: 7599e3adfaa638985adccd88c2acf4fbccca9f90e5bc5d2ac7262cd9a9fd4982d94916f031df244a236e31e75685f97b29a7ae7501fe7c978e032f932fb82106
+  data.tar.gz: af39e6cc6e04afa0c2bcd491dc23876586f278e439b8fd6ca44ae3b010c8136996ee0cd712b98dd4c93cfd1671db89466fa78973c5e8e878b07ae1d733b00b82

data/lib/progressrus.rb

@@ -40,7 +40,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, expires_at: nil)
+    error_count: 0, persist: false, expires_at: nil, persisted: false)
 
     raise ArgumentError, "Total cannot be negative." if total && total < 0
 
@@ -57,6 +57,7 @@ class Progressrus
     @completed_at = parse_time(completed_at)
     @failed_at    = parse_time(failed_at)
     @expires_at   = parse_time(expires_at)
+    @persisted    = persisted
 
     persist(force: true) if persist
   end
@@ -122,6 +123,8 @@ class Progressrus
   def total=(new_total)
     raise ArgumentError, "Total cannot be negative." if new_total < 0
     @total = new_total
+    persist(force: true) if persisted?
+    @total
   end
 
   def total
@@ -153,6 +156,10 @@ class Progressrus
     expires_at && expires_at < now
   end
 
+  def persisted?
+    @persisted
+  end
+
   private
 
   def persist(force: false)
@@ -162,6 +169,7 @@ class Progressrus
       rescue Progressrus::Store::BackendError => e
       end
     end
+    @persisted = true
   end
 
   def parse_time(time)

data/lib/progressrus/store/redis.rb

@@ -63,7 +63,7 @@ class Progressrus
       end
 
       def deserialize(value)
-        JSON.parse(value, symbolize_names: true)
+        JSON.parse(value, symbolize_names: true).merge(persisted: true)
       end
 
       def outdated?(progress, now: Time.now)

data/lib/progressrus/version.rb

@@ -1,3 +1,3 @@
 class Progressrus
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/integration_test.rb

@@ -21,6 +21,14 @@ class IntegrationTest < Minitest::Test
     assert_equal 1, tick.count
   end
 
+  def test_setting_total_after_persist_persists_total
+    progress = Progressrus.new(scope: ["walrus"], total: 0, persist: true, id: '123')
+    assert_equal 0, progress.total
+    progress.total = 20
+    progress = Progressrus.find(["walrus"], '123')
+    assert_equal 20, progress.total
+  end
+
   def test_create_multiple_ticks_and_see_them_in_redis
     @progress.tick
 

data/test/store/redis_test.rb

@@ -38,12 +38,14 @@ class RedisStoreTest < Minitest::Test
   end
 
   def test_scope_should_return_progressruses_indexed_by_id
-  	@store.persist(@progress)
-  	@store.persist(@another_progress)
-  	actual = @store.scope(@scope)
+    @store.persist(@progress)
+    @store.persist(@another_progress)
+    actual = @store.scope(@scope)
 
-  	assert_equal @progress.id, actual['oemg'].id
-  	assert_equal @another_progress.id, actual['oemg-two'].id
+    assert_equal @progress.id, actual['oemg'].id
+    assert actual['oemg'].persisted?
+    assert_equal @another_progress.id, actual['oemg-two'].id
+    assert actual['oemg-two'].persisted?
   end
 
   def test_scope_should_return_an_empty_hash_if_nothing_is_found
@@ -51,9 +53,10 @@ class RedisStoreTest < Minitest::Test
   end
 
   def test_find_should_return_a_single_progressrus_for_scope_and_id
-  	@store.persist(@progress)
-
-  	assert_equal @progress.id, @store.find(@scope, 'oemg').id
+    @store.persist(@progress)
+    stored_progress = @store.find(@scope, 'oemg')
+    assert_equal @progress.id, stored_progress.id
+    assert stored_progress.persisted?
   end
 
   def test_find_should_return_nil_if_nothing_is_found

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: progressrus
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Simon Eskildsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Monitor the progress of remote, long-running jobs.