dynamodb_framework 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca8decdb6f99c0cce8c288170de0e355e9ff0e9f
-  data.tar.gz: a0ac595cb6283e231397e027b861b610a374705b
+  metadata.gz: a14cd99712936bca38b2833324d48e653aefbca3
+  data.tar.gz: a72d99378e3fd88e4c34acf7c1a6113340c2891f
 SHA512:
-  metadata.gz: 4d422839049b5021e5a4203c1a50c1d3707201972ce2cd71beeeabbd70c31b19f0238fe471d4d01fb66107d5ea0ed4c5a628eac2c886e7d2ec328ba1bdb52e05
-  data.tar.gz: 46bdbcf9396bfbc4e64fd8354f8d246b9eebfd5a97493bce09b36689efe707cacf75183257bf476bd9fc55d827a9f1bdcc5c4a77e7ffc43279f52939722be837
+  metadata.gz: ce4164b5df1be839b74fb3fd686c33b155c05eadd0d953ab39c8944cb00f344087e417e3eebf2ba8668d80c29fb14bcffc6d6b9e0c65fc5c8b560b8c3073b0ce
+  data.tar.gz: e2bf4eeda87c3e6b7d698838fb67228cd21663c08dd493d40f8662af781c81753d83b2d1a89ccdf52ad4b1bafac3e4f9420bbf6c1da05d80d162aa44a9517061

data/lib/dynamodb_framework/dynamodb_query.rb

@@ -1,6 +1,12 @@
 module DynamoDbFramework
   class Query
 
+    class InvalidQueryError < StandardError
+      def initialize(message)
+        super(message)
+      end
+    end
+
     def initialize(table_name:, partition_key:, partition_value:, index_name: nil)
       @table_name = table_name
       @partition_key = partition_key
@@ -44,6 +50,26 @@ module DynamoDbFramework
       self
     end
 
+    def contains(value)
+      field = @parts.last
+      unless field[:type] == :field
+        raise ::InvalidQueryError.new('The contains query part can only be chained to a field.')
+      end
+      @parts.pop
+      @parts << { type: :contains, field: field[:value], value: value }
+      self
+    end
+
+    def exists?
+      field = @parts.last
+      unless field[:type] == :field
+        raise ::InvalidQueryError.new('The exists? query part can only be chained to a field.')
+      end
+      @parts.pop
+      @parts << { type: :exists, field: field[:value] }
+      self
+    end
+
     def and
       @parts << { type: :and }
       self
@@ -77,6 +103,17 @@ module DynamoDbFramework
             counter = counter + 1
             @expression_string += ' ' + p[:expression].to_s + ' ' + param_name
             @expression_params[param_name] = clean_value(p[:value])
+          when :contains
+            param_name = ':p' + counter.to_s
+            counter = counter + 1
+            field_param = '#' + p[:field].to_s
+            @expression_string += ' contains(' + field_param + ', ' + param_name + ')'
+            @expression_params[field_param] = p[:field].to_s
+            @expression_params[param_name] = clean_value(p[:value])
+          when :exists
+            field_param = '#' + p[:field].to_s
+            @expression_string += ' attribute_exists(' + field_param + ')'
+            @expression_params[field_param] = p[:field].to_s
           when :and
             @expression_string += ' and'
           when :or

data/lib/dynamodb_framework/version.rb

@@ -1,3 +1,3 @@
 module DynamoDbFramework
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
 end

data/spec/dynamodb_query_spec.rb

@@ -45,11 +45,17 @@ RSpec.describe DynamoDbFramework::Query do
                           .number.gt_eq(1)
                           .and
                           .number.lt_eq(5)
+                          .and
+                          .number.exists?
+                          .and
+                          .name.contains('name')
                           .build
-      expect(string).to eq '#number >= :p0 and #number <= :p1'
+      expect(string).to eq '#number >= :p0 and #number <= :p1 and attribute_exists(#number) and contains(#name, :p2)'
       expect(params['#number']).to eq 'number'
       expect(params[':p0']).to eq 1
       expect(params[':p1']).to eq 5
+      expect(params['#name']).to eq 'name'
+      expect(params[':p2']).to eq 'name'
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamodb_framework
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler