rdy 0.1.3 → 0.2.0

data/README.md

@@ -2,7 +2,7 @@
 
 Fun little ruby client for Amazon DynamoDB.
 
-    rdy = Rdy.new("your_table", "your_hash_value")
+    rdy = Rdy.new("your_table", [:your_hash_key, :string])
     rdy.any_attribute = "nice!"
     rdy.foo = "bar"
     rdy.save("1") # hash key value
@@ -17,6 +17,11 @@ Fun little ruby client for Amazon DynamoDB.
     rdy.destroy # delete item
 
     rdy.all
+    rdy.count
+
+    rdy.scan(:any_attribute => 'nice!')
+    limit = 10
+    rdy.scan(:any_attribute => 'nice!', 10)
 
     read_capacity_units = 10
     write_capacity_units = 5

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/rdy.rb

@@ -3,17 +3,38 @@ gem "aws-sdk"
 require "aws-sdk"
 
 class Rdy
-  def initialize(table, hash_key)
-    @attributes = {}; @table = table; @hash_key = hash_key; @is_new = true
-    @_table = Rdy.dynamo_db.tables[@table]
-    @_table.status
+  attr_accessor :hash_key_conditional_check, :check_table_status
+  @@_tables = {}
+  
+  def initialize(table, hash_key, range_key = nil)
+    @attributes = {}; @table = table; @hash_key = hash_key[0].to_s
+    @range_key = range_key[0].to_s if range_key
+    @is_new = true
+    self.hash_key_conditional_check = false
+    self.check_table_status = false
+    if @@_tables[table]
+      @_table = @@_tables[table]
+    else
+      @_table = Rdy.dynamo_db.tables[@table]
+      if self.check_table_status
+        if @_table.status == :active
+          @@_tables[table] = @_table
+        else
+          raise "Table not active yet!"
+        end
+      else
+        @_table.hash_key = [@hash_key.to_sym, hash_key[1].to_sym]
+        @_table.range_key = [@range_key.to_sym, range_key[1].to_sym] if @range_key
+      end
+    end
   end
   def table=(value); @table = value; end
   def table; @table; end
   def attributes; @attributes; end
   def hash_value; @hash_value; end
   def hash_key; @hash_key; end
-  
+  def range_key; @range_key; end
+
   def self.dynamo_db
     config = YAML.load(File.read("#{ENV['HOME']}/.rdy.yml"))
     raise "Config file expected in ~/.rdy.yml" unless config
@@ -26,11 +47,15 @@ class Rdy
   end
 
   def all; @_table.items.collect {|i| i.attributes.to_h }; end
-  def find(hash_value)
+  def find(hash_value, range_value = nil)
     raise "missing hash value" if hash_value.nil?
-    @_item = @_table.items[hash_value]
+    if @range_key and range_value
+      @_item = @_table.items.at(@hash_value, range_value)
+    else
+      @_item = @_table.items[hash_value]
+    end
     @attributes.clear
-    if @_item.attributes.any?
+    if @_item and @_item.attributes and @_item.attributes.any?
       @_item.attributes.to_h.each {|k, v| self.send("#{k}=".to_sym, v) unless k == @hash_key }
       @hash_value = hash_value; @is_new = false
     else
@@ -38,19 +63,43 @@ class Rdy
     end
     @attributes
   end
+  def count; @_table.items.count; end
 
   def is_new?; @is_new; end
   def save(hash_value = nil)
     raise "missing hash value" if hash_value.nil? and is_new?
-    @_item = @_table.items.create(@hash_key.to_sym => hash_value) if is_new?
+    if is_new?
+      if @range_key
+        values = { @hash_key.to_sym => hash_value, @range_key.to_sym => @attributes[@range_key] }
+      else
+        values = { @hash_key.to_sym => hash_value }
+      end
+      options = {}
+      options[:unless_exists] = @hash_key if hash_key_conditional_check  
+      @_item = @_table.items.create(values, options)
+    end
     if @_item
-      @_item.attributes.set(@attributes)
+      if @range_key
+        attrs = @attributes; attrs.delete(@range_key)
+        @_item.attributes.set(attrs)
+      else
+        @_item.attributes.set(@attributes)
+      end
       @hash_value = hash_value if is_new?
       @is_new = false
       @_item.attributes.to_h
     end
   end
 
+  def scan(attrs, limit = nil)
+    values = []; options = {}
+    options[:limit] = limit if limit
+    @_table.items.where(attrs).each(options) do |item|
+      values << item.attributes.to_h
+    end
+    values
+  end
+
   def destroy
     unless is_new?
       @_item.delete

data/test/helper.rb

@@ -14,8 +14,12 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rdy'
 
-puts "Setting up test table for Rdy..."
-Rdy.create_table("rdy_test", 10, 5, :id => :string)
+RDY_SIMPLE_TABLE = 'rdy_test_simple'
+RDY_RANGE_TABLE = 'rdy_test_range'
+
+puts "Setting up test tables for Rdy..."
+Rdy.create_table(RDY_SIMPLE_TABLE, 10, 5, :id => :string) rescue nil
+Rdy.create_table(RDY_RANGE_TABLE, 10, 5, {:id => :string}, {:foo => :string}) rescue nil
 
 class Test::Unit::TestCase
 end

data/test/test_rdy.rb

@@ -2,16 +2,26 @@ require 'helper'
 
 class TestRdy < Test::Unit::TestCase
   def rdy
-    @rdy = Rdy.new('rdy_test', 'id')
+    @rdy = Rdy.new(RDY_SIMPLE_TABLE, [:id, :string])
   end
-  
+
+  def rdy_range
+    @rdy2 = Rdy.new(RDY_RANGE_TABLE, [:id, :string], [:foo, :string])
+  end
+
   should "create an Rdy instance" do
-    rdy = Rdy.new('rdy_test', 'id')
-    assert_equal rdy.table, 'rdy_test'
+    assert_equal rdy.table, RDY_SIMPLE_TABLE
     assert_equal rdy.hash_key, 'id'
     assert_nil rdy.hash_value, nil
   end
   
+  should "create an Rdy instance for table with a range key" do
+    assert_equal rdy_range.table, RDY_RANGE_TABLE
+    assert_equal rdy_range.hash_key, 'id'
+    assert_equal rdy_range.range_key, 'foo'
+    assert_nil rdy.hash_value, nil
+  end
+  
   context "Attributes" do
     setup do
       rdy
@@ -20,10 +30,11 @@ class TestRdy < Test::Unit::TestCase
     should "create assign a value to an attribute" do
       @rdy.foo = "bar"
       @rdy.bar = 23
-      @rdy.flag = true
+      @rdy.tags = ['a', 'b', 'c']
       assert_equal @rdy.foo, "bar"
       assert_equal @rdy.bar, 23
-      assert @rdy.flag
+      assert_not_nil @rdy.tags
+      assert_equal @rdy.tags.size, 3
     end
     
     should "have values in attributes hash" do
@@ -43,14 +54,18 @@ class TestRdy < Test::Unit::TestCase
     should "save an item" do
       assert @rdy.is_new?
       @rdy.foo = "bar"
+      @rdy.count = 1
+      @rdy.tags = ['a', 'b', 'c']
       assert_equal @rdy.foo, "bar"
-      assert_equal @rdy.table, "rdy_test"
+      assert_equal @rdy.table, RDY_SIMPLE_TABLE
       assert_nil @rdy.hash_value
       attributes = @rdy.save('1')
       assert_equal @rdy.hash_value, '1'
-      assert_equal attributes.size, 2
+      assert_equal attributes.size, 4
       assert attributes.keys.include?('id')
       assert attributes.keys.include?('foo')
+      assert attributes.keys.include?('count')
+      assert attributes.keys.include?('tags')
       assert !@rdy.is_new?
       @rdy.destroy
     end
@@ -77,7 +92,7 @@ class TestRdy < Test::Unit::TestCase
       @rdy.destroy
     end
   end
-  
+
   context "Destroying" do
     setup do
       rdy
@@ -94,4 +109,77 @@ class TestRdy < Test::Unit::TestCase
       assert_nil @rdy.hash_value
     end
   end
+  
+  context "Scan Table" do
+    setup do
+      rdy_range
+    end
+    
+    should "scan table by attribute values" do
+      @rdy2 = Rdy.new(RDY_RANGE_TABLE, [:id, :string], [:foo, :string])
+      @rdy2.foo = "bar1"
+      @rdy2.data = "test"
+      @rdy2.save("4")
+      
+      @rdy3 = Rdy.new(RDY_RANGE_TABLE, [:id, :string], [:foo, :string])
+      @rdy3.foo = "bar2"
+      @rdy3.data = "test"
+      @rdy3.save("5")
+
+      attrs = @rdy2.scan(:data => 'test')
+      assert_not_nil attrs
+      assert_equal attrs.size, 2
+
+      attrs = @rdy2.scan(:data => 'test', :foo => 'bar1')
+      assert_not_nil attrs
+      assert_equal attrs.size, 1
+      assert_equal attrs[0]['foo'], 'bar1'
+
+      attrs = @rdy2.scan(:data => 'test', :foo => 'bar2')
+      assert_not_nil attrs
+      assert_equal attrs.size, 1
+      assert_equal attrs[0]['foo'], 'bar2'
+
+      limit = 1
+      attrs = @rdy2.scan({:data => 'test'}, limit)
+      assert_not_nil attrs
+      assert_equal attrs.size, 1
+      
+      @rdy2.find("4", "bar1")
+      @rdy2.destroy
+      
+      @rdy3.find("5", "bar2")
+      @rdy3.destroy
+    end
+  end
+
+  context "Finding hash-key based items" do
+    setup do
+      rdy
+    end
+    
+    should "find an item by hash-key" do
+      @rdy.foo = "bar"
+      attributes = @rdy.save("6")
+      @rdy.find("6")
+      assert_not_nil @rdy.foo
+      assert_equal @rdy.foo, "bar"
+      @rdy.destroy
+    end
+  end
+  
+  context "Finding hash-key/range based items" do
+    setup do
+      rdy_range
+    end
+    
+    should "find an item by hash-key & range combination" do
+      @rdy2.foo = "bar"
+      attributes = @rdy2.save("7")
+      @rdy2.find("7", "bar")
+      assert_not_nil @rdy2.foo
+      assert_equal @rdy2.foo, "bar"
+      @rdy2.destroy
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rdy
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Oliver Kiessler
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-13 00:00:00 Z
+date: 2012-02-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement