simple_record 1.4.8 → 1.4.9

data/lib/simple_record/active_sdb.rb

@@ -944,9 +944,9 @@ module SimpleRecord
             end
 
             # Item ID
-            def to_s
-                @id
-            end
+#            def to_s
+#                @id
+#            end
 
             # Returns true if this object hasn�t been saved yet.
             def new_record?

data/lib/simple_record.rb

@@ -855,7 +855,7 @@ module SimpleRecord
             end
 #            puts 'params2=' + params.inspect
 
-            results = q_type == :all ? [] : nil
+             ret = q_type == :all ? [] : nil
             begin
                 results=find_with_metadata(*params)
 #                puts "RESULT=" + results.inspect
@@ -863,32 +863,32 @@ module SimpleRecord
                 #puts 'params3=' + params.inspect
                 SimpleRecord.stats.selects += 1
                 if q_type == :count
-                    results = results[:count]
+                    ret = results[:count]
                 elsif q_type == :first
                     ret = results[:items].first
                     # todo: we should store request_id and box_usage with the object maybe?
                     cache_results(ret)
-                    results = ret
                 elsif results[:single]
-                    results = results[:single]
-                    cache_results(results)
+                    ret = results[:single]
+                    cache_results(ret)
                 else
                     if results[:items] #.is_a?(Array)
                         cache_results(results[:items])
-                        results = SimpleRecord::ResultsArray.new(self, params, results, next_token)
+                        ret = SimpleRecord::ResultsArray.new(self, params, results, next_token)
                     end
                 end
-            rescue Aws::AwsError, SimpleRecord::ActiveSdb::ActiveSdbError
-#                puts "RESCUED: " + $!.message
-                if ($!.message().index("NoSuchDomain") != nil)
+            rescue Aws::AwsError, SimpleRecord::ActiveSdb::ActiveSdbError => ex
+#                puts "RESCUED: " + ex.message
+                if (ex.message().index("NoSuchDomain") != nil)
                     # this is ok
-                elsif ($!.message() =~ @@regex_no_id)
-                    results = nil
+                elsif (ex.message() =~ @@regex_no_id)
+                    ret = nil
                 else
-                    raise $!
+                    raise ex
                 end
             end
-            return results
+#            puts 'single2=' + ret.inspect
+            return ret
         end
 
         def self.select(*params)

data/test/my_model.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
-require 'my_base_model'
+require_relative 'my_base_model'
 
 class MyModel < MyBaseModel
 

data/test/temp.rb

@@ -0,0 +1,43 @@
+require_relative 'my_model'
+
+class ToSClass
+    def to_s
+        "#{self.class.name} to_s called"
+    end
+end
+class InspectClass
+    def inspect
+        "#{self.class.name} inspect called"
+    end
+end
+class BothClass
+    def inspect
+        "#{self.class.name} inspect called"
+    end
+    def to_s
+        "#{self.class.name} to_s called"
+    end
+end
+
+c1 = ToSClass.new
+puts c1.inspect
+puts c1.to_s
+c1 = InspectClass.new
+puts c1.inspect
+puts c1.to_s
+c1 = BothClass.new
+puts c1.inspect
+puts c1.to_s
+
+a = []
+afirst = a.first
+puts 'afirst=' + afirst.inspect
+
+p = nil
+puts 'p=' + p.inspect.to_s
+puts "p=" + p.inspect
+
+p = MyModel.new
+puts 'p=' + p.inspect.to_s
+puts 'p=' + p.to_s
+puts "p=" + p.inspect

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 4
-  - 8
-  version: 1.4.8
+  - 9
+  version: 1.4.9
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -07:00
+date: 2010-08-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +27,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -63,6 +61,7 @@ files:
 - test/my_child_model.rb
 - test/my_model.rb
 - test/paging_array_test.rb
+- test/temp.rb
 - test/temp_test.rb
 - test/test_base.rb
 - test/test_dirty.rb
@@ -90,7 +89,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -99,7 +97,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -117,6 +114,7 @@ test_files:
 - test/my_child_model.rb
 - test/my_model.rb
 - test/paging_array_test.rb
+- test/temp.rb
 - test/temp_test.rb
 - test/test_base.rb
 - test/test_dirty.rb