activerecord-simpledb-adapter 0.4.11 → 0.4.12

data/.gitignore

@@ -0,0 +1,5 @@
+.DS_Store
+.idea
+pkg
+*.swp
+.bundle

data/.rspec

@@ -0,0 +1,4 @@
+--colour
+--format
+progress
+mtime

data/Gemfile

@@ -1,15 +1,14 @@
 source "http://rubygems.org"
 
-gem 'aws', '~> 2.3.0'
-gem 'rails', '~> 3.0.9'
-gem 'uuidtools', '~> 2.1.1'
+gem 'aws'
+gem 'rake'
+gem 'activerecord', '~> 3.0.9'
+gem 'uuidtools'
 
 group :development do
   gem 'awesome_print'
-  gem 'rspec', '~> 2.3.0'
-  gem 'jeweler'
-  gem 'rcov', '>= 0'
-  gem 'genspec', '0.2.0.prerails3.2'
+  gem 'rspec'
   gem 'thor'
-  gem 'ruby-debug'
+  gem 'rails', '~> 3.0.9'
+  gem 'genspec'
 end

data/Gemfile.lock

@@ -2,119 +2,107 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
+    actionmailer (3.0.13)
+      actionpack (= 3.0.13)
       mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    actionpack (3.0.13)
+      activemodel (= 3.0.13)
+      activesupport (= 3.0.13)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
-      rack (~> 1.2.1)
+      rack (~> 1.2.5)
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.13)
+      activesupport (= 3.0.13)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    activerecord (3.0.13)
+      activemodel (= 3.0.13)
+      activesupport (= 3.0.13)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    activeresource (3.0.13)
+      activemodel (= 3.0.13)
+      activesupport (= 3.0.13)
+    activesupport (3.0.13)
     arel (2.0.10)
-    awesome_print (0.4.0)
-    aws (2.3.34)
-      activesupport
+    awesome_print (1.0.2)
+    aws (2.5.6)
       http_connection
       uuidtools
       xml-simple
     builder (2.1.2)
-    columnize (0.3.4)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    genspec (0.2.0.prerails3.2)
-      rspec (>= 2.0.0.beta.14)
-      sc-core-ext (>= 1.2.1)
-    git (1.2.5)
+    genspec (0.2.6)
+      i18n (>= 0.5.0)
+      rspec (~> 2)
+      sc-core-ext (~> 1.2.1)
+      thor (~> 0.14.6)
     http_connection (1.4.1)
     i18n (0.5.0)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
+    json (1.7.3)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    polyglot (0.3.1)
-    rack (1.2.3)
+    mime-types (1.18)
+    polyglot (0.3.3)
+    rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.0.13)
+      actionmailer (= 3.0.13)
+      actionpack (= 3.0.13)
+      activerecord (= 3.0.13)
+      activeresource (= 3.0.13)
+      activesupport (= 3.0.13)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.0.13)
+    railties (3.0.13)
+      actionpack (= 3.0.13)
+      activesupport (= 3.0.13)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2)
-    rbx-require-relative (0.0.5)
-    rcov (0.9.9)
-    rdoc (3.8)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
     sc-core-ext (1.2.1)
       activesupport (>= 2.3.5)
     thor (0.14.6)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.33)
     uuidtools (2.1.2)
-    xml-simple (1.1.0)
+    xml-simple (1.1.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (~> 3.0.9)
   awesome_print
-  aws (~> 2.3.0)
-  genspec (= 0.2.0.prerails3.2)
-  jeweler
+  aws
+  genspec
   rails (~> 3.0.9)
-  rcov
-  rspec (~> 2.3.0)
-  ruby-debug
+  rake
+  rspec
   thor
-  uuidtools (~> 2.1.1)
+  uuidtools

data/Rakefile

@@ -0,0 +1,23 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec

data/VERSION

@@ -0,0 +1 @@
+0.4.11

data/activerecord-simpledb-adapter.gemspec

@@ -1,85 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{activerecord-simpledb-adapter}
-  s.version = "0.4.11"
+  s.name          = %q{activerecord-simpledb-adapter}
+  s.version       = "0.4.12"
+  s.authors       = ["Ilia Ablamonov", "Alex Gorkunov", "Cloud Castle Inc."]
+  s.email         = %q{ilia@flamefork.ru}
+  s.licenses      = ["MIT"]
+  s.homepage      = %q{http://www.github.com/gorkunov/consular-another-gnome-terminal}
+  s.summary       = %q{Gnome Terminal support for Consular (without using xdotool)}
+  s.description   = %q{Gnome Terminal support for Consular without emulation keyboard events}
+  s.homepage      = %q{http://github.com/cloudcastle/activerecord-simpledb-adapter}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ilia Ablamonov", "Alex Gorkunov", "Cloud Castle Inc."]
-  s.date = %q{2011-07-26}
-  s.email = %q{ilia@flamefork.ru}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "activerecord-simpledb-adapter.gemspec",
-    "lib/active_record/connection_adapters/simpledb_adapter.rb",
-    "lib/active_record/connection_adapters/simpledb_adapter/adapter.rb",
-    "lib/active_record/connection_adapters/simpledb_adapter/base.rb",
-    "lib/active_record/connection_adapters/simpledb_adapter/column.rb",
-    "lib/active_record/connection_adapters/simpledb_adapter/defaults.rb",
-    "lib/active_record/connection_adapters/simpledb_adapter/finder_methods.rb",
-    "lib/active_record/connection_adapters/simpledb_adapter/misc/aws_overrides.rb",
-    "lib/active_record/connection_adapters/simpledb_adapter/misc/simpledb_logger.rb",
-    "lib/active_record/connection_adapters/simpledb_adapter/table_definition.rb",
-    "lib/active_record/connection_adapters/simpledb_adapter/validations.rb",
-    "lib/activerecord-simpledb-adapter.rb",
-    "lib/arel/visitors/simpledb.rb",
-    "lib/generators/active_record/model/model_generator.rb",
-    "lib/generators/active_record/model/templates/model.rb",
-    "lib/tasks/simpledb.rake"
-  ]
-  s.homepage = %q{http://github.com/cloudcastle/activerecord-simpledb-adapter}
-  s.licenses = ["MIT"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{ActiveRecord SimpleDB adapter}
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<aws>, ["~> 2.3.0"])
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0.9"])
-      s.add_runtime_dependency(%q<uuidtools>, ["~> 2.1.1"])
-      s.add_development_dependency(%q<awesome_print>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<genspec>, ["= 0.2.0.prerails3.2"])
-      s.add_development_dependency(%q<thor>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
-    else
-      s.add_dependency(%q<aws>, ["~> 2.3.0"])
-      s.add_dependency(%q<rails>, ["~> 3.0.9"])
-      s.add_dependency(%q<uuidtools>, ["~> 2.1.1"])
-      s.add_dependency(%q<awesome_print>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<genspec>, ["= 0.2.0.prerails3.2"])
-      s.add_dependency(%q<thor>, [">= 0"])
-      s.add_dependency(%q<ruby-debug>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<aws>, ["~> 2.3.0"])
-    s.add_dependency(%q<rails>, ["~> 3.0.9"])
-    s.add_dependency(%q<uuidtools>, ["~> 2.1.1"])
-    s.add_dependency(%q<awesome_print>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<genspec>, ["= 0.2.0.prerails3.2"])
-    s.add_dependency(%q<thor>, [">= 0"])
-    s.add_dependency(%q<ruby-debug>, [">= 0"])
-  end
+  s.add_runtime_dependency(%q<aws>)
+  s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.9"])
+  s.add_runtime_dependency(%q<uuidtools>)
+  s.add_development_dependency(%q<awesome_print>)
+  s.add_development_dependency(%q<rspec>)
+  s.add_development_dependency(%q<rails>, ["~> 3.0.9"])
+  s.add_development_dependency(%q<genspec>)
+  s.add_development_dependency(%q<thor>)
 end
-

data/lib/active_record/connection_adapters/simpledb_adapter/defaults.rb

@@ -20,7 +20,7 @@ module ActiveRecordSimpledbAdapter
 
           if has_default
             value = if column.default.is_a? Proc
-                      column.default.call(self)
+                      column.default.call
                     else
                       column.default
                     end

data/lib/activerecord-simpledb-adapter.rb

@@ -1,16 +1,6 @@
-module ActiveRecordSimpledbAdapter
-  class Railtie < ::Rails::Railtie
-    rake_tasks do
-      load 'tasks/simpledb.rake'
-    end
-
-    generators do
-      require 'generators/active_record/model/model_generator'
-    end
-
-    ActiveSupport.on_load(:active_record) do
-      require 'active_record/connection_adapters/simpledb_adapter'
-      require 'arel/visitors/simpledb'
-    end
-  end
+if defined?(Rails)
+  require "railtie"
+else
+  require 'active_record/connection_adapters/simpledb_adapter'
+  require 'arel/visitors/simpledb'
 end

data/lib/railtie.rb

@@ -0,0 +1,16 @@
+module ActiveRecordSimpledbAdapter
+  class Railtie < ::Rails::Railtie
+    rake_tasks do
+      load 'tasks/simpledb.rake'
+    end
+
+    generators do
+      require 'generators/active_record/model/model_generator'
+    end
+
+    ActiveSupport.on_load(:active_record) do
+      require 'active_record/connection_adapters/simpledb_adapter'
+      require 'arel/visitors/simpledb'
+    end
+  end
+end

data/spec/active_record/associations_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+describe "SimpleDBAdapter ActiveRecord associations" do
+  class Bar < ActiveRecord::Base
+    columns_definition do |t|
+      t.json :bar
+    end
+    has_many :fars
+  end
+  class Far < ActiveRecord::Base
+    columns_definition do |t|
+      t.json :bar
+      t.string :bar_id
+    end
+    belongs_to :bar
+  end
+
+  before :each do
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Base.establish_connection($config)
+    ActiveRecord::Base.connection.create_domain($config[:domain_name])
+  end
+
+  after :each do
+    ActiveRecord::Base.connection.delete_domain($config[:domain_name])
+  end
+
+  it "should create has many recources" do
+    t = Bar.create!
+    t.fars.create!
+    t.fars.count.should == 1
+  end
+end

data/spec/active_record/batch_spec.rb

@@ -0,0 +1,91 @@
+require 'spec_helper'
+#spec helpers difition
+class F < ActiveRecord::Base
+  columns_definition do |t|
+    t.string :body
+  end
+
+  has_many :bs
+  after_save lambda { self.bs.create!({:body => "test"}) }
+end
+class B < ActiveRecord::Base
+  columns_definition do |t|
+    t.string :body
+    t.string :f_id
+  end
+end
+#testes
+describe "SimpleDBAdapter ActiveRecord batches operation" do
+
+  before :each do
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Base.establish_connection($config)
+    ActiveRecord::Base.connection.create_domain($config[:domain_name])
+  end
+
+  after :each do
+    ActiveRecord::Base.connection.delete_domain($config[:domain_name])
+  end
+
+  it "should work with usual create statments" do
+    count = 5
+    Person.batch do
+      count.times { |i| Person.create_valid }
+      Person.count.should == 0
+    end
+    items = Person.all
+    items.count.should == count
+    items.each { |item| item.is_valid? }
+  end
+
+  it "should work with usual update statments" do
+    count = 5
+    items = []
+    count.times { items << Person.create_valid }
+    Person.batch do
+      items.each {|item| item.update_attributes({:login => 'test'}); item.save! }
+    end
+    items = Person.all
+    items.count.should == count
+    items.each { |item| item.login.should == 'test' }
+  end
+
+  it "should work with usual destroy statments" do
+    count = 5
+    items = []
+    count.times { items << Person.create_valid }
+    Person.batch do
+      items.each {|item| item.destroy }
+    end
+    Person.count.should == 0
+  end
+  
+  it "should work with diferrent statments in one batch session" do
+    count = 5
+    items = []
+    count.times { items << Person.create_valid }
+    Person.batch do
+      items.each do |item| 
+        item.destroy
+        Person.create_valid
+      end
+    end
+    Person.count.should == count
+  end
+
+  it "should auto split to several batches when count of items more than BATCH_MAX_ITEM_COUNT" do
+    count = 50
+    Person.batch do
+      count.times { |i| Person.create_valid }
+    end
+    Person.count.should == count
+  end
+
+  it "should batch internal operations too (sub-updates)" do
+    count = 5
+    F.batch do
+      count.times { F.create!({:body => "body"}) }
+    end
+    [F, B].each {|r| r.count.should == count }
+  end
+end