activerecord-simpledb-adapter 0.1.1 → 0.1.2

data/README.md

@@ -33,7 +33,7 @@ model example:
 	    t.string :login
 	    t.integer :year, :limit => 4
 	    t.boolean :active
-	    t.string :from, :to => 'from_property'
+	    t.string :from
 	    t.float :price
 	    t.integer :lock_version
 

data/activerecord-simpledb-adapter.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-simpledb-adapter}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Alex Gorkunov", "Cloud Castle Inc."]
@@ -30,7 +30,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{ActiveRecord SimpleDB adapter}
   s.test_files = [
-    "spec/activerecord-simpledb-adapter_spec.rb",
+    "spec/active_record/connection_adapters/simpledb_adapter_spec.rb",
+    "spec/active_record/core_actions_spec.rb",
+    "spec/active_record/locking_spec.rb",
+    "spec/active_record/record_attributes_spec.rb",
+    "spec/active_record/validates_spec.rb",
+    "spec/active_record/where_spec.rb",
     "spec/spec_helper.rb"
   ]
 

data/lib/active_record/connection_adapters/simpledb_adapter.rb

@@ -58,6 +58,22 @@ class Aws::SdbInterface
 end
 
 module ActiveRecord
+
+  class SimpleDBLogger
+    def initialize(logger)
+      @logger = logger
+    end
+
+    def info *args
+      #skip noisy info messages from aws interface
+    end
+
+    def method_missing m, *args
+      @logger.send(m, args)
+    end
+
+  end
+
   class Base
     def self.simpledb_connection(config) # :nodoc:
       require 'aws'
@@ -72,7 +88,7 @@ module ActiveRecord
               :server => config[:host],
               :port => config[:port],
               :protocol => config[:protocol],
-              :logger => logger
+              :logger => SimpleDBLogger.new(logger)
           },
           config
     end
@@ -318,8 +334,8 @@ module ActiveRecord
       end
 
       def execute sql, name = nil, skip_logging = false
-        p sql
-        case sql[:action]
+        log sql.inspect, "SimpleDB" do
+          case sql[:action]
           when :insert
             item_name = get_id sql[:attrs]
             item_name = sql[:attrs][:id] = generate_id unless item_name
@@ -333,6 +349,7 @@ module ActiveRecord
             @connection.delete_attributes domain_name, item_name, nil, sql[:wheres]
           else
             raise "Unsupported action: #{sql[:action].inspect}"
+          end
         end
       end
 
@@ -342,30 +359,29 @@ module ActiveRecord
       alias :create :insert_sql
 
       def select sql, name = nil
-        puts sql
-        result = []
-        response = @connection.select(sql, nil, true)
-        collection_name = get_collection_column_and_name(sql)
-        columns = columns_definition(collection_name)
-
-        response[:items].each do |item|
-          item.each do |id, attrs|
-            ritem = {}
-            ritem['id'] = id unless id == 'Domain' && attrs['Count'] # unless count(*) result
-            attrs.each {|k, vs|
-              column = columns[k]
-              if column.present?
-                ritem[column.name] = column.unquote_number(vs.first)
-              else
-                ritem[k] = vs.first
-              end
-            }
-            puts ritem.inspect
-            result << ritem
+        log sql, "SimpleDB" do
+          result = []
+          response = @connection.select(sql, nil, true)
+          collection_name = get_collection_column_and_name(sql)
+          columns = columns_definition(collection_name)
+
+          response[:items].each do |item|
+            item.each do |id, attrs|
+              ritem = {}
+              ritem['id'] = id unless id == 'Domain' && attrs['Count'] # unless count(*) result
+              attrs.each {|k, vs|
+                column = columns[k]
+                if column.present?
+                  ritem[column.name] = column.unquote_number(vs.first)
+                else
+                  ritem[k] = vs.first
+                end
+              }
+              result << ritem
+            end
           end
+          result
         end
-        # puts "Box usage: #{response[:box_usage].to_f}"
-        result
       end
 
       # Executes the update statement and returns the number of rows affected.
@@ -414,7 +430,7 @@ module ActiveRecord
           raise  PreparedStatementInvalid, "collection column '#{@@ccn.values.join(" or ")}' not found in the WHERE section in query"
         end
       end
-
     end
+
   end
 end

data/spec/active_record/connection_adapters/simpledb_adapter_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+describe "SimpleDBAdapter establish connection" do
+
+  it "should connect to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.should_not be_nil
+    ActiveRecord::Base.connection.class.should == ActiveRecord::ConnectionAdapters::SimpleDBAdapter
+  end
+
+  it "should be active after connection to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.should be_active
+  end
+
+  it "should not be active after disconnection to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.disconnect!
+    ActiveRecord::Base.connection.should_not be_active
+  end
+
+  it "should be active after reconnection to database" do
+    ActiveRecord::Base.establish_connection(CONNECTION_PARAMS)
+    ActiveRecord::Base.connection.reconnect!
+    ActiveRecord::Base.connection.should be_active
+  end
+  
+end

data/spec/active_record/core_actions_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe "SimpleDBAdapter ActiveRecord core actions" do
+
+  before :each do
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Base.establish_connection($config)
+    ActiveRecord::Base.connection.create_domain($config[:domain_name])
+    Person.create!(Person.valid_params)
+  end
+
+  after :each do
+    ActiveRecord::Base.connection.delete_domain($config[:domain_name])
+  end
+
+  it "should be correct work with .all statement" do
+    Person.all.should_not be_empty
+    Person.all.first.is_a?(Person).should be_true
+  end
+
+  it "should be correct work with .first statement" do
+    Person.first.is_a?(Person).should be_true
+  end
+
+  it "should be correct work with .last statement" do
+    Person.last.is_a?(Person).should be_true
+  end
+
+  it "should be correct work with .count statement" do
+    Person.count.should > 0
+  end
+
+  it "should be correct work with .find statement" do
+    p1 = Person.create!
+    p2 = Person.find p1.id
+    p1.should == p2
+  end
+  
+  it "should be correct work with .destroy statement" do
+    p1 = Person.new
+    p1.save
+    id = p1.id
+    p1.destroy
+    p2 = Person.find_by_id id
+    p2.should be_nil
+  end
+end

data/spec/active_record/locking_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe "SimpleDBAdapter ActiveRecord with optimistic locking" 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 be have not nil lock version value after save" do
+    p = Person.new
+    p.save
+    p.reload
+    p.lock_version.should_not be_nil
+  end
+
+  it "should change lock version value after sevarals saves" do
+    p = Person.new
+    p.save
+    old_lock_version = p.lock_version
+    p.login = "blabla"
+    p.save
+    p.reload
+    p.lock_version.should_not == old_lock_version
+  end
+
+  it "should raise error when tried save model with non-actual values (changed another place and time)" do
+    p = Person.new
+    p.save
+    p1 = Person.find p.id
+    p1.login = "blabla"
+    p.login = "bla"
+    p1.save
+    lambda {p.save!}.should raise_error(ActiveRecord::StaleObjectError)
+  end
+
+  it "should raise error when tried destroy item with changed state" do
+    p = Person.new
+    p.save
+    p1 = Person.find p.id
+    p1.login = "blabla"
+    p1.save
+    lambda {p.destroy}.should raise_error(ActiveRecord::StaleObjectError)
+  end
+end

data/spec/active_record/record_attributes_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe "SimpleDBAdapter ActiveRecord attributes" 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 correct auto-generated properites (id, created_at, updated_at)" do
+    p = Person.new
+    p.id.should be_nil
+    p.created_at.should be_nil
+    p.updated_at.should be_nil
+    p.save!
+    p.id.should_not be_nil
+    p.created_at.should_not be_nil
+    p.updated_at.should_not be_nil
+  end
+
+  it "should be different ids for different model instances after create" do
+    p1 = Person.create!
+    p2 = Person.create!
+    p1.id.should_not == p2.id
+  end
+
+  it "should correct saved and loaded" do
+    p = Person.create!(Person.valid_params)
+
+    r = Person.find p.id
+    Person.valid_params.each do |key, value|
+      r.try(key).should == value
+    end
+  end
+
+  it "should correct save and load integer values" do
+    p = Person.new
+    p.year = 2010
+    p.save
+    p.year = p.year + 1
+    p.save
+    p.reload
+    p.year.is_a?(Fixnum).should be_true
+    p.year.should == 2011
+  end
+
+  it "should correct save and load float values" do
+    p = Person.new
+    p.price = 10.04
+    p.save
+    p.price = p.price + 1.2
+    p.save
+    p.reload
+    p.price.is_a?(Float).should be_true
+    p.price.should == 11.24
+  end
+
+  it "should corrert save and load negative values" do
+    p = Person.new
+    p.price = -10.04
+    p.year = -200
+    p.save
+    p.price = p.price - 1.02
+    p.year = p.year - 2
+    p.save
+    p.reload
+    p.price.should == -11.06
+    p.year.should == -202
+  end
+
+  it "should correct save and load boolean values" do
+    p = Person.new
+    p.active = true
+    p.save
+    p.reload
+    p.active.should be_true
+    p.active = false
+    p.save
+    p.reload
+    p.active.should be_false
+  end
+
+  it "should correct save and load string values" do
+    p = Person.new
+    p.login = "superman"
+    p.save
+    p.login = p.login + "123"
+    p.save
+    p.reload
+    p.login.should == "superman123"
+  end
+  
+  it "should update updated_at property when invoke .touch" do
+    p1 = Person.new
+    p1.save
+    p2 = Person.find p1.id
+    p1.touch
+    p1.updated_at.class.should == Time
+    p1.updated_at.should > p2.updated_at
+  end
+end

data/spec/active_record/validates_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe "SimpleDBAdapter ActiveRecord validates" 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 be correct work with validates presense of" do
+    class PersonWithValidates < Person
+      validates_presence_of :login
+    end
+
+    lambda {
+      PersonWithValidates.create!
+    }.should raise_error(ActiveRecord::RecordInvalid, "Validation failed: Login can't be blank")
+  end
+  
+  it "should be correct work with validates uniqueness of" do
+    class PersonWithValidates < Person
+      validates_uniqueness_of :login
+    end
+
+    PersonWithValidates.create!(Person.valid_params)
+
+    lambda {
+      PersonWithValidates.create!(Person.valid_params)
+    }.should raise_error(ActiveRecord::RecordInvalid, "Validation failed: Login has already been taken")
+  end
+end

data/spec/active_record/where_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe "SimpleDBAdapter ActiveRecord where statement" do
+
+  before :each do
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    ActiveRecord::Base.establish_connection($config)
+    ActiveRecord::Base.connection.create_domain($config[:domain_name])
+    Person.create!(Person.valid_params)
+  end
+
+  after :each do
+    ActiveRecord::Base.connection.delete_domain($config[:domain_name])
+  end
+
+  it "should be return items by conditions with different type values" do
+    Person.valid_params.each do |name, value|
+      result = Person.where(name => value).first
+      result.try(name).should == value
+    end
+  end
+  
+  it "should be return items by condition with table name prefix" do
+    result = Person.where("people.state" => 'paid').first
+    result.state.should == 'paid'
+  end
+end

data/spec/spec_helper.rb

@@ -38,7 +38,7 @@ class Person < ActiveRecord::Base
     t.string :login
     t.integer :year, :limit => 4
     t.boolean :active
-    t.string :from
+    t.string :state
     t.float :price
     t.integer :lock_version
 
@@ -51,7 +51,7 @@ class Person < ActiveRecord::Base
         :year => 2010,
         :active => true,
         :price => 10.04,
-        :from => 'paid'
+        :state => 'paid'
     }
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-simpledb-adapter
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -205,7 +205,12 @@ files:
 - lib/activerecord-simpledb-adapter.rb
 - lib/arel/visitors/simpledb.rb
 - lib/tasks/simpledb.rake
-- spec/activerecord-simpledb-adapter_spec.rb
+- spec/active_record/connection_adapters/simpledb_adapter_spec.rb
+- spec/active_record/core_actions_spec.rb
+- spec/active_record/locking_spec.rb
+- spec/active_record/record_attributes_spec.rb
+- spec/active_record/validates_spec.rb
+- spec/active_record/where_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/cloudcastle/activerecord-simpledb-adapter
@@ -242,5 +247,10 @@ signing_key:
 specification_version: 3
 summary: ActiveRecord SimpleDB adapter
 test_files: 
-- spec/activerecord-simpledb-adapter_spec.rb
+- spec/active_record/connection_adapters/simpledb_adapter_spec.rb
+- spec/active_record/core_actions_spec.rb
+- spec/active_record/locking_spec.rb
+- spec/active_record/record_attributes_spec.rb
+- spec/active_record/validates_spec.rb
+- spec/active_record/where_spec.rb
 - spec/spec_helper.rb

data/spec/activerecord-simpledb-adapter_spec.rb

@@ -1,149 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "model with active_record_simple_db" do
-
-  before :each do
-    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
-  #test .new
-  it "should be without id, created_at and updated_at when model is new" do
-    p = Person.new
-    p.id.should be_nil
-    p.created_at.should be_nil
-    p.updated_at.should be_nil
-  end
-
-  #test .create and .save
-  it "should be with id, created_at and updated_at when saved when new model was saved or created immediately" do
-    p1 = Person.new
-    p1.save
-    p1.id.should_not be_nil
-    p1.created_at.should_not be_nil
-    p1.updated_at.should_not be_nil
-    p2 = Person.create!
-    p2.id.should_not be_nil
-    p2.created_at.should_not be_nil
-    p2.updated_at.should_not be_nil
-  end
-
-  #test correct saving/loading properties
-  it "should correct save and load all properties" do
-    p = Person.create!(Person.valid_params)
-
-    r = Person.find p.id
-    Person.valid_params.each do |key, value|
-      r.try(key).should == value
-    end
-  end
-
-  #test validates instructions
-  it "should be correct work with validates instruction" do
-    class PersonWithValidates < Person
-      validates_presence_of :login
-      validates_uniqueness_of :login
-    end
-
-    lambda {
-      PersonWithValidates.create!
-    }.should raise_error(ActiveRecord::RecordInvalid, "Validation failed: Login can't be blank")
-
-    PersonWithValidates.create!(Person.valid_params)
-
-    lambda {
-      PersonWithValidates.create!(Person.valid_params)
-    }.should raise_error(ActiveRecord::RecordInvalid, "Validation failed: Login has already been taken")
-  end
-
-  #test .create
-  it "should be different ids for different model instances" do
-    p1 = Person.create!
-    p2 = Person.create!
-    p1.id.should_not == p2.id
-  end
-
-  #test .find
-  it "should be found entry by id" do
-    p1 = Person.create!
-    p2 = Person.find p1.id
-    p1.should == p2
-  end
-
-  #test .all
-  it "should return collection of models when invoke .all" do
-    p = Person.new
-    p.save
-    r = Person.all
-    r.should_not be_nil
-    r.should_not be_empty
-  end
-
-  #test .first
-  it "should return valid entry when invoke .first" do
-    p = Person.new
-    p.save
-    p1 = Person.first
-    p1.should_not be_nil
-  end
-
-  #test .first
-  it "should return valid entry when invoke .last" do
-    p = Person.new
-    p.save
-    p1 = Person.last
-    p1.should_not be_nil
-  end
-
-  #test .touch
-  it "should update updated_at property when invoke .touch" do
-    p1 = Person.new
-    p1.save
-    p2 = Person.find p1.id
-    p1.touch
-    p1.updated_at.should > p2.updated_at
-  end
-
-  #test .destroy
-  it "should be destroy entry when invoke destroy" do
-    p1 = Person.new
-    p1.save
-    id = p1.id
-    p1.destroy
-    p2 = Person.find_by_id id
-    p2.should be_nil
-  end
-
-  #test optimistic locking
-  it "should be throw exception when invoke destroy twice for same object" do
-    p1 = Person.new
-    p1.save
-    p2 = Person.find p1.id
-    p1.year = 2008
-    p1.save
-    lambda {p2.destroy}.should raise_error(ActiveRecord::StaleObjectError)
-  end
-
-  #test where selection
-  it "should be correct work with where statment with equalities" do
-    p1 = Person.new
-    p1.year = 2008
-    p1.save
-    p2 = Person.new
-    p2.year = 2010
-    p2.save
-    p = Person.where(:year => 2010).all
-    p.should_not be_empty
-  end
-
-  it "should be correct work with where statment with \"from\" column" do
-    p1 = Person.new
-    p1.from = 'test'
-    p1.save
-    p = Person.where(:from => 'test').all
-    p.should_not be_empty
-  end
-end