activerecord-simpledb-adapter 0.4.6 → 0.4.7

data/Gemfile

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

data/Gemfile.lock

@@ -2,12 +2,12 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+    actionmailer (3.0.9)
+      actionpack (= 3.0.9)
+      mail (~> 2.2.19)
+    actionpack (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -15,26 +15,28 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
+    activerecord (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
+    activeresource (3.0.9)
+      activemodel (= 3.0.9)
+      activesupport (= 3.0.9)
+    activesupport (3.0.9)
     arel (2.0.10)
     awesome_print (0.4.0)
-    aws (2.5.3)
+    aws (2.3.34)
+      activesupport
       http_connection
       uuidtools
       xml-simple
     builder (2.1.2)
+    columnize (0.3.4)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -44,10 +46,12 @@ GEM
     git (1.2.5)
     http_connection (1.4.1)
     i18n (0.5.0)
-    jeweler (1.6.0)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -60,21 +64,24 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.0.9)
+      actionmailer (= 3.0.9)
+      actionpack (= 3.0.9)
+      activerecord (= 3.0.9)
+      activeresource (= 3.0.9)
+      activesupport (= 3.0.9)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.0.9)
+    railties (3.0.9)
+      actionpack (= 3.0.9)
+      activesupport (= 3.0.9)
       rake (>= 0.8.7)
+      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.0)
+    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)
@@ -83,27 +90,31 @@ GEM
     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)
     sc-core-ext (1.2.1)
       activesupport (>= 2.3.5)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.29)
     uuidtools (2.1.2)
-    xml-simple (1.0.15)
+    xml-simple (1.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
-  activesupport
   awesome_print
-  aws
-  bundler (~> 1.0.0)
+  aws (~> 2.3.0)
   genspec (= 0.2.0.prerails3.2)
   jeweler
-  rails
+  rails (~> 3.0.9)
   rcov
   rspec (~> 2.3.0)
+  ruby-debug
   thor
+  uuidtools (~> 2.1.1)

data/activerecord-simpledb-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-simpledb-adapter}
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   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-05-24}
+  s.date = %q{2011-07-07}
   s.email = %q{ilia@flamefork.ru}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -48,57 +48,39 @@ Gem::Specification.new do |s|
     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<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<aws>, [">= 0"])
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<genspec>, ["= 0.2.0.prerails3.2"])
       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.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.7"])
+      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<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<aws>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<genspec>, ["= 0.2.0.prerails3.2"])
       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.7"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.7"])
-      s.add_dependency(%q<uuidtools>, ["~> 2.1.1"])
-      s.add_dependency(%q<rails>, ["~> 3.0.7"])
+      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<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<aws>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<genspec>, ["= 0.2.0.prerails3.2"])
     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.7"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.7"])
-    s.add_dependency(%q<uuidtools>, ["~> 2.1.1"])
-    s.add_dependency(%q<rails>, ["~> 3.0.7"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
   end
 end
 

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

@@ -34,17 +34,9 @@ module ActiveRecord
 
       #========= 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}'"
+        if value.nil?
+          quote(nil_representation, column)
         else
           super
         end
@@ -188,7 +180,7 @@ module ActiveRecord
               attrs.each {|k, vs|
                 column = columns[k]
                 if column.present?
-                  ritem[column.name] = column.unquote_number(vs.first)
+                  ritem[column.name] = column.unconvert(vs.first)
                 else
                   ritem[k] = vs.first
                 end

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

@@ -35,5 +35,10 @@ module ActiveRecord
       block.call
       connection.commit_batch
     end
+
+    #disable quoting for id
+    def quoted_id
+      id
+    end
   end
 end

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

@@ -1,6 +1,8 @@
 module ActiveRecord
   module ConnectionAdapters
     class SimpleDBColumn < Column
+      # include qouting for correct converting date to sdb
+      include Quoting
 
       DEFAULT_NUMBER_LIMIT = 4
       DEFAULT_FLOAT_PRECISION = 4
@@ -13,24 +15,36 @@ module ActiveRecord
         @to = to
       end
 
-      def quote_number value
+      #convert to sdb
+      def convert value
+        return nil if value.nil?
         case sql_type
           when :float then
             sprintf("%.#{number_precision}f", number_shift + value.to_f)
-          else
+          when :integer then
             (number_shift + value.to_i).to_s
+          when :json then
+            ActiveSupport::JSON.encode(value)
+          else
+            if value.acts_like?(:date) || value.acts_like?(:time)
+              quoted_date(value)
+            else
+              value.to_s
+            end
         end
       end
 
-      def unquote_number value
+      #unconvert to sdb
+      def unconvert 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
+          when :json then
+            ActiveSupport::JSON.decode(value)
           else
             value
         end

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

@@ -27,6 +27,13 @@ module ActiveRecord
         @columns_with_defaults ||= @columns.select { |column| column.default.present? }
       end
 
+      #for json type
+      def json(*args)
+        options = args.extract_options!                                       
+        column_names = args                                                   
+        column_names.each { |name| column(name, 'json', options) }  
+      end                                                                     
+
     end
   end
 end

data/lib/arel/visitors/simpledb.rb

@@ -4,10 +4,6 @@ module Arel
     class SimpleDB < Arel::Visitors::ToSql
       private
 
-      def hash_value_quote value, column = nil
-        @connection.hash_value_quote value, column
-      end
-
       def visit_Arel_Nodes_DeleteStatement o
         {
             :action => :delete,
@@ -54,8 +50,8 @@ module Arel
 
       def visit_Arel_Nodes_Values o
         result = {}
-        o.expressions.zip(o.columns).map {|value, column|
-          result[column.column.db_column_name] = hash_value_quote(value, column.column)
+        o.expressions.zip(o.columns).map {|v, c|
+          result[c.column.db_column_name] = c.column.convert(v)
         }
         result
       end
@@ -69,20 +65,17 @@ module Arel
       end
       
       def visit_Arel_Nodes_Assignment o
-        right = o.right ? hash_value_quote(o.right, o.left.column) : nil
+        right = o.right ? o.left.column.convert(o.right) : nil
         left = o.left.column.name
         {left => right}
       end
 
       def visit_Arel_Nodes_Equality o
-        right = o.right ? hash_value_quote(o.right, o.left.column) : nil
-        begin
+        right = o.right ? o.left.column.convert(o.right) : nil
         left = o.left.column.name
-        rescue
-          puts $!.backtrace
-        end
         {left => right}.tap { |m|
-          m.override_to_s "#{visit o.left} = #{quote(o.right, o.left.column)}"
+          value = o.left.column.convert(o.right)
+          m.override_to_s "#{visit o.left} = #{quote(value)}"
         }
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-simpledb-adapter
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -17,55 +17,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 +04:00
+date: 2011-07-07 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
+        - 3
         - 0
-        version: "0"
+        version: 2.3.0
   requirement: *id001
   prerelease: false
-  type: :development
-  name: awesome_print
+  type: :runtime
+  name: aws
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 21
         segments: 
-        - 2
         - 3
         - 0
-        version: 2.3.0
+        - 9
+        version: 3.0.9
   requirement: *id002
   prerelease: false
-  type: :development
-  name: rspec
+  type: :runtime
+  name: rails
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 9
         segments: 
+        - 2
         - 1
-        - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 2.1.1
   requirement: *id003
   prerelease: false
-  type: :development
-  name: bundler
+  type: :runtime
+  name: uuidtools
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -79,21 +81,23 @@ dependencies:
   requirement: *id004
   prerelease: false
   type: :development
-  name: jeweler
+  name: awesome_print
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
+        - 3
         - 0
-        version: "0"
+        version: 2.3.0
   requirement: *id005
   prerelease: false
   type: :development
-  name: rcov
+  name: rspec
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -107,7 +111,7 @@ dependencies:
   requirement: *id006
   prerelease: false
   type: :development
-  name: aws
+  name: jeweler
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -121,23 +125,9 @@ dependencies:
   requirement: *id007
   prerelease: false
   type: :development
-  name: activerecord
+  name: rcov
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
-  prerelease: false
-  type: :development
-  name: activesupport
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -150,12 +140,12 @@ dependencies:
         - prerails3
         - 2
         version: 0.2.0.prerails3.2
-  requirement: *id009
+  requirement: *id008
   prerelease: false
   type: :development
   name: genspec
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -164,12 +154,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
+  requirement: *id009
   prerelease: false
   type: :development
   name: thor
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -178,90 +168,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
+  requirement: *id010
   prerelease: false
   type: :development
-  name: rails
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        version: 2.3.0
-  requirement: *id012
-  prerelease: false
-  type: :runtime
-  name: aws
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 0
-        - 7
-        version: 3.0.7
-  requirement: *id013
-  prerelease: false
-  type: :runtime
-  name: activerecord
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 0
-        - 7
-        version: 3.0.7
-  requirement: *id014
-  prerelease: false
-  type: :runtime
-  name: activesupport
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
-        version: 2.1.1
-  requirement: *id015
-  prerelease: false
-  type: :runtime
-  name: uuidtools
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id016 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 3
-        - 0
-        - 7
-        version: 3.0.7
-  requirement: *id016
-  prerelease: false
-  type: :runtime
-  name: rails
+  name: ruby-debug
 description: 
 email: ilia@flamefork.ru
 executables: []