simple_record 1.4.18 → 1.4.19

data/lib/simple_record.rb

@@ -49,22 +49,32 @@ module SimpleRecord
     @@logging = false
     @@s3 = nil
     @@auto_close_s3 = false
+    @@logger = Logger.new(STDOUT)
+    @@logger.level = Logger::INFO
 
     class << self;
         attr_accessor :aws_access_key, :aws_secret_key
 
+        # Deprecated
         def enable_logging
             @@logging = true
+            @@logger.level = Logger::DEBUG
         end
 
+        # Deprecated
         def disable_logging
             @@logging = false
         end
 
+        # Deprecated
         def logging?
             @@logging
         end
 
+        def logger
+            @@logger
+        end
+
         # This can be used to log queries and what not to a file.
         # Params:
         # :select=>{:filename=>"file_to_write_to", :format=>"csv"}

data/lib/simple_record/active_sdb.rb

@@ -360,6 +360,9 @@ module SimpleRecord
 
                 protected
 
+                def logger
+                    SimpleRecord.logger
+                end
                 # Select
 
                 def select_from_ids(args, options) # :nodoc:
@@ -403,16 +406,18 @@ module SimpleRecord
                     @next_token       = options[:next_token]
                     @consistent_read  = options[:consistent_read]
                     select_expression = build_select(options)
+                    logger.debug 'SELECT=' + select_expression
                     # request items
                     query_result      = self.connection.select(select_expression, @next_token, @consistent_read)
                     # puts 'QR=' + query_result.inspect
+                    @next_token       = query_result[:next_token]
                     ret               = {}
                     if count
                         ret[:count] = query_result.delete(:items)[0]["Domain"]["Count"][0].to_i
                         ret.merge!(query_result)
                         return ret
                     end
-                    @next_token       = query_result[:next_token]
+
                     items             = query_result.delete(:items).map do |hash|
                         id, attributes = hash.shift
                         new_item = self.new()
@@ -626,6 +631,7 @@ module SimpleRecord
                     rx     = /\b(\w*)[\s|>=|<=|!=|=|>|<|like]/
                     fields = conditions[0].scan(rx)
 #                    puts 'condition_fields = ' + fields.inspect
+                    fields[0]
                 end
 
             end

data/test/test_base.rb

@@ -21,6 +21,7 @@ class TestBase < Test::Unit::TestCase
 
 
     def reset_connection
+        puts 'reset_connection'
         @config = YAML::load(File.open(File.expand_path("~/.test-configs/simple_record.yml")))
         #puts 'inspecting config = ' + @config.inspect
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 18
-  version: 1.4.18
+  - 19
+  version: 1.4.19
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-24 00:00:00 -07:00
+date: 2010-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency