simple_record 1.3.1 → 1.3.3

data/lib/simple_record.rb

@@ -591,7 +591,7 @@ module SimpleRecord
             connection.delete_attributes(domain, id)
         end
 
-        def self.delete_all(* params)
+        def self.delete_all(*params)
             # could make this quicker by just getting item_names and deleting attributes rather than creating objects
             obs = self.find(params)
             i = 0
@@ -602,7 +602,7 @@ module SimpleRecord
             return i
         end
 
-        def self.destroy_all(* params)
+        def self.destroy_all(*params)
             obs = self.find(params)
             i = 0
             obs.each do |a|
@@ -804,7 +804,7 @@ module SimpleRecord
         # Query example:
         #   MyModel.find(:all, :conditions=>["name = ?", name], :order=>"created desc", :limit=>10)
         #
-        def self.find(* params)
+        def self.find(*params)
             #puts 'params=' + params.inspect
             q_type = :all
             select_attributes=[]
@@ -825,7 +825,7 @@ module SimpleRecord
 
             results = q_type == :all ? [] : nil
             begin
-                results=super(* params)
+                results=super(*params)
 #                puts "RESULT=" + results.inspect
                 #puts 'params3=' + params.inspect
                 SimpleRecord.stats.selects += 1
@@ -848,33 +848,33 @@ module SimpleRecord
             return results
         end
 
-        def self.select(* params)
-            return find(* params)
+        def self.select(*params)
+            return find(*params)
         end
 
-        def self.all(* args)
-            find(:all, * args)
+        def self.all(*args)
+            find(:all, *args)
         end
 
-        def self.first(* args)
-            find(:first, * args)
+        def self.first(*args)
+            find(:first, *args)
         end
 
-        def self.count(* args)
-            find(:count, * args)
+        def self.count(*args)
+            find(:count, *args)
         end
 
         # This gets less and less efficient the higher the page since SimpleDB has no way
         # to start at a specific row. So it will iterate from the first record and pull out the specific pages.
         def self.paginate(options={})
 #            options = args.pop
-            puts 'paginate options=' + options.inspect if SimpleRecord.logging?
+#            puts 'paginate options=' + options.inspect if SimpleRecord.logging?
             page     = options[:page] || 1
             per_page = options[:per_page] || self.per_page || 50
             total    = options[:total_entries]
             options[:limit] = page * per_page
             fr = find(:all, options)
-            puts 'fr.size=' + fr.size.to_s
+#            puts 'fr.size=' + fr.size.to_s
             ret = []
             i = 0
             p = 1
@@ -932,8 +932,8 @@ module SimpleRecord
             @@debug
         end
 
-        def self.sanitize_sql(* params)
-            return ActiveRecord::Base.sanitize_sql(* params)
+        def self.sanitize_sql(*params)
+            return ActiveRecord::Base.sanitize_sql(*params)
         end
 
         def self.table_name
@@ -1010,30 +1010,30 @@ module SimpleRecord
             return count
         end
 
-        def each(* params, & block)
-            return load.each(* params) { |record| block.call(record) }
+        def each(*params, &block)
+            return load.each(*params) { |record| block.call(record) }
         end
 
-        def find_all(* params)
-            find(:all, * params)
+        def find_all(*params)
+            find(:all, *params)
         end
 
         def empty?
             return load.empty?
         end
 
-        def build(* params)
+        def build(*params)
             params[0][@referencename]=@referencevalue
-            eval(@subname).new(* params)
+            eval(@subname).new(*params)
         end
 
-        def create(* params)
+        def create(*params)
             params[0][@referencename]=@referencevalue
-            record = eval(@subname).new(* params)
+            record = eval(@subname).new(*params)
             record.save
         end
 
-        def find(* params)
+        def find(*params)
             query=[:first, {}]
             #{:conditions=>"id=>1"}
             if params[0]
@@ -1056,7 +1056,7 @@ module SimpleRecord
                 #query[1][:conditions]="id='#{@id}'"
             end
 
-            return eval(@subname).find(* query)
+            return eval(@subname).find(*query)
         end
 
     end

data/lib/simple_record/json.rb

@@ -2,8 +2,6 @@ module SimpleRecord
     module Json
 
         def self.included(base)
-            puts "TestMixin included in #{base}"
-
             base.extend ClassMethods
         end
 
@@ -24,7 +22,7 @@ module SimpleRecord
 
         end
 
-        def to_json(* a)
+        def to_json(*a)
             result = {
                     'json_class' => self.class.name
             }
@@ -37,12 +35,8 @@ module SimpleRecord
                 end
 #                puts 'result[name]=' + result[name].inspect
             end
-#
-#            instance_variables.inject(result) do |r, name|
-#                r[name[1..-1]] = instance_variable_get name
-#                r
-#            end
-            result.to_json(* a)
+
+            result.to_json(*a)
         end
 
     end

data/lib/simple_record/results_array.rb

@@ -74,8 +74,9 @@ module SimpleRecord
         end
 
         def size
-            # puts 'SIZE count=' + @count.inspect
-            # todo: if no next token, should use the array.size so we don't call count
+            if @next_token.nil?
+                return @items.size
+            end
             return @count if @count
             params_for_count = params.dup
             params_for_count[0] = :count

data/lib/simple_record/translations.rb

@@ -29,14 +29,14 @@ module SimpleRecord
             unless value.blank?
                 if att_meta.options
                     if att_meta.options[:encrypted]
-                    puts "ENCRYPTING #{name} value #{value}"
+#                    puts "ENCRYPTING #{name} value #{value}"
                         ret = Translations.encrypt(ret, att_meta.options[:encrypted])
-                    puts 'encrypted value=' + ret.to_s
+#                    puts 'encrypted value=' + ret.to_s
                     end
                     if att_meta.options[:hashed]
-                        puts "hashing #{name}"
+#                        puts "hashing #{name}"
                         ret = Translations.pass_hash(ret)
-                        puts "hashed value=" + ret.inspect
+#                        puts "hashed value=" + ret.inspect
                     end
                 end
             end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 -07:00
+date: 2010-05-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: aws
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -52,6 +55,24 @@ files:
 - lib/simple_record/stats.rb
 - lib/simple_record/translations.rb
 - README.markdown
+- test/conversions.rb
+- test/model_with_enc.rb
+- test/my_base_model.rb
+- test/my_child_model.rb
+- test/my_model.rb
+- test/paging_array_test.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
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_record/
 licenses: []
@@ -62,23 +83,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.