simple_record 1.0.2 → 1.0.3

data/lib/simple_record.rb

@@ -10,7 +10,7 @@
 # 
 # AWS_ACCESS_KEY_ID='XXXXX'
 # AWS_SECRET_ACCESS_KEY='YYYYY'
-# RightAws::ActiveSdb.establish_connection(AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY, {:multi_thread => false})
+# RightAws::ActiveSdb.establish_connection(AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY)
 # # Save an object
 # mm = MyModel.new
 # mm.name = "Travis"
@@ -29,7 +29,7 @@ require 'local_cache'
 
 module SimpleRecord
 
-VERSION = '1.0.2'
+VERSION = '1.0.3'
 
   class Base < RightAws::ActiveSdb::Base
 
@@ -124,6 +124,7 @@ VERSION = '1.0.2'
           else
             ret = self[arg.to_s]
           end
+		  return nil if ret.nil?
           return un_offset_if_int(arg, ret)
         end
 
@@ -153,6 +154,13 @@ VERSION = '1.0.2'
 #    @@dates = args
       #    puts 'dates=' + @@dates.inspect
     end
+	
+	@@booleans = []
+    def self.are_booleans(*args)
+      args.each do |arg|
+        @@booleans << arg if @@booleans.index(arg).nil?
+      end
+    end
 
     @@virtuals=[]
     def self.has_virtuals(*args)
@@ -184,8 +192,8 @@ VERSION = '1.0.2'
         #      puts 'val=' + @attributes[arg_id][0].inspect unless @attributes[arg_id].nil?
         ret = nil
         arg_id = arg.to_s + '_id'
-        if !@attributes[arg_id].nil? && @attributes[arg_id].size > 0
-          if !@@cache_store.nil?
+		if !@attributes[arg_id].nil? && @attributes[arg_id].size > 0 && @attributes[arg_id][0] != nil && @attributes[arg_id][0] != ''         
+		  if !@@cache_store.nil?
             arg_id_val = @attributes[arg_id][0]
             cache_key = self.class.cache_key(class_name, arg_id_val)
 #          puts 'cache_key=' + cache_key
@@ -502,7 +510,25 @@ VERSION = '1.0.2'
         for d in @@dates
 #        puts 'converting created: ' + self['created'].inspect
            if d == arg
-             x = DateTime.parse(x)
+               x = to_date(x)
+           end
+#          if !self[d].nil?
+#            self[d].collect!{ |d2|
+#              if d2.is_a?(String)
+#                DateTime.parse(d2)
+#              else
+#                d2
+#              end
+#            }
+#          end
+#        puts 'after=' + self['created'].inspect
+        end
+      end
+	  if !@@booleans.nil?
+        for b in @@booleans
+#        puts 'converting created: ' + self['created'].inspect
+           if b == arg
+               x = to_bool(x)
            end
 #          if !self[d].nil?
 #            self[d].collect!{ |d2|
@@ -518,6 +544,25 @@ VERSION = '1.0.2'
       end
       x
     end
+	
+	
+  def to_date(x)
+    if x.is_a?(String)
+      DateTime.parse(x)
+    else
+      x
+    end
+
+  end
+  
+  def to_bool(x)
+    if x.is_a?(String)
+	  x == "true"
+	else
+	  x
+	end
+  end
+
 
     def un_offset_int(x)
       if x.is_a?(String)
@@ -621,9 +666,16 @@ This is done on getters now
 
     def self.find(*params)
       reload=true
-      all=false
-      select=false
-      select_attributes=[]
+      first=false
+    all=false
+    select=false
+    select_attributes=[]
+
+    if params.size > 0
+      all = params[0] == :all
+      first = params[0] == :first
+    end
+
 
        # Pad and Offset number attributes
       options = params[1]
@@ -632,29 +684,49 @@ This is done on getters now
       
 #    puts 'after collect=' + params.inspect
 
-      results = []
+      results = all ? [] : nil
       begin
         results=super(*params)
         cache_results(results)
-      rescue RightAws::AwsError
+      rescue RightAws::AwsError, RightAws::ActiveSdb::ActiveSdbError
         puts "RESCUED: " + $!
-        if ($!.message().index("NoSuchDomain") == nil)
+        if ($!.message().index("NoSuchDomain") != nil)
+          # this is ok
+        elsif ($!.message() =~ @@regex_no_id)
+          results = nil
+        else
           raise $!
         end
       end
       return results
     end
 
-    def select(*params)
-	options = params[1]
+   @@regex_no_id = /.*Couldn't find.*with ID.*/
+    def self.select(*params)
+	first=false
+    all=false
+    select=false
+    select_attributes=[]
+
+    if params.size > 0
+      all = params[0] == :all
+      first = params[0] == :first
+    end
+
+      options = params[1]
       convert_condition_params(options)
-      results = []
+      
+      results = all ? [] : nil
       begin
         results=super(*params)
         cache_results(results)
-      rescue RightAws::AwsError
+      rescue RightAws::AwsError, RightAws::ActiveSdb::ActiveSdbError
         puts "RESCUED: " + $!
-        if ($!.message().index("NoSuchDomain") == nil)
+        if ($!.message().index("NoSuchDomain") != nil)
+          # this is ok
+        elsif ($!.message() =~ @@regex_no_id)
+          results = nil
+        else
           raise $!
         end
       end
@@ -667,7 +739,7 @@ This is done on getters now
         conditions = options[:conditions]
         if !conditions.nil? && conditions.size > 1
           # all after first are values
-          conditions[1...conditions.size] = conditions[1...conditions.size].collect { |x|
+          conditions.collect! { |x|
             self.pad_and_offset(x)
           }
         end

data/test/test_simple_record.rb

@@ -1,8 +1,74 @@
 require "test/unit"
-require "simple_record"
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require "yaml"
+require 'right_aws'
+require 'my_model'
 
 class TestSimpleRecord < Test::Unit::TestCase
-  def test_sanity
-    flunk "write tests or I will kneecap you"
+
+  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_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.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-25 00:00:00 -07:00
+date: 2009-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency