ddbcli 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 989847bbd044a7f8b55277fcf79d6f87497ce6dc
-  data.tar.gz: ebd92af86e25aa7f696851966c09ff62706f0667
+  metadata.gz: 0ed0ee9d9dc097573bbdf49182bcef2a8751af2e
+  data.tar.gz: 112ce4939ccb1cbfb083bc785cae474427b1f03d
 SHA512:
-  metadata.gz: fd546866388539e3f4881b098c734fffe1c9c6237de8f6edb28164d9007d3bcd00d088457ae3100fc4c49b92d11a9c6e40785aa27586a2e4db24bc9a918707d8
-  data.tar.gz: cd554bcd559c6d3e396d43e754844412e421d02f23e21e071fec7df14a8e476e470b9958e4c1c492329d37437b276c3c063dbed2d9463954b27d8cf4e1181bfb
+  metadata.gz: 9fe3469ade8447b7a46fe768a75e8939b01b1486193e69b201d2ae4c4f0d4452b37db3dd9c17a3dea76b4a5215fa38766b5d6243559771bffbecfae696935a35
+  data.tar.gz: 4edef9cd083130f4f1f39abb280c1e28c272fec6769817b98de87cca7bb4978c77c2b9b478d6dce9792a4ef0b741778f1998a84377b832ed6878b72da066aaab

data/README.md

@@ -11,12 +11,13 @@ ddbcli is an interactive command-line client of Amazon DynamoDB.
 
 If you are not using RubyGems, you can use the script files that depend on only Ruby.
 
-[ddbcli-0.3.5](https://bitbucket.org/winebarrel/ddbcli/downloads/ddbcli-0.3.5)
+[ddbcli-0.3.6](https://bitbucket.org/winebarrel/ddbcli/downloads/ddbcli-0.3.6)
 
 ```sh
-wget https://bitbucket.org/winebarrel/ddbcli/downloads/ddbcli-0.3.5
-sudo cp ddbcli-0.3.5 /usr/local/bin/ddbcli
-sudo chmod 755 /usr/local/bin/ddbcli
+wget https://bitbucket.org/winebarrel/ddbcli/downloads/ddbcli-0.3.6
+mv ddbcli-0.3.6 ddbcli
+chmod 755 ddbcli
+./ddbcli # show prompt
 ```
 
 ## Usage
@@ -61,7 +62,7 @@ DEBUG: 'i' contains: [{"gender"=>"F"}, {"gender"=>"F"}, {"gender"=>"F"}] ...
 
 * [https://gist.github.com/winebarrel/7938971](https://gist.github.com/winebarrel/7938971)
 
-## Enabling ctrl-r (reverse-search-history) on OS X
+## Enable ctrl-r (reverse-search-history) on OS X
 
     $ echo 'bind "^R" em-inc-search-prev' >> ~/.editrc
 
@@ -121,7 +122,7 @@ DELETE ALL FROM table_name WHERE [WHERE attr1 = '...' AND ...] [ORDER {ASC|DESC}
   deletes items
   ("DELETE" can delete only one record. Please use "DELETE ALL", when you update more than one.)
 
-SELECT {*|attr1,attr2,...|COUNT(*)} FROM table_name [USE INDEX (index_name)] [WHERE key1 = '...' AND ...] [ORDER {ASC|DESC}] [LIMIT limit]
+SELECT {*|attr1,attr2,...|COUNT(*)} FROM table_name [USE INDEX (index_name)] [WHERE key1 = '...' AND ...] [HAVING attr1 = '...' AND ...] [ORDER {ASC|DESC}] [LIMIT limit]
 SELECT ALL {*|attr1,attr2,...|COUNT(*)} FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
 SELECT segment/total_segments {*|attr1,attr2,...|COUNT(*)} FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
   queries using the Query/Scan action
@@ -162,9 +163,10 @@ Query (SELECT)
   = | <= | < | >= | > | BEGINS_WITH | BETWEEN
   see http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Query.html#DDB-Query-request-KeyConditions
 
-Scan (SELECT ALL)
+Scan (SELECT ALL), QueryFilter (HAVING)
   = | <> | != | <= | < | >= | > | IS NOT NULL | IS NULL | CONTAINS | NOT CONTAINS | BEGINS_WITH | IN | BETWEEN
-  see http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html#DDB-Scan-request-ScanFilter
+  see http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html#DDB-Scan-request-ScanFilter,
+      http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Query.html#DDB-Query-request-QueryFilter
 
 
 ##### Pass to Ruby/Shell #####
@@ -211,7 +213,3 @@ Append
 .timeout         SECOND?        displays a timeout second or changes it
 .version                        displays a version
 ```
-
-## Link
-
-* [RubyGems.org site](http://rubygems.org/gems/ddbcli)

data/lib/ddbcli/cli/help.rb

@@ -55,7 +55,7 @@ DELETE ALL FROM table_name WHERE [WHERE attr1 = '...' AND ...] [ORDER {ASC|DESC}
   deletes items
   ("DELETE" can delete only one record. Please use "DELETE ALL", when you update more than one.)
 
-SELECT {*|attr1,attr2,...|COUNT(*)} FROM table_name [USE INDEX (index_name)] [WHERE key1 = '...' AND ...] [ORDER {ASC|DESC}] [LIMIT limit]
+SELECT {*|attr1,attr2,...|COUNT(*)} FROM table_name [USE INDEX (index_name)] [WHERE key1 = '...' AND ...] [HAVING attr1 = '...' AND ...] [ORDER {ASC|DESC}] [LIMIT limit]
 SELECT ALL {*|attr1,attr2,...|COUNT(*)} FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
 SELECT segment/total_segments {*|attr1,attr2,...|COUNT(*)} FROM table_name [WHERE attr1 = '...' AND ...] [LIMIT limit]
   queries using the Query/Scan action
@@ -96,9 +96,10 @@ Query (SELECT)
   = | <= | < | >= | > | BEGINS_WITH | BETWEEN
   see http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Query.html#DDB-Query-request-KeyConditions
 
-Scan (SELECT ALL)
+Scan (SELECT ALL), QueryFilter (HAVING)
   = | <> | != | <= | < | >= | > | IS NOT NULL | IS NULL | CONTAINS | NOT CONTAINS | BEGINS_WITH | IN | BETWEEN
-  see http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html#DDB-Scan-request-ScanFilter
+  see http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html#DDB-Scan-request-ScanFilter,
+      http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Query.html#DDB-Query-request-QueryFilter
 
 
 ##### Pass to Ruby/Shell #####

data/lib/ddbcli/ddb-driver.rb

@@ -604,6 +604,21 @@ module DynamoDB
           end
         end # key conditions / scan filter
 
+        # query filter
+        if action == 'Query' and parsed.having
+          req_hash['QueryFilter'] = {}
+
+          parsed.having.each do |key, operator, values|
+            h = req_hash['QueryFilter'][key] = {
+              'ComparisonOperator' => operator.to_s
+            }
+
+            h['AttributeValueList'] = values.map do |val|
+              convert_to_attribute_value(val)
+            end
+          end
+        end # query filter
+
         rd = nil
 
         begin