simple_record 1.4.8 → 1.4.9

Sign up to get free protection for your applications and to get access to all the features.
@@ -944,9 +944,9 @@ module SimpleRecord
944
944
  end
945
945
 
946
946
  # Item ID
947
- def to_s
948
- @id
949
- end
947
+ # def to_s
948
+ # @id
949
+ # end
950
950
 
951
951
  # Returns true if this object hasn�t been saved yet.
952
952
  def new_record?
data/lib/simple_record.rb CHANGED
@@ -855,7 +855,7 @@ module SimpleRecord
855
855
  end
856
856
  # puts 'params2=' + params.inspect
857
857
 
858
- results = q_type == :all ? [] : nil
858
+ ret = q_type == :all ? [] : nil
859
859
  begin
860
860
  results=find_with_metadata(*params)
861
861
  # puts "RESULT=" + results.inspect
@@ -863,32 +863,32 @@ module SimpleRecord
863
863
  #puts 'params3=' + params.inspect
864
864
  SimpleRecord.stats.selects += 1
865
865
  if q_type == :count
866
- results = results[:count]
866
+ ret = results[:count]
867
867
  elsif q_type == :first
868
868
  ret = results[:items].first
869
869
  # todo: we should store request_id and box_usage with the object maybe?
870
870
  cache_results(ret)
871
- results = ret
872
871
  elsif results[:single]
873
- results = results[:single]
874
- cache_results(results)
872
+ ret = results[:single]
873
+ cache_results(ret)
875
874
  else
876
875
  if results[:items] #.is_a?(Array)
877
876
  cache_results(results[:items])
878
- results = SimpleRecord::ResultsArray.new(self, params, results, next_token)
877
+ ret = SimpleRecord::ResultsArray.new(self, params, results, next_token)
879
878
  end
880
879
  end
881
- rescue Aws::AwsError, SimpleRecord::ActiveSdb::ActiveSdbError
882
- # puts "RESCUED: " + $!.message
883
- if ($!.message().index("NoSuchDomain") != nil)
880
+ rescue Aws::AwsError, SimpleRecord::ActiveSdb::ActiveSdbError => ex
881
+ # puts "RESCUED: " + ex.message
882
+ if (ex.message().index("NoSuchDomain") != nil)
884
883
  # this is ok
885
- elsif ($!.message() =~ @@regex_no_id)
886
- results = nil
884
+ elsif (ex.message() =~ @@regex_no_id)
885
+ ret = nil
887
886
  else
888
- raise $!
887
+ raise ex
889
888
  end
890
889
  end
891
- return results
890
+ # puts 'single2=' + ret.inspect
891
+ return ret
892
892
  end
893
893
 
894
894
  def self.select(*params)
data/test/my_model.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
2
- require 'my_base_model'
2
+ require_relative 'my_base_model'
3
3
 
4
4
  class MyModel < MyBaseModel
5
5
 
data/test/temp.rb ADDED
@@ -0,0 +1,43 @@
1
+ require_relative 'my_model'
2
+
3
+ class ToSClass
4
+ def to_s
5
+ "#{self.class.name} to_s called"
6
+ end
7
+ end
8
+ class InspectClass
9
+ def inspect
10
+ "#{self.class.name} inspect called"
11
+ end
12
+ end
13
+ class BothClass
14
+ def inspect
15
+ "#{self.class.name} inspect called"
16
+ end
17
+ def to_s
18
+ "#{self.class.name} to_s called"
19
+ end
20
+ end
21
+
22
+ c1 = ToSClass.new
23
+ puts c1.inspect
24
+ puts c1.to_s
25
+ c1 = InspectClass.new
26
+ puts c1.inspect
27
+ puts c1.to_s
28
+ c1 = BothClass.new
29
+ puts c1.inspect
30
+ puts c1.to_s
31
+
32
+ a = []
33
+ afirst = a.first
34
+ puts 'afirst=' + afirst.inspect
35
+
36
+ p = nil
37
+ puts 'p=' + p.inspect.to_s
38
+ puts "p=" + p.inspect
39
+
40
+ p = MyModel.new
41
+ puts 'p=' + p.inspect.to_s
42
+ puts 'p=' + p.to_s
43
+ puts "p=" + p.inspect
metadata CHANGED
@@ -1,13 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simple_record
3
3
  version: !ruby/object:Gem::Version
4
- hash: 23
5
4
  prerelease: false
6
5
  segments:
7
6
  - 1
8
7
  - 4
9
- - 8
10
- version: 1.4.8
8
+ - 9
9
+ version: 1.4.9
11
10
  platform: ruby
12
11
  authors:
13
12
  - Travis Reeder
@@ -17,7 +16,7 @@ autorequire:
17
16
  bindir: bin
18
17
  cert_chain: []
19
18
 
20
- date: 2010-07-30 00:00:00 -07:00
19
+ date: 2010-08-23 00:00:00 -07:00
21
20
  default_executable:
22
21
  dependencies:
23
22
  - !ruby/object:Gem::Dependency
@@ -28,7 +27,6 @@ dependencies:
28
27
  requirements:
29
28
  - - ">="
30
29
  - !ruby/object:Gem::Version
31
- hash: 3
32
30
  segments:
33
31
  - 0
34
32
  version: "0"
@@ -63,6 +61,7 @@ files:
63
61
  - test/my_child_model.rb
64
62
  - test/my_model.rb
65
63
  - test/paging_array_test.rb
64
+ - test/temp.rb
66
65
  - test/temp_test.rb
67
66
  - test/test_base.rb
68
67
  - test/test_dirty.rb
@@ -90,7 +89,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
90
89
  requirements:
91
90
  - - ">="
92
91
  - !ruby/object:Gem::Version
93
- hash: 3
94
92
  segments:
95
93
  - 0
96
94
  version: "0"
@@ -99,7 +97,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
99
97
  requirements:
100
98
  - - ">="
101
99
  - !ruby/object:Gem::Version
102
- hash: 3
103
100
  segments:
104
101
  - 0
105
102
  version: "0"
@@ -117,6 +114,7 @@ test_files:
117
114
  - test/my_child_model.rb
118
115
  - test/my_model.rb
119
116
  - test/paging_array_test.rb
117
+ - test/temp.rb
120
118
  - test/temp_test.rb
121
119
  - test/test_base.rb
122
120
  - test/test_dirty.rb