dynameek 0.2.1 → 0.2.2

data/README.md

@@ -9,7 +9,8 @@ A very lightweight ORMish model thing for amazon's dynamo db, after initialising
    
 You can create table models with this kind of syntax:
 
-    class Conversion < Dynameek::Model
+    class Conversion 
+      include Dynameek::Model
 
       field :client_id, :integer
       field :channel_id, :string
@@ -25,10 +26,16 @@ Creation of the models is as you'd expect
     
     con = Conversion.create(:client_id => 1, :channel_id => "google", :goal_name=> "Some Goal", :time => DateTime.now)
 
-The models can be edited like normal (_no update\_attributes yet though_)
+The models can be edited like normal (*no update_attributes yet though*)
 
     con.goal_name="hello"
     con.save
+
+Deletion also happens as you'd expect
+
+    con.delete
+    Conversion.delete_table
+    Conversion.query(["1", "google"]).delete
     
 These models can be queried by find and query, although this is still undergoing some refactoring at the moment it currently looks something like this:
     
@@ -36,10 +43,9 @@ These models can be queried by find and query, although this is still undergoing
     
     Conversion.query(["1", "google"]).where(DateTime.now, :lt).where(DateTime.now - 10, :gte).all
   
-  NB. The where clauses are only for referencing the range part of the composite hash key, there is currently no way to search by
-  hash contents as that felt like it was against the point of a document store. 
+> NB. The where clauses are only for referencing the range part of the composite hash key, there is currently no way to search by
+> hash contents as that felt like it was against the point of a document store. 
   
 ### Disclaimery Bit
 
-Delete is not currently supported because I don't need it. The gem is dynameek (unsurprisingly) but I wouldn't use it yet, far better
-to clone down the project and modify it for your own use.
+The gem is dynameek (unsurprisingly) but I wouldn't use it yet, far better to clone down the project and modify it for your own use.

data/lib/dynameek/model/query.rb

@@ -2,13 +2,12 @@ module Dynameek
   module Model
     module Query
       #Similar to dynamoids approach but lighter (hopefully)
-    
       class QueryChain
       
         def initialize(model)
           @model = model
           @hash_key = nil
-          @range = {eq: nil, within: nil, gte: nil, gt: nil, lte: nil, lt: nil, begins_with: nil}
+          @range = {eq: nil,  gte: nil, gt: nil, lte: nil, lt: nil}
         end
       
         def query(hash_key)
@@ -45,12 +44,11 @@ module Dynameek
         RANGE_QUERY_MAP =
         {
           eq: :range_value,
-          within: :range_value,
           gte: :range_gte,
           gt: :range_greater_than,
           lte: :range_lte,
           lt: :range_less_than,
-          begins_with: :range_begins_with
+          # begins_with: :range_begins_with
         }
       
         private
@@ -61,24 +59,34 @@ module Dynameek
         
           query_hash = {:hash_value => hash_key, :select => :all}
         
-          query_hash = @range.reduce(query_hash) do |hsh, (key, val)|
-            if(!val.nil?)
-              hsh[RANGE_QUERY_MAP[key]] = @model.convert_to_dynamodb(@model.range_info.type, val)
-            end
-            hsh
+          range = @range.select{|key, val| !val.nil?}
+          if range.size == 2
+            #only makes sense if one is a gt and the other a lt
+            multiple_gt = (range.keys & [:gte, :gt]).size == 2
+            multiple_lt = (range.keys & [:lte, :lt]).size == 2
+            raise Exception.new("Query cannot have multiple greater than operations") if multiple_gt
+            raise Exception.new("Query cannot have multiple less than operations") if multiple_lt
+            start_of_range = range[:gte] || range[:gt].succ
+            end_of_range = range[:lte] || range[:lt]
+            
+            converted_start_of_range = @model.convert_to_dynamodb(@model.range_info.type, start_of_range)
+            converted_end_of_range = @model.convert_to_dynamodb(@model.range_info.type, end_of_range)
+            
+            range[:range_value] = Range.new(converted_start_of_range, converted_end_of_range, (range[:lte].nil?))
+            range.delete(:lt)
+            range.delete(:lte)
+            range.delete(:gt)
+            range.delete(:gte)
+          elsif range.size > 2
+            raise Exception.new("Dynameek does not currently support more than two range querys")
+          else
+            range = range.reduce({}) {|memo, (key, val)| memo[RANGE_QUERY_MAP[key]] = @model.convert_to_dynamodb(@model.range_info.type, val); memo}
           end
-          # p query_hash
-          # "CONTENTS"
-          # @model.table.items.each{|item| p item.inspect}
-          # p "_________"
+          query_hash.merge!(range)
           @model.table.items.query(query_hash).map{|item| 
-            # p item.inspect
             @model.item_to_instance(item)
           }
-        
         end
-      
-    
       end
     
       [:query, :where, :all, :each, :each_with_index, :delete].each do |method|

data/lib/dynameek/model/structure.rb

@@ -2,7 +2,6 @@ module Dynameek
   module Model
     module Structure
       
-
       def fields
         @fields ||= {}
       end
@@ -46,9 +45,7 @@ module Dynameek
       def multi_column_hash_key_fields
         @multi_column_hash_key_fields ||= []
       end
-      
-  
-      
+            
       def multi_column_join
         @multi_column_join ||= "|"
       end
@@ -70,8 +67,6 @@ module Dynameek
         define_method("#{fieldname.to_s}=") {|value| write_attribute(fieldname, value) }
       end 
 
-
-
       def hash_key fieldname
         fieldname = fieldname.to_sym
         check_field(fieldname)
@@ -79,10 +74,6 @@ module Dynameek
         hash_key_info.type = fields[fieldname]
         define_method(:hash_key) { read_attribute(fieldname) }
       end
-
-      
-    
-    
     
       def multi_column_hash_key fieldnames
         fieldnames = fieldnames.map(&:to_sym)
@@ -100,8 +91,6 @@ module Dynameek
         hash_key_info.field = fieldname
         hash_key_info.type = :string
       end
-    
-
 
       def range fieldname
         fieldname = fieldname.to_sym
@@ -110,11 +99,6 @@ module Dynameek
         range_info.type = fields[fieldname]
       end
 
-    
-    
-  
-      
-
       def check_field(fieldname)
         raise ("#{fieldname} is not a recognised field") if fields[fieldname].nil?
       end

data/lib/dynameek/model.rb

@@ -22,8 +22,6 @@ module Dynameek
       self
     end
     
-    
-    
     def attributes
       @attributes ||= {}
     end
@@ -62,31 +60,24 @@ module Dynameek
       include Dynameek::Model::DynamoDb
       include Dynameek::Model::Structure
       include Dynameek::Model::Query
-      
-  
-  
   
       def find(hash_key, range_val=nil)
         raise Exception("This has a composite hash with a range, the range val is required") if(range_val.nil? && range?)
         #multicolumn
         hash_key = hash_key.join(multi_column_join) if(hash_key.is_a?(Array))
-
         items = if range?
           range_val = convert_to_dynamodb(range_info.type, range_val)
           table.batch_get(:all, [[hash_key, range_val]])
         else  
           table.batch_get(:all, [hash_key])
         end
-        # p items.methods - Object.new.methods
         return nil if(items.entries.size == 0)
         item_to_instance(items.first)
-    
       end
   
       def delete_table
         table.delete
       end
-
   
       def item_to_instance(item)
         item_hsh = (item.is_a?(AWS::DynamoDB::Item) || item.is_a?(AWS::DynamoDB::ItemData) ? item.attributes.to_hash : item)
@@ -101,8 +92,6 @@ module Dynameek
         instance
       end
   
-      
-  
       def create(attrib)
         instance = self.new
         attrib.each do |key, val|
@@ -119,14 +108,10 @@ module Dynameek
         before_save_callbacks << method.to_sym
       end
   
-
-  
       def table_name
         self.to_s
       end
   
-
-  
     end
   end
 end

data/lib/dynameek/version.rb

@@ -1,3 +1,3 @@
 module Dynameek
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/spec/conversion_spec.rb

@@ -50,8 +50,8 @@ describe Conversion do
     cons.size.should == 3
     cons = Conversion.query([1, "google"]).where(now - 4, :gt).all
     cons.size.should == 3
-    # cons = Conversion.query([1, "google"]).where(now - 2, :gte).where(now, :lt).all
-    #    cons.size.should == 2 Not supported on fake_dynamo, seems to work fine on prod
+    cons = Conversion.query([1, "google"]).where(now - 2, :gte).where(now, :lt).all
+    cons.size.should == 2
   end
   
   

metadata

@@ -2,7 +2,7 @@
 name: dynameek
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Max Dupenois