appfuel 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01694bfb7b1b82467a7416337c19a837a8eb47e4
-  data.tar.gz: 70eff28c04fa90216add52b3a443af8697c41404
+  metadata.gz: 26008749776ba357f8a284a4feee76e7370c18c7
+  data.tar.gz: 0c2c61390c5e6e8a36a4b4101bd51ea49e97953f
 SHA512:
-  metadata.gz: 5e88d8348a698285e0443f61b26a5bf2be05b689b63eb4d079b63416f0981bb04e9a473027a7baf1900b04837c6e1311a1298a4511de9efd8234402c897e4644
-  data.tar.gz: 7fab691e8d97d7a35c875b890869f9be117713faa63f66efe977cf3f28fa7febe6330bd6441a3708bf2f15f456f0247536a92117ccf120edf3dd053899d4bc4b
+  metadata.gz: 47a10118db23f624497b4035fe3267239d3ebbde0da51fd98769033ce02656afe2859344c2037d57147047d7241e3193695a5ff30514a734bf39c2128da7129b
+  data.tar.gz: 5df321fb1f883bf3f7a6ed91d29517a515986933c9d8f5928d5dd81f4247c7e1b652951c6977b7c86e5403bb0109d34c288e1e2f4a53df7395e06e8104a6afde

data/CHANGELOG.md

@@ -5,7 +5,12 @@ All notable changes to this project will be documented in this file. (Pending ap
 
 
 # Releases
-## [[0.5.9]](https://github.com/rsb/appfuel/releases/tag/0.5.8) 2017-07-27
+## [[0.5.10]](https://github.com/rsb/appfuel/releases/tag/0.5.10) 2017-07-28
+### Added
+- Primary key object for dynamodb
+- new adapter interfaces for get, put, and delete
+
+## [[0.5.9]](https://github.com/rsb/appfuel/releases/tag/0.5.9) 2017-07-27
 ### Added
 - Adding a `run!` to handler which deals with failures
 - Adding a HandlerFailure has for when the handler fails

data/lib/appfuel/storage/dynamodb.rb

@@ -1,2 +1,3 @@
-require_relative 'dynamodb/repository'
+require_relative 'dynamodb/primary_key'
 require_relative 'dynamodb/adapter'
+require_relative 'dynamodb/repository'

data/lib/appfuel/storage/dynamodb/adapter.rb

@@ -1,6 +1,7 @@
 module Appfuel
   module Dynamodb
-    CLIENT_CONTAINER_KEY = 'aws.dynamodb.client'
+    DEFAULT_CONFIG_KEY   = 'aws.dynamodb'
+    CLIENT_CONTAINER_KEY = "#{DEFAULT_CONFIG_KEY}.client"
 
     class NoSqlModel
       include Appfuel::Application::AppContainer
@@ -11,7 +12,9 @@ module Appfuel
         end
 
         def config_key(value = nil)
-          return @config_key if value.nil?
+          if value.nil?
+            return @config_key ||= DEFAULT_CONFIG_KEY
+          end
           @config_key = value.to_s
         end
 
@@ -61,12 +64,8 @@ module Appfuel
           stage_class_for_registration(klass)
         end
 
-        def primary_key(hash_key, hash_type, range_key = nil, range_type = nil)
-          @primary_key = [ {hash_key => hash_type.to_s.downcase} ]
-          unless range_key.nil?
-            fail "range type is required" if range_type.nil?
-            @primary_key << { range_key => range_type }
-          end
+        def primary_key(hash, hash_type, range = nil, range_type = nil)
+          @primary_key = PrimaryKey.new(hash, hash_type, range, range_type)
         end
       end
 
@@ -91,18 +90,19 @@ module Appfuel
         self.class.indexes[key]
       end
 
+      def primary_key
+        fail "No primary key assigned" if self.class.primary_key.nil?
+        self.class.primary_key
+      end
+
+
       def put_params(data)
-        {
-          table_name: table_name,
-          item: data
-        }
+        create_table_hash(item: data)
       end
 
-      def table_params(keys ={})
-        {
-          table_name: table_name,
-          key: keys
-        }
+      def table_params(hash_key_value, range_key_value = nil)
+        params = primary_key.params(hash_key_value, range_key_value)
+        create_table_hash(key: params)
       end
 
       def query_select_map(type)
@@ -115,13 +115,12 @@ module Appfuel
       end
 
       def select_index_params(key, attrs_returned, key_expr, values = {})
-        {
-          table_name: table_name,
+        create_table_hash(
           index_name: index_name(key),
-          select:      query_select_map(attrs_returned),
+          select:     query_select_map(attrs_returned),
           key_condition_expression: key_expr,
           expression_attribute_values: values
-        }
+        )
       end
 
       def select_index(key, select, key_expr, values = {})
@@ -129,11 +128,36 @@ module Appfuel
         client.query(params)
       end
 
-      def index_query_params(key, opts = {})
-        if opts.key?(:select)
-          params[:select] = query_select_map(opts[:select])
-        end
+      def put(data)
+        params = put_params(data)
+        ap params
+        client.put_item(params)
+      end
+
+      def get(hash_value, range_value = nil)
+        result = get_item(hash_value, range_value)
+        return false if result.item.nil?
+
+        result.item
+      end
+
+      def get_item(hash_value, range_value = nil)
+        params = table_params(hash_value, range_value)
+        client.get_item(params)
+      end
+
+      def delete(hash_value, range_value = nil)
+        delete_item(hash_value, range_value)
+      end
+
+      def delete_item(hash_value, range_value = nil)
+        params = table_params(hash_value, range_value)
+        client.delete_item(params)
+      end
 
+      private
+      def create_table_hash(data = {})
+        data.merge!(table_name: table_name)
       end
     end
   end

data/lib/appfuel/storage/dynamodb/primary_key.rb

@@ -0,0 +1,34 @@
+module Appfuel
+  module Dynamodb
+    class PrimaryKey
+      attr_reader :hash_key, :range_key
+
+      def initialize(hash_key, hash_type, range_key = nil, range_type = nil)
+        @hash_key = hash_key.to_sym
+        @hash_type = hash_type
+        unless range_key.nil?
+          if range_type.nil?
+            fail "range_type is required for primary range key"
+          end
+          @range_key = range_key
+          @range_type = range_type
+        end
+      end
+
+      def composite?
+        !range_key.nil?
+      end
+
+      def params(hash_value, range_value = nil)
+        data = { hash_key => hash_value }
+        if composite?
+          if range_value.nil?
+            fail "This is a composite key range_value is required"
+          end
+          data[range_key] = range_value
+        end
+        data
+      end
+    end
+  end
+end

data/lib/appfuel/storage/repository/base.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module Appfuel
   module Repository
     # The generic repository behavior. This represents repo behavior that is
@@ -237,6 +239,10 @@ module Appfuel
         app_container[key].new(hash)
       end
 
+      def generate_uuid
+        SecureRandom.uuid
+      end
+
       private
       def method_not_implemented_error
         fail "must be implemented by a storage specific repository"

data/lib/appfuel/version.rb

@@ -1,3 +1,3 @@
 module Appfuel
-  VERSION = "0.5.9"
+  VERSION = "0.5.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfuel
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -342,6 +342,7 @@ files:
 - lib/appfuel/storage/db/repository_query.rb
 - lib/appfuel/storage/dynamodb.rb
 - lib/appfuel/storage/dynamodb/adapter.rb
+- lib/appfuel/storage/dynamodb/primary_key.rb
 - lib/appfuel/storage/dynamodb/repository.rb
 - lib/appfuel/storage/file.rb
 - lib/appfuel/storage/file/base.rb