lock_method 0.2.0 → 0.2.1

data/README.rdoc

@@ -2,6 +2,12 @@
 
 It's like <tt>alias_method</tt>, but it's <tt>lock_method</tt>!
 
+Lets you lock a method so that only one process can call it at a time. Defaults to using lockfiles on the local file system, but can be configured to store the locks in Memcached or Redis, allowing the method locks to hold over multiple hosts.
+
+== Real-world usage
+
+In production use at {carbon.brighterplanet.com}[http://carbon.brighterplanet.com] and {data.brighterplanet.com}[http://data.brighterplanet.com].
+
 == Example
 
     require 'lock_method'
@@ -28,10 +34,6 @@ Just in case, you can clear them
 
     my_blog.clear_method_lock :get_latest_entries
 
-== Real-world usage
-
-In production use at {carbon.brighterplanet.com}[http://carbon.brighterplanet.com], the Brighter Planet emission estimate web service.
-
 == Pays attention to method arguments
 
 If you lock Foo.bar(*args), calling Foo.bar(:baz) will not lock out Foo.bar(:zoo).

data/lib/lock_method/default_storage_client.rb

@@ -11,10 +11,10 @@ module LockMethod
       attr_reader :created_at
       attr_reader :ttl
       attr_reader :v
-      def initialize(attrs = {})
-        attrs.each do |k, v|
-          instance_variable_set "@#{k}", v
-        end
+      def initialize(ttl, v)
+        @created_at = ::Time.now.to_f
+        @ttl = ttl
+        @v = v
       end
       def expired?
         ttl.to_i > 0 and (::Time.now.to_f - created_at.to_f) > ttl.to_i
@@ -29,10 +29,10 @@ module LockMethod
     end
   
     def set(k, v, ttl)
-      entry = Entry.new :created_at => ::Time.now.to_f, :ttl => ttl, :v => v
+      entry = Entry.new ttl, v
       semaphore.synchronize do
         ::FileUtils.mkdir_p dir unless ::File.directory? dir
-        ::File.open(path(k), ::File::RDWR|::File::CREAT) do |f|
+        ::File.open(path(k), ::File::RDWR|::File::CREAT, :external_encoding => 'ASCII-8BIT') do |f|
           f.flock ::File::LOCK_EX
           f.write ::Marshal.dump(entry)
         end

data/lib/lock_method/lock.rb

@@ -26,15 +26,17 @@ module LockMethod
       end
     end
 
-    def initialize(attrs = {})
-      attrs.each do |k, v|
-        instance_variable_set "@#{k}", v
-      end
-    end
-
     attr_reader :obj
     attr_reader :method_id
     attr_reader :args
+
+    def initialize(obj, method_id, options = {})
+      @obj = obj
+      @method_id = method_id
+      options = options.symbolize_keys
+      @ttl = options[:ttl]
+      @args = options[:args]
+    end
         
     def method_signature
       @method_signature ||= Lock.method_signature(obj, method_id)

data/lib/lock_method/version.rb

@@ -1,3 +1,3 @@
 module LockMethod
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/lock_method.rb

@@ -1,4 +1,11 @@
+require 'active_support'
+require 'active_support/version'
+if ::ActiveSupport::VERSION::MAJOR >= 3
+  require 'active_support/core_ext'
+end
+
 require 'lock_method/version'
+
 # See the README.rdoc for more info!
 module LockMethod
   autoload :Config, 'lock_method/config'
@@ -20,7 +27,7 @@ module LockMethod
     # Example:
     #     my_blog.clear_method_lock :get_latest_entries
     def clear_method_lock(method_id)
-      lock = ::LockMethod::Lock.new :obj => self, :method_id => method_id
+      lock = ::LockMethod::Lock.new self, method_id
       lock.delete
     end
   end
@@ -46,7 +53,7 @@ module LockMethod
       original_method_id = "_unlocked_#{method_id}"
       alias_method original_method_id, method_id
       define_method method_id do |*args|
-        lock = ::LockMethod::Lock.new :obj => self, :method_id => method_id, :args => args, :ttl => ttl
+        lock = ::LockMethod::Lock.new self, method_id, :ttl => ttl, :args => args
         lock.call_and_lock original_method_id, *args
       end
     end

data/lock_method.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
   
-  s.add_dependency 'cache', '>=0.2.1'
+  s.add_runtime_dependency 'cache', '>=0.2.1'
+  s.add_runtime_dependency 'activesupport'
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'memcached'
   s.add_development_dependency 'redis'

data/test/shared_tests.rb

@@ -228,4 +228,15 @@ module SharedTests
       Blog2.work_really_hard_on :foo
     end
   end
+  
+  def test_13_no_encoding_issues
+    old_int = Encoding.default_internal
+    old_ext = Encoding.default_external
+    Encoding.default_internal = 'UTF-8'
+    Encoding.default_external = 'UTF-8'
+    assert_equal ["hello from my_blog"], new_instance_of_my_blog.get_latest_entries
+  ensure
+    Encoding.default_internal = old_int
+    Encoding.default_external = old_ext
+  end
 end

metadata

@@ -1,83 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lock_method
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-15 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cache
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2161845800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2161845800
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2161843720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2161843720
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &2161841860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: memcached
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2161841860
+- !ruby/object:Gem::Dependency
+  name: memcached
+  requirement: &2161830720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: redis
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2161830720
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: &2161830100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2161830100
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &2161829520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *2161829520
 description: Like alias_method, but it's lock_method!
-email: 
+email:
 - seamus@abshere.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -93,35 +99,32 @@ files:
 - test/test_default_storage.rb
 - test/test_memcached_storage.rb
 - test/test_redis_storage.rb
-has_rdoc: true
 homepage: https://github.com/seamusabshere/lock_method
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: lock_method
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Lets you lock methods (to memcached, redis, etc.) as though you had a lockfile for each one
-test_files: 
+summary: Lets you lock methods (to memcached, redis, etc.) as though you had a lockfile
+  for each one
+test_files:
 - test/helper.rb
 - test/shared_tests.rb
 - test/test_default_storage.rb