RubyGems - dynamoid - Versions diffs - 0.6.1 → 0.7.0 - Mend

dynamoid 0.6.1 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (92) hide show

data/.travis.yml +4 -0
data/Gemfile +3 -2
data/Gemfile.lock +40 -45
data/README.markdown +55 -25
data/Rakefile +31 -0
data/VERSION +1 -1
data/doc/Dynamoid.html +58 -42
data/doc/Dynamoid/Adapter.html +666 -179
data/doc/Dynamoid/Adapter/AwsSdk.html +752 -236
data/doc/Dynamoid/Associations.html +28 -21
data/doc/Dynamoid/Associations/Association.html +102 -49
data/doc/Dynamoid/Associations/BelongsTo.html +28 -25
data/doc/Dynamoid/Associations/ClassMethods.html +95 -52
data/doc/Dynamoid/Associations/HasAndBelongsToMany.html +28 -25
data/doc/Dynamoid/Associations/HasMany.html +28 -25
data/doc/Dynamoid/Associations/HasOne.html +28 -25
data/doc/Dynamoid/Associations/ManyAssociation.html +138 -94
data/doc/Dynamoid/Associations/SingleAssociation.html +67 -38
data/doc/Dynamoid/Components.html +60 -22
data/doc/Dynamoid/Config.html +61 -44
data/doc/Dynamoid/Config/Options.html +90 -61
data/doc/Dynamoid/Criteria.html +28 -21
data/doc/Dynamoid/Criteria/Chain.html +508 -100
data/doc/Dynamoid/Criteria/ClassMethods.html +26 -19
data/doc/Dynamoid/Dirty.html +424 -0
data/doc/Dynamoid/Dirty/ClassMethods.html +174 -0
data/doc/Dynamoid/Document.html +451 -84
data/doc/Dynamoid/Document/ClassMethods.html +281 -102
data/doc/Dynamoid/Errors.html +29 -22
data/doc/Dynamoid/Errors/ConditionalCheckFailedException.html +141 -0
data/doc/Dynamoid/Errors/DocumentNotValid.html +36 -25
data/doc/Dynamoid/Errors/Error.html +27 -20
data/doc/Dynamoid/Errors/InvalidField.html +27 -19
data/doc/Dynamoid/Errors/InvalidQuery.html +131 -0
data/doc/Dynamoid/Errors/MissingRangeKey.html +27 -19
data/doc/Dynamoid/Fields.html +94 -77
data/doc/Dynamoid/Fields/ClassMethods.html +166 -37
data/doc/Dynamoid/Finders.html +28 -21
data/doc/Dynamoid/Finders/ClassMethods.html +505 -78
data/doc/Dynamoid/IdentityMap.html +492 -0
data/doc/Dynamoid/IdentityMap/ClassMethods.html +534 -0
data/doc/Dynamoid/Indexes.html +41 -28
data/doc/Dynamoid/Indexes/ClassMethods.html +45 -29
data/doc/Dynamoid/Indexes/Index.html +100 -62
data/doc/Dynamoid/Middleware.html +115 -0
data/doc/Dynamoid/Middleware/IdentityMap.html +264 -0
data/doc/Dynamoid/Persistence.html +326 -85
data/doc/Dynamoid/Persistence/ClassMethods.html +275 -109
data/doc/Dynamoid/Validations.html +47 -31
data/doc/_index.html +116 -71
data/doc/class_list.html +13 -7
data/doc/css/full_list.css +4 -2
data/doc/css/style.css +60 -44
data/doc/file.LICENSE.html +26 -19
data/doc/file.README.html +152 -48
data/doc/file_list.html +14 -8
data/doc/frames.html +20 -5
data/doc/index.html +152 -48
data/doc/js/app.js +52 -43
data/doc/js/full_list.js +14 -9
data/doc/js/jquery.js +4 -16
data/doc/method_list.html +446 -540
data/doc/top-level-namespace.html +27 -20
data/{Dynamoid.gemspec → dynamoid.gemspec} +21 -8
data/lib/dynamoid/adapter.rb +11 -10
data/lib/dynamoid/adapter/aws_sdk.rb +40 -19
data/lib/dynamoid/components.rb +2 -1
data/lib/dynamoid/criteria/chain.rb +29 -11
data/lib/dynamoid/dirty.rb +6 -0
data/lib/dynamoid/document.rb +34 -19
data/lib/dynamoid/fields.rb +36 -30
data/lib/dynamoid/finders.rb +7 -5
data/lib/dynamoid/persistence.rb +37 -10
data/spec/app/models/address.rb +2 -0
data/spec/app/models/camel_case.rb +10 -0
data/spec/app/models/car.rb +6 -0
data/spec/app/models/nuclear_submarine.rb +5 -0
data/spec/app/models/subscription.rb +2 -2
data/spec/app/models/vehicle.rb +7 -0
data/spec/dynamoid/adapter/aws_sdk_spec.rb +20 -11
data/spec/dynamoid/adapter_spec.rb +67 -82
data/spec/dynamoid/associations/association_spec.rb +30 -30
data/spec/dynamoid/criteria/chain_spec.rb +56 -9
data/spec/dynamoid/criteria_spec.rb +3 -0
data/spec/dynamoid/dirty_spec.rb +8 -0
data/spec/dynamoid/document_spec.rb +109 -47
data/spec/dynamoid/fields_spec.rb +32 -3
data/spec/dynamoid/finders_spec.rb +12 -0
data/spec/dynamoid/persistence_spec.rb +73 -8
data/spec/spec_helper.rb +1 -0
data/spec/support/with_partitioning.rb +15 -0
metadata +22 -9

data/doc/Dynamoid/Adapter/AwsSdk.html CHANGED

@@ -6,19 +6,21 @@
 <title>
   Module: Dynamoid::Adapter::AwsSdk
-    &mdash; Documentation by YARD 0.7.5
+    &mdash; Documentation by YARD 0.8.6.1
 </title>
-  <link rel="stylesheet" href="../../css/style.css" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="../../css/style.css" type="text/css" charset="utf-8" />
-  <link rel="stylesheet" href="../../css/common.css" type="text/css" media="screen" charset="utf-8" />
+  <link rel="stylesheet" href="../../css/common.css" type="text/css" charset="utf-8" />
 <script type="text/javascript" charset="utf-8">
-  relpath = '../..';
-  if (relpath != '') relpath += '/';
+  hasFrames = window.top.frames.main ? true : false;
+  relpath = '../../';
+  framesUrl = "../../frames.html#!" + escape(window.location.href);
 </script>
   <script type="text/javascript" charset="utf-8" src="../../js/jquery.js"></script>
   <script type="text/javascript" charset="utf-8" src="../../js/app.js"></script>
@@ -26,36 +28,41 @@
   </head>
   <body>
-    <script type="text/javascript" charset="utf-8">
-      if (window.top.frames.main) document.body.className = 'frames';
-    </script>
     <div id="header">
       <div id="menu">
-    <a href="../../_index.html">Index (A)</a> &raquo;
+    <a href="../../_index.html">Index (A)</a> &raquo;
     <span class='title'><span class='object_link'><a href="../../Dynamoid.html" title="Dynamoid (module)">Dynamoid</a></span></span> &raquo; <span class='title'><span class='object_link'><a href="../Adapter.html" title="Dynamoid::Adapter (module)">Adapter</a></span></span>
      &raquo;
     <span class="title">AwsSdk</span>
   <div class="noframes"><span class="title">(</span><a href="." target="_top">no frames</a><span class="title">)</span></div>
 </div>
       <div id="search">
-    <a id="class_list_link" href="#">Class List</a>
+    <a class="full_list_link" id="class_list_link"
+        href="../../class_list.html">
+      Class List
+    </a>
-    <a id="method_list_link" href="#">Method List</a>
+    <a class="full_list_link" id="method_list_link"
+        href="../../method_list.html">
+      Method List
+    </a>
-    <a id="file_list_link" href="#">File List</a>
+    <a class="full_list_link" id="file_list_link"
+        href="../../file_list.html">
+      File List
+    </a>
 </div>
       <div class="clear"></div>
     </div>
     <iframe id="search_frame"></iframe>
     <div id="content"><h1>Module: Dynamoid::Adapter::AwsSdk
@@ -127,7 +134,30 @@ More information is available at that Gem's Github page:
         <li class="public ">
   <span class="summary_signature">
-      <a href="#batch_get_item-instance_method" title="#batch_get_item (instance method)">- (Hash) <strong>batch_get_item</strong>(options) </a>
+      <a href="#batch_delete_item-instance_method" title="#batch_delete_item (instance method)">- (Object) <strong>batch_delete_item</strong>(options) </a>
+  </span>
+    <span class="summary_desc"><div class='inline'><p>Delete many items at once from DynamoDB.</p>
+</div></span>
+</li>
+        <li class="public ">
+  <span class="summary_signature">
+      <a href="#batch_get_item-instance_method" title="#batch_get_item (instance method)">- (Hash) <strong>batch_get_item</strong>(table_ids, options = {}) </a>
@@ -138,6 +168,7 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'><p>Get many items at once from DynamoDB.</p>
@@ -160,6 +191,7 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'><p>Establish the connection to DynamoDB.</p>
@@ -182,11 +214,35 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'><p>Return the established connection.</p>
 </div></span>
+</li>
+        <li class="public ">
+  <span class="summary_signature">
+      <a href="#count-instance_method" title="#count (instance method)">- (Integer) <strong>count</strong>(table_name) </a>
+  </span>
+    <span class="summary_desc"><div class='inline'><p>Number of items from a table.</p>
+</div></span>
 </li>
@@ -204,6 +260,7 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'><p>Create a table on DynamoDB.</p>
@@ -226,6 +283,7 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'><p>Removes an item from DynamoDB.</p>
@@ -248,6 +306,7 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'><p>Deletes an entire table from DynamoDB.</p>
@@ -259,7 +318,7 @@ More information is available at that Gem's Github page:
         <li class="public ">
   <span class="summary_signature">
-      <a href="#get_item-instance_method" title="#get_item (instance method)">- (Object) <strong>get_item</strong>(table_name, key, options = {}) </a>
+      <a href="#get_item-instance_method" title="#get_item (instance method)">- (Hash) <strong>get_item</strong>(table_name, key, options = {}) </a>
@@ -270,9 +329,11 @@ More information is available at that Gem's Github page:
-    <span class="summary_desc"><div class='inline'></div></span>
+    <span class="summary_desc"><div class='inline'><p>Fetches an item from DynamoDB.</p>
+</div></span>
 </li>
@@ -291,6 +352,7 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'></div></span>
@@ -312,6 +374,7 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'><p>List all tables on DynamoDB.</p>
@@ -323,7 +386,7 @@ More information is available at that Gem's Github page:
         <li class="public ">
   <span class="summary_signature">
-      <a href="#put_item-instance_method" title="#put_item (instance method)">- (Object) <strong>put_item</strong>(table_name, object) </a>
+      <a href="#put_item-instance_method" title="#put_item (instance method)">- (Object) <strong>put_item</strong>(table_name, object, options = nil) </a>
@@ -334,6 +397,7 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'><p>Persists an item on DynamoDB.</p>
@@ -345,7 +409,7 @@ More information is available at that Gem's Github page:
         <li class="public ">
   <span class="summary_signature">
-      <a href="#query-instance_method" title="#query (instance method)">- (Array) <strong>query</strong>(table_name, opts = {}) </a>
+      <a href="#query-instance_method" title="#query (instance method)">- (Enumerator) <strong>query</strong>(table_name, opts = {}) </a>
@@ -356,6 +420,7 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'><p>Query the DynamoDB table.</p>
@@ -367,7 +432,7 @@ More information is available at that Gem's Github page:
         <li class="public ">
   <span class="summary_signature">
-      <a href="#scan-instance_method" title="#scan (instance method)">- (Array) <strong>scan</strong>(table_name, scan_hash, select_opts) </a>
+      <a href="#scan-instance_method" title="#scan (instance method)">- (Enumerator) <strong>scan</strong>(table_name, scan_hash, select_opts) </a>
@@ -378,6 +443,7 @@ More information is available at that Gem's Github page:
     <span class="summary_desc"><div class='inline'><p>Scan the DynamoDB table.</p>
@@ -400,6 +466,29 @@ More information is available at that Gem's Github page:
+    <span class="summary_desc"><div class='inline'></div></span>
+</li>
+        <li class="public ">
+  <span class="summary_signature">
+      <a href="#update_item-instance_method" title="#update_item (instance method)">- (Object) <strong>update_item</strong>(table_name, key, options = {}, &amp;block) </a>
+  </span>
     <span class="summary_desc"><div class='inline'></div></span>
@@ -414,18 +503,23 @@ More information is available at that Gem's Github page:
   <div id="instance_method_details" class="method_details_list">
     <h2>Instance Method Details</h2>
       <div class="method_details first">
-  <p class="signature first" id="batch_get_item-instance_method">
+  <h3 class="signature first" id="batch_delete_item-instance_method">
-    - (<tt>Hash</tt>) <strong>batch_get_item</strong>(options)
+    - (<tt>Object</tt>) <strong>batch_delete_item</strong>(options)
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
-    <p>Get many items at once from DynamoDB. More efficient than getting each item individually.</p>
+    <p>Delete many items at once from DynamoDB. More efficient than delete each item individually.</p>
+<p>or
+  Dynamoid::Adapter::AwsSdk.batch_delete_item('table1' =&gt; [['hk1', 'rk2'], ['hk1', 'rk2']]]))</p>
   </div>
@@ -433,14 +527,16 @@ More information is available at that Gem's Github page:
 <div class="tags">
   <div class="examples">
-    <h3>Examples:</h3>
+    <p class="tag_title">Examples:</p>
-      <h4><div class='inline'><p>Retrieve IDs 1 and 2 from the table testtable</p>
-</div></h4>
-      <pre class="example code"><span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Adapter</span><span class='op'>::</span><span class='const'>AwsSdk</span><span class='period'>.</span><span class='id identifier rubyid_batch_get_item'>batch_get_item</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>table1</span><span class='tstring_end'>'</span></span> <span class='op'>=&gt;</span> <span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>1</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>2</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span><span class='rparen'>)</span></pre>
+        <p class="example_title"><div class='inline'><p>Delete IDs 1 and 2 from the table testtable</p>
+</div></p>
+      <pre class="example code"><code><span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Adapter</span><span class='op'>::</span><span class='const'>AwsSdk</span><span class='period'>.</span><span class='id identifier rubyid_batch_delete_item'>batch_delete_item</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>table1</span><span class='tstring_end'>'</span></span> <span class='op'>=&gt;</span> <span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>1</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>2</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span><span class='rparen'>)</span></code></pre>
   </div>
-<h3>Parameters:</h3>
+<p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -452,15 +548,135 @@ More information is available at that Gem's Github page:
+        &mdash;
+        <div class='inline'><p>the hash of tables and IDs to delete</p>
+</div>
+    </li>
+</ul>
+<p class="tag_title">Returns:</p>
+<ul class="return">
+    <li>
+        <span class='type'></span>
+        <div class='inline'><p>nil</p>
+</div>
+    </li>
+</ul>
+</div><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 90</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_batch_delete_item'>batch_delete_item</span><span class='lparen'>(</span><span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
+  <span class='kw'>return</span> <span class='kw'>nil</span> <span class='kw'>if</span> <span class='id identifier rubyid_options'>options</span><span class='period'>.</span><span class='id identifier rubyid_all?'>all?</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='comma'>,</span> <span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='id identifier rubyid_v'>v</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span><span class='rbrace'>}</span>
+  <span class='id identifier rubyid_options'>options</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_t'>t</span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>ids</span><span class='op'>|</span>
+    <span class='const'>Array</span><span class='lparen'>(</span><span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_in_groups_of'>in_groups_of</span><span class='lparen'>(</span><span class='int'>25</span><span class='comma'>,</span> <span class='kw'>false</span><span class='rparen'>)</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_group'>group</span><span class='op'>|</span>
+      <span class='id identifier rubyid_batch'>batch</span> <span class='op'>=</span> <span class='const'>AWS</span><span class='op'>::</span><span class='const'>DynamoDB</span><span class='op'>::</span><span class='const'>BatchWrite</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='symbol'>:config</span> <span class='op'>=&gt;</span> <span class='cvar'>@@connection</span><span class='period'>.</span><span class='id identifier rubyid_config'>config</span><span class='rparen'>)</span>
+      <span class='id identifier rubyid_batch'>batch</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span><span class='lparen'>(</span><span class='id identifier rubyid_t'>t</span><span class='comma'>,</span><span class='id identifier rubyid_group'>group</span><span class='rparen'>)</span>
+      <span class='id identifier rubyid_batch'>batch</span><span class='period'>.</span><span class='id identifier rubyid_process!'>process!</span>
+    <span class='kw'>end</span>
+  <span class='kw'>end</span>
+  <span class='kw'>nil</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+      <div class="method_details ">
+  <h3 class="signature " id="batch_get_item-instance_method">
+    - (<tt>Hash</tt>) <strong>batch_get_item</strong>(table_ids, options = {})
+</h3><div class="docstring">
+  <div class="discussion">
+    <p>Get many items at once from DynamoDB. More efficient than getting each item individually.</p>
+  </div>
+</div>
+<div class="tags">
+  <div class="examples">
+    <p class="tag_title">Examples:</p>
+        <p class="example_title"><div class='inline'><p>Retrieve IDs 1 and 2 from the table testtable</p>
+</div></p>
+      <pre class="example code"><code><span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Adapter</span><span class='op'>::</span><span class='const'>AwsSdk</span><span class='period'>.</span><span class='id identifier rubyid_batch_get_item'>batch_get_item</span><span class='lparen'>(</span><span class='lbrace'>{</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>table1</span><span class='tstring_end'>'</span></span> <span class='op'>=&gt;</span> <span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>1</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>2</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span><span class='rbrace'>}</span><span class='comma'>,</span> <span class='symbol'>:consistent_read</span> <span class='op'>=&gt;</span> <span class='kw'>true</span><span class='rparen'>)</span></code></pre>
+  </div>
+<p class="tag_title">Parameters:</p>
+<ul class="param">
+    <li>
+        <span class='name'>table_ids</span>
+        <span class='type'>(<tt>Hash</tt>)</span>
         &mdash;
         <div class='inline'><p>the hash of tables and IDs to retrieve</p>
 </div>
     </li>
+    <li>
+        <span class='name'>options</span>
+        <span class='type'>(<tt>Hash</tt>)</span>
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
+        &mdash;
+        <div class='inline'><p>to be passed to underlying BatchGet call</p>
+</div>
+    </li>
 </ul>
-<h3>Returns:</h3>
+<p class="tag_title">Returns:</p>
 <ul class="return">
     <li>
@@ -477,7 +693,7 @@ More information is available at that Gem's Github page:
     </li>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -499,31 +715,31 @@ More information is available at that Gem's Github page:
       <pre class="lines">
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56</pre>
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 43</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 64</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_batch_get_item'>batch_get_item</span><span class='lparen'>(</span><span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_batch_get_item'>batch_get_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table_ids'>table_ids</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_hash'>hash</span> <span class='op'>=</span> <span class='const'>Hash</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_h'>h</span><span class='comma'>,</span> <span class='id identifier rubyid_k'>k</span><span class='op'>|</span> <span class='id identifier rubyid_h'>h</span><span class='lbracket'>[</span><span class='id identifier rubyid_k'>k</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span><span class='rbrace'>}</span>
-  <span class='kw'>return</span> <span class='id identifier rubyid_hash'>hash</span> <span class='kw'>if</span> <span class='id identifier rubyid_options'>options</span><span class='period'>.</span><span class='id identifier rubyid_all?'>all?</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='comma'>,</span> <span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='id identifier rubyid_v'>v</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span><span class='rbrace'>}</span>
-  <span class='id identifier rubyid_options'>options</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_t'>t</span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>ids</span><span class='op'>|</span>
+  <span class='kw'>return</span> <span class='id identifier rubyid_hash'>hash</span> <span class='kw'>if</span> <span class='id identifier rubyid_table_ids'>table_ids</span><span class='period'>.</span><span class='id identifier rubyid_all?'>all?</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='comma'>,</span> <span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='id identifier rubyid_v'>v</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span><span class='rbrace'>}</span>
+  <span class='id identifier rubyid_table_ids'>table_ids</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_t'>t</span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>ids</span><span class='op'>|</span>
     <span class='const'>Array</span><span class='lparen'>(</span><span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_in_groups_of'>in_groups_of</span><span class='lparen'>(</span><span class='int'>100</span><span class='comma'>,</span> <span class='kw'>false</span><span class='rparen'>)</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_group'>group</span><span class='op'>|</span>
       <span class='id identifier rubyid_batch'>batch</span> <span class='op'>=</span> <span class='const'>AWS</span><span class='op'>::</span><span class='const'>DynamoDB</span><span class='op'>::</span><span class='const'>BatchGet</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='symbol'>:config</span> <span class='op'>=&gt;</span> <span class='cvar'>@@connection</span><span class='period'>.</span><span class='id identifier rubyid_config'>config</span><span class='rparen'>)</span>
-      <span class='id identifier rubyid_batch'>batch</span><span class='period'>.</span><span class='id identifier rubyid_table'>table</span><span class='lparen'>(</span><span class='id identifier rubyid_t'>t</span><span class='comma'>,</span> <span class='symbol'>:all</span><span class='comma'>,</span> <span class='const'>Array</span><span class='lparen'>(</span><span class='id identifier rubyid_group'>group</span><span class='rparen'>)</span><span class='rparen'>)</span> <span class='kw'>unless</span> <span class='id identifier rubyid_group'>group</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='op'>||</span> <span class='id identifier rubyid_group'>group</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span>
+      <span class='id identifier rubyid_batch'>batch</span><span class='period'>.</span><span class='id identifier rubyid_table'>table</span><span class='lparen'>(</span><span class='id identifier rubyid_t'>t</span><span class='comma'>,</span> <span class='symbol'>:all</span><span class='comma'>,</span> <span class='const'>Array</span><span class='lparen'>(</span><span class='id identifier rubyid_group'>group</span><span class='rparen'>)</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span> <span class='kw'>unless</span> <span class='id identifier rubyid_group'>group</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='op'>||</span> <span class='id identifier rubyid_group'>group</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span>
       <span class='id identifier rubyid_batch'>batch</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_attributes'>attributes</span><span class='op'>|</span>
         <span class='id identifier rubyid_hash'>hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rbracket'>]</span> <span class='op'>&lt;&lt;</span> <span class='id identifier rubyid_attributes'>attributes</span><span class='period'>.</span><span class='id identifier rubyid_symbolize_keys!'>symbolize_keys!</span>
       <span class='kw'>end</span>
@@ -537,22 +753,46 @@ More information is available at that Gem's Github page:
 </div>
       <div class="method_details ">
-  <p class="signature " id="connect!-instance_method">
+  <h3 class="signature " id="connect!-instance_method">
     - (<tt>AWS::DynamoDB::Connection</tt>) <strong>connect!</strong>
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Establish the connection to DynamoDB.</p>
+<p>Call DynamoDB new, with no parameters.
+Make sure the aws.yml file or aws.rb file, refer the link for more details.
+<a href="https://github.com/amazonwebservices/aws-sdk-for-ruby">https://github.com/amazonwebservices/aws-sdk-for-ruby</a>
+1. Create config/aws.yml as follows:
+Fill in your AWS Access Key ID and Secret Access Key
+<a href="http://aws.amazon.com/security-credentials">http://aws.amazon.com/security-credentials</a>
+access_key_id: REPLACE_WITH_ACCESS_KEY_ID
+secret_access_key: REPLACE_WITH_SECRET_ACCESS_KEY
+(or)
+2, Create config/initializers/aws.rb as follows:
+load the libraries
+require 'aws'
+log requests using the default rails logger
+AWS.config(:logger =&gt; Rails.logger)
+load credentials from a file
+config_path = File.expand_path(File.dirname(<strong>FILE</strong>)+&quot;/../aws.yml&quot;)
+AWS.config(YAML.load(File.read(config_path)))
+Additionally include any of the dynamodb paramters as needed
+(eg: if you would like to change the dynamodb endpoint, then add the parameter in
+the following paramter in the file  aws.yml or aws.rb
+dynamo_db_endpoint : dynamodb.ap-southeast-1.amazonaws.com)</p>
   </div>
 </div>
 <div class="tags">
-<h3>Returns:</h3>
+<p class="tag_title">Returns:</p>
 <ul class="return">
     <li>
@@ -569,7 +809,7 @@ More information is available at that Gem's Github page:
     </li>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -591,15 +831,15 @@ More information is available at that Gem's Github page:
       <pre class="lines">
-20
-21
-22</pre>
+40
+41
+42</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 20</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 40</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_connect!'>connect!</span>
-  <span class='cvar'>@@connection</span> <span class='op'>=</span> <span class='const'>AWS</span><span class='op'>::</span><span class='const'>DynamoDB</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='symbol'>:access_key_id</span> <span class='op'>=&gt;</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_access_key'>access_key</span><span class='comma'>,</span> <span class='symbol'>:secret_access_key</span> <span class='op'>=&gt;</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_secret_key'>secret_key</span><span class='comma'>,</span> <span class='symbol'>:dynamo_db_endpoint</span> <span class='op'>=&gt;</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_endpoint'>endpoint</span><span class='rparen'>)</span>
+<span class='cvar'>@@connection</span> <span class='op'>=</span> <span class='const'>AWS</span><span class='op'>::</span><span class='const'>DynamoDB</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -607,13 +847,15 @@ More information is available at that Gem's Github page:
 </div>
       <div class="method_details ">
-  <p class="signature " id="connection-instance_method">
+  <h3 class="signature " id="connection-instance_method">
     - (<tt>AWS::DynamoDB::Connection</tt>) <strong>connection</strong>
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Return the established connection.</p>
@@ -622,7 +864,7 @@ More information is available at that Gem's Github page:
 </div>
 <div class="tags">
-<h3>Returns:</h3>
+<p class="tag_title">Returns:</p>
 <ul class="return">
     <li>
@@ -639,7 +881,7 @@ More information is available at that Gem's Github page:
     </li>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -661,12 +903,12 @@ More information is available at that Gem's Github page:
       <pre class="lines">
-29
-30
-31</pre>
+49
+50
+51</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 29</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 49</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_connection'>connection</span>
   <span class='cvar'>@@connection</span>
@@ -677,13 +919,108 @@ More information is available at that Gem's Github page:
 </div>
       <div class="method_details ">
-  <p class="signature " id="create_table-instance_method">
+  <h3 class="signature " id="count-instance_method">
+    - (<tt>Integer</tt>) <strong>count</strong>(table_name)
+</h3><div class="docstring">
+  <div class="discussion">
+    <p>Number of items from a table</p>
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+    <li>
+        <span class='name'>table_name</span>
+        <span class='type'>(<tt>String</tt>)</span>
+        &mdash;
+        <div class='inline'><p>the name of the table</p>
+</div>
+    </li>
+</ul>
+<p class="tag_title">Returns:</p>
+<ul class="return">
+    <li>
+        <span class='type'>(<tt>Integer</tt>)</span>
+        &mdash;
+        <div class='inline'><p>the number of items from a table</p>
+</div>
+    </li>
+</ul>
+<p class="tag_title">Since:</p>
+<ul class="since">
+    <li>
+        <div class='inline'><p>0.6.1</p>
+</div>
+    </li>
+</ul>
+</div><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+281
+282
+283
+284</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 281</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_count'>count</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_table'>table</span> <span class='op'>=</span> <span class='id identifier rubyid_get_table'>get_table</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_count'>count</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+      <div class="method_details ">
+  <h3 class="signature " id="create_table-instance_method">
     - (<tt>Object</tt>) <strong>create_table</strong>(table_name, key = :id, options = {})
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Create a table on DynamoDB. This usually takes a long time to complete.</p>
@@ -691,7 +1028,7 @@ More information is available at that Gem's Github page:
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -745,7 +1082,7 @@ More information is available at that Gem's Github page:
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -767,19 +1104,21 @@ More information is available at that Gem's Github page:
       <pre class="lines">
-65
-66
-67
-68
-69
-70
-71
-72</pre>
+109
+110
+111
+112
+113
+114
+115
+116
+117</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 65</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 109</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_create_table'>create_table</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_key'>key</span> <span class='op'>=</span> <span class='symbol'>:id</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='rparen'>)</span>
+  <span class='const'>Dynamoid</span><span class='period'>.</span><span class='id identifier rubyid_logger'>logger</span><span class='period'>.</span><span class='id identifier rubyid_info'>info</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Creating </span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rbrace'>}</span><span class='tstring_content'> table. This could take a while.</span><span class='tstring_end'>&quot;</span></span>
   <span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:hash_key</span><span class='rbracket'>]</span> <span class='op'>||=</span> <span class='lbrace'>{</span><span class='id identifier rubyid_key'>key</span><span class='period'>.</span><span class='id identifier rubyid_to_sym'>to_sym</span> <span class='op'>=&gt;</span> <span class='symbol'>:string</span><span class='rbrace'>}</span>
   <span class='id identifier rubyid_read_capacity'>read_capacity</span> <span class='op'>=</span> <span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:read_capacity</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_read_capacity'>read_capacity</span>
   <span class='id identifier rubyid_write_capacity'>write_capacity</span> <span class='op'>=</span> <span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:write_capacity</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_write_capacity'>write_capacity</span>
@@ -793,13 +1132,15 @@ More information is available at that Gem's Github page:
 </div>
       <div class="method_details ">
-  <p class="signature " id="delete_item-instance_method">
+  <h3 class="signature " id="delete_item-instance_method">
     - (<tt>Object</tt>) <strong>delete_item</strong>(table_name, key, options = {})
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Removes an item from DynamoDB.</p>
@@ -807,7 +1148,7 @@ More information is available at that Gem's Github page:
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -857,7 +1198,7 @@ More information is available at that Gem's Github page:
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -879,29 +1220,21 @@ More information is available at that Gem's Github page:
       <pre class="lines">
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91</pre>
+126
+127
+128
+129
+130
+131
+132</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 81</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 126</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_delete_item'>delete_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_range_key'>range_key</span> <span class='op'>=</span> <span class='id identifier rubyid_options'>options</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span><span class='lparen'>(</span><span class='symbol'>:range_key</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_table'>table</span> <span class='op'>=</span> <span class='id identifier rubyid_get_table'>get_table</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_result'>result</span> <span class='op'>=</span> <span class='kw'>if</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_composite_key?'>composite_key?</span>
-    <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_at'>at</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_range_key'>range_key</span><span class='rparen'>)</span>
-  <span class='kw'>else</span>
-    <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span>
-  <span class='kw'>end</span>
+  <span class='id identifier rubyid_result'>result</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_at'>at</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_range_key'>range_key</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_result'>result</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span> <span class='kw'>unless</span> <span class='id identifier rubyid_result'>result</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='period'>.</span><span class='id identifier rubyid_to_h'>to_h</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span>
   <span class='kw'>true</span>
 <span class='kw'>end</span></pre>
@@ -911,22 +1244,24 @@ More information is available at that Gem's Github page:
 </div>
       <div class="method_details ">
-  <p class="signature " id="delete_table-instance_method">
+  <h3 class="signature " id="delete_table-instance_method">
     - (<tt>Object</tt>) <strong>delete_table</strong>(table_name)
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
-    <p>Deletes an entire table from DynamoDB. Only 10 tables can be in the deleting state at once,
+    <p>Deletes an entire table from DynamoDB. Only 10 tables can be in the deleting state at once,
 so if you have more this method may raise an exception.</p>
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -946,7 +1281,7 @@ so if you have more this method may raise an exception.</p>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -968,15 +1303,21 @@ so if you have more this method may raise an exception.</p>
       <pre class="lines">
-99
-100
-101</pre>
+140
+141
+142
+143
+144
+145</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 99</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 140</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_delete_table'>delete_table</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rparen'>)</span>
-  <span class='cvar'>@@connection</span><span class='period'>.</span><span class='id identifier rubyid_tables'>tables</span><span class='lbracket'>[</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span>
+  <span class='const'>Dynamoid</span><span class='period'>.</span><span class='id identifier rubyid_logger'>logger</span><span class='period'>.</span><span class='id identifier rubyid_info'>info</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Deleting </span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rbrace'>}</span><span class='tstring_content'> table. This could take a while.</span><span class='tstring_end'>&quot;</span></span>
+  <span class='id identifier rubyid_table'>table</span> <span class='op'>=</span> <span class='cvar'>@@connection</span><span class='period'>.</span><span class='id identifier rubyid_tables'>tables</span><span class='lbracket'>[</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rbracket'>]</span>
+  <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span>
+  <span class='id identifier rubyid_sleep'>sleep</span> <span class='float'>0.5</span> <span class='kw'>while</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_exists?'>exists?</span> <span class='op'>==</span> <span class='kw'>true</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -984,46 +1325,133 @@ so if you have more this method may raise an exception.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="get_item-instance_method">
+  <h3 class="signature " id="get_item-instance_method">
-    - (<tt>Object</tt>) <strong>get_item</strong>(table_name, key, options = {})
+    - (<tt>Hash</tt>) <strong>get_item</strong>(table_name, key, options = {})
-</p><table class="source_code">
+</h3><div class="docstring">
+  <div class="discussion">
+    <p>Fetches an item from DynamoDB.</p>
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
+    <li>
+        <span class='name'>table_name</span>
+        <span class='type'>(<tt>String</tt>)</span>
+        &mdash;
+        <div class='inline'><p>the name of the table</p>
+</div>
+    </li>
+    <li>
+        <span class='name'>key</span>
+        <span class='type'>(<tt>String</tt>)</span>
+        &mdash;
+        <div class='inline'><p>the hash key of the item to find</p>
+</div>
+    </li>
+    <li>
+        <span class='name'>range_key</span>
+        <span class='type'>(<tt>Number</tt>)</span>
+        &mdash;
+        <div class='inline'><p>the range key of the item to find, required if the table has a composite key</p>
+</div>
+    </li>
+</ul>
+<p class="tag_title">Returns:</p>
+<ul class="return">
+    <li>
+        <span class='type'>(<tt>Hash</tt>)</span>
+        &mdash;
+        <div class='inline'><p>a hash representing the raw item in DynamoDB</p>
+</div>
+    </li>
+</ul>
+<p class="tag_title">Since:</p>
+<ul class="since">
+    <li>
+        <div class='inline'><p>0.2.0</p>
+</div>
+    </li>
+</ul>
+</div><table class="source_code">
   <tr>
     <td>
       <pre class="lines">
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131</pre>
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 117</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 158</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_get_item'>get_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_range_key'>range_key</span> <span class='op'>=</span> <span class='id identifier rubyid_options'>options</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span><span class='lparen'>(</span><span class='symbol'>:range_key</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_table'>table</span> <span class='op'>=</span> <span class='id identifier rubyid_get_table'>get_table</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_result'>result</span> <span class='op'>=</span> <span class='kw'>if</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_composite_key?'>composite_key?</span>
-    <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_at'>at</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_range_key'>range_key</span><span class='rparen'>)</span>
-  <span class='kw'>else</span>
-    <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span>
-  <span class='kw'>end</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='period'>.</span><span class='id identifier rubyid_to_h'>to_h</span><span class='lparen'>(</span><span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_result'>result</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_at'>at</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_range_key'>range_key</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='period'>.</span><span class='id identifier rubyid_to_h'>to_h</span><span class='lparen'>(</span><span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
   <span class='kw'>if</span> <span class='id identifier rubyid_result'>result</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span>
     <span class='kw'>nil</span>
   <span class='kw'>else</span>
@@ -1036,17 +1464,19 @@ so if you have more this method may raise an exception.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="get_table-instance_method">
+  <h3 class="signature " id="get_table-instance_method">
     - (<tt>Object</tt>) <strong>get_table</strong>(table_name)
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
   <div class="note todo">
-    <strong>TODO:</strong>
+    <strong>TODO:</strong>
     <div class='inline'><p>Add an UpdateTable method.</p>
 </div>
   </div>
@@ -1064,17 +1494,17 @@ so if you have more this method may raise an exception.</p>
       <pre class="lines">
-202
-203
-204
-205
-206
-207
-208
-209</pre>
+261
+262
+263
+264
+265
+266
+267
+268</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 202</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 261</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_get_table'>get_table</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rparen'>)</span>
   <span class='kw'>unless</span> <span class='id identifier rubyid_table'>table</span> <span class='op'>=</span> <span class='id identifier rubyid_table_cache'>table_cache</span><span class='lbracket'>[</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rbracket'>]</span>
@@ -1090,13 +1520,15 @@ so if you have more this method may raise an exception.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="list_tables-instance_method">
+  <h3 class="signature " id="list_tables-instance_method">
     - (<tt>Object</tt>) <strong>list_tables</strong>
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>List all tables on DynamoDB.</p>
@@ -1105,7 +1537,7 @@ so if you have more this method may raise an exception.</p>
 </div>
 <div class="tags">
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -1127,12 +1559,12 @@ so if you have more this method may raise an exception.</p>
       <pre class="lines">
-136
-137
-138</pre>
+184
+185
+186</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 136</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 184</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_list_tables'>list_tables</span>
   <span class='cvar'>@@connection</span><span class='period'>.</span><span class='id identifier rubyid_tables'>tables</span><span class='period'>.</span><span class='id identifier rubyid_collect'>collect</span><span class='lparen'>(</span><span class='op'>&amp;</span><span class='symbol'>:name</span><span class='rparen'>)</span>
@@ -1143,13 +1575,15 @@ so if you have more this method may raise an exception.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="put_item-instance_method">
+  <h3 class="signature " id="put_item-instance_method">
-    - (<tt>Object</tt>) <strong>put_item</strong>(table_name, object)
+    - (<tt>Object</tt>) <strong>put_item</strong>(table_name, object, options = nil)
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Persists an item on DynamoDB.</p>
@@ -1157,7 +1591,7 @@ so if you have more this method may raise an exception.</p>
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -1192,7 +1626,7 @@ so if you have more this method may raise an exception.</p>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -1214,17 +1648,27 @@ so if you have more this method may raise an exception.</p>
       <pre class="lines">
-146
-147
-148
-149</pre>
+194
+195
+196
+197
+198
+199
+200
+201
+202</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 146</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 194</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_put_item'>put_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_object'>object</span><span class='rparen'>)</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_put_item'>put_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_object'>object</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span> <span class='op'>=</span> <span class='kw'>nil</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_table'>table</span> <span class='op'>=</span> <span class='id identifier rubyid_get_table'>get_table</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_create'>create</span><span class='lparen'>(</span><span class='id identifier rubyid_object'>object</span><span class='period'>.</span><span class='id identifier rubyid_delete_if'>delete_if</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='comma'>,</span> <span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='id identifier rubyid_v'>v</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='op'>||</span> <span class='lparen'>(</span><span class='id identifier rubyid_v'>v</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='symbol'>:empty?</span><span class='rparen'>)</span> <span class='op'>&amp;&amp;</span> <span class='id identifier rubyid_v'>v</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span><span class='rparen'>)</span><span class='rbrace'>}</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_create'>create</span><span class='lparen'>(</span>
+    <span class='id identifier rubyid_object'>object</span><span class='period'>.</span><span class='id identifier rubyid_delete_if'>delete_if</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='comma'>,</span> <span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='id identifier rubyid_v'>v</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='op'>||</span> <span class='lparen'>(</span><span class='id identifier rubyid_v'>v</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='symbol'>:empty?</span><span class='rparen'>)</span> <span class='op'>&amp;&amp;</span> <span class='id identifier rubyid_v'>v</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span><span class='rparen'>)</span><span class='rbrace'>}</span><span class='comma'>,</span>
+    <span class='id identifier rubyid_options'>options</span> <span class='op'>||</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
+  <span class='rparen'>)</span>
+<span class='kw'>rescue</span> <span class='const'>AWS</span><span class='op'>::</span><span class='const'>DynamoDB</span><span class='op'>::</span><span class='const'>Errors</span><span class='op'>::</span><span class='const'>ConditionalCheckFailedException</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_e'>e</span>
+  <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Errors</span><span class='op'>::</span><span class='const'>ConditionalCheckFailedException</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1232,23 +1676,25 @@ so if you have more this method may raise an exception.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="query-instance_method">
+  <h3 class="signature " id="query-instance_method">
-    - (<tt>Array</tt>) <strong>query</strong>(table_name, opts = {})
+    - (<tt>Enumerator</tt>) <strong>query</strong>(table_name, opts = {})
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
-    <p>Query the DynamoDB table. This employs DynamoDB's indexes so is generally faster than scanning, but is
-only really useful for range queries, since it can only find by one hash key at once. Only provide
+    <p>Query the DynamoDB table. This employs DynamoDB's indexes so is generally faster than scanning, but is
+only really useful for range queries, since it can only find by one hash key at once. Only provide
 one range key to the hash.</p>
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -1290,7 +1736,7 @@ one range key to the hash.</p>
-    <h3>Options Hash (<tt>opts</tt>):</h3>
+    <p class="tag_title">Options Hash (<tt>opts</tt>):</p>
     <ul class="option">
         <li>
@@ -1299,8 +1745,10 @@ one range key to the hash.</p>
           <span class="default">
           </span>
-          &mdash; <div class='inline'><p>the value of the hash key to find</p>
+            &mdash; <div class='inline'><p>the value of the hash key to find</p>
 </div>
         </li>
         <li>
@@ -1309,8 +1757,10 @@ one range key to the hash.</p>
           <span class="default">
           </span>
-          &mdash; <div class='inline'><p>find the range key within this range</p>
+            &mdash; <div class='inline'><p>find the range key within this range</p>
 </div>
         </li>
         <li>
@@ -1319,8 +1769,10 @@ one range key to the hash.</p>
           <span class="default">
           </span>
-          &mdash; <div class='inline'><p>find range keys greater than this</p>
+            &mdash; <div class='inline'><p>find range keys greater than this</p>
 </div>
         </li>
         <li>
@@ -1329,8 +1781,10 @@ one range key to the hash.</p>
           <span class="default">
           </span>
-          &mdash; <div class='inline'><p>find range keys less than this</p>
+            &mdash; <div class='inline'><p>find range keys less than this</p>
 </div>
         </li>
         <li>
@@ -1339,8 +1793,10 @@ one range key to the hash.</p>
           <span class="default">
           </span>
-          &mdash; <div class='inline'><p>find range keys greater than or equal to this</p>
+            &mdash; <div class='inline'><p>find range keys greater than or equal to this</p>
 </div>
         </li>
         <li>
@@ -1349,31 +1805,33 @@ one range key to the hash.</p>
           <span class="default">
           </span>
-          &mdash; <div class='inline'><p>find range keys less than or equal to this</p>
+            &mdash; <div class='inline'><p>find range keys less than or equal to this</p>
 </div>
         </li>
     </ul>
-<h3>Returns:</h3>
+<p class="tag_title">Returns:</p>
 <ul class="return">
     <li>
-        <span class='type'>(<tt>Array</tt>)</span>
+        <span class='type'>(<tt>Enumerator</tt>)</span>
         &mdash;
-        <div class='inline'><p>an array of all matching items</p>
+        <div class='inline'><p>an iterator of all matching items</p>
 </div>
     </li>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -1395,32 +1853,44 @@ one range key to the hash.</p>
       <pre class="lines">
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178</pre>
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 167</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 220</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_query'>query</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_opts'>opts</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_table'>table</span> <span class='op'>=</span> <span class='id identifier rubyid_get_table'>get_table</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_consistent_opts'>consistent_opts</span> <span class='op'>=</span> <span class='lbrace'>{</span> <span class='symbol'>:consistent_read</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:consistent_read</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='kw'>false</span> <span class='rbrace'>}</span>
-  <span class='kw'>if</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_composite_key?'>composite_key?</span>
-    <span class='id identifier rubyid_results'>results</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
-    <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_query'>query</span><span class='lparen'>(</span><span class='id identifier rubyid_opts'>opts</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_data'>data</span><span class='op'>|</span> <span class='id identifier rubyid_results'>results</span> <span class='op'>&lt;&lt;</span> <span class='id identifier rubyid_data'>data</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='period'>.</span><span class='id identifier rubyid_to_h'>to_h</span><span class='lparen'>(</span><span class='id identifier rubyid_consistent_opts'>consistent_opts</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_symbolize_keys!'>symbolize_keys!</span><span class='rbrace'>}</span>
-    <span class='id identifier rubyid_results'>results</span>
-  <span class='kw'>else</span>
-    <span class='id identifier rubyid_get_item'>get_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:hash_value</span><span class='rbracket'>]</span><span class='rparen'>)</span>
+  <span class='const'>Enumerator</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_yielder'>yielder</span><span class='op'>|</span>
+    <span class='id identifier rubyid_consistent_opts'>consistent_opts</span> <span class='op'>=</span> <span class='lbrace'>{</span> <span class='symbol'>:consistent_read</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:consistent_read</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='kw'>false</span> <span class='rbrace'>}</span>
+    <span class='kw'>if</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_composite_key?'>composite_key?</span>
+      <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_query'>query</span><span class='lparen'>(</span><span class='id identifier rubyid_opts'>opts</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_data'>data</span><span class='op'>|</span>
+        <span class='kw'>if</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_has_key?'>has_key?</span> <span class='symbol'>:select</span>
+          <span class='id identifier rubyid_yielder'>yielder</span><span class='period'>.</span><span class='id identifier rubyid_yield'>yield</span> <span class='id identifier rubyid_data'>data</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='period'>.</span><span class='id identifier rubyid_symbolize_keys!'>symbolize_keys!</span>
+        <span class='kw'>else</span>
+          <span class='id identifier rubyid_yielder'>yielder</span><span class='period'>.</span><span class='id identifier rubyid_yield'>yield</span> <span class='id identifier rubyid_data'>data</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='period'>.</span><span class='id identifier rubyid_to_h'>to_h</span><span class='lparen'>(</span><span class='id identifier rubyid_consistent_opts'>consistent_opts</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_symbolize_keys!'>symbolize_keys!</span>
+        <span class='kw'>end</span>
+      <span class='kw'>end</span>
+    <span class='kw'>else</span>
+      <span class='id identifier rubyid_yielder'>yielder</span><span class='period'>.</span><span class='id identifier rubyid_yield'>yield</span> <span class='id identifier rubyid_get_item'>get_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_opts'>opts</span><span class='lbracket'>[</span><span class='symbol'>:hash_value</span><span class='rbracket'>]</span><span class='rparen'>)</span>
+    <span class='kw'>end</span>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
@@ -1429,13 +1899,15 @@ one range key to the hash.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="scan-instance_method">
+  <h3 class="signature " id="scan-instance_method">
-    - (<tt>Array</tt>) <strong>scan</strong>(table_name, scan_hash, select_opts)
+    - (<tt>Enumerator</tt>) <strong>scan</strong>(table_name, scan_hash, select_opts)
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Scan the DynamoDB table. This is usually a very slow operation as it naively filters all data on
 the DynamoDB servers.</p>
@@ -1444,7 +1916,7 @@ the DynamoDB servers.</p>
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -1479,24 +1951,24 @@ the DynamoDB servers.</p>
 </ul>
-<h3>Returns:</h3>
+<p class="tag_title">Returns:</p>
 <ul class="return">
     <li>
-        <span class='type'>(<tt>Array</tt>)</span>
+        <span class='type'>(<tt>Enumerator</tt>)</span>
         &mdash;
-        <div class='inline'><p>an array of all matching items</p>
+        <div class='inline'><p>an iterator of all matching items</p>
 </div>
     </li>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -1518,25 +1990,25 @@ the DynamoDB servers.</p>
       <pre class="lines">
-189
-190
-191
-192
-193
-194
-195
-196</pre>
+248
+249
+250
+251
+252
+253
+254
+255</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 189</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 248</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_scan'>scan</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_scan_hash'>scan_hash</span><span class='comma'>,</span> <span class='id identifier rubyid_select_opts'>select_opts</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_table'>table</span> <span class='op'>=</span> <span class='id identifier rubyid_get_table'>get_table</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rparen'>)</span>
-  <span class='id identifier rubyid_results'>results</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
-  <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_where'>where</span><span class='lparen'>(</span><span class='id identifier rubyid_scan_hash'>scan_hash</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_select'>select</span><span class='lparen'>(</span><span class='id identifier rubyid_select_opts'>select_opts</span><span class='rparen'>)</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_data'>data</span><span class='op'>|</span>
-    <span class='id identifier rubyid_results'>results</span> <span class='op'>&lt;&lt;</span> <span class='id identifier rubyid_data'>data</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='period'>.</span><span class='id identifier rubyid_symbolize_keys!'>symbolize_keys!</span>
+  <span class='const'>Enumerator</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_yielder'>yielder</span><span class='op'>|</span>
+    <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_where'>where</span><span class='lparen'>(</span><span class='id identifier rubyid_scan_hash'>scan_hash</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_select'>select</span><span class='lparen'>(</span><span class='id identifier rubyid_select_opts'>select_opts</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_data'>data</span><span class='op'>|</span>
+      <span class='id identifier rubyid_yielder'>yielder</span><span class='period'>.</span><span class='id identifier rubyid_yield'>yield</span> <span class='id identifier rubyid_data'>data</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='period'>.</span><span class='id identifier rubyid_symbolize_keys!'>symbolize_keys!</span>
+    <span class='kw'>end</span>
   <span class='kw'>end</span>
-  <span class='id identifier rubyid_results'>results</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1544,24 +2016,26 @@ the DynamoDB servers.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="table_cache-instance_method">
+  <h3 class="signature " id="table_cache-instance_method">
     - (<tt>Object</tt>) <strong>table_cache</strong>
-</p><table class="source_code">
+</h3><table class="source_code">
   <tr>
     <td>
       <pre class="lines">
-211
-212
-213</pre>
+270
+271
+272</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 211</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 270</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_table_cache'>table_cache</span>
   <span class='ivar'>@table_cache</span> <span class='op'>||=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
@@ -1571,14 +2045,56 @@ the DynamoDB servers.</p>
 </table>
 </div>
-  </div>
+      <div class="method_details ">
+  <h3 class="signature " id="update_item-instance_method">
+    - (<tt>Object</tt>) <strong>update_item</strong>(table_name, key, options = {}, &amp;block)
+</h3><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+171
+172
+173
+174
+175
+176
+177
+178
+179</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter/aws_sdk.rb', line 171</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_update_item'>update_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='comma'>,</span> <span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_range_key'>range_key</span> <span class='op'>=</span> <span class='id identifier rubyid_options'>options</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span><span class='lparen'>(</span><span class='symbol'>:range_key</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_conditions'>conditions</span> <span class='op'>=</span> <span class='id identifier rubyid_options'>options</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span><span class='lparen'>(</span><span class='symbol'>:conditions</span><span class='rparen'>)</span> <span class='op'>||</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
+  <span class='id identifier rubyid_table'>table</span> <span class='op'>=</span> <span class='id identifier rubyid_get_table'>get_table</span><span class='lparen'>(</span><span class='id identifier rubyid_table_name'>table_name</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_item'>item</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_items'>items</span><span class='period'>.</span><span class='id identifier rubyid_at'>at</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_range_key'>range_key</span><span class='rparen'>)</span>
+  <span class='id identifier rubyid_item'>item</span><span class='period'>.</span><span class='id identifier rubyid_attributes'>attributes</span><span class='period'>.</span><span class='id identifier rubyid_update'>update</span><span class='lparen'>(</span><span class='id identifier rubyid_conditions'>conditions</span><span class='period'>.</span><span class='id identifier rubyid_merge'>merge</span><span class='lparen'>(</span><span class='symbol'>:return</span> <span class='op'>=&gt;</span> <span class='symbol'>:all_new</span><span class='rparen'>)</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
+<span class='kw'>rescue</span> <span class='const'>AWS</span><span class='op'>::</span><span class='const'>DynamoDB</span><span class='op'>::</span><span class='const'>Errors</span><span class='op'>::</span><span class='const'>ConditionalCheckFailedException</span>
+  <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Errors</span><span class='op'>::</span><span class='const'>ConditionalCheckFailedException</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
 </div>
+  </div>
+</div>
     <div id="footer">
-  Generated on Thu Apr 26 01:26:26 2012 by
+  Generated on Thu Jun 27 21:59:13 2013 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.7.5 (ruby-1.9.3).
+  0.8.6.1 (ruby-1.9.3).
 </div>
   </body>