simple_record 1.4.11 → 1.4.12

data/lib/simple_record.rb

@@ -26,6 +26,8 @@
 
 require 'aws'
 require 'base64'
+require 'active_support'
+require 'active_support/core_ext'
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/attributes")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/active_sdb")
 require File.expand_path(File.dirname(__FILE__) + "/simple_record/callbacks")
@@ -232,7 +234,7 @@ module SimpleRecord
             unless @domain
                 # This strips off the module if there is one.
                 n2 = name.split('::').last || name
-                puts 'n2=' + n2
+#                puts 'n2=' + n2
                 if n2.respond_to?(:tableize)
                     @domain = n2.tableize
                 else
@@ -634,6 +636,7 @@ module SimpleRecord
         end
 
         def delete()
+            # TODO: DELETE CLOBS, etc from s3
             super
         end
 
@@ -839,6 +842,7 @@ module SimpleRecord
 
             # Pad and Offset number attributes
             options = {}
+            params_dup = params.dup
             if params.size > 1
                 options = params[1]
                 #puts 'options=' + options.inspect
@@ -850,15 +854,14 @@ module SimpleRecord
                     op_dup = options.dup
                     op_dup[:limit] = per_token # simpledb uses Limit as a paging thing, not what is normal
                     op_dup[:consistent_read] = consistent_read
-                    params[1] = op_dup
+                    params_dup[1] = op_dup
                 end
-
             end
 #            puts 'params2=' + params.inspect
 
              ret = q_type == :all ? [] : nil
             begin
-                results=find_with_metadata(*params)
+                results=find_with_metadata(*params_dup)
 #                puts "RESULT=" + results.inspect
                 write_usage(:select, domain, q_type, options, results)
                 #puts 'params3=' + params.inspect

data/lib/simple_record/json.rb

@@ -25,9 +25,29 @@ module SimpleRecord
             end
 
         end
+#
+#        def to_json(*a)
+#            puts 'SimpleRecord to_json called'
+#            result = {
+#                    'json_class' => self.class.name,
+#                    'id' => self.id
+#            }
+#            defined_attributes_local.each_pair do |name, val|
+##                puts name.to_s + "=" + val.inspect
+#                if val.type == :belongs_to
+#                    result[name.to_s + "_id"] = get_attribute_sdb(name)
+#                else
+#                    result[name] = get_attribute(name)
+#                end
+##                puts 'result[name]=' + result[name].inspect
+#            end
+#            ret = result.to_json(*a)
+##            puts 'ret=' + ret.inspect
+#            return ret
+#        end
 
-        def to_json(*a)
-#            puts 'to_json called'
+        def as_json(options={})
+#            puts 'SimpleRecord as_json called'
             result = {
                     'json_class' => self.class.name,
                     'id' => self.id
@@ -41,7 +61,7 @@ module SimpleRecord
                 end
 #                puts 'result[name]=' + result[name].inspect
             end
-            ret = result.to_json(*a)
+            ret = result.as_json(options)
 #            puts 'ret=' + ret.inspect
             return ret
         end

data/test/my_base_model.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
-
-class MyBaseModel < SimpleRecord::Base
-
-    has_strings :base_string
-
-    
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+
+class MyBaseModel < SimpleRecord::Base
+
+    has_strings :base_string
+
+    
 end

data/test/my_child_model.rb

@@ -1,35 +1,35 @@
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
-require 'my_model'
-
-class MyChildModel < SimpleRecord::Base
-    belongs_to :my_model
-    belongs_to :x, :class_name=>"MyModel"
-    has_attributes :name, :child_attr
-
-end
-
-
-=begin
-
-
-puts 'word'
-
-mm = MyModel.new
-puts 'word2'
-
-mcm = MyChildModel.new
-
-puts 'mcm instance methods=' + MyChildModel.instance_methods(true).inspect
-#puts 'mcm=' + mcm.instance_methods(false)
-puts 'mcm class vars = ' + mcm.class.class_variables.inspect
-puts mcm.class == MyChildModel
-puts 'saved? ' + mm.save.to_s
-puts mm.errors.inspect
-
-puts "mm attributes=" + MyModel.defined_attributes.inspect
-puts "mcm attributes=" + MyChildModel.defined_attributes.inspect
-
-mcm2 = MyChildModel.new
-puts "mcm2 attributes=" + MyChildModel.defined_attributes.inspect
-
-=end
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require_relative 'my_model'
+
+class MyChildModel < SimpleRecord::Base
+    belongs_to :my_model
+    belongs_to :x, :class_name=>"MyModel"
+    has_attributes :name, :child_attr
+
+end
+
+
+=begin
+
+
+puts 'word'
+
+mm = MyModel.new
+puts 'word2'
+
+mcm = MyChildModel.new
+
+puts 'mcm instance methods=' + MyChildModel.instance_methods(true).inspect
+#puts 'mcm=' + mcm.instance_methods(false)
+puts 'mcm class vars = ' + mcm.class.class_variables.inspect
+puts mcm.class == MyChildModel
+puts 'saved? ' + mm.save.to_s
+puts mm.errors.inspect
+
+puts "mm attributes=" + MyModel.defined_attributes.inspect
+puts "mcm attributes=" + MyChildModel.defined_attributes.inspect
+
+mcm2 = MyChildModel.new
+puts "mcm2 attributes=" + MyChildModel.defined_attributes.inspect
+
+=end

data/test/paging_array_test.rb

@@ -1,15 +1,15 @@
-
-require File.expand_path(File.dirname(__FILE__) + "/../lib/results_array")
-
-array = SimpleRecord::ResultsArray.new()
-#array.extend(ResultsArray)
-
-500.times do |i|
-    array << "_ob_" + i.to_s
-end
-
-array.each do |v|
-    puts v.to_s
-end
-
+
+require File.expand_path(File.dirname(__FILE__) + "/../lib/results_array")
+
+array = SimpleRecord::ResultsArray.new()
+#array.extend(ResultsArray)
+
+500.times do |i|
+    array << "_ob_" + i.to_s
+end
+
+array.each do |v|
+    puts v.to_s
+end
+
 puts array[10]

data/test/test_base.rb

@@ -3,8 +3,8 @@ require File.join(File.dirname(__FILE__), "/../lib/simple_record")
 require File.join(File.dirname(__FILE__), "./test_helpers")
 require "yaml"
 require 'aws'
-require 'my_model'
-require 'my_child_model'
+require_relative 'my_model'
+require_relative 'my_child_model'
 require 'active_support'
 
 class TestBase < Test::Unit::TestCase

data/test/test_json.rb

@@ -4,10 +4,10 @@ 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 'model_with_enc'
-require 'active_support'
+require_relative 'my_model'
+require_relative 'my_child_model'
+require_relative 'model_with_enc'
+require 'active_support/core_ext'
 
 # Tests for SimpleRecord
 #
@@ -30,6 +30,8 @@ class TestJson < TestBase
 
         mm.save
 
+        puts 'no trying an array'
+
         data = {}
         models = []
         data[:models] = models
@@ -47,15 +49,19 @@ class TestJson < TestBase
         assert unjsoned[0].id.present?
         assert unjsoned[0].id == mm.id, "unjsoned.id=#{unjsoned[0].id}"
 
+        puts 'array good'
+
         t = Tester.new
         t2 = Tester.new
         t2.x1 = "i'm number 2"
         t.x1 = 1
         t.x2 = t2
-        t.to_json
-        jsoned = JSON.generate t
+        jsoned = t.to_json
+
         puts 'jsoned=' + jsoned
 
+        puts 'non simplerecord object good'
+
         mcm = MyChildModel.new
         mcm.name = "child"
         mcm.my_model = mm

data/test/test_simple_record.rb

@@ -4,10 +4,9 @@ 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 'model_with_enc'
-require 'active_support'
+require_relative 'my_model'
+require_relative 'my_child_model'
+require_relative 'model_with_enc'
 
 # Tests for SimpleRecord
 #

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 1
   - 4
-  - 11
-  version: 1.4.11
+  - 12
+  version: 1.4.12
 platform: ruby
 authors: 
 - Travis Reeder
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -07:00
+date: 2010-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,12 +27,24 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: active_support
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.
 email: travis@appoxy.com
 executables: []
@@ -57,26 +68,26 @@ files:
 - lib/simple_record/stats.rb
 - lib/simple_record/translations.rb
 - README.markdown
-- test/test_lobs.rb
-- test/paging_array_test.rb
-- test/test_marshalled.rb
-- test/test_dirty.rb
-- test/test_helpers.rb
-- test/test_base.rb
-- test/test_pagination.rb
+- test/conversions.rb
+- test/model_with_enc.rb
 - test/my_base_model.rb
 - test/my_child_model.rb
-- test/test_global_options.rb
-- test/test_results_array.rb
-- test/test_usage.rb
-- test/conversions.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
 - test/test_encodings.rb
+- test/test_global_options.rb
+- test/test_helpers.rb
 - test/test_json.rb
+- test/test_lobs.rb
+- test/test_marshalled.rb
+- test/test_pagination.rb
+- test/test_results_array.rb
 - test/test_simple_record.rb
-- test/temp.rb
-- test/model_with_enc.rb
-- test/my_model.rb
+- test/test_usage.rb
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_record/
 licenses: []
@@ -91,7 +102,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -100,7 +110,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -112,23 +121,23 @@ signing_key:
 specification_version: 3
 summary: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.
 test_files: 
-- test/test_lobs.rb
-- test/paging_array_test.rb
-- test/test_marshalled.rb
-- test/test_dirty.rb
-- test/test_helpers.rb
-- test/test_base.rb
-- test/test_pagination.rb
+- test/conversions.rb
+- test/model_with_enc.rb
 - test/my_base_model.rb
 - test/my_child_model.rb
-- test/test_global_options.rb
-- test/test_results_array.rb
-- test/test_usage.rb
-- test/conversions.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
 - test/test_encodings.rb
+- test/test_global_options.rb
+- test/test_helpers.rb
 - test/test_json.rb
+- test/test_lobs.rb
+- test/test_marshalled.rb
+- test/test_pagination.rb
+- test/test_results_array.rb
 - test/test_simple_record.rb
-- test/temp.rb
-- test/model_with_enc.rb
-- test/my_model.rb
+- test/test_usage.rb