sdb_lock 0.0.2 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a9b9ebf2fa554880afaa6906692e45d7a04ab855
+  data.tar.gz: 684b125391fb61cb928bf685543ddd66987f7b4d
+SHA512:
+  metadata.gz: cdf66afa2420112cdc27aa0b8ef656a926c46ed209b80b000a6ed391d1e76312a44aca1dbd9585b62387ec4c08a47237f04155c70284545e5aa58949241d4912
+  data.tar.gz: 4aae120e31e057fcbddf5411a7ffa363c0416efcf418c3ae0053266ec3a22d16556487770ac71bd4eff97e054b645ec9d456c7ea312e6a381d0050f0d1ab5d08

data/README.md

@@ -58,6 +58,14 @@ lock.unlock_old(10)
 
 ````
 
+## Test
+
+`AWS_REGION` environmental variable is required to run tests.
+
+```
+$ AWS_REGION=ap-northeast-1 bundle exec rake
+```
+
 ## Limitation
 
 * Lock might remain by network failure or other reason. See `#unlock_old`.

data/Rakefile

@@ -1,2 +1,11 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/lib/sdb_lock/version.rb

@@ -1,3 +1,3 @@
 class SdbLock
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/sdb_lock.rb

@@ -1,6 +1,5 @@
 require "sdb_lock/version"
-
-require 'aws'
+require 'aws-sdk'
 
 # Lock using SimpleDB conditional put.
 #
@@ -35,13 +34,12 @@ class SdbLock
   # @param [String] domain_name SimpleDB domain name
   # @param [Hash] options
   def initialize(domain_name, options = {})
-    @sdb = AWS::SimpleDB.new(options)
-    options = options.dup
-    if options.has_key?(:create_domain)
-      @sdb.domains.create(domain_name) if options[:create_domain]
-      options.delete(:create_domain)
+    @sdb = ::Aws::SimpleDB::Client.new(options)
+    @domain_name = domain_name
+    unless domains.include? @domain_name
+      @sdb.create_domain(domain_name: @domain_name)
+      @domains = @sdb.list_domains.domain_names
     end
-    @domain = @sdb.domains[domain_name]
   end
 
   # Try to lock resource_name
@@ -49,8 +47,22 @@ class SdbLock
   # @param [String] resource_name name to lock
   # @return [TrueClass] true when locked, unless false
   def try_lock(resource_name)
-    attributes = {LOCK_TIME => format_time(Time.now), unless: LOCK_TIME}
-    item(resource_name).attributes.set(attributes)
+    attributes = [
+      {
+        name: LOCK_TIME,
+        value: format_time(Time.now)
+      }
+    ]
+
+    @sdb.put_attributes(
+      domain_name: @domain_name,
+      item_name: resource_name,
+      attributes: attributes,
+      expected: {
+        name: LOCK_TIME,
+        exists: false
+      }
+    )
     if block_given?
       begin
         yield
@@ -59,7 +71,7 @@ class SdbLock
       end
     end
     true
-  rescue AWS::SimpleDB::Errors::ConditionalCheckFailed
+  rescue ::Aws::SimpleDB::Errors::ConditionalCheckFailed
     false
   end
 
@@ -90,22 +102,35 @@ class SdbLock
   # Unlock resource_name
   # @param [String] resource_name name to unlock
   def unlock(resource_name, expected_lock_time = nil)
-    if expected_lock_time
-      item(resource_name).attributes.delete(LOCK_TIME, if: {LOCK_TIME => expected_lock_time})
+    expected = if expected_lock_time
+      {
+        name: LOCK_TIME,
+        value: expected_lock_time,
+        exists: true
+      }
     else
-      item(resource_name).attributes.delete(LOCK_TIME)
+      {}
     end
+
+    @sdb.delete_attributes(
+      domain_name: @domain_name,
+      item_name: resource_name,
+      expected: expected
+    )
     true
-  rescue AWS::SimpleDB::Errors::ConditionalCheckFailed
+  rescue ::Aws::SimpleDB::Errors::ConditionalCheckFailed
     false
   end
 
   # Locked time for resource_name
   # @return [Time] locked time, nil if it is not locked
   def locked_time(resource_name)
-    attribute = item(resource_name).attributes[LOCK_TIME]
-    lock_time_string = attribute.values.first
-    Time.at(lock_time_string.to_i) if lock_time_string
+    attributes = item(resource_name)
+    unless attributes.empty?
+      attributes.each do |a|
+        break Time.at(a.value.to_i) if a.name == LOCK_TIME
+      end
+    end
   end
 
   # All locked resources
@@ -117,7 +142,8 @@ class SdbLock
     else
       cond = "`#{LOCK_TIME}` is not null"
     end
-    @domain.items.where(cond).map(&:name)
+    statement = "SELECT * FROM #{@domain_name} WHERE #{cond}"
+    @sdb.select(select_expression: statement).items.map { |i| i.name }
   end
 
   # Unlock old resources.
@@ -130,9 +156,11 @@ class SdbLock
     targets = locked_resources(age_in_seconds)
     unlocked = []
     targets.each do |resource_name|
-      values = item(resource_name).attributes[LOCK_TIME].values
-      next if !values || !values.first || values.first > format_time(Time.now - age_in_seconds)
-      succ = unlock(resource_name, values.first)
+      value = item(resource_name).each do |attribute|
+        break attribute.value if attribute.name == LOCK_TIME
+      end
+      next if !value || value > format_time(Time.now - age_in_seconds)
+      succ = unlock(resource_name, value)
       unlocked << resource_name if succ
     end
     unlocked
@@ -140,8 +168,15 @@ class SdbLock
 
   private
 
+  def domains
+    @domains ||= @sdb.list_domains.domain_names
+  end
+
   def item(resource_name)
-    @domain.items[resource_name]
+    @sdb.get_attributes(
+      domain_name: @domain_name,
+      item_name: resource_name
+    ).attributes
   end
 
   # Format time to compare lexicographically

data/sdb_lock.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = SdbLock::VERSION
 
-  gem.add_dependency 'aws-sdk', '~> 1.5.7'
+  gem.add_dependency 'aws-sdk', '~> 2'
 
   gem.add_development_dependency 'rake', '~> 0.9.2.2'
+  gem.add_development_dependency 'minitest'
 end

data/test/{lock_test.rb → test_lock.rb}

@@ -1,13 +1,10 @@
-require 'minitest/unit'
 require 'minitest/autorun'
 require "sdb_lock"
 
-class LockTest < MiniTest::Unit::TestCase
+class LockTest < MiniTest::Test
   def setup
     @lock = SdbLock.new(
-        'lock_test',
-        create_domain: true,
-        simple_db_endpoint: "sdb.ap-northeast-1.amazonaws.com"
+        'lock_test'
     )
     @lock.unlock("test")
   end

metadata

@@ -1,48 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sdb_lock
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - KAWACHI Takashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.7
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.7
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.2.2
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Lock library using Amazon SimpleDB
 email:
 - kawachi@p-lucky.net
@@ -50,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -58,36 +67,29 @@ files:
 - lib/sdb_lock.rb
 - lib/sdb_lock/version.rb
 - sdb_lock.gemspec
-- test/lock_test.rb
+- test/test_lock.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1769990317450640860
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1769990317450640860
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Lock library using Amazon SimpleDB
 test_files:
-- test/lock_test.rb
+- test/test_lock.rb