simple_record 2.1.3 → 2.1.6

data/lib/simple_record/json.rb

@@ -1,71 +1,51 @@
 module SimpleRecord
-    module Json
+  module Json
 
-        def self.included(base)
-            base.extend ClassMethods
-        end
+    def self.included(base)
+      base.extend ClassMethods
+    end
 
-        module ClassMethods
+    module ClassMethods
 
-            def json_create(object)
-                obj = new
-                for key, value in object
-                    next if key == 'json_class'
-                    if key == 'id'
-                        obj.id = value
-                        next
-                    end
-                    obj.set key, value
-                end
-                obj
-            end
+      def json_create(object)
+        obj = new
+        for key, value in object
+          next if key == 'json_class'
+          if key == 'id'
+            obj.id = value
+            next
+          end
+          obj.set key, value
+        end
+        obj
+      end
 
-            def from_json(json_string)
-                return JSON.parse(json_string)
-            end
+      def from_json(json_string)
+        return JSON.parse(json_string)
+      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
+    end
 
-        def as_json(options={})
-#            puts 'SimpleRecord as_json called'
-            result = {
-                    'json_class' => self.class.name,
-                    'id' => self.id
-            }
-            defined_attributes_local.each_pair do |name, val|
+    def as_json(options={})
+      puts 'SimpleRecord as_json called with options: ' + options.inspect
+      result = {
+          'id' => self.id
+      }
+      result['json_class'] = self.class.name unless options[:exclude_json_class]
+      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
+        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
+      end
 #            ret = result.as_json(options)
 #            puts 'ret=' + ret.inspect
 #            return ret
-            result
-        end
-
+      result
     end
+
+  end
 end

data/lib/simple_record/sharding.rb

@@ -1,3 +1,5 @@
+require 'concur'
+
 module SimpleRecord
 
   module Sharding
@@ -26,7 +28,7 @@ module SimpleRecord
         options = params.size > 1 ? params[1] : {}
 
         if options[:shard] # User specified shard.
-          shard   = options[:shard]
+          shard = options[:shard]
           domains = shard.is_a?(Array) ? (shard.collect { |x| prefix_shard_name(x) }) : [prefix_shard_name(shard)]
         else
           domains = sharded_domains
@@ -34,32 +36,58 @@ module SimpleRecord
 #                puts "sharded_domains=" + domains.inspect
 
         single = false
+        by_ids = false
         case params.first
           when nil then
             raise "Invalid parameters passed to find: nil."
           when :all, :first, :count
             # nada
           else # single id
+            by_ids = true
             unless params.first.is_a?(Array)
               single = true
             end
         end
-
-        results = ShardedResults.new(params)
+        puts 'single? ' + single.inspect
+        puts 'by_ids? ' + by_ids.inspect
+
+        # todo: should have a global executor
+        executor = options[:concurrent] ? Concur::Executor.new_multi_threaded_executor : Concur::Executor.new_single_threaded_executor
+        results = nil
+        if by_ids
+          results = []
+        else
+          results = ShardedResults.new(params)
+        end
+        futures = []
         domains.each do |d|
-          p2               = params.dup
-          op2              = options.dup
-          op2[:from]       = d
+          p2 = params.dup
+          op2 = options.dup
+          op2[:from] = d
           op2[:shard_find] = true
-          p2[1]            = op2
-          rs               = find(*p2)
+          p2[1] = op2
+
+          futures << executor.execute do
+            puts 'executing=' + p2.inspect
+            # todo: catch RecordNotFound errors and throw later if there really isn't any record found.
+            rs = find(*p2)
+            puts 'rs=' + rs.inspect
+            rs
+          end
+        end
+        futures.each do |f|
+          puts 'getting future ' + f.inspect
           if params.first == :first || single
-            return rs if rs
+            puts 'f.get=' + f.get.inspect
+            return f.get if f.get
+          elsif by_ids
+            results << f.get if f.get
           else
-            results.add_results rs
+            results.add_results f.get
           end
         end
-        puts 'results=' + results.inspect
+        executor.shutdown
+#        puts 'results=' + results.inspect
         if params.first == :first || single
           # Then we found nothing by this point so return nil
           return nil
@@ -81,7 +109,7 @@ module SimpleRecord
 
       def sharded_domains
         sharded_domains = []
-        shard_names     = shards
+        shard_names = shards
         shard_names.each do |s|
           sharded_domains << prefix_shard_name(s)
         end
@@ -91,7 +119,7 @@ module SimpleRecord
 
     def sharded_domain
 #            puts 'getting sharded_domain'
-      options        = self.class.sharding_options
+      options = self.class.sharding_options
 #            val = self.send(options[:on])
 #            puts "val=" + val.inspect
 #            shards = options[:shards] # is user passed in static array of shards
@@ -107,8 +135,8 @@ module SimpleRecord
       include Enumerable
 
       def initialize(params)
-        @params         = params
-        @options        = params.size > 1 ? params[1] : {}
+        @params = params
+        @options = params.size > 1 ? params[1] : {}
         @results_arrays = []
       end
 
@@ -146,9 +174,9 @@ module SimpleRecord
           return element_at(index)
         else
           offset = i[0]
-          rows   = i[1]
-          ret    = []
-          x      = offset
+          rows = i[1]
+          ret = []
+          x = offset
           while x < (offset+rows)
             ret << element_at(x)
             x+=1
@@ -268,9 +296,9 @@ module SimpleRecord
 #                puts 'sdbm_hash ' + str.inspect
         hash = 0
         len.times { |i|
-          c    = str[i]
+          c = str[i]
 #                    puts "c=" + c.class.name + "--" + c.inspect + " -- " + c.ord.inspect
-          c    = c.ord
+          c = c.ord
           hash = c + (hash << 6) + (hash << 16) - hash
         }
 #                puts "hash=" + hash.inspect

data/lib/simple_record/validations.rb

@@ -9,7 +9,7 @@ module SimpleRecord
 #    end
 
     def self.included(base)
-      puts 'Validations included ' + base.inspect
+#      puts 'Validations included ' + base.inspect
 #      if defined?(ActiveModel)
 #        base.class_eval do
 #          alias_method :am_valid?, :valid?

metadata

@@ -1,38 +1,50 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: simple_record
-version: !ruby/object:Gem::Version
-  version: 2.1.3
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 2.1.6
 platform: ruby
-authors:
+authors: 
 - Travis Reeder
 - Chad Arimura
 - RightScale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-02-11 00:00:00.000000000 -08:00
-default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-05-08 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: aws
-  requirement: &26752296 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: concur
   prerelease: false
-  version_requirements: *26752296
-description: ActiveRecord like interface for Amazon SimpleDB. Store, query, shard,
-  etc. By http://www.appoxy.com
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+description: ActiveRecord like interface for Amazon SimpleDB. Store, query, shard, etc. By http://www.appoxy.com
 email: travis@appoxy.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - lib/simple_record.rb
 - lib/simple_record/active_sdb.rb
 - lib/simple_record/attributes.rb
@@ -48,79 +60,32 @@ files:
 - lib/simple_record/translations.rb
 - lib/simple_record/validations.rb
 - README.markdown
-- test/conversions_test.rb
-- test/model_with_enc.rb
-- test/my_base_model.rb
-- test/my_child_model.rb
-- test/my_model.rb
-- test/my_sharded_model.rb
-- test/my_simple_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_rails3.rb
-- test/test_results_array.rb
-- test/test_shards.rb
-- test/test_simple_record.rb
-- test/test_usage.rb
-- test/test_validations.rb
-has_rdoc: true
 homepage: http://github.com/appoxy/simple_record/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: ActiveRecord like interface for Amazon SimpleDB. By http://www.appoxy.com
-test_files:
-- test/conversions_test.rb
-- test/model_with_enc.rb
-- test/my_base_model.rb
-- test/my_child_model.rb
-- test/my_model.rb
-- test/my_sharded_model.rb
-- test/my_simple_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_rails3.rb
-- test/test_results_array.rb
-- test/test_shards.rb
-- test/test_simple_record.rb
-- test/test_usage.rb
-- test/test_validations.rb
+test_files: []
+

data/test/conversions_test.rb

@@ -1,44 +0,0 @@
-require "yaml"
-require 'aws'
-
-require_relative "test_base"
-require_relative "../lib/simple_record"
-require_relative 'my_model'
-require_relative 'my_child_model'
-
-class ConversionsTest < TestBase
-
-    def test_ints
-        x = 0
-        puts SimpleRecord::Translations.pad_and_offset(x)
-        assert_equal "09223372036854775808", SimpleRecord::Translations.pad_and_offset(x)
-
-        x = 1
-        puts SimpleRecord::Translations.pad_and_offset(x)
-        assert_equal "09223372036854775809", SimpleRecord::Translations.pad_and_offset(x)
-
-        x = "09223372036854775838"
-        puts SimpleRecord::Translations.un_offset_int(x)
-        assert_equal 30, SimpleRecord::Translations.un_offset_int(x)
-    end
-
-    # All from examples here: http://tools.ietf.org/html/draft-wood-ldapext-float-00
-    def test_floats
-        zero = "3 000 0.0000000000000000"
-        assert_equal zero, SimpleRecord::Translations.pad_and_offset(0.0)
-
-        puts 'induced = ' + "3.25e5".to_f.to_s
-
-        assert_equal "5 005 3.2500000000000000", SimpleRecord::Translations.pad_and_offset("3.25e5".to_f)
-        assert_equal "4 994 8.4000000000000000", SimpleRecord::Translations.pad_and_offset("8.4e-5".to_f)
-        assert_equal "4 992 8.4000000000000000", SimpleRecord::Translations.pad_and_offset("8.4e-7".to_f)
-        assert_equal "3 000 0.0000000000000000", SimpleRecord::Translations.pad_and_offset("0.0e0".to_f)
-        assert_equal "2 004 5.7500000000000000", SimpleRecord::Translations.pad_and_offset("-4.25e-4".to_f)
-        assert_equal "2 004 3.6500000000000000", SimpleRecord::Translations.pad_and_offset("-6.35e-4".to_f)
-        assert_equal "2 003 3.6500000000000000", SimpleRecord::Translations.pad_and_offset("-6.35e-3".to_f)
-        assert_equal "1 895 6.0000000000000000", SimpleRecord::Translations.pad_and_offset("-4.0e105".to_f)
-        assert_equal "1 894 6.0000000000000000", SimpleRecord::Translations.pad_and_offset("-4.0e105".to_f)
-        assert_equal "1 894 4.0000000000000000", SimpleRecord::Translations.pad_and_offset("-6.0e105".to_f)
-
-    end
-end