toy-dynamo 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26adbe6ed91bc6404764076fa4a8cf89261597e6
-  data.tar.gz: 49628a7f3143baa115424d15018c2405fb08a350
+  metadata.gz: 379a504380d30c3c6b1c38c47661e7f366a3a6ae
+  data.tar.gz: d7b3c58d0d7a2f4bca65d234b542e295cc4b9c56
 SHA512:
-  metadata.gz: a4b817bc3fd46858022e85473ee9fff66b8dbfc8437d2562c97aed3af4303ca548414f75fa25c577bdf976d309d4c42c3f779ee3c3f0b6ea3e18515d6f543d27
-  data.tar.gz: 73182f130442e510ff3ad6e725b0d288584525c75cec34d3d631186fab0f74b53c49f5ed53072433e614b4187b6a258c7acba3a422aec35222d3dc05b89dacd5
+  metadata.gz: 27692d7df92daba4828fb3bb122ef684e50a378b307090341e9c2ac653e42c13a329b23c1f0ee2497fe351913e6a27674e09770328cd35bc767bfe4bd8c238fa
+  data.tar.gz: 4f8a7e8b64b3c16862fb83f02db97405c470bbbfe57464f926b94b13b17f3254ad63e963ed6b163979b577e7ac86b7203e7af382e4babd03564fa82edf414453

data/lib/toy/dynamo/table.rb

@@ -31,9 +31,25 @@ module Toy
         :ge => "GE",
         :gt => "GT",
         :begins_with => "BEGINS_WITH",
-        :between => "BETWEEN"
+        :between => "BETWEEN",
+        # Scan only
+        :ne => "NE",
+        :not_null => "NOT_NULL",
+        :null => "NULL",
+        :contains => "CONTAINS",
+        :not_contains => "NOT_CONTAINS",
+        :in => "IN"
       }
 
+      COMPARISON_OPERATOR_SCAN_ONLY = [
+        :ne, 
+        :not_null,
+        :null,
+        :contains,
+        :not_contains,
+        :in
+      ]
+
       def initialize(table_schema, client, options={})
         @table_schema = table_schema
         @client = client
@@ -139,7 +155,7 @@ module Toy
         if options[:range] 
           raise ArgumentError, "Expected a 1 element Hash for :range (ex {:age.gt => 13})" unless options[:range].is_a?(Hash) && options[:range].keys.size == 1
           range_key_name, comparison_operator = options[:range].keys.first.split(".")
-          raise ArgumentError, "Comparison operator must be one of (#{COMPARISON_OPERATOR.keys.join(", ")})" unless COMPARISON_OPERATOR.keys.include?(comparison_operator.to_sym)
+          raise ArgumentError, "Comparison operator must be one of (#{(COMPARISON_OPERATOR.keys - COMPARISON_OPERATOR_SCAN_ONLY).join(", ")})" unless COMPARISON_OPERATOR.keys.include?(comparison_operator.to_sym)
           range_key = @range_keys.find{|k| k[:attribute_name] == range_key_name}
           raise ArgumentError, ":range key must be a valid Range attribute" unless range_key
           raise ArgumentError, ":range key must be a Range if using the operator BETWEEN" if comparison_operator == "between" && !options[:range].values.first.is_a?(Range)
@@ -325,6 +341,70 @@ module Toy
         end
       end
 
+      # Perform a table scan
+      # http://docs.aws.amazon.com/amazondynamodb/latest/APIReference/API_Scan.html
+      def scan(options={})
+        options[:return_consumed_capacity] ||= :none # "NONE" # || "TOTAL"
+        # Default if not already set
+        options[:select] ||= :all # :all, :projected, :count, []
+
+        scan_request = {
+          :table_name => options[:table_name] || self.table_name,
+          :return_consumed_capacity => RETURNED_CONSUMED_CAPACITY[options[:return_consumed_capacity]]
+        }
+
+        scan_request.merge!({ :limit => options[:limit].to_i }) if options.has_key?(:limit)
+        scan_request.merge!({ :exclusive_start_key => options[:exclusive_start_key] }) if options[:exclusive_start_key]
+
+        if options[:select].is_a?(Array)
+          attrs_to_select = [options[:select].map(&:to_s)].flatten
+          attrs_to_select << @hash_key[:attribute_name]
+          attrs_to_select << @range_keys.find{|k| k[:primary_range_key] }[:attribute_name] if @range_keys
+          scan_request.merge!({
+            :select => QUERY_SELECT[:specific],
+            :attributes_to_get => attrs_to_select.uniq
+          })
+        else
+          scan_request.merge!({ :select => QUERY_SELECT[options[:select]] })
+        end
+
+        # :scan_filter => { :name.begins_with => "a" }
+        scan_filter = {}
+        if options[:scan_filter].present?
+          options[:scan_filter].each_pair.each do |k,v|
+            # Hard to validate attribute types here, so infer by type sent and assume the user knows their own attrs
+            key_name, comparison_operator = k.split(".")
+            raise ArgumentError, "Comparison operator must be one of (#{COMPARISON_OPERATOR.keys.join(", ")})" unless COMPARISON_OPERATOR.keys.include?(comparison_operator.to_sym)
+            raise ArgumentError, "scan_filter value must be a Range if using the operator BETWEEN" if comparison_operator == "between" && !v.is_a?(Range)
+            raise ArgumentError, "scan_filter value must be a Array if using the operator IN" if comparison_operator == "in" && !v.is_a?(Array)
+
+            attribute_value_list = []
+            if comparison_operator == "in"
+              v.each do |in_v|
+                attribute_value_list << attr_with_type(key_name, in_v).values.last
+              end
+            elsif comparison_operator == "between"
+              attribute_value_list << attr_with_type(key_name, range_value.min).values.last
+              attribute_value_list << attr_with_type(key_name, range_value.max).values.last
+            else
+              attribute_value_list << attr_with_type(key_name, v).values.last
+            end
+            scan_filter.merge!({
+              key_name => {
+                :comparison_operator => COMPARISON_OPERATOR[comparison_operator.to_sym],
+                :attribute_value_list => attribute_value_list
+              }
+            })
+          end
+          scan_request.merge!(:scan_filter => scan_filter)
+        end
+
+        scan_request.merge!({ :segment => options[:segment] }) if options[:segment]
+        scan_request.merge!({ :total_segments => options[:total_segments].to_i }) if options[:total_segments]
+
+        @client.scan(scan_request)
+      end
+
       # Call proc or return string
       def table_name
         if @table_schema[:table_name].respond_to?(:call)

data/lib/toy/dynamo/version.rb

@@ -1,5 +1,5 @@
 module Toy
   module Dynamo
-    VERSION = "0.0.15"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toy-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors:
 - Cary Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: ActiveModel based DynamoDB ORM - extension to toystore