scrolls 0.2.1 → 0.2.3

data/README.md

@@ -114,7 +114,7 @@ Time and nil:
 
 ```ruby
     Scrolls.log(t: Time.at(1340118167), this: nil)
-    t=t=2012-06-19T11:02:35-0400 this=nil
+    t=2012-06-19T11:02:47-0400 this=nil
 ```
 
 True/False:

data/lib/scrolls/atomic.rb

@@ -1,58 +1,59 @@
-# The result of issues with an update I made to Scrolls. After talking with
-# Fabio Kung about a fix I started work on an atomic object, but he added some
-# fixes to #context without it and then used Headius' atomic gem.
-#
-# The code below is the start and cleanup of my atomic object. It's slim on
-# details and eventually cleaned up around inspiration from Headius' code.
-#
-# LICENSE: Apache 2.0
-#
-# See Headius' atomic gem here:
-# https://github.com/headius/ruby-atomic
-
 require 'thread'
 
-class AtomicObject
-  def initialize(o)
-    @mtx = Mutex.new
-    @o = o
-  end
+module Scrolls
+  # The result of issues with an update I made to Scrolls. After talking with
+  # Fabio Kung about a fix I started work on an atomic object, but he added some
+  # fixes to #context without it and then used Headius' atomic gem.
+  #
+  # The code below is the start and cleanup of my atomic object. It's slim on
+  # details and eventually cleaned up around inspiration from Headius' code.
+  #
+  # LICENSE: Apache 2.0
+  #
+  # See Headius' atomic gem here:
+  # https://github.com/headius/ruby-atomic
+  class AtomicObject
+    def initialize(o)
+      @mtx = Mutex.new
+      @o = o
+    end
 
-  def get
-    @mtx.synchronize { @o }
-  end
+    def get
+      @mtx.synchronize { @o }
+    end
 
-  def set(n)
-    @mtx.synchronize { @o = n }
-  end
+    def set(n)
+      @mtx.synchronize { @o = n }
+    end
 
-  def verify_set(o, n)
-    return false unless @mtx.try_lock
-    begin
-      return false unless @o.equal? o
-      @o = n
-    ensure
-      @mtx.unlock
+    def verify_set(o, n)
+      return false unless @mtx.try_lock
+      begin
+        return false unless @o.equal? o
+        @o = n
+      ensure
+        @mtx.unlock
+      end
     end
   end
-end
 
-class Atomic < AtomicObject
-  def initialize(v=nil)
-    super(v)
-  end
+  class Atomic < AtomicObject
+    def initialize(v=nil)
+      super(v)
+    end
 
-  def value
-    self.get
-  end
+    def value
+      self.get
+    end
 
-  def value=(v)
-    self.set(v)
-    v
-  end
+    def value=(v)
+      self.set(v)
+      v
+    end
 
-  def update
-    true until self.verify_set(o = self.get, n = yield(o))
-    n
+    def update
+      true until self.verify_set(o = self.get, n = yield(o))
+      n
+    end
   end
-end
+end

data/lib/scrolls/log.rb

@@ -68,7 +68,7 @@ module Scrolls
       else
         start = Time.now
         res = nil
-        log(logdata.merge(at: "start"))
+        log(logdata.merge(:at => "start"))
         begin
           res = yield
         rescue StandardError, Timeout::Error => e
@@ -82,7 +82,7 @@ module Scrolls
           )
           raise e
         end
-        log(logdata.merge(at: "finish", elapsed: calc_time(start, Time.now)))
+        log(logdata.merge(:at => "finish", :elapsed => calc_time(start, Time.now)))
         res
       end
     end
@@ -117,8 +117,9 @@ module Scrolls
       return unless block_given?
       old = context
       self.context = old.merge(prefix)
-      yield if block_given?
+      res = yield if block_given?
       self.context = old
+      res
     end
 
     private

data/lib/scrolls/version.rb

@@ -1,3 +1,3 @@
 module Scrolls
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
 end

data/test/test_atomic.rb

@@ -2,22 +2,22 @@ require_relative "test_helper"
 
 class TestAtomic < Test::Unit::TestCase
   def test_construct
-    atomic = Atomic.new
+    atomic = Scrolls::Atomic.new
     assert_equal nil, atomic.value
     
-    atomic = Atomic.new(0)
+    atomic = Scrolls::Atomic.new(0)
     assert_equal 0, atomic.value
   end
   
   def test_value
-    atomic = Atomic.new(0)
+    atomic = Scrolls::Atomic.new(0)
     atomic.value = 1
     
     assert_equal 1, atomic.value
   end
   
   def test_update
-    atomic = Atomic.new(1000)
+    atomic = Scrolls::Atomic.new(1000)
     res = atomic.update {|v| v + 1}
     
     assert_equal 1001, atomic.value
@@ -26,7 +26,7 @@ class TestAtomic < Test::Unit::TestCase
 
   def test_update_retries
     tries = 0
-    atomic = Atomic.new(1000)
+    atomic = Scrolls::Atomic.new(1000)
     atomic.update{|v| tries += 1 ; atomic.value = 1001 ; v + 1}
     assert_equal 2, tries
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scrolls
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies: []
 description: Logging, easier, more consistent.
 email:
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: When do we log? All the time.