appoxy-simple_record 1.0.28 → 1.1.1

data/lib/simple_record.rb

@@ -844,33 +844,30 @@ This is done on getters now
 
         def self.find(*params)
             #puts 'params=' + params.inspect
-            reload=true
-            first=false
-            all=false
-            select=false
+            q_type = :all
             select_attributes=[]
 
             if params.size > 0
-                all = params[0] == :all
-                first = params[0] == :first
+                q_type = params[0]
             end
 
-
             # Pad and Offset number attributes
             options = {}
             if params.size > 1
                 options = params[1]
                 #puts 'options=' + options.inspect
                 #puts 'after collect=' + options.inspect
+                convert_condition_params(options)
             end
-            convert_condition_params(options)
             #puts 'params2=' + params.inspect
 
-            results = all ? [] : nil
+            results = q_type == :all ? [] : nil
             begin
                 results=super(*params)
-                cache_results(results)
-                results = SimpleRecord::ResultsArray.new(self, params, results, next_token)
+                if q_type != :count
+                    cache_results(results)
+                    results = SimpleRecord::ResultsArray.new(self, params, results, next_token)
+                end
             rescue RightAws::AwsError, RightAws::ActiveSdb::ActiveSdbError
                 puts "RESCUED: " + $!.message
                 if ($!.message().index("NoSuchDomain") != nil)

data/test/test_simple_record.rb

@@ -169,6 +169,11 @@ class TestSimpleRecord < Test::Unit::TestCase
 
     end
 
+    def test_count
+        count = MyModel.find(:count)
+        assert count > 0
+    end
+
     def test_attributes_correct
 
         #MyModel.defined_attributes.each do |a|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appoxy-simple_record
 version: !ruby/object:Gem::Version 
-  version: 1.0.28
+  version: 1.1.1
 platform: ruby
 authors: 
 - Travis Reeder