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.html CHANGED

@@ -6,19 +6,21 @@
 <title>
   Module: Dynamoid::Adapter
-    &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">Adapter</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
@@ -81,7 +88,7 @@
     <dt class="r1 last">Defined in:</dt>
     <dd class="r1 last">lib/dynamoid/adapter.rb<span class="defines">,<br />
-  lib/dynamoid/adapter/local.rb,<br /> lib/dynamoid/adapter/aws_sdk.rb</span>
+  lib/dynamoid/adapter/aws_sdk.rb</span>
 </dd>
 </dl>
@@ -89,7 +96,7 @@
 <h2>Overview</h2><div class="docstring">
   <div class="discussion">
-    <p>Adapter provides a generic, write-through class that abstracts variations in the underlying connections to provide a uniform response
+    <p>Adapter provides a generic, write-through class that abstracts variations in the underlying connections to provide a uniform response
 to Dynamoid.</p>
@@ -100,11 +107,11 @@ to Dynamoid.</p>
 </div><h2>Defined Under Namespace</h2>
 <p class="children">
-      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Adapter/AwsSdk.html" title="Dynamoid::Adapter::AwsSdk (module)">AwsSdk</a></span>, <span class='object_link'><a href="Adapter/Local.html" title="Dynamoid::Adapter::Local (module)">Local</a></span>
+      <strong class="modules">Modules:</strong> <span class='object_link'><a href="Adapter/AwsSdk.html" title="Dynamoid::Adapter::AwsSdk (module)">AwsSdk</a></span>
 </p>
@@ -125,6 +132,7 @@ to Dynamoid.</p>
   </span>
@@ -167,9 +175,10 @@ to Dynamoid.</p>
-    <span class="summary_desc"><div class='inline'><p>The actual adapter currently in use: presently, either AwsSdk or Local.</p>
+    <span class="summary_desc"><div class='inline'><p>The actual adapter currently in use: presently AwsSdk.</p>
 </div></span>
 </li>
@@ -189,6 +198,7 @@ to Dynamoid.</p>
     <span class="summary_desc"><div class='inline'><p>Shows how long it takes a method to run on the adapter.</p>
@@ -200,7 +210,7 @@ to Dynamoid.</p>
         <li class="public ">
   <span class="summary_signature">
-      <a href="#delete-instance_method" title="#delete (instance method)">- (Object) <strong>delete</strong>(table, id, options = {}) </a>
+      <a href="#delete-instance_method" title="#delete (instance method)">- (Object) <strong>delete</strong>(table, ids, options = {}) </a>
@@ -211,11 +221,35 @@ to Dynamoid.</p>
     <span class="summary_desc"><div class='inline'><p>Delete an item from a table.</p>
 </div></span>
+</li>
+        <li class="public ">
+  <span class="summary_signature">
+      <a href="#get_original_id_and_partition-instance_method" title="#get_original_id_and_partition (instance method)">- (String) <strong>get_original_id_and_partition</strong>(id) </a>
+  </span>
+    <span class="summary_desc"><div class='inline'><p>Get original id (hash_key) and partiton number from a hash_key.</p>
+</div></span>
 </li>
@@ -233,6 +267,7 @@ to Dynamoid.</p>
     <span class="summary_desc"><div class='inline'><p>Takes a list of ids and returns them with partitioning added.</p>
@@ -244,7 +279,7 @@ to Dynamoid.</p>
         <li class="public ">
   <span class="summary_signature">
-      <a href="#method_missing-instance_method" title="#method_missing (instance method)">- (Object) <strong>method_missing</strong>(method, *args) </a>
+      <a href="#method_missing-instance_method" title="#method_missing (instance method)">- (Object) <strong>method_missing</strong>(method, *args, &amp;block) </a>
@@ -255,11 +290,35 @@ to Dynamoid.</p>
     <span class="summary_desc"><div class='inline'><p>Delegate all methods that aren't defind here to the underlying adapter.</p>
 </div></span>
+</li>
+        <li class="public ">
+  <span class="summary_signature">
+      <a href="#query-instance_method" title="#query (instance method)">- (Array) <strong>query</strong>(table_name, opts = {}) </a>
+  </span>
+    <span class="summary_desc"><div class='inline'><p>Query the DynamoDB table.</p>
+</div></span>
 </li>
@@ -277,6 +336,7 @@ to Dynamoid.</p>
     <span class="summary_desc"><div class='inline'><p>Read one or many keys from the selected table.</p>
@@ -299,6 +359,7 @@ to Dynamoid.</p>
     <span class="summary_desc"><div class='inline'><p>Establishes a connection to the underyling adapter and caches all its tables for speedier future lookups.</p>
@@ -310,7 +371,7 @@ to Dynamoid.</p>
         <li class="public ">
   <span class="summary_signature">
-      <a href="#result_for_partition-instance_method" title="#result_for_partition (instance method)">- (Object) <strong>result_for_partition</strong>(results) </a>
+      <a href="#result_for_partition-instance_method" title="#result_for_partition (instance method)">- (Object) <strong>result_for_partition</strong>(results, table_name) </a>
@@ -321,9 +382,10 @@ to Dynamoid.</p>
-    <span class="summary_desc"><div class='inline'><p>Takes an array of results that are partitioned, find the most recently updated one, and return only it.</p>
+    <span class="summary_desc"><div class='inline'><p>Takes an array of query results that are partitioned, find the most recently updated ones that share an id and range_key, and return only the most recently updated.</p>
 </div></span>
 </li>
@@ -343,6 +405,7 @@ to Dynamoid.</p>
     <span class="summary_desc"><div class='inline'><p>Scans a table.</p>
@@ -354,7 +417,7 @@ to Dynamoid.</p>
         <li class="public ">
   <span class="summary_signature">
-      <a href="#write-instance_method" title="#write (instance method)">- (Object) <strong>write</strong>(table, object) </a>
+      <a href="#write-instance_method" title="#write (instance method)">- (Object) <strong>write</strong>(table, object, options = nil) </a>
@@ -365,6 +428,7 @@ to Dynamoid.</p>
     <span class="summary_desc"><div class='inline'><p>Write an object to the adapter.</p>
@@ -384,13 +448,15 @@ to Dynamoid.</p>
   </p>
     <div class="method_details first">
-  <p class="signature first" id="method_missing-instance_method">
+  <h3 class="signature first" id="method_missing-instance_method">
+    - (<tt>Object</tt>) <strong>method_missing</strong>(method, *args, &amp;block)
-    - (<tt>Object</tt>) <strong>method_missing</strong>(method, *args)
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Delegate all methods that aren't defind here to the underlying adapter.</p>
@@ -399,7 +465,7 @@ to Dynamoid.</p>
 </div>
 <div class="tags">
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -421,16 +487,16 @@ to Dynamoid.</p>
       <pre class="lines">
-169
-170
-171
-172</pre>
+222
+223
+224
+225</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 169</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 222</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_method_missing'>method_missing</span><span class='lparen'>(</span><span class='id identifier rubyid_method'>method</span><span class='comma'>,</span> <span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='rparen'>)</span>
-  <span class='kw'>return</span> <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='id identifier rubyid_method'>method</span><span class='comma'>,</span> <span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='rparen'>)</span> <span class='lbrace'>{</span><span class='id identifier rubyid_adapter'>adapter</span><span class='period'>.</span><span class='id identifier rubyid_send'>send</span><span class='lparen'>(</span><span class='id identifier rubyid_method'>method</span><span class='comma'>,</span> <span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='rparen'>)</span><span class='rbrace'>}</span> <span class='kw'>if</span> <span class='ivar'>@adapter</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='id identifier rubyid_method'>method</span><span class='rparen'>)</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_method_missing'>method_missing</span><span class='lparen'>(</span><span class='id identifier rubyid_method'>method</span><span class='comma'>,</span> <span class='op'>*</span><span class='id identifier rubyid_args'>args</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'>return</span> <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='id identifier rubyid_method'>method</span><span class='comma'>,</span> <span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='rparen'>)</span> <span class='lbrace'>{</span><span class='id identifier rubyid_adapter'>adapter</span><span class='period'>.</span><span class='id identifier rubyid_send'>send</span><span class='lparen'>(</span><span class='id identifier rubyid_method'>method</span><span class='comma'>,</span> <span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span><span class='rbrace'>}</span> <span class='kw'>if</span> <span class='ivar'>@adapter</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='id identifier rubyid_method'>method</span><span class='rparen'>)</span>
   <span class='kw'>super</span>
 <span class='kw'>end</span></pre>
     </td>
@@ -445,15 +511,16 @@ to Dynamoid.</p>
       <span id="tables=-instance_method"></span>
-      <span id="tables-instance_method"></span>
       <div class="method_details first">
-  <p class="signature first" id="tables-instance_method">
+  <h3 class="signature first" id="tables-instance_method">
     - (<tt>Object</tt>) <strong>tables</strong>
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Returns the value of attribute tables</p>
@@ -489,25 +556,27 @@ to Dynamoid.</p>
   <div id="instance_method_details" class="method_details_list">
     <h2>Instance Method Details</h2>
       <div class="method_details first">
-  <p class="signature first" id="adapter-instance_method">
+  <h3 class="signature first" id="adapter-instance_method">
     - (<tt>Object</tt>) <strong>adapter</strong>
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
-    <p>The actual adapter currently in use: presently, either AwsSdk or Local.</p>
+    <p>The actual adapter currently in use: presently AwsSdk.</p>
   </div>
 </div>
 <div class="tags">
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -547,13 +616,15 @@ to Dynamoid.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="benchmark-instance_method">
+  <h3 class="signature " id="benchmark-instance_method">
     - (<tt>Object</tt>) <strong>benchmark</strong>(method, *args) { ... }
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Shows how long it takes a method to run on the adapter. Useful for generating logged output.</p>
@@ -561,7 +632,7 @@ to Dynamoid.</p>
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -596,7 +667,7 @@ to Dynamoid.</p>
 </ul>
-<h3>Yields:</h3>
+<p class="tag_title">Yields:</p>
 <ul class="yield">
     <li>
@@ -613,7 +684,7 @@ to Dynamoid.</p>
     </li>
 </ul>
-<h3>Returns:</h3>
+<p class="tag_title">Returns:</p>
 <ul class="return">
     <li>
@@ -630,7 +701,7 @@ to Dynamoid.</p>
     </li>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -674,13 +745,15 @@ to Dynamoid.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="delete-instance_method">
+  <h3 class="signature " id="delete-instance_method">
-    - (<tt>Object</tt>) <strong>delete</strong>(table, id, options = {})
+    - (<tt>Object</tt>) <strong>delete</strong>(table, ids, options = {})
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Delete an item from a table. If partitioning is turned on, deletes all partitioned keys as well.</p>
@@ -688,7 +761,7 @@ to Dynamoid.</p>
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -708,15 +781,15 @@ to Dynamoid.</p>
     <li>
-        <span class='name'>id</span>
+        <span class='name'>ids</span>
-        <span class='type'>(<tt>String</tt>)</span>
+        <span class='type'>(<tt>Array</tt>)</span>
         &mdash;
-        <div class='inline'><p>the id of the record</p>
+        <div class='inline'><p>to delete, can also be a string of just one id</p>
 </div>
     </li>
@@ -726,28 +799,131 @@ to Dynamoid.</p>
         <span class='name'>range_key</span>
-        <span class='type'>(<tt>Number</tt>)</span>
+        <span class='type'>(<tt>Array</tt>)</span>
         &mdash;
-        <div class='inline'><p>the range key of the record</p>
+        <div class='inline'><p>of the record to delete, can also be a string of just one range_key</p>
 </div>
     </li>
 </ul>
-<h3>Since:</h3>
-<ul class="since">
+</div><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 101</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_delete'>delete</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>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_range_key'>range_key</span> <span class='op'>=</span> <span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:range_key</span><span class='rbracket'>]</span> <span class='comment'>#array of range keys that matches the ids passed in
+</span>  <span class='kw'>if</span> <span class='id identifier rubyid_ids'>ids</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='symbol'>:each</span><span class='rparen'>)</span>
+    <span class='kw'>if</span> <span class='id identifier rubyid_range_key'>range_key</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='symbol'>:each</span><span class='rparen'>)</span>
+      <span class='comment'>#turn ids into array of arrays each element being hash_key, range_key
+</span>      <span class='id identifier rubyid_ids'>ids</span> <span class='op'>=</span> <span class='id identifier rubyid_ids'>ids</span><span class='period'>.</span><span class='id identifier rubyid_each_with_index'>each_with_index</span><span class='period'>.</span><span class='id identifier rubyid_map'>map</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_id'>id</span><span class='comma'>,</span><span class='id identifier rubyid_i'>i</span><span class='op'>|</span> <span class='lbracket'>[</span><span class='id identifier rubyid_id'>id</span><span class='comma'>,</span><span class='id identifier rubyid_range_key'>range_key</span><span class='lbracket'>[</span><span class='id identifier rubyid_i'>i</span><span class='rbracket'>]</span><span class='rbracket'>]</span><span class='rbrace'>}</span>
+    <span class='kw'>else</span>
+      <span class='id identifier rubyid_ids'>ids</span> <span class='op'>=</span> <span class='id identifier rubyid_range_key'>range_key</span> <span class='op'>?</span> <span class='lbracket'>[</span><span class='lbracket'>[</span><span class='id identifier rubyid_ids'>ids</span><span class='comma'>,</span> <span class='id identifier rubyid_range_key'>range_key</span><span class='rbracket'>]</span><span class='rbracket'>]</span> <span class='op'>:</span> <span class='id identifier rubyid_ids'>ids</span>
+    <span class='kw'>end</span>
+    <span class='kw'>if</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_partitioning?'>partitioning?</span>
+      <span class='id identifier rubyid_batch_delete_item'>batch_delete_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</span><span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span><span class='rparen'>)</span>
+    <span class='kw'>else</span>
+      <span class='id identifier rubyid_batch_delete_item'>batch_delete_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span>
+    <span class='kw'>end</span>
+  <span class='kw'>else</span>
+    <span class='kw'>if</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_partitioning?'>partitioning?</span>
+      <span class='id identifier rubyid_ids'>ids</span> <span class='op'>=</span> <span class='id identifier rubyid_range_key'>range_key</span> <span class='op'>?</span> <span class='lbracket'>[</span><span class='lbracket'>[</span><span class='id identifier rubyid_ids'>ids</span><span class='comma'>,</span> <span class='id identifier rubyid_range_key'>range_key</span><span class='rbracket'>]</span><span class='rbracket'>]</span> <span class='op'>:</span> <span class='id identifier rubyid_ids'>ids</span>
+      <span class='id identifier rubyid_batch_delete_item'>batch_delete_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</span><span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span><span class='rparen'>)</span>
+    <span class='kw'>else</span>
+      <span class='id identifier rubyid_delete_item'>delete_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>ids</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
+    <span class='kw'>end</span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+      <div class="method_details ">
+  <h3 class="signature " id="get_original_id_and_partition-instance_method">
+    - (<tt>String</tt>) <strong>get_original_id_and_partition</strong>(id)
+</h3><div class="docstring">
+  <div class="discussion">
+    <p>Get original id (hash_key) and partiton number from a hash_key</p>
+  </div>
+</div>
+<div class="tags">
+  <p class="tag_title">Parameters:</p>
+<ul class="param">
     <li>
+        <span class='name'>id</span>
+        <span class='type'>(<tt>String</tt>)</span>
-        <div class='inline'><p>0.2.0</p>
+        &mdash;
+        <div class='inline'><p>the id or hash_key of a record, ex. xxxxx.13</p>
+</div>
+    </li>
+</ul>
+<p class="tag_title">Returns:</p>
+<ul class="return">
+    <li>
+        <span class='type'>(<tt>String</tt>, <tt>String</tt>)</span>
+        &mdash;
+        <div class='inline'><p>original_id and the partition number, ex original_id = xxxxx partition = 13</p>
 </div>
     </li>
@@ -760,27 +936,21 @@ to Dynamoid.</p>
       <pre class="lines">
-98
-99
-100
-101
-102
-103
-104
-105
-106</pre>
+170
+171
+172
+173
+174
+175</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 98</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 170</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_delete'>delete</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_id'>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='kw'>if</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_partitioning?'>partitioning?</span>
-    <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Delete Item</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_id'>id</span><span class='rparen'>)</span> <span class='kw'>do</span>
-      <span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</span><span class='id identifier rubyid_id'>id</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_i'>i</span><span class='op'>|</span> <span class='id identifier rubyid_delete_item'>delete_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_i'>i</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span><span class='rbrace'>}</span>
-    <span class='kw'>end</span>
-  <span class='kw'>else</span>
-    <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Delete Item</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_id'>id</span><span class='rparen'>)</span> <span class='lbrace'>{</span><span class='id identifier rubyid_delete_item'>delete_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_id'>id</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span><span class='rbrace'>}</span>
-  <span class='kw'>end</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_get_original_id_and_partition'>get_original_id_and_partition</span> <span class='id identifier rubyid_id'>id</span>
+  <span class='id identifier rubyid_partition'>partition</span> <span class='op'>=</span> <span class='id identifier rubyid_id'>id</span><span class='period'>.</span><span class='id identifier rubyid_split'>split</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>.</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_last'>last</span>
+  <span class='id identifier rubyid_id'>id</span> <span class='op'>=</span> <span class='id identifier rubyid_id'>id</span><span class='period'>.</span><span class='id identifier rubyid_split'>split</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>.</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_partition'>partition</span><span class='rbrace'>}</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span>
+  <span class='kw'>return</span> <span class='id identifier rubyid_id'>id</span><span class='comma'>,</span> <span class='id identifier rubyid_partition'>partition</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -788,15 +958,17 @@ to Dynamoid.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="id_with_partitions-instance_method">
+  <h3 class="signature " id="id_with_partitions-instance_method">
     - (<tt>Object</tt>) <strong>id_with_partitions</strong>(ids)
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
-    <p>Takes a list of ids and returns them with partitioning added. If an array of arrays is passed, we assume the second key is the range key
+    <p>Takes a list of ids and returns them with partitioning added. If an array of arrays is passed, we assume the second key is the range key
 and pass it in unchanged.</p>
@@ -805,18 +977,22 @@ and pass it in unchanged.</p>
 <div class="tags">
   <div class="examples">
-    <h3>Examples:</h3>
+    <p class="tag_title">Examples:</p>
-      <h4><div class='inline'><p>Partition id 1</p>
-</div></h4>
-      <pre class="example code"><span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Adapter</span><span class='period'>.</span><span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</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='rbracket'>]</span><span class='rparen'>)</span> <span class='comment'># ['1.0', '1.1', '1.2', ..., '1.199']</span></pre>
+        <p class="example_title"><div class='inline'><p>Partition id 1</p>
+</div></p>
+      <pre class="example code"><code><span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Adapter</span><span class='period'>.</span><span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</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='rbracket'>]</span><span class='rparen'>)</span> <span class='comment'># ['1.0', '1.1', '1.2', ..., '1.199']</span></code></pre>
-      <h4><div class='inline'><p>Partition id 1 and range_key 1.0</p>
-</div></h4>
-      <pre class="example code"><span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Adapter</span><span class='period'>.</span><span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</span><span class='lbracket'>[</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='float'>1.0</span><span class='rbracket'>]</span><span class='rbracket'>]</span><span class='rparen'>)</span> <span class='comment'># [['1.0', 1.0], ['1.1', 1.0], ['1.2', 1.0], ..., ['1.199', 1.0]]</span></pre>
+        <p class="example_title"><div class='inline'><p>Partition id 1 and range_key 1.0</p>
+</div></p>
+      <pre class="example code"><code><span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Adapter</span><span class='period'>.</span><span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</span><span class='lbracket'>[</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='float'>1.0</span><span class='rbracket'>]</span><span class='rbracket'>]</span><span class='rparen'>)</span> <span class='comment'># [['1.0', 1.0], ['1.1', 1.0], ['1.2', 1.0], ..., ['1.199', 1.0]]</span></code></pre>
   </div>
-<h3>Parameters:</h3>
+<p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -836,7 +1012,7 @@ and pass it in unchanged.</p>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -858,12 +1034,12 @@ and pass it in unchanged.</p>
       <pre class="lines">
-143
-144
-145</pre>
+161
+162
+163</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 143</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 161</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</span><span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</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_collect'>collect</span> <span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_id'>id</span><span class='op'>|</span> <span class='lparen'>(</span><span class='int'>0</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_partition_size'>partition_size</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_collect'>collect</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_n'>n</span><span class='op'>|</span> <span class='id identifier rubyid_id'>id</span><span class='period'>.</span><span class='id identifier rubyid_is_a?'>is_a?</span><span class='lparen'>(</span><span class='const'>Array</span><span class='rparen'>)</span> <span class='op'>?</span> <span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_id'>id</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span><span class='rbrace'>}</span><span class='tstring_content'>.</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_n'>n</span><span class='rbrace'>}</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span> <span class='id identifier rubyid_id'>id</span><span class='period'>.</span><span class='id identifier rubyid_last'>last</span><span class='rbracket'>]</span> <span class='op'>:</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_id'>id</span><span class='rbrace'>}</span><span class='tstring_content'>.</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_n'>n</span><span class='rbrace'>}</span><span class='tstring_end'>&quot;</span></span><span class='rbrace'>}</span><span class='rbrace'>}</span><span class='period'>.</span><span class='id identifier rubyid_flatten'>flatten</span><span class='lparen'>(</span><span class='int'>1</span><span class='rparen'>)</span>
@@ -874,24 +1050,246 @@ and pass it in unchanged.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="read-instance_method">
+  <h3 class="signature " id="query-instance_method">
+    - (<tt>Array</tt>) <strong>query</strong>(table_name, opts = {})
+</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
+one range key to the hash. If paritioning is on, will run a query for every parition and join the results</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'>opts</span>
+        <span class='type'>(<tt>Hash</tt>)</span>
+        <em class="default">(defaults to: <tt>{}</tt>)</em>
+        &mdash;
+        <div class='inline'><p>the options to query the table with</p>
+</div>
+    </li>
+</ul>
+    <p class="tag_title">Options Hash (<tt>opts</tt>):</p>
+    <ul class="option">
+        <li>
+          <span class="name">:hash_value</span>
+          <span class="type">(<tt>String</tt>)</span>
+          <span class="default">
+          </span>
+            &mdash; <div class='inline'><p>the value of the hash key to find</p>
+</div>
+        </li>
+        <li>
+          <span class="name">:range_value</span>
+          <span class="type">(<tt>Range</tt>)</span>
+          <span class="default">
+          </span>
+            &mdash; <div class='inline'><p>find the range key within this range</p>
+</div>
+        </li>
+        <li>
+          <span class="name">:range_greater_than</span>
+          <span class="type">(<tt>Number</tt>)</span>
+          <span class="default">
+          </span>
+            &mdash; <div class='inline'><p>find range keys greater than this</p>
+</div>
+        </li>
+        <li>
+          <span class="name">:range_less_than</span>
+          <span class="type">(<tt>Number</tt>)</span>
+          <span class="default">
+          </span>
+            &mdash; <div class='inline'><p>find range keys less than this</p>
+</div>
+        </li>
+        <li>
+          <span class="name">:range_gte</span>
+          <span class="type">(<tt>Number</tt>)</span>
+          <span class="default">
+          </span>
+            &mdash; <div class='inline'><p>find range keys greater than or equal to this</p>
+</div>
+        </li>
+        <li>
+          <span class="name">:range_lte</span>
+          <span class="type">(<tt>Number</tt>)</span>
+          <span class="default">
+          </span>
+            &mdash; <div class='inline'><p>find range keys less than or equal to this</p>
+</div>
+        </li>
+    </ul>
+<p class="tag_title">Returns:</p>
+<ul class="return">
+    <li>
+        <span class='type'>(<tt>Array</tt>)</span>
+        &mdash;
+        <div class='inline'><p>an array of all matching items</p>
+</div>
+    </li>
+</ul>
+</div><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 242</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='kw'>unless</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_partitioning?'>partitioning?</span>
+    <span class='comment'>#no paritioning? just pass to the standard query method
+</span>    <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_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='rparen'>)</span>
+  <span class='kw'>else</span>
+    <span class='comment'>#get all the hash_values that could be possible
+</span>    <span class='id identifier rubyid_ids'>ids</span> <span class='op'>=</span> <span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</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='comment'>#lets not overwrite with the original options
+</span>    <span class='id identifier rubyid_modified_options'>modified_options</span> <span class='op'>=</span> <span class='id identifier rubyid_opts'>opts</span><span class='period'>.</span><span class='id identifier rubyid_clone'>clone</span>
+    <span class='id identifier rubyid_results'>results</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
+    <span class='comment'>#loop and query on each of the partition ids
+</span>    <span class='id identifier rubyid_ids'>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_id'>id</span><span class='op'>|</span>
+      <span class='id identifier rubyid_modified_options'>modified_options</span><span class='lbracket'>[</span><span class='symbol'>:hash_value</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_id'>id</span>
+      <span class='id identifier rubyid_query_result'>query_result</span> <span class='op'>=</span> <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_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_modified_options'>modified_options</span><span class='rparen'>)</span>
+      <span class='id identifier rubyid_results'>results</span> <span class='op'>+=</span> <span class='id identifier rubyid_query_result'>query_result</span><span class='period'>.</span><span class='id identifier rubyid_inject'>inject</span><span class='lparen'>(</span><span class='lbracket'>[</span><span class='rbracket'>]</span><span class='rparen'>)</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_array'>array</span><span class='comma'>,</span> <span class='id identifier rubyid_result'>result</span><span class='op'>|</span> <span class='id identifier rubyid_array'>array</span> <span class='op'>+=</span> <span class='lbracket'>[</span><span class='id identifier rubyid_result'>result</span><span class='rbracket'>]</span><span class='rbrace'>}</span> <span class='kw'>if</span> <span class='id identifier rubyid_query_result'>query_result</span><span class='period'>.</span><span class='id identifier rubyid_any?'>any?</span>
+    <span class='kw'>end</span>
+    <span class='id identifier rubyid_result_for_partition'>result_for_partition</span> <span class='id identifier rubyid_results'>results</span><span class='comma'>,</span> <span class='id identifier rubyid_table_name'>table_name</span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+      <div class="method_details ">
+  <h3 class="signature " id="read-instance_method">
     - (<tt>Object</tt>) <strong>read</strong>(table, ids, options = {})
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Read one or many keys from the selected table. This method intelligently calls batch_get or get on the underlying adapter depending on
 whether ids is a range or a single key: additionally, if partitioning is enabled, it batch_gets all keys in the partition space
-automatically. Finally, if a range key is present, it will also interpolate that into the ids so that the batch get will acquire the
+automatically. Finally, if a range key is present, it will also interpolate that into the ids so that the batch get will acquire the
 correct record.</p>
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -926,22 +1324,23 @@ correct record.</p>
     <li>
-        <span class='name'>range_key</span>
+        <span class='name'>options:</span>
-        <span class='type'>(<tt>Number</tt>)</span>
+        <span class='type'>(<tt>Hash</tt>)</span>
         &mdash;
-        <div class='inline'><p>the range key of the record</p>
+        <div class='inline'><p>Passed to the underlying query. The :range_key option is required whenever the table has a range key,
+unless multiple ids are passed in and Dynamoid::Config.partitioning? is turned off.</p>
 </div>
     </li>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -963,8 +1362,6 @@ correct record.</p>
       <pre class="lines">
-70
-71
 72
 73
 74
@@ -982,28 +1379,34 @@ correct record.</p>
 86
 87
 88
-89</pre>
+89
+90
+91
+92
+93</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 70</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 72</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_read'>read</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>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_range_key'>range_key</span> <span class='op'>=</span> <span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:range_key</span><span class='rbracket'>]</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='kw'>if</span> <span class='id identifier rubyid_ids'>ids</span><span class='period'>.</span><span class='id identifier rubyid_respond_to?'>respond_to?</span><span class='lparen'>(</span><span class='symbol'>:each</span><span class='rparen'>)</span>
     <span class='id identifier rubyid_ids'>ids</span> <span class='op'>=</span> <span class='id identifier rubyid_ids'>ids</span><span class='period'>.</span><span class='id identifier rubyid_collect'>collect</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_id'>id</span><span class='op'>|</span> <span class='id identifier rubyid_range_key'>range_key</span> <span class='op'>?</span> <span class='lbracket'>[</span><span class='id identifier rubyid_id'>id</span><span class='comma'>,</span> <span class='id identifier rubyid_range_key'>range_key</span><span class='rbracket'>]</span> <span class='op'>:</span> <span class='id identifier rubyid_id'>id</span><span class='rbrace'>}</span>
     <span class='kw'>if</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_partitioning?'>partitioning?</span>
-      <span class='id identifier rubyid_results'>results</span> <span class='op'>=</span> <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Partitioned Batch Get Item</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span> <span class='lbrace'>{</span><span class='id identifier rubyid_batch_get_item'>batch_get_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</span><span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span><span class='rparen'>)</span><span class='rbrace'>}</span>
-      <span class='lbrace'>{</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_result_for_partition'>result_for_partition</span><span class='lparen'>(</span><span class='id identifier rubyid_results'>results</span><span class='lbracket'>[</span><span class='id identifier rubyid_table'>table</span><span class='rbracket'>]</span><span class='rparen'>)</span><span class='rbrace'>}</span>
+      <span class='id identifier rubyid_results'>results</span> <span class='op'>=</span> <span class='id identifier rubyid_batch_get_item'>batch_get_item</span><span class='lparen'>(</span><span class='lbrace'>{</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</span><span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span><span class='rbrace'>}</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
+      <span class='lbrace'>{</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_result_for_partition'>result_for_partition</span><span class='lparen'>(</span><span class='id identifier rubyid_results'>results</span><span class='lbracket'>[</span><span class='id identifier rubyid_table'>table</span><span class='rbracket'>]</span><span class='comma'>,</span><span class='id identifier rubyid_table'>table</span><span class='rparen'>)</span><span class='rbrace'>}</span>
     <span class='kw'>else</span>
-      <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Batch Get Item</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span> <span class='lbrace'>{</span><span class='id identifier rubyid_batch_get_item'>batch_get_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span><span class='rbrace'>}</span>
+      <span class='id identifier rubyid_batch_get_item'>batch_get_item</span><span class='lparen'>(</span><span class='lbrace'>{</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_ids'>ids</span><span class='rbrace'>}</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
     <span class='kw'>end</span>
   <span class='kw'>else</span>
     <span class='kw'>if</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_partitioning?'>partitioning?</span>
       <span class='id identifier rubyid_ids'>ids</span> <span class='op'>=</span> <span class='id identifier rubyid_range_key'>range_key</span> <span class='op'>?</span> <span class='lbracket'>[</span><span class='lbracket'>[</span><span class='id identifier rubyid_ids'>ids</span><span class='comma'>,</span> <span class='id identifier rubyid_range_key'>range_key</span><span class='rbracket'>]</span><span class='rbracket'>]</span> <span class='op'>:</span> <span class='id identifier rubyid_ids'>ids</span>
-      <span class='id identifier rubyid_results'>results</span> <span class='op'>=</span> <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Partitioned Get Item</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span> <span class='lbrace'>{</span><span class='id identifier rubyid_batch_get_item'>batch_get_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</span><span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span><span class='rparen'>)</span><span class='rbrace'>}</span>
-      <span class='id identifier rubyid_result_for_partition'>result_for_partition</span><span class='lparen'>(</span><span class='id identifier rubyid_results'>results</span><span class='lbracket'>[</span><span class='id identifier rubyid_table'>table</span><span class='rbracket'>]</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span>
+      <span class='id identifier rubyid_results'>results</span> <span class='op'>=</span> <span class='id identifier rubyid_batch_get_item'>batch_get_item</span><span class='lparen'>(</span><span class='lbrace'>{</span><span class='id identifier rubyid_table'>table</span> <span class='op'>=&gt;</span> <span class='id identifier rubyid_id_with_partitions'>id_with_partitions</span><span class='lparen'>(</span><span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span><span class='rbrace'>}</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
+      <span class='id identifier rubyid_result_for_partition'>result_for_partition</span><span class='lparen'>(</span><span class='id identifier rubyid_results'>results</span><span class='lbracket'>[</span><span class='id identifier rubyid_table'>table</span><span class='rbracket'>]</span><span class='comma'>,</span><span class='id identifier rubyid_table'>table</span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span>
     <span class='kw'>else</span>
-      <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Get Item</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>ids</span><span class='rparen'>)</span> <span class='lbrace'>{</span><span class='id identifier rubyid_get_item'>get_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>ids</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span><span class='rbrace'>}</span>
+      <span class='id identifier rubyid_options'>options</span><span class='lbracket'>[</span><span class='symbol'>:range_key</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_range_key'>range_key</span> <span class='kw'>if</span> <span class='id identifier rubyid_range_key'>range_key</span>
+      <span class='id identifier rubyid_get_item'>get_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_ids'>ids</span><span class='comma'>,</span> <span class='id identifier rubyid_options'>options</span><span class='rparen'>)</span>
     <span class='kw'>end</span>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
@@ -1013,13 +1416,15 @@ correct record.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="reconnect!-instance_method">
+  <h3 class="signature " id="reconnect!-instance_method">
     - (<tt>Object</tt>) <strong>reconnect!</strong>
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Establishes a connection to the underyling adapter and caches all its tables for speedier future lookups. Issued when the adapter is first called.</p>
@@ -1028,7 +1433,7 @@ correct record.</p>
 </div>
 <div class="tags">
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -1072,22 +1477,24 @@ correct record.</p>
 </div>
       <div class="method_details ">
-  <p class="signature " id="result_for_partition-instance_method">
+  <h3 class="signature " id="result_for_partition-instance_method">
-    - (<tt>Object</tt>) <strong>result_for_partition</strong>(results)
+    - (<tt>Object</tt>) <strong>result_for_partition</strong>(results, table_name)
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
-    <p>Takes an array of results that are partitioned, find the most recently updated one, and return only it. Compares each result by
+    <p>Takes an array of query results that are partitioned, find the most recently updated ones that share an id and range_key, and return only the most recently updated. Compares each result by
 their id and updated_at attributes; if the updated_at is the greatest, then it must be the correct result.</p>
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -1105,9 +1512,24 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
     </li>
+    <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>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -1129,33 +1551,77 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
       <pre class="lines">
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164</pre>
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 153</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_result_for_partition'>result_for_partition</span><span class='lparen'>(</span><span class='id identifier rubyid_results'>results</span><span class='rparen'>)</span>
-  <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_hash'>hash</span><span class='op'>|</span>
-    <span class='const'>Array</span><span class='lparen'>(</span><span class='id identifier rubyid_results'>results</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_result'>result</span><span class='op'>|</span>
-      <span class='kw'>next</span> <span class='kw'>if</span> <span class='id identifier rubyid_result'>result</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
-      <span class='id identifier rubyid_id'>id</span> <span class='op'>=</span> <span class='id identifier rubyid_result'>result</span><span class='lbracket'>[</span><span class='symbol'>:id</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_split'>split</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>.</span><span class='tstring_end'>'</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span>
-      <span class='kw'>if</span> <span class='op'>!</span><span class='id identifier rubyid_hash'>hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_id'>id</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='lparen'>(</span><span class='id identifier rubyid_result'>result</span><span class='lbracket'>[</span><span class='symbol'>:updated_at</span><span class='rbracket'>]</span> <span class='op'>&gt;</span> <span class='id identifier rubyid_hash'>hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_id'>id</span><span class='rbracket'>]</span><span class='lbracket'>[</span><span class='symbol'>:updated_at</span><span class='rbracket'>]</span><span class='rparen'>)</span>
-        <span class='id identifier rubyid_result'>result</span><span class='lbracket'>[</span><span class='symbol'>:id</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_id'>id</span>
-        <span class='id identifier rubyid_hash'>hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_id'>id</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_result'>result</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 184</span>
+<span class='kw'>def</span> <span class='id identifier rubyid_result_for_partition'>result_for_partition</span><span class='lparen'>(</span><span class='id identifier rubyid_results'>results</span><span class='comma'>,</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='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_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'>if</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_range_key'>range_key</span>
+    <span class='id identifier rubyid_range_key_name'>range_key_name</span> <span class='op'>=</span> <span class='id identifier rubyid_table'>table</span><span class='period'>.</span><span class='id identifier rubyid_range_key'>range_key</span><span class='period'>.</span><span class='id identifier rubyid_name'>name</span><span class='period'>.</span><span class='id identifier rubyid_to_sym'>to_sym</span>
+    <span class='id identifier rubyid_final_hash'>final_hash</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
+    <span class='id identifier rubyid_results'>results</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_record'>record</span><span class='op'>|</span>
+      <span class='id identifier rubyid_test_record'>test_record</span> <span class='op'>=</span> <span class='id identifier rubyid_final_hash'>final_hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_record'>record</span><span class='lbracket'>[</span><span class='id identifier rubyid_range_key_name'>range_key_name</span><span class='rbracket'>]</span><span class='rbracket'>]</span>
+      <span class='kw'>if</span> <span class='id identifier rubyid_test_record'>test_record</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='op'>||</span> <span class='lparen'>(</span><span class='lparen'>(</span><span class='id identifier rubyid_record'>record</span><span class='lbracket'>[</span><span class='id identifier rubyid_range_key_name'>range_key_name</span><span class='rbracket'>]</span> <span class='op'>==</span> <span class='id identifier rubyid_test_record'>test_record</span><span class='lbracket'>[</span><span class='id identifier rubyid_range_key_name'>range_key_name</span><span class='rbracket'>]</span><span class='rparen'>)</span> <span class='op'>&amp;&amp;</span> <span class='lparen'>(</span><span class='id identifier rubyid_record'>record</span><span class='lbracket'>[</span><span class='symbol'>:updated_at</span><span class='rbracket'>]</span> <span class='op'>&gt;</span> <span class='id identifier rubyid_test_record'>test_record</span><span class='lbracket'>[</span><span class='symbol'>:updated_at</span><span class='rbracket'>]</span><span class='rparen'>)</span><span class='rparen'>)</span>
+        <span class='comment'>#get ride of our partition and put it in the array with the range key
+</span>        <span class='id identifier rubyid_record'>record</span><span class='lbracket'>[</span><span class='symbol'>:id</span><span class='rbracket'>]</span><span class='comma'>,</span> <span class='id identifier rubyid_partition'>partition</span> <span class='op'>=</span> <span class='id identifier rubyid_get_original_id_and_partition'>get_original_id_and_partition</span>  <span class='id identifier rubyid_record'>record</span><span class='lbracket'>[</span><span class='symbol'>:id</span><span class='rbracket'>]</span>
+        <span class='id identifier rubyid_final_hash'>final_hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_record'>record</span><span class='lbracket'>[</span><span class='id identifier rubyid_range_key_name'>range_key_name</span><span class='rbracket'>]</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_record'>record</span>
       <span class='kw'>end</span>
     <span class='kw'>end</span>
-  <span class='kw'>end</span><span class='period'>.</span><span class='id identifier rubyid_values'>values</span>
+    <span class='kw'>return</span> <span class='id identifier rubyid_final_hash'>final_hash</span><span class='period'>.</span><span class='id identifier rubyid_values'>values</span>
+  <span class='kw'>else</span>
+    <span class='lbrace'>{</span><span class='rbrace'>}</span><span class='period'>.</span><span class='id identifier rubyid_tap'>tap</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_hash'>hash</span><span class='op'>|</span>
+      <span class='const'>Array</span><span class='lparen'>(</span><span class='id identifier rubyid_results'>results</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_result'>result</span><span class='op'>|</span>
+        <span class='kw'>next</span> <span class='kw'>if</span> <span class='id identifier rubyid_result'>result</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span>
+        <span class='comment'>#Need to find the value of id with out the . and partition number
+</span>        <span class='id identifier rubyid_id'>id</span><span class='comma'>,</span> <span class='id identifier rubyid_partition'>partition</span> <span class='op'>=</span> <span class='id identifier rubyid_get_original_id_and_partition'>get_original_id_and_partition</span> <span class='id identifier rubyid_result'>result</span><span class='lbracket'>[</span><span class='symbol'>:id</span><span class='rbracket'>]</span>
+        <span class='kw'>if</span> <span class='op'>!</span><span class='id identifier rubyid_hash'>hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_id'>id</span><span class='rbracket'>]</span> <span class='op'>||</span> <span class='lparen'>(</span><span class='id identifier rubyid_result'>result</span><span class='lbracket'>[</span><span class='symbol'>:updated_at</span><span class='rbracket'>]</span> <span class='op'>&gt;</span> <span class='id identifier rubyid_hash'>hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_id'>id</span><span class='rbracket'>]</span><span class='lbracket'>[</span><span class='symbol'>:updated_at</span><span class='rbracket'>]</span><span class='rparen'>)</span>
+          <span class='id identifier rubyid_result'>result</span><span class='lbracket'>[</span><span class='symbol'>:id</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_id'>id</span>
+          <span class='id identifier rubyid_hash'>hash</span><span class='lbracket'>[</span><span class='id identifier rubyid_id'>id</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='id identifier rubyid_result'>result</span>
+        <span class='kw'>end</span>
+      <span class='kw'>end</span>
+    <span class='kw'>end</span><span class='period'>.</span><span class='id identifier rubyid_values'>values</span>
+  <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1163,13 +1629,15 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
 </div>
       <div class="method_details ">
-  <p class="signature " id="scan-instance_method">
+  <h3 class="signature " id="scan-instance_method">
     - (<tt>Object</tt>) <strong>scan</strong>(table, query, opts = {})
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Scans a table. Generally quite slow; try to avoid using scan if at all possible.</p>
@@ -1177,7 +1645,7 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -1212,7 +1680,7 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -1234,24 +1702,24 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
       <pre class="lines">
-114
-115
-116
-117
-118
-119
-120
-121</pre>
+132
+133
+134
+135
+136
+137
+138
+139</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 114</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 132</span>
 <span class='kw'>def</span> <span class='id identifier rubyid_scan'>scan</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_query'>query</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='kw'>if</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_partitioning?'>partitioning?</span>
     <span class='id identifier rubyid_results'>results</span> <span class='op'>=</span> <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Scan</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_query'>query</span><span class='rparen'>)</span> <span class='lbrace'>{</span><span class='id identifier rubyid_adapter'>adapter</span><span class='period'>.</span><span class='id identifier rubyid_scan'>scan</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_query'>query</span><span class='comma'>,</span> <span class='id identifier rubyid_opts'>opts</span><span class='rparen'>)</span><span class='rbrace'>}</span>
-    <span class='id identifier rubyid_result_for_partition'>result_for_partition</span><span class='lparen'>(</span><span class='id identifier rubyid_results'>results</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_result_for_partition'>result_for_partition</span><span class='lparen'>(</span><span class='id identifier rubyid_results'>results</span><span class='comma'>,</span><span class='id identifier rubyid_table'>table</span><span class='rparen'>)</span>
   <span class='kw'>else</span>
-    <span class='id identifier rubyid_adapter'>adapter</span><span class='period'>.</span><span class='id identifier rubyid_scan'>scan</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_query'>query</span><span class='comma'>,</span> <span class='id identifier rubyid_opts'>opts</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Scan</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_query'>query</span><span class='rparen'>)</span> <span class='lbrace'>{</span><span class='id identifier rubyid_adapter'>adapter</span><span class='period'>.</span><span class='id identifier rubyid_scan'>scan</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_query'>query</span><span class='comma'>,</span> <span class='id identifier rubyid_opts'>opts</span><span class='rparen'>)</span><span class='rbrace'>}</span>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
@@ -1260,13 +1728,15 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
 </div>
       <div class="method_details ">
-  <p class="signature " id="write-instance_method">
+  <h3 class="signature " id="write-instance_method">
-    - (<tt>Object</tt>) <strong>write</strong>(table, object)
+    - (<tt>Object</tt>) <strong>write</strong>(table, object, options = nil)
-</p><div class="docstring">
+</h3><div class="docstring">
   <div class="discussion">
     <p>Write an object to the adapter. Partition it to a randomly selected key first if necessary.</p>
@@ -1274,7 +1744,7 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
   </div>
 </div>
 <div class="tags">
-  <h3>Parameters:</h3>
+  <p class="tag_title">Parameters:</p>
 <ul class="param">
     <li>
@@ -1307,9 +1777,26 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
     </li>
+    <li>
+        <span class='name'>options</span>
+        <span class='type'>(<tt>Hash</tt>)</span>
+        <em class="default">(defaults to: <tt>nil</tt>)</em>
+        &mdash;
+        <div class='inline'><p>Options that are passed to the put_item call</p>
+</div>
+    </li>
 </ul>
-<h3>Returns:</h3>
+<p class="tag_title">Returns:</p>
 <ul class="return">
     <li>
@@ -1326,7 +1813,7 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
     </li>
 </ul>
-<h3>Since:</h3>
+<p class="tag_title">Since:</p>
 <ul class="since">
     <li>
@@ -1348,23 +1835,23 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
       <pre class="lines">
-52
 53
 54
 55
 56
 57
-58</pre>
+58
+59</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 52</span>
+      <pre class="code"><span class="info file"># File 'lib/dynamoid/adapter.rb', line 53</span>
-<span class='kw'>def</span> <span class='id identifier rubyid_write'>write</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</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_write'>write</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</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='kw'>if</span> <span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_partitioning?'>partitioning?</span> <span class='op'>&amp;&amp;</span> <span class='id identifier rubyid_object'>object</span><span class='lbracket'>[</span><span class='symbol'>:id</span><span class='rbracket'>]</span>
     <span class='id identifier rubyid_object'>object</span><span class='lbracket'>[</span><span class='symbol'>:id</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_object'>object</span><span class='lbracket'>[</span><span class='symbol'>:id</span><span class='rbracket'>]</span><span class='rbrace'>}</span><span class='tstring_content'>.</span><span class='embexpr_beg'>#{</span><span class='const'>Random</span><span class='period'>.</span><span class='id identifier rubyid_rand'>rand</span><span class='lparen'>(</span><span class='const'>Dynamoid</span><span class='op'>::</span><span class='const'>Config</span><span class='period'>.</span><span class='id identifier rubyid_partition_size'>partition_size</span><span class='rparen'>)</span><span class='rbrace'>}</span><span class='tstring_end'>&quot;</span></span>
     <span class='id identifier rubyid_object'>object</span><span class='lbracket'>[</span><span class='symbol'>:updated_at</span><span class='rbracket'>]</span> <span class='op'>=</span> <span class='const'>Time</span><span class='period'>.</span><span class='id identifier rubyid_now'>now</span><span class='period'>.</span><span class='id identifier rubyid_to_f'>to_f</span>
   <span class='kw'>end</span>
-  <span class='id identifier rubyid_benchmark'>benchmark</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>Put Item</span><span class='tstring_end'>'</span></span><span class='comma'>,</span> <span class='id identifier rubyid_object'>object</span><span class='rparen'>)</span> <span class='lbrace'>{</span><span class='id identifier rubyid_put_item'>put_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</span><span class='comma'>,</span> <span class='id identifier rubyid_object'>object</span><span class='rparen'>)</span><span class='rbrace'>}</span>
+  <span class='id identifier rubyid_put_item'>put_item</span><span class='lparen'>(</span><span class='id identifier rubyid_table'>table</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='rparen'>)</span>
 <span class='kw'>end</span></pre>
     </td>
   </tr>
@@ -1374,11 +1861,11 @@ their id and updated_at attributes; if the updated_at is the greatest, then it m
   </div>
 </div>
     <div id="footer">
-  Generated on Thu Apr 26 01:26:24 2012 by
+  Generated on Thu Jun 27 21:59:10 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>