simple_record 1.4.0 → 1.4.2

data/lib/simple_record/logging.rb

@@ -0,0 +1,42 @@
+module SimpleRecord
+
+    require 'csv'
+
+    module Logging
+
+        module ClassMethods
+            def write_usage(type, domain, q_type, params, results)
+                puts 'params=' + params.inspect
+                if SimpleRecord.usage_logging_options
+                    type_options = SimpleRecord.usage_logging_options[type]
+                    if type_options
+                        file = type_options[:file]
+                        if file.nil?
+                            file = File.open(type_options[:filename], File.exists?(type_options[:filename]) ? "a" : "w")
+                            puts file.path
+                            type_options[:file] = file
+                        end
+                        conditions = params[:conditions][0] if params[:conditions]
+                        line = usage_line(type_options[:format], [type, domain, q_type, conditions, params[:order]], results[:request_id], results[:box_usage])
+                        file.puts line
+                        puts 'line=' + line
+                    end
+                end
+            end
+
+            def usage_line(format, query_data, request_id, box_usage)
+                if format == :csv
+                    line_data = []
+                    line_data << Time.now.iso8601
+                    query_data.each do |r|
+                        line_data << r.to_s
+                    end
+                    line_data << request_id
+                    line_data << box_usage
+                    return CSV.generate_line(line_data)
+                end
+            end
+        end
+    end
+end
+

data/lib/simple_record/translations.rb

@@ -84,7 +84,7 @@ module SimpleRecord
 #      puts 'to eval=' + to_eval
                         begin
                             ret = eval(to_eval) # (defined? #{arg}_id)
-                        rescue Aws::ActiveSdb::ActiveSdbError => ex
+                        rescue SimpleRecord::ActiveSdb::ActiveSdbError => ex
                             if ex.message.include? "Couldn't find"
                                 ret = RemoteNil.new
                             else

data/test/test_encodings.rb

@@ -14,5 +14,30 @@ class Person < SimpleRecord::Base
 end
 class TestEncodings < TestBase
 
-    
+    def test_ascii_http_post
+        first_name = "joe" + ("X" * 1000) # pad the field to help get the URL over the 2000 length limit so AWS uses a POST
+        last_name = "blow" + ("X" * 1000) # pad the field to help get the URL over the 2000 length limit so AWS uses a POST
+        mm = MyModel.create :first_name=>first_name, :last_name=>last_name
+        mm.save
+        sleep 1
+        assert mm.first_name == first_name
+        assert mm.last_name == last_name
+        mm2 = MyModel.find(mm.id)
+        assert mm2.first_name == first_name
+        assert mm2.last_name == last_name
+    end
+
+    def test_utf8_http_post
+        first_name = "jos�" + ("X" * 1000) # pad the field to help get the URL over the 2000 length limit so AWS uses a POST
+        last_name = "??" + ("X" * 1000) # pad the field to help get the URL over the 2000 length limit so AWS uses a POST
+        mm = MyModel.create :first_name=>first_name, :last_name=>last_name
+        mm.save
+        sleep 1
+        assert mm.first_name == first_name
+        assert mm.last_name == last_name
+        mm2 = MyModel.find(mm.id)
+        assert mm2.first_name == first_name
+        assert mm2.last_name == last_name
+    end
+
 end

data/test/test_usage.rb

@@ -0,0 +1,40 @@
+# These ones take longer to run
+
+require 'test/unit'
+require File.join(File.dirname(__FILE__), "/../lib/simple_record")
+require File.join(File.dirname(__FILE__), "./test_helpers")
+require File.join(File.dirname(__FILE__), "./test_base")
+require "yaml"
+require 'aws'
+require 'my_model'
+require 'my_child_model'
+require 'active_support'
+
+# Tests for SimpleRecord
+#
+
+class TestUsage < TestBase
+
+
+    # ensures that it uses next token and what not
+    def test_select_usage_logging
+
+        SimpleRecord.log_usage(:select=>{:filename=>"/mnt/selects.csv", :format=>:csv})
+
+        num_made = 10
+        num_made.times do |i|
+            mm = MyModel.create(:name=>"Travis", :age=>i, :cool=>true)
+        end
+
+        mms = MyModel.find(:all, :conditions=>["name=?", "Travis"])
+        mms = MyModel.find(:all, :conditions=>["name=?", "Travis"], :order=>"name desc")
+        mms = MyModel.find(:all, :conditions=>["name=? and age>?", "Travis", 3], :order=>"name desc")
+                
+
+        SimpleRecord.close_usage_log(:select)
+
+    end
+
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-05 00:00:00 -07:00
+date: 2010-07-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,12 +44,14 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - lib/simple_record.rb
+- lib/simple_record/active_sdb.rb
 - lib/simple_record/attributes.rb
 - lib/simple_record/callbacks.rb
 - lib/simple_record/encryptor.rb
 - lib/simple_record/errors.rb
 - lib/simple_record/exceptions.rb
 - lib/simple_record/json.rb
+- lib/simple_record/logging.rb
 - lib/simple_record/password.rb
 - lib/simple_record/results_array.rb
 - lib/simple_record/stats.rb
@@ -73,6 +75,7 @@ files:
 - test/test_pagination.rb
 - test/test_results_array.rb
 - test/test_simple_record.rb
+- test/test_usage.rb
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_record/
 licenses: []
@@ -126,3 +129,4 @@ test_files:
 - test/test_pagination.rb
 - test/test_results_array.rb
 - test/test_simple_record.rb
+- test/test_usage.rb