awful 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58326fca01b2146895915969cdff05f8ba598c1d
-  data.tar.gz: 2016fc803bb3559537eb3f1699446b52b52a1a15
+  metadata.gz: de50bfb59c215fedd6732d5db9d20ababda674c4
+  data.tar.gz: fee0153a6bbc75fa1982ce51c3bc9411c7346da2
 SHA512:
-  metadata.gz: a8ca8e2dcd0db733bd4b049596a45763e07501d78e86d5a07ab182b0fb7d082bfb4c76e7a48d0b55822d3af2d0972215ba1676900ef45371c04c5a16a96c7220
-  data.tar.gz: 47cfd6a0c7580a60cd5d458284ec6d2e279e9ea9515eda136010138e7bde00c4b7da596c4be0c46c531ae0c31eb1e23b0d897e8d92732d9864b3861e25866fe3
+  metadata.gz: ff2e36715ba4dcd740de1a62314caf8dbe5e9a5df943bcb429711e87491485ae6293d83409a6c011c244cd4f8163519bd48b1b6a3feb18541522b9995b4d8086
+  data.tar.gz: e5bb40be4a4a6bbcb247735764c1b934bfaec3b0634debf8e8eda1a853e250c8047a528c9e172986c121147e8f2746a30b27db93aa379de62a8b43be13cd473a

data/lib/awful.rb

@@ -34,10 +34,23 @@ module Awful
 
       ## to use dynamodb-local, set DYNAMO_ENDPOINT or DYNAMODB_ENDPOINT to e.g. http://localhost:8000
       def dynamodb
-        options = { endpoint: ENV['DYNAMO_ENDPOINT'] || ENV['DYNAMODB_ENDPOINT'] }.reject { |_,v| v.nil? }
+        options = {endpoint: ENV['DYNAMO_ENDPOINT'] || ENV['DYNAMODB_ENDPOINT']}.reject { |_,v| v.nil? }
         @dynamodb ||= Aws::DynamoDB::Client.new(options)
       end
 
+      ## dynamodb client with parameter conversion turned off,
+      ## for getting result as Aws::Plugins::Protocols::JsonRpc;
+      ## see https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DataFormat.html;
+      ## client method calls need simple attributes in requests also (strings not symbols, etc)
+      def dynamodb_simple
+        options = {
+          simple_attributes: false,
+          simple_json: true,
+          endpoint: ENV['DYNAMO_ENDPOINT'] || ENV['DYNAMODB_ENDPOINT'],
+        }.reject { |_,v| v.nil? }
+        @dynamodb_simple ||= Aws::DynamoDB::Client.new(options)
+      end
+
       def s3
         @s3 ||= Aws::S3::Client.new
       end

data/lib/awful/dynamodb.rb

@@ -27,31 +27,31 @@ module Awful
       end
     end
 
-    desc 'scan NAME', 'scan table with NAME'
-    def scan(name, start_key = nil)
-      r = dynamodb.scan(table_name: name, exclusive_start_key: start_key) #.items.tap{ |x| p x.count }.tap do |table|
-      puts r.items.map { |item| JSON.generate(item) }.join("\n")
-      if r.last_evaluated_key # recurse if more data to get
-        scan(name, r.last_evaluated_key)
-      end
-    end
-
     desc 'create_table NAME', 'create table with NAME'
     def create_table(name, file = nil)
       opt = load_cfg(options, file)
       params = only_keys_matching(opt, %i[attribute_definitions key_schema])
       params[:table_name] = name
       params[:provisioned_throughput] = only_keys_matching(opt[:provisioned_throughput], %i[read_capacity_units write_capacity_units])
-      params[:local_secondary_indexes] = opt[:local_secondary_indexes].map do |lsi|
-        only_keys_matching(lsi, %i[index_name key_schema projection])
+
+      ## scrub unwanted keys from LSIs
+      if opt.has_key?(:local_secondary_indexes)
+        params[:local_secondary_indexes] = opt[:local_secondary_indexes].map do |lsi|
+          only_keys_matching(lsi, %i[index_name key_schema projection])
+        end
       end
-      params[:global_secondary_indexes] = opt[:global_secondary_indexes].map do |gsi|
-        only_keys_matching(gsi, %i[index_name key_schema projection]).tap do |g|
-          if gsi[:provisioned_throughput]
-            g[:provisioned_throughput] = only_keys_matching(gsi[:provisioned_throughput], %i[read_capacity_units write_capacity_units])
+
+      ## scrub unwanted keys from GSIs
+      if opt.has_key?(:global_secondary_indexes)
+        params[:global_secondary_indexes] = opt[:global_secondary_indexes].map do |gsi|
+          only_keys_matching(gsi, %i[index_name key_schema projection]).tap do |g|
+            if gsi[:provisioned_throughput]
+              g[:provisioned_throughput] = only_keys_matching(gsi[:provisioned_throughput], %i[read_capacity_units write_capacity_units])
+            end
           end
         end
       end
+
       dynamodb.create_table(params)
     end
 
@@ -66,12 +66,25 @@ module Awful
       end
     end
 
+    ## uses simple_json to get Aws::Plugins::Protocols::JsonRpc output from scan;
+    ## this also means request params need to be raw strings and not symbols, etc
+    desc 'scan NAME', 'scan table with NAME'
+    def scan(name, exclusive_start_key = nil)
+      r = dynamodb_simple.scan('TableName' => name, 'ExclusiveStartKey' => exclusive_start_key)
+      puts r['Items'].map { |item| JSON.generate(item) }.join("\n")
+
+      ## recurse if more data to get
+      if r.has_key?('LastEvaluatedKey')
+        scan(name, r['LastEvaluatedKey'])
+      end
+    end
+
     desc 'put_items NAME', 'puts json items into the table with NAME'
     def put_items(name, file = nil)
       io = (file and File.open(file)) || ((not $stdin.tty?) and $stdin)
       count = 0
       io.each_line do |line|
-        dynamodb.put_item(table_name: name, item: JSON.parse(line))
+        dynamodb_simple.put_item('TableName' => name, 'Item' => JSON.parse(line))
         count += 1
       end
       count.tap { |c| puts "put #{c} items" }

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = "0.0.29"
+  VERSION = "0.0.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.30
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler