dynamini 1.7.7 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7130407abb9dbe1185b3ef9fb6eebacbeced2895
-  data.tar.gz: 962468987cde482861fa02ca24c078bbdccc3ca6
+  metadata.gz: 5b2c47d2bbbe481f882f553c5be6bbd19e55c3ea
+  data.tar.gz: 896d9cf814087ab94a553b6442544b08736d4936
 SHA512:
-  metadata.gz: 996a125425f9f8344339ad153498f5c234114320e87145358d2d8d88915927da62455aeea868d1836944fc9999381a2a2dcacf7617aaec589f9bb5268fb5bd97
-  data.tar.gz: db9208b0bf5d17161d03fbc5b480d7cff583b6e03fc020aa25bfccc102d29f20a050a8c6bc4b7e04827bbc6783aa85152676cb8052636744efd824fc438b3120
+  metadata.gz: 1fa38ebcab26e62bc0b8096d1aacf64d067589f50a4ddd37dce1fb6a3566d8201ea4a81719672c6c18531e02891c871fe590105b09f34b401aee3cf5aabfa9b1
+  data.tar.gz: 0430d5c20bd42e61bb99c9ce7765aae89eb05899aaa08e9248ef0b9d87c9f6d118049d8d273f6d4e4ac7f1be2c13fd80ab125c3d4b92c558e1166ff3b8b4f5df

data/lib/dynamini/base.rb

@@ -133,6 +133,18 @@ module Dynamini
         objects
       end
 
+      def query(args = {})
+        fail ArgumentError, 'You must provide a :hash_key.' unless args[:hash_key]
+        fail TypeError, 'Your range key must be handled as an integer, float, date, or time.' unless self.range_is_numeric?
+
+        response = self.dynamo_query(args)
+        objects = []
+        response.items.each do |item|
+          objects << new(item.symbolize_keys, false)
+        end
+        objects
+      end
+
       def enqueue_for_save(attributes, options = {})
         model = new(attributes, true)
         model.generate_timestamps! unless options[:skip_timestamps]
@@ -314,6 +326,37 @@ module Dynamini
       client.batch_write_item(request_options)
     end
 
+    def self.dynamo_query(args)
+      expression_attribute_values = self.build_expression_attribute_values(args)
+      key_condition_expression = self.build_key_condition_expression(args)
+
+      client.query(
+          table_name: table_name,
+          key_condition_expression: key_condition_expression,
+          expression_attribute_values: expression_attribute_values
+      )
+    end
+
+    def self.build_expression_attribute_values(args)
+      expression_values = {}
+      expression_values[':h'] = args[:hash_key]
+      expression_values[':s'] = args[:start] if args[:start]
+      expression_values[':e'] = args[:end] if args[:end]
+      expression_values
+    end
+
+    def self.build_key_condition_expression(args)
+      expression = "#{hash_key} = :h"
+      if args[:start] && args[:end]
+        expression += " AND #{range_key} BETWEEN :s AND :e"
+      elsif args[:start]
+        expression += " AND #{range_key} >= :s"
+      elsif args[:end]
+        expression += " AND #{range_key} <= :e"
+      end
+      expression
+    end
+
     def key
       key_hash = { self.class.hash_key => @attributes[self.class.hash_key] }
       key_hash[self.class.range_key] = @attributes[self.class.range_key] if self.class.range_key
@@ -326,6 +369,30 @@ module Dynamini
       key_hash
     end
 
+    def self.build_range_expression(start_value, end_value)
+      operator = (
+        if start_value && end_value
+          'BETWEEN'
+        elsif start_value
+          'GE'
+        elsif end_value
+          'LE'
+        end
+      )
+      attribute_value_list = []
+
+      if handle = handles[range_key.to_sym]
+        attribute_value_list << attribute_callback(SETTER_PROCS, handle, start_value) if start_value
+        attribute_value_list << attribute_callback(SETTER_PROCS, handle, end_value) if end_value
+      else
+        attribute_value_list << start_value if start_value
+        attribute_value_list << end_value if end_value
+      end
+
+      {attribute_value_list: attribute_value_list, comparison_operator: operator}
+    end
+
+
     def attribute_updates
       changes.reduce({}) do |updates, (key, value)|
         current_value = value[1]
@@ -434,5 +501,9 @@ module Dynamini
       self.class.handles
     end
 
+    def self.range_is_numeric?
+      handles[@range_key] && [:integer, :time, :float, :date].include?(handles[@range_key][:format])
+    end
+
   end
 end

data/lib/dynamini/test_client.rb

@@ -90,6 +90,43 @@ module Dynamini
       @data[args[:table_name]].delete(args[:key][hash_key_attr])
     end
 
+    def query(args = {})
+      # Possible key condition structures:
+      # "foo = val"
+      # "foo = val AND bar <= val2"
+      # "foo = val AND bar >= val2"
+      # "foo = val AND bar BETWEEN val2 AND val3"
+
+      args[:expression_attribute_values].each do |symbol, value|
+        args[:key_condition_expression].gsub!(symbol, value.to_s)
+      end
+
+      tokens = args[:key_condition_expression].split(/\s+/)
+      hash_key = tokens[2]
+      case tokens[5]
+        when ">="
+          start_val = tokens[6]
+          end_val = nil
+        when "<="
+          start_val = nil
+          end_val = tokens[6]
+        when "BETWEEN"
+          start_val = tokens[6]
+          end_val = tokens[8]
+        else
+          start_val = nil
+          end_val = nil
+      end
+      parent = @data[args[:table_name]][hash_key]
+      return OpenStruct.new(items:[]) unless parent
+
+      selected = parent.values
+      selected = selected.select{ |item| item[@range_key_attr] >= start_val.to_f } if start_val
+      selected = selected.select{ |item| item[@range_key_attr] <= end_val.to_f } if end_val
+
+      OpenStruct.new(items: selected)
+    end
+
     def reset
       @data = {}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamini
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.8.0
 platform: ruby
 authors:
 - Greg Ward
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel