dynamodb_framework 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e8d0250d290cb006f3cbfecaffcd35a3c61819c7
-  data.tar.gz: 98398a2a0aae655ef04ba9ccd01155bd320c5cf1
+SHA256:
+  metadata.gz: 92cddfb4858c3bc9d655d4ddb353d437a4bb3e417695c23053ce426be35d3056
+  data.tar.gz: cc8e3f7286350e88f09b7a9f68efb57d7220a82c6cc513e54bcb110182e10e3d
 SHA512:
-  metadata.gz: d46aac43125f003b06522522790d87dcf201728af48f80e64effe39812bb53a83895aefd331b341b6e4437788f2de9642d74c126b257d8991e2feeaae2d67e69
-  data.tar.gz: 71428f806932374f1c52a81f04f9cddc6aaafcdce0c11e0c6899825bd12644b663a319b5dbe93a212a164fc9238ef35596306d53df93e0c97ae3d30f3593524d
+  metadata.gz: bd3de1be8d514d5af939c48737d0316c02bb27367fba8b7819c43a7f30e529b88529f975716eca5e005f24449a201a09c260c247a4b4668ce9a9dc520e659ee3
+  data.tar.gz: a441ff92489712e5218d20e6957508426aa9445a9dc91cfdee727dce1f23e7accd26928e142d348a16148fee6a88e3bc2bbd037dd4870e57d826abff12d72167

data/lib/dynamodb_framework/dynamodb_index.rb

@@ -46,7 +46,7 @@ module DynamoDbFramework
       self.instance_variable_set(:@range_key, { field: field, type: type })
     end
 
-    def create(store: DynamoDbFramework.default_store, read_capacity: 25, write_capacity: 25, submit: true)
+    def create(store: DynamoDbFramework.default_store, read_capacity: 25, write_capacity: 25, submit: true, billing_mode: 'PROVISIONED')
       unless self.instance_variable_defined?(:@table)
         raise DynamoDbFramework::Index::InvalidConfigException.new('Table must be specified.')
       end
@@ -84,10 +84,10 @@ module DynamoDbFramework
 
       range_key_field = range_key[:field] unless range_key == nil
 
-      index =table_manager.create_global_index(full_index_name, partition_key[:field], range_key_field, read_capacity, write_capacity)
+      index =table_manager.create_global_index(full_index_name, partition_key[:field], range_key_field, read_capacity, write_capacity, billing_mode)
 
       if submit
-        table_manager.add_index(table_name, builder.attributes, index)
+        table_manager.add_index(table_name, builder.attributes, index, billing_mode)
       end
 
       index

data/lib/dynamodb_framework/dynamodb_table_manager.rb

@@ -66,7 +66,7 @@ module DynamoDbFramework
 
     end
 
-    def add_index(table_name, attributes, global_index)
+    def add_index(table_name, attributes, global_index, billing_mode = 'PROVISIONED')
 
       attribute_definitions = []
 
@@ -79,7 +79,8 @@ module DynamoDbFramework
           :attribute_definitions => attribute_definitions,
           :global_secondary_index_updates => [
               :create => global_index
-          ]
+          ],
+          :billing_mode => billing_mode
       }
 
       dynamodb.client.update_table(table)
@@ -235,7 +236,7 @@ module DynamoDbFramework
 
     end
 
-    def create(table_name, attributes, partition_key, range_key = nil, read_capacity = 20, write_capacity = 10, global_indexes = nil)
+    def create(table_name, attributes, partition_key, range_key = nil, read_capacity = 20, write_capacity = 10, global_indexes = nil, billing_mode = 'PROVISIONED')
 
       if exists?(table_name)
         return
@@ -257,11 +258,17 @@ module DynamoDbFramework
           :table_name => table_name,
           :attribute_definitions => attribute_definitions,
           :key_schema => key_schema,
+          :billing_mode => billing_mode
+      }
+
+      unless billing_mode == 'PAY_PER_REQUEST'
+        table = table.merge(
           :provisioned_throughput => {
-              :read_capacity_units => read_capacity,
-              :write_capacity_units => write_capacity
+            :read_capacity_units => read_capacity,
+            :write_capacity_units => write_capacity
           }
-      }
+        )
+      end
 
       if global_indexes != nil
         table[:global_secondary_indexes] = global_indexes
@@ -316,11 +323,17 @@ module DynamoDbFramework
           :table_name => table_name,
           :attribute_definitions => attribute_definitions,
           :key_schema => key_schema,
+          :billing_mode => options[:billing_mode] || 'PROVISIONED'
+      }
+
+      unless options[:billing_mode] == 'PAY_PER_REQUEST'
+        table = table.merge(
           :provisioned_throughput => {
-              :read_capacity_units => options[:read_capacity],
-              :write_capacity_units => options[:write_capacity]
+            :read_capacity_units => options[:read_capacity],
+            :write_capacity_units => options[:write_capacity]
           }
-      }
+        )
+      end
 
       if options[:global_indexes] != nil
         table[:global_secondary_indexes] = options[:global_indexes]
@@ -338,7 +351,7 @@ module DynamoDbFramework
       DynamoDbFramework.logger.info "[#{self.class}] - Table: [#{table_name}] created."
     end
 
-    def create_global_index(name, partition_key, range_key = nil, read_capacity = 20, write_capacity = 10)
+    def create_global_index(name, partition_key, range_key = nil, read_capacity = 20, write_capacity = 10, billing_mode = 'PROVISIONED')
 
       key_schema = []
 
@@ -352,13 +365,18 @@ module DynamoDbFramework
           :key_schema => key_schema,
           :projection => {
               :projection_type => :ALL
-          },
-          :provisioned_throughput => {
-              :read_capacity_units => read_capacity,
-              :write_capacity_units => write_capacity,
           }
       }
 
+      if billing_mode == 'PROVISIONED'
+        index = index.merge(
+          :provisioned_throughput => {
+            :read_capacity_units => read_capacity,
+            :write_capacity_units => write_capacity,
+          }
+        )
+      end
+
       return index
     end
 

data/lib/dynamodb_framework/version.rb

@@ -1,3 +1,3 @@
 module DynamoDbFramework
-  VERSION = '1.7.0'
+  VERSION = '1.8.0'
 end

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
 require "rubygems"
 require "bundler"
 require 'aws-sdk-core'
@@ -9,12 +14,7 @@ require_relative '../spec/example_table'
 require_relative '../spec/example_index'
 require 'pry'
 
-require 'simplecov'
-SimpleCov.start do
-  add_filter '/spec/'
-end
-
-DYNAMODB_STORE_ENDPOINT = 'http://dynamodb:8000'
+DYNAMODB_STORE_ENDPOINT = ENV.fetch('DYNAMODB_ENDPOINT', 'http://localhost:8000')
 
 Aws.config[:credentials] = Aws::Credentials.new('test_key', 'test_secret')
 Aws.config[:region] = 'eu-west-1'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb_framework
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2019-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +111,7 @@ dependencies:
 description: A lightweight framework to provide managers for working with aws dynamodb
   (incuding local version).
 email:
-- vaughanbritton@gmail.com
+- vaughan.britton@sage.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -132,16 +132,16 @@ files:
 - lib/dynamodb_framework/dynamodb_table_manager.rb
 - lib/dynamodb_framework/hash_helper.rb
 - lib/dynamodb_framework/version.rb
-- spec/dynamodb_index_spec.rb
-- spec/dynamodb_migration_manager_spec.rb
-- spec/dynamodb_namespace_migration_manager_spec.rb
-- spec/dynamodb_query_spec.rb
-- spec/dynamodb_repository_spec.rb
-- spec/dynamodb_table_manager_spec.rb
-- spec/dynamodb_table_spec.rb
+- spec/dynamodb_framework/dynamodb_index_spec.rb
+- spec/dynamodb_framework/dynamodb_migration_manager_spec.rb
+- spec/dynamodb_framework/dynamodb_namespace_migration_manager_spec.rb
+- spec/dynamodb_framework/dynamodb_query_spec.rb
+- spec/dynamodb_framework/dynamodb_repository_spec.rb
+- spec/dynamodb_framework/dynamodb_table_manager_spec.rb
+- spec/dynamodb_framework/dynamodb_table_spec.rb
+- spec/dynamodb_framework/hash_helper_spec.rb
 - spec/example_index.rb
 - spec/example_table.rb
-- spec/hash_helper_spec.rb
 - spec/spec_helper.rb
 - spec/test_item.rb
 - spec/test_migration_script1.rb
@@ -165,8 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A lightweight framework to provide managers for working with aws dynamodb