simple_record 1.0.1 → 1.0.2

data/lib/simple_record.rb

@@ -29,7 +29,7 @@ require 'local_cache'
 
 module SimpleRecord
 
-VERSION = '1.0.1'
+VERSION = '1.0.2'
 
   class Base < RightAws::ActiveSdb::Base
 
@@ -625,104 +625,13 @@ This is done on getters now
       select=false
       select_attributes=[]
 
-      #    puts 'FIND=' + params.inspect
-      # Pad and Offset number attributes
+       # Pad and Offset number attributes
       options = params[1]
 #    puts 'options=' + options.inspect
-      if !options.nil? && options.size > 0
-        conditions = options[:conditions]
-        if !conditions.nil? && conditions.size > 1
-          # all after first are values
-          conditions[1...conditions.size] = conditions[1...conditions.size].collect { |x|
-            self.pad_and_offset(x)
-          }
-        end
-      end
+      convert_condition_params(options)
+      
 #    puts 'after collect=' + params.inspect
-=begin
-
-
-    params.each_with_index do |param, index|
-      #this is the easiest way to determine if it will be necessary to reload several rows or just one
-      #note that :all (or :first) is always params[0], and everything else is in a Hash in params[1]
-      if param==:all
-        all=true
-      end
-
-      if param.class==Hash
-        param.each do |key, value|
-          case key
-          when :reload;
-            reload=value #new option I'm adding so you can prevent reloading when it isn't necessary
-          when :conditions  #conditions have to be reformatted to work with ActiveSDB
-            if value #value will sometimes be nil
-              query=sanitize_sql(value)#sanitize the conditions into an SQL query
-              query=query.gsub(/\w+\./, '') #this removes tables from the query, just a temporary measure, we need to inspect the table and alter query
-              #query=quote_regexp(query,/[a-z0-9._-]+/)#ActiveSDB.find needs quotes around the attributes and values
-              query=quote_regexp(query, /[^\s=']+/)
-              #next we put brackets around the entire query, and turn it into an array
-              #note, that these are 2 seperate things, and are both necessary for the function to work with ActiveSDB find
-              params[index][:conditions]= ["[#{query}]"]
-            end
-            #params[index][:conditions][0]= "[#{params[index][:conditions][0]}]"
-            #we then find any attributes in the query and put single quotes around them
-            #@@attributes.each do |attribute|
-            #  params[index][:conditions][0]=params[index][:conditions][0].gsub(attribute.to_s,"'#{attribute.to_s}'")
-            #end
-
-          when :select #next we implement select functionality
-            if value #value will sometimes be nil
-              select=true
-              #if the selected attributes are in array for, we can assume we are good to go
-              if value.class==Array
-                select_attributes=value
-              else
-                #however if they are passed as comma seperated values in a string, we have to split it into an array.
-                #we remove all whitespace from the selected string, then split on comma
-                select_attributes=value.gsub(' ', '').split(',')
-              end
-            end
-          end
-        end
-      end
-    end
-
-    results = "scooby"
-    begin
-      results=super(*params)
-      if results
-        if reload
-          if select
-            if all
-              results.each do |row|
-                row.reload_attributes(select_attributes)
-              end
-            else
-              results.reload_attributes(select_attributes)
-            end
-          else
-            if all
-              results.each do |row|
-                row.reload
-              end
-            else
-              results.reload
-            end
-          end
-        end
-      end
-    rescue RightAws::AwsError
-      puts "RESCUED: " + $!
-      if ($!.is_a?(Hash))
-        puts "it's a hash..."
-      end
-      if ($!.message().index("NoSuchDomain") == nil)
-        raise $!
-      end
-    end
-    return results
 
-=end
       results = []
       begin
         results=super(*params)
@@ -737,6 +646,8 @@ This is done on getters now
     end
 
     def select(*params)
+	options = params[1]
+      convert_condition_params(options)
       results = []
       begin
         results=super(*params)
@@ -750,6 +661,18 @@ This is done on getters now
       return results
 
     end
+	
+	def self.convert_condition_params(options)
+	   if !options.nil? && options.size > 0
+        conditions = options[:conditions]
+        if !conditions.nil? && conditions.size > 1
+          # all after first are values
+          conditions[1...conditions.size] = conditions[1...conditions.size].collect { |x|
+            self.pad_and_offset(x)
+          }
+        end
+      end
+	end
 
     def self.cache_results(results)
       if !@@cache_store.nil? && !results.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-24 00:00:00 -07:00
+date: 2009-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency