falls_back_on 0.1.1 → 0.1.2

data/lib/falls_back_on/definition.rb

@@ -23,6 +23,7 @@ module FallsBackOn
     end
     
     def attrs
+      return {} unless Storage.instance[parent].is_a?(::Hash)
       Storage.instance[parent].inject({}) do |memo, (k, v)|
         memo[k] = calculate k
         memo

data/lib/falls_back_on/version.rb

@@ -1,3 +1,3 @@
 module FallsBackOn
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/test/helper.rb

@@ -20,12 +20,12 @@ rescue ArgumentError
   ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
 end
 
-my_client = Memcached.new
-CacheMethod.config.storage = my_client
-LockMethod.config.storage = my_client
+$my_client = Memcached.new
 
 class Test::Unit::TestCase
   def setup
+    CacheMethod.config.storage = $my_client
+    LockMethod.config.storage = $my_client
     CacheMethod.config.storage.flush
     LockMethod.config.storage.flush
     @old_abort_on_exception = Thread.abort_on_exception

data/test/test_falls_back_on.rb

@@ -38,6 +38,13 @@ class Car3
   falls_back_on :long_running_calculation => lambda { sleep 3 }
 end
 
+class Car4
+  attr_accessor :fuel
+  def ==(other)
+    self.fuel == other.fuel
+  end
+end
+
 class TestFallsBackOn < Test::Unit::TestCase
   def test_fallback
     assert_equal 'gasoline', Car1.fallback.fuel
@@ -96,6 +103,10 @@ class TestFallsBackOn < Test::Unit::TestCase
       end
     end
     
+    # 3 seconds every time.
+    # start it, wait a second, clear fallbacks (and therefore any locks)
+    # you would expect it to completely restart, taking another 3 seconds
+    # so it will time out after 4 seconds
     assert_raises(Timeout::Error) do
       Timeout.timeout(4) do
         blocker = Thread.new { Car3.fallback.long_running_calculation }
@@ -105,4 +116,14 @@ class TestFallsBackOn < Test::Unit::TestCase
       end
     end
   end
+  
+  def test_no_memcached
+    CacheMethod.config.storage = nil
+    LockMethod.config.storage = nil
+    assert_equal 5.5, Car2.fallback.efficiency
+  end
+  
+  def test_no_definition
+    assert_equal Car4.new, Car4.fallback
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: falls_back_on
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Seamus Abshere