simple_record 1.0.5 → 1.0.6

data/lib/simple_record.rb

@@ -29,7 +29,7 @@ require 'local_cache'
 
 module SimpleRecord
 
-   VERSION = '1.0.5'
+   VERSION = '1.0.6'
 
   class Base < RightAws::ActiveSdb::Base
 
@@ -69,8 +69,6 @@ module SimpleRecord
     end
 
 
-    #  @@domain_name_for_class = nil
-
     def domain
       super # super.domain
     end
@@ -113,6 +111,7 @@ module SimpleRecord
     def self.has_attributes(*args)
       @@attributes = args
       args.each do |arg|
+          # define reader method
         send :define_method, arg do
           ret = nil
           if self[arg.to_s].class==Array
@@ -128,6 +127,7 @@ module SimpleRecord
           return un_offset_if_int(arg, ret)
         end
 
+        # define writer method
         method_name = (arg.to_s+"=")
         send(:define_method, method_name) do |value|
           self[arg.to_s]=value#      end
@@ -173,21 +173,23 @@ module SimpleRecord
 
     @@belongs_to_map = {}
     # One belongs_to association per call. Call multiple times if there are more than one.
+    #
+    # This method will also create an {association)_id method that will return the ID of the foreign object
+    # without actually materializing it.
     def self.belongs_to(association_id, options = {})
       @@belongs_to_map[association_id] = options
       arg = association_id
+      arg_id = arg.to_s + '_id'
 
       # todo: should also handle foreign_key http://74.125.95.132/search?q=cache:KqLkxuXiBBQJ:wiki.rubyonrails.org/rails/show/belongs_to+rails+belongs_to&hl=en&ct=clnk&cd=1&gl=us
       #    puts "arg_id=#{arg}_id"
       #        puts "is defined? " + eval("(defined? #{arg}_id)").to_s
       #        puts 'atts=' + @attributes.inspect
+
+      # Define reader method
       send(:define_method, arg) do
         options2 = @@belongs_to_map[arg]
         class_name = options2[:class_name] || arg.to_s[0...1].capitalize + arg.to_s[1...arg.to_s.length]
-        #        return eval("#{arg.to_s.capitalize}.find(self['#{arg}_id']) if !self['#{arg}_id'].nil?") # (defined? #{arg}_id)
-        #        return eval("#{arg.to_s.capitalize}.find(#{arg}_id) if(defined? #{arg}_id)")
-        #     ORIGINAL   return eval("#{arg.to_s.capitalize}.find(#{arg}_id)")
-
         #      puts "attr=" + @attributes[arg_id].inspect
         #      puts 'val=' + @attributes[arg_id][0].inspect unless @attributes[arg_id].nil?
         ret = nil
@@ -218,7 +220,17 @@ module SimpleRecord
 #      puts 'ret=' + ret.inspect
         return ret
       end
-      send(:define_method, arg.to_s+"=") do |value|
+
+      # Define reader ID method
+      send(:define_method, arg_id) do
+          if !@attributes[arg_id].nil? && @attributes[arg_id].size > 0 && @attributes[arg_id][0] != nil && @attributes[arg_id][0] != ''
+              return @attributes[arg_id][0]
+          end
+          return nil
+      end
+
+      # Define writer method
+      send(:define_method, arg.to_s + "=") do |value|
         arg_id = arg.to_s + '_id'
         if value.nil?
           self[arg_id]=nil unless self[arg_id].nil? # if it went from something to nil, then we have to remember and remove attribute on save
@@ -226,6 +238,7 @@ module SimpleRecord
           self[arg_id]=value.id
         end
       end
+
       send(:define_method, "create_"+arg.to_s) do |*params|
         newsubrecord=eval(arg.to_s.classify).new(*params)
         newsubrecord.save
@@ -234,56 +247,6 @@ module SimpleRecord
       end
     end
 
-    def self.belongs_to_OLD_and_wrong(*args)
-      #create the accesor functions
-      args.each do |arg|
-        #      puts 'belongs_to ' + arg.to_s
-        send(:define_method, arg) do
-          #        return eval("#{arg.to_s.capitalize}.find(self['#{arg}_id']) if !self['#{arg}_id'].nil?") # (defined? #{arg}_id)
-          #        return eval("#{arg.to_s.capitalize}.find(#{arg}_id) if(defined? #{arg}_id)")
-          #     ORIGINAL   return eval("#{arg.to_s.capitalize}.find(#{arg}_id)")
-          puts "arg_id=#{arg}_id"
-#        puts "is defined? " + eval("(defined? #{arg}_id)").to_s
-          #        puts 'atts=' + @attributes.inspect
-          puts "attr=" + @attributes[arg.to_s + '_id'].inspect
-          puts 'val=' + @attributes[arg.to_s + '_id'][0].inspect unless @attributes[arg.to_s + '_id'].nil?
-          to_eval = "#{arg.to_s[0...1].capitalize + arg.to_s[1...arg.to_s.length]}.find(@attributes['#{arg}_id'][0], :auto_load=>true) unless @attributes['#{arg}_id'].nil?"
-          puts 'to eval=' + to_eval
-          ret = eval(to_eval) # (defined? #{arg}_id)
-          puts 'ret=' + ret.inspect
-          ret
-        end
-      end
-
-      args.each do |arg|
-        send(:define_method, arg.to_s+"=") do |value|
-          self[arg.to_s+"_id"]=value.id
-        end
-      end
-
-      #create the build_subrecord and creat_subrecord methods
-      #args.each do |arg|
-      #  send(:define_method, "build_"+arg.to_s) do |*params|
-      #    self.arg.to_s=eval(arg.to_s.classify).new
-      #  end
-      #end
-
-      args.each do |arg|
-        send(:define_method, "create_"+arg.to_s) do |*params|
-          newsubrecord=eval(arg.to_s.classify).new(*params)
-          newsubrecord.save
-          self[arg.to_s+"_id"]=newsubrecord.id
-        end
-      end
-    end #belongs_to
-
-    #  def self.has_many(*args)
-    #    args.each do |arg|
-    #      send(:define_method, arg) do
-    #        return eval(%{#{(arg.to_s).classify}.find(:all, :conditions => ["#{(self.class.name).tableize.singularize}_id = ?",id])})
-    #      end
-    #    end
-    #  end
     def self.has_many(*args)
       args.each do |arg|
         #okay, this creates an instance method with the pluralized name of the symbol passed to belongs_to
@@ -748,7 +711,6 @@ This is done on getters now
         results=super(*params)
         cache_results(results)
       rescue RightAws::AwsError, RightAws::ActiveSdb::ActiveSdbError
-        puts "RESCUED: " + $!
         if ($!.message().index("NoSuchDomain") != nil)
           # this is ok
         elsif ($!.message() =~ @@regex_no_id)

data/test/test_simple_record.rb

@@ -1,97 +1,116 @@
-require "test/unit"
+require 'minitest/unit'
 require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
 require "yaml"
 require 'right_aws'
 require 'my_model'
+require 'my_child_model'
 
 class TestSimpleRecord < Test::Unit::TestCase
 
-  def setup
-    @config = YAML::load(File.read('test-config.yml'))
-    puts 'akey=' + @config['amazon']['access_key']
-    puts 'skey=' + @config['amazon']['secret_key']
-    RightAws::ActiveSdb.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'])
-    SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")
-  end
+    def setup
+        @config = YAML::load(File.read('test-config.yml'))
+        puts 'akey=' + @config['amazon']['access_key']
+        puts 'skey=' + @config['amazon']['secret_key']
+        RightAws::ActiveSdb.establish_connection(@config['amazon']['access_key'], @config['amazon']['secret_key'])
+        SimpleRecord::Base.set_domain_prefix("simplerecord_tests_")
+    end
+
+    def teardown
+        RightAws::ActiveSdb.close_connection()
+    end
+
+    def test_save_get
+        mm = MyModel.new
+        mm.name = "Travis"
+        mm.age = 32
+        mm.cool = true
+        mm.save
+        id = mm.id
+        puts 'id=' + id.to_s
+        # Get the object back
+        mm2 = MyModel.find(id)
+        puts 'got=' + mm2.name + ' and he/she is ' + mm2.age.to_s + ' years old and he/she is cool? ' + mm2.cool.to_s
+        puts mm2.cool.class.name
+        assert mm2.id == mm.id
+        assert mm2.age == mm.age
+        assert mm2.cool == mm.cool
+    end
+
+    def test_batch_save
+        items = []
+        mm = MyModel.new
+        mm.name = "Travis"
+        mm.age = 32
+        mm.cool = true
+        items << mm
+        mm = MyModel.new
+        mm.name = "Tritt"
+        mm.age = 44
+        mm.cool = false
+        items << mm
+        MyModel.batch_save(items)
+        items.each do |item|
+            puts 'id=' + item.id
+            new_item = MyModel.find(item.id)
+            puts 'new=' + new_item.inspect
+            assert item.id == new_item.id
+            assert item.name == new_item.name
+            assert item.cool == new_item.cool
+        end
+    end
 
-  def teardown
-    RightAws::ActiveSdb.close_connection()
-  end
+    # Testing getting the association ID without materializing the obejct
+    def test_get_belongs_to_id
+        mm = MyModel.new
+        mm.name = "Parent"
+        mm.age = 55
+        mm.cool = true
+        mm.save
 
-  def test_save_get
-    mm = MyModel.new
-    mm.name = "Travis"
-    mm.age = 32
-    mm.cool = true
-    mm.save
-    id = mm.id
-    puts 'id=' + id.to_s
-    # Get the object back
-    mm2 = MyModel.find(id)
-    puts 'got=' + mm2.name + ' and he/she is ' + mm2.age.to_s + ' years old and he/she is cool? ' + mm2.cool.to_s
-    puts mm2.cool.class.name
-    assert mm2.id == mm.id
-    assert mm2.age == mm.age
-    assert mm2.cool == mm.cool
-  end
+        child = MyChildModel.new
+        child.name = "Child"
+        child.my_model = mm
+        child.save
 
-  def test_batch_save
-    items = []
-    mm = MyModel.new
-    mm.name = "Travis"
-    mm.age = 32
-    mm.cool = true
-    items << mm
-    mm = MyModel.new
-    mm.name = "Tritt"
-    mm.age = 44
-    mm.cool = false
-    items << mm
-    MyModel.batch_save(items)
-    items.each do |item|
-      puts 'id=' + item.id
-      new_item = MyModel.find(item.id)
-      puts 'new=' + new_item.inspect
-      assert item.id == new_item.id
-      assert item.name == new_item.name
-      assert item.cool == new_item.cool
+        child = MyChildModel.find(child.id)
+        puts child.my_model_id
+        assert child.my_model_id == mm.id
     end
-  end
 
-  def test_callbacks
-    # these DO NOT work right now, all objects get all callbacks
-    #	I tried like this, seem to be getting somewhere.
-    #
-    #  class << self;
-    #  @@callbacks.each do |callback|
-    #    #we first have to make an initialized array for each of the callbacks, to prevent problems if they are not called
-    #    puts 'setting callback ' + callback.to_s + ' on ' + self.inspect
-    #    eval %{
-    #
-    #        # add the methods to the class
-    #        def #{callback}(*args)
-    #        args.each do |arg|
-    #          cb_names = self.instance_variable_get(:@#{callback}_names)
-    #          cb_names = [] if cb_names.nil?
-    #          cb_names << arg.to_s if cb_names.index(arg.to_s).nil?
-    #          self.instance_variable_set(:@#{callback}_names, cb_names)
-    #        end
-    ##      asdf    @@#{callback}_names=args.map{|arg| arg.to_s}
-    #      end
-    #
-    #        # now we run the methods in the callback array for this class
-    #send :define_method, "run_#{callback}" do
-    ##        def run_#{callback}
-    #          cb_names = self.instance_variable_get(:@#{callback}_names)
-    #          cb_names.each { |name|
-    #          unless eval(name)
-    #            return false
-    #          end
-    #          }
-    #          return true
-    #        end
-    #    }
-    #  end
-    #  end
-  end
+    def test_callbacks
+        # these DO NOT work right now, all objects get all callbacks
+        #	I tried like this, seem to be getting somewhere.
+        #
+        #  class << self;
+        #  @@callbacks.each do |callback|
+        #    #we first have to make an initialized array for each of the callbacks, to prevent problems if they are not called
+        #    puts 'setting callback ' + callback.to_s + ' on ' + self.inspect
+        #    eval %{
+        #
+        #        # add the methods to the class
+        #        def #{callback}(*args)
+        #        args.each do |arg|
+        #          cb_names = self.instance_variable_get(:@#{callback}_names)
+        #          cb_names = [] if cb_names.nil?
+        #          cb_names << arg.to_s if cb_names.index(arg.to_s).nil?
+        #          self.instance_variable_set(:@#{callback}_names, cb_names)
+        #        end
+        ##      asdf    @@#{callback}_names=args.map{|arg| arg.to_s}
+        #      end
+        #
+        #        # now we run the methods in the callback array for this class
+        #send :define_method, "run_#{callback}" do
+        ##        def run_#{callback}
+        #          cb_names = self.instance_variable_get(:@#{callback}_names)
+        #          cb_names.each { |name|
+        #          unless eval(name)
+        #            return false
+        #          end
+        #          }
+        #          return true
+        #        end
+        #    }
+        #  end
+        #  end
+    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 -07:00
+date: 2009-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency