activerecord-simpledb-adapter 0.2.1 → 0.3.0

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 group :development do
+  gem "awesome_print"
   gem "rspec", "~> 2.3.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"

data/Gemfile.lock

@@ -2,34 +2,35 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    aws (2.3.34)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.9)
+    awesome_print (0.3.2)
+    aws (2.4.5)
       activesupport
       http_connection
       uuidtools
@@ -42,35 +43,35 @@ GEM
       rspec (>= 2.0.0.beta.14)
       sc-core-ext (>= 1.2.1)
     git (1.2.5)
-    http_connection (1.4.0)
+    http_connection (1.4.1)
     i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    mail (2.2.14)
+    mail (2.2.17)
       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.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
@@ -88,9 +89,9 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
-    uuidtools (2.1.1)
-    xml-simple (1.0.12)
+    tzinfo (0.3.26)
+    uuidtools (2.1.2)
+    xml-simple (1.0.15)
 
 PLATFORMS
   ruby
@@ -98,6 +99,7 @@ PLATFORMS
 DEPENDENCIES
   activerecord
   activesupport
+  awesome_print
   aws
   bundler (~> 1.0.0)
   genspec (= 0.2.0.prerails3.2)

data/activerecord-simpledb-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-simpledb-adapter}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   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-01-21}
+  s.date = %q{2011-04-21}
   s.email = %q{ilia@flamefork.ru}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -22,6 +22,14 @@ Gem::Specification.new do |s|
     "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/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",
@@ -34,6 +42,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{ActiveRecord SimpleDB adapter}
   s.test_files = [
+    "spec/active_record/batch_spec.rb",
     "spec/active_record/connection_adapters/simpledb_adapter_spec.rb",
     "spec/active_record/core_actions_spec.rb",
     "spec/active_record/defaults_spec.rb",
@@ -52,6 +61,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<awesome_print>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -63,11 +73,12 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<thor>, [">= 0"])
       s.add_development_dependency(%q<rails>, [">= 0"])
       s.add_runtime_dependency(%q<aws>, ["~> 2.3.0"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.3"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.7"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.7"])
       s.add_runtime_dependency(%q<uuidtools>, ["~> 2.1.1"])
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0.7"])
     else
+      s.add_dependency(%q<awesome_print>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -79,12 +90,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thor>, [">= 0"])
       s.add_dependency(%q<rails>, [">= 0"])
       s.add_dependency(%q<aws>, ["~> 2.3.0"])
-      s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.7"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.7"])
       s.add_dependency(%q<uuidtools>, ["~> 2.1.1"])
-      s.add_dependency(%q<rails>, ["~> 3.0.3"])
+      s.add_dependency(%q<rails>, ["~> 3.0.7"])
     end
   else
+    s.add_dependency(%q<awesome_print>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -96,10 +108,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<thor>, [">= 0"])
     s.add_dependency(%q<rails>, [">= 0"])
     s.add_dependency(%q<aws>, ["~> 2.3.0"])
-    s.add_dependency(%q<activerecord>, ["~> 3.0.3"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.3"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.7"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.7"])
     s.add_dependency(%q<uuidtools>, ["~> 2.1.1"])
-    s.add_dependency(%q<rails>, ["~> 3.0.3"])
+    s.add_dependency(%q<rails>, ["~> 3.0.7"])
   end
 end
 

data/lib/active_record/connection_adapters/simpledb_adapter.rb

@@ -3,469 +3,11 @@ require 'active_support/core_ext/kernel/requires'
 require 'active_support/core_ext/hash'
 require 'uuidtools'
 
-class Aws::SdbInterface
-  def put_attributes(domain_name, item_name, attributes, replace = false, expected_attributes = {})
-    params = params_with_attributes(domain_name, item_name, attributes, replace, expected_attributes)
-    link = generate_request("PutAttributes", params)
-    request_info( link, QSdbSimpleParser.new )
-  rescue Exception
-    on_exception
-  end
-
-  def delete_attributes(domain_name, item_name, attributes = nil, expected_attributes = {})
-    params = params_with_attributes(domain_name, item_name, attributes, false, expected_attributes)
-    link = generate_request("DeleteAttributes", params)
-    request_info( link, QSdbSimpleParser.new )
-  rescue Exception
-    on_exception
-  end
-
-  private
-  def pack_expected_attributes(attributes) #:nodoc:
-    {}.tap do |result|
-      idx = 0
-      attributes.each do |attribute, value|
-        v = value.is_a?(Array) ? value.first : value
-        result["Expected.#{idx}.Name"]  = attribute.to_s
-        result["Expected.#{idx}.Value"] = ruby_to_sdb(v)
-        idx += 1
-      end
-    end
-  end
-
-  def pack_attributes(attributes = {}, replace = false, key_prefix = "")
-    {}.tap do |result|
-      idx = 0
-      if attributes
-        attributes.each do |attribute, value|
-          v = value.is_a?(Array) ? value.first : value
-          result["#{key_prefix}Attribute.#{idx}.Replace"] = 'true' if replace
-          result["#{key_prefix}Attribute.#{idx}.Name"] = attribute
-          result["#{key_prefix}Attribute.#{idx}.Value"] = ruby_to_sdb(v)
-          idx += 1
-        end
-      end
-    end
-  end
-
-  def params_with_attributes(domain_name, item_name, attributes, replace, expected_attrubutes)
-    {}.tap do |p|
-      p['DomainName'] = domain_name
-      p['ItemName'] = item_name
-      p.merge!(pack_attributes(attributes, replace)).merge!(pack_expected_attributes(expected_attrubutes))
-    end
-  end
-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'
-
-      config = config.symbolize_keys
-
-      ConnectionAdapters::SimpleDBAdapter.new nil, logger,
-          config[:access_key_id],
-          config[:secret_access_key],
-          config[:domain_name],
-          {
-              :server => config[:host],
-              :port => config[:port],
-              :protocol => config[:protocol],
-              :connection_mode => :per_thread,
-              :logger => SimpleDBLogger.new(logger)
-          },
-          config
-    end
-
-    DEFAULT_COLLECTION_COLUMN_NAME = "collection".freeze
-
-    def self.columns_definition options = {}
-      table_definition = ConnectionAdapters::SimpleDbTableDifinition.new(options[:collection_column_name] || DEFAULT_COLLECTION_COLUMN_NAME)
-      table_definition.primary_key(Base.get_primary_key(table_name.to_s.singularize))
-
-      alias_method_chain :initialize, :defaults
-      
-      yield table_definition if block_given?
-
-      ConnectionAdapters::SimpleDBAdapter.set_collection_columns table_name, table_definition
-    end
-
-    def initialize_with_defaults(attrs = nil)
-      initialize_without_defaults(attrs) do
-        safe_attribute_names = []
-        if attrs
-          stringified_attrs = attrs.stringify_keys
-          safe_attrs =  sanitize_for_mass_assignment(stringified_attrs)
-          safe_attribute_names = safe_attrs.keys.map { |x| x.to_s }
-        end
-
-        ActiveRecord::Base.connection.columns_definition(self.class.table_name).columns_with_defaults.each do |column|
-          if !safe_attribute_names.any? { |attr_name| attr_name =~ /^#{column.name}($|\()/ }
-            value =  if column.default.is_a? Proc
-                       column.default.call(self)
-                     else
-                       column.default
-                     end
-            __send__("#{column.name}=", value)
-            changed_attributes.delete(column.name)
-          end
-        end
-        yield(self) if block_given?
-      end
-    end
-
-  end
-
-  module Validations
-
-    class UniquenessValidator < ActiveModel::EachValidator
-
-      def validate_each(record, attribute, value)
-        finder_class = find_finder_class_for(record)
-        table = finder_class.unscoped
-
-        table_name   = record.class.quoted_table_name
-
-        if value && record.class.serialized_attributes.key?(attribute.to_s)
-          value = YAML.dump value
-        end
-
-        sql, params  = mount_sql_and_params(finder_class, table_name, attribute, value)
-
-        relation = table.where(sql, *params)
-
-        Array.wrap(options[:scope]).each do |scope_item|
-          scope_value = record.send(scope_item)
-          relation = relation.where(scope_item => scope_value)
-        end
-
-        if record.persisted?
-          # TODO : This should be in Arel
-          relation = relation.where("#{record.class.primary_key} != ?", record.send(:id))
-        end
-
-        if relation.exists?
-          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
-        end
-      end
-
-      protected
-      def mount_sql_and_params(klass, table_name, attribute, value) #:nodoc:
-        column = klass.columns_hash[attribute.to_s]
-
-        sql_attribute = "#{klass.connection.quote_column_name(column.db_column_name)}"
-        sql = "#{sql_attribute} = ?"
-        if value.nil?
-          [sql, [value]]
-        elsif (options[:case_sensitive] || !column.text?)
-          [sql, [value]]
-        else
-          [sql, [value.downcase]]
-        end
-      end
-    end
-
-  end
-
-  module ConnectionAdapters
-
-    class SimpleDbTableDifinition < TableDefinition
-
-      attr_reader :collection_column_name
-
-      def initialize collection_column_name
-        super nil
-        @collection_column_name = collection_column_name
-      end
-
-      def xml_column_fallback(*args)
-        raise ConfigurationError, "Not supported"
-      end
-
-      def [](name)
-        @columns.find {|column| column.db_column_name == name.to_s}
-      end
-
-      def column(name, type, options = {})
-        raise ConfigurationError, %Q(column '#{collection_column_name}' reserved, please change column name) if name.to_s == collection_column_name
-        @columns << SimpleDBColumn.new(name.to_s, type.to_sym, options[:limit], options[:precision], options[:to], options[:default])
-        self
-      end
-
-      def columns_with_defaults
-        @columns_with_defaults ||= @columns.select { |column| column.default.present? }
-      end
-
-    end
-
-    class SimpleDBColumn < Column
-
-      DEFAULT_NUMBER_LIMIT = 4
-      DEFAULT_FLOAT_PRECISION = 4
-
-      def initialize(name, type, limit = nil, pricision = nil, to = nil, default = nil)
-        super name, nil, type, true
-        @limit = limit if limit.present?
-        @precision = precision if precision.present?
-        @default = default
-        @to = to
-      end
-
-      def quote_number value
-        case sql_type
-          when :float then
-            sprintf("%.#{number_precision}f", number_shift + value.to_f)
-          else
-            (number_shift + value.to_i).to_s
-        end
-      end
-
-      def unquote_number value
-        return nil if value.nil?
-
-        case sql_type
-          when :integer then
-            value.to_i - number_shift
-          when :float then
-            precision_part = 10 ** number_precision
-            ((value.to_f - number_shift) * precision_part).round / precision_part.to_f
-          else
-            value
-        end
-      end
-
-      def db_column_name
-        @to || name
-      end
-
-      private
-      def number_shift
-        5 * 10 ** (limit || DEFAULT_NUMBER_LIMIT)
-      end
-
-      def number_precision
-        @precision || DEFAULT_FLOAT_PRECISION
-      end
-
-      def simplified_type(field_type)
-        t = field_type.to_s
-        if t == "primary_key"
-          :string
-        else
-          super(t)
-        end
-      end
-    end
-
-    class SimpleDBAdapter < AbstractAdapter
-
-      @@collections = {}
-      @@ccn = {}
-
-      def self.set_collection_columns table_name, columns_definition
-        @@collections[table_name] = columns_definition
-        @@ccn[table_name] = columns_definition.collection_column_name
-      end
-
-      def columns_definition table_name
-        @@collections[table_name]
-      end
-
-      def collection_column_name table_name
-        @@ccn[table_name]
-      end
-
-      ADAPTER_NAME = 'SimpleDB'.freeze
-
-      def adapter_name
-        ADAPTER_NAME
-      end
-
-      NIL_REPRESENTATION = "Aws::Nil".freeze
-
-      def nil_representation
-        NIL_REPRESENTATION
-      end
-
-
-      def supports_count_distinct?; false; end
-
-      #========= QUOTING =====================
-
-      #dirty hack for removing all (') from value for hash table attrubutes
-      def hash_value_quote(value, column = nil)
-        return nil if value.nil?
-        quote(value, column).gsub /^'*|'*$/, ''
-      end
-
-      def quote(value, column = nil)
-        if value.present? && column.present? && column.number?
-          "'#{column.quote_number value}'"
-        elsif value.nil?
-          "'#{nil_representation}'"
-        else
-          super
-        end
-      end
-
-      def quote_column_name(column_name)
-        "`#{column_name}`"
-      end
-      
-      def quote_table_name(table_name)
-        table_name
-      end
-      #=======================================
-
-      attr_reader :domain_name
-
-      def initialize(connection, logger, aws_key, aws_secret, domain_name, connection_parameters, config)
-        super(connection, logger)
-        @config = config
-        @domain_name = domain_name
-        @connection_parameters = [
-            aws_key,
-            aws_secret,
-            connection_parameters.merge(:nil_representation => nil_representation)
-        ]
-        connect
-      end
-
-      def connect
-        @connection = Aws::SdbInterface.new *@connection_parameters
-      end
-
-      def tables
-        @@collections.keys
-      end
-
-      def columns table_name, name = nil
-        @@collections[table_name].columns
-      end
-
-      def primary_key _
-        'id'
-      end
-
-      def execute sql, name = nil, skip_logging = false
-        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
-            @connection.put_attributes domain_name, item_name, sql[:attrs], true
-            @last_insert_id = item_name
-          when :update
-            item_name = get_id sql[:wheres], true
-            @connection.put_attributes domain_name, item_name, sql[:attrs], true, sql[:wheres]
-          when :delete
-            item_name = get_id sql[:wheres], true
-            @connection.delete_attributes domain_name, item_name, nil, sql[:wheres]
-          else
-            raise "Unsupported action: #{sql[:action].inspect}"
-          end
-        end
-      end
-
-      def insert_sql sql, name = nil, pk = nil, id_value = nil, sequence_name = nil
-        super || @last_insert_id
-      end
-      alias :create :insert_sql
-
-      def select sql, name = nil
-        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
-      end
-
-      # Executes the update statement and returns the number of rows affected.
-      def update_sql(sql, name = nil)
-        begin
-          execute(sql, name)
-          1
-        rescue Aws::AwsError => ex
-          #if not conflict state raise
-          raise if ex.http_code != '409'
-          0
-        end
-      end
-
-      # Executes the delete statement and returns the number of rows affected.
-      def delete_sql(sql, name = nil)
-        update_sql(sql, name)
-      end
-
-      def create_domain domain_name
-        @connection.create_domain domain_name
-      end
-
-      def delete_domain domain_name
-        @connection.delete_domain domain_name
-      end
-
-      def list_domains
-        @connection.list_domains[:domains]
-      end
-
-      private
-
-      def generate_id
-        UUIDTools::UUID.timestamp_create().to_s
-      end
-
-      def get_id hash, delete_id = false
-        if delete_id
-          hash.delete(:id) || hash.delete('id')
-        else
-          hash[:id] || hash['id']
-        end
-      end
-
-      def get_collection_column_and_name sql
-        if sql.match /`?(#{@@ccn.values.join("|")})`?\s*=\s*'(.*?)'/
-          $2
-        else
-          raise  PreparedStatementInvalid, "collection column '#{@@ccn.values.join(" or ")}' not found in the WHERE section in query"
-        end
-      end
-    end
-
-  end
-end
+require 'active_record/connection_adapters/simpledb_adapter/misc/aws_overrides'
+require 'active_record/connection_adapters/simpledb_adapter/misc/simpledb_logger'
+require 'active_record/connection_adapters/simpledb_adapter/finder_methods'
+require 'active_record/connection_adapters/simpledb_adapter/base'
+require 'active_record/connection_adapters/simpledb_adapter/validations'
+require 'active_record/connection_adapters/simpledb_adapter/table_definition'
+require 'active_record/connection_adapters/simpledb_adapter/column'
+require 'active_record/connection_adapters/simpledb_adapter/adapter'