dm-adapter-simpledb 1.1.0 → 1.2.0

data/README

@@ -62,6 +62,8 @@ http://github.com/devver/dm-adapter-simpledb/
  * Support of normalized 1:1 table:domain schemes that works with associations
  * Sharding
  * Support BatchPutAttributes
+ * Silence SSL warnings
+   See http://pivotallabs.com/users/carl/blog/articles/1079-standup-blog-11-24-2009-model-validations-without-backing-store-associations-to-array-and-ssl-with-aws
 
 == Usage
   

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/dm-adapter-simpledb/adapters/simpledb_adapter.rb

@@ -24,6 +24,7 @@ module DataMapper
         @sdb_options[:domain] = options.fetch(:domain) { 
           options[:path].to_s.gsub(%r{(^/+)|(/+$)},"") # remove slashes
         }
+        @sdb_options[:create_domain] = options.fetch(:create_domain) { false }
         # We do not expect to be saving any nils in future, because now we
         # represent null values by removing the attributes. The representation
         # here is chosen on the basis of it being unlikely to match any strings
@@ -35,6 +36,10 @@ module DataMapper
         @consistency_policy = 
           normalised_options.fetch(:wait_for_consistency) { false }
         @sdb = options.fetch(:sdb_interface) { nil }
+        if @sdb_options[:create_domain] && !domains.include?(@sdb_options[:domain])
+          @sdb_options[:logger].info "Creating domain #{domain}"
+          @sdb.create_domain(@sdb_options[:domain])
+        end
       end
 
       def create(resources)
@@ -146,6 +151,17 @@ module DataMapper
         end until tokens.include?(@current_consistency_token)
       end
 
+      def domains
+        result = []
+        token  = nil
+        begin
+          response = sdb.list_domains(nil, token)
+          result.concat(response[:domains])
+          token = response[:next_token]
+        end while(token)
+        result
+      end
+
     private
       # Returns the domain for the model
       def domain

data/lib/dm-adapter-simpledb/chunked_string.rb

@@ -45,7 +45,7 @@ module DmAdapterSimpledb
         #return original value, they could have put strings in the system not
         #using the adapter or previous versions that are larger than chunk size,
         #but less than 1024
-        value
+        value.to_s
       end
     end
 

data/lib/dm-adapter-simpledb/record.rb

@@ -68,6 +68,7 @@ module DmAdapterSimpledb
         @simpledb_attributes  = attrs_to_update
         @deletable_attributes = attrs_to_delete
         @item_name = item_name_for_resource(hash_or_resource)
+        @model = hash_or_resource.model
       when Hash
         hash = hash_or_resource
         @item_name = hash.keys.first
@@ -142,10 +143,16 @@ module DmAdapterSimpledb
     # Returns the "Table" this record belongs to. SimpleDB has no concept of
     # tables, but we fake it with metadata.
     def table
-      Table.name_from_metadata(metadata) || 
+      table_name_from_model || Table.name_from_metadata(metadata) || 
         storage_name
     end
 
+    def table_name_from_model(repository=DataMapper.repository.name)
+      if defined?(@model) && @model
+        @model.storage_name(repository)
+      end
+    end
+
     def metadata
       simpledb_attributes[METADATA_KEY]
     end

data/spec/integration/simpledb_adapter_spec.rb

@@ -224,4 +224,5 @@ EOF
       attributes["__dm_metadata"].should include("table:projects")
     end
   end
+
 end

data/spec/unit/record_spec.rb

@@ -235,6 +235,7 @@ describe DmAdapterSimpledb::Record do
       @resource_class = Class.new do
         include DataMapper::Resource
         storage_names[:default] = "books"
+        storage_names[:backup]  = "tomes"
 
         property :author,       String, :key => true
         property :date,         Date
@@ -310,6 +311,13 @@ describe DmAdapterSimpledb::Record do
       end
 
     end
+
+    it "should take repo into account when determining table name" do
+      DataMapper.repository(:backup) do
+        @it.table.should be == "tomes"
+      end
+    end
+
   end
 
   describe "given a saved datamapper resource" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-adapter-simpledb
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Jeremy Boles
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -05:00
+date: 2010-01-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,7 +110,6 @@ files:
 - Rakefile
 - VERSION
 - aws_config.sample
-- dm-adapter-simpledb.gemspec
 - lib/dm-adapter-simpledb.rb
 - lib/dm-adapter-simpledb/adapters/simpledb_adapter.rb
 - lib/dm-adapter-simpledb/chunked_string.rb

data/dm-adapter-simpledb.gemspec

@@ -1,119 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{dm-adapter-simpledb}
-  s.version = "1.1.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeremy Boles", "Edward Ocampo-Gooding", "Dan Mayer", "Thomas Olausson", "Avdi Grimm"]
-  s.date = %q{2009-11-24}
-  s.description = %q{A DataMapper adapter for Amazon's SimpleDB service. 
-
-Features:
- * Uses the RightAWS gem for efficient SimpleDB operations.
- * Full set of CRUD operations
- * Supports all DataMapper query predicates.
- * Can translate many queries into efficient native SELECT operations.
- * Migrations
- * DataMapper identity map support for record caching
- * Lazy-loaded attributes
- * DataMapper Serial property support via UUIDs.
- * Array properties
- * Basic aggregation support (Model.count("..."))
- * String "chunking" permits attributes to exceed the 1024-byte limit
-
-Note: as of version 1.0.0, this gem supports supports the DataMapper 0.10.*
-series and breaks backwards compatibility with DataMapper 0.9.*.
-}
-  s.email = %q{devs@devver.net}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".autotest",
-     ".gitignore",
-     "History.txt",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "aws_config.sample",
-     "dm-adapter-simpledb.gemspec",
-     "lib/dm-adapter-simpledb.rb",
-     "lib/dm-adapter-simpledb/adapters/simpledb_adapter.rb",
-     "lib/dm-adapter-simpledb/chunked_string.rb",
-     "lib/dm-adapter-simpledb/migrations/simpledb_adapter.rb",
-     "lib/dm-adapter-simpledb/rake.rb",
-     "lib/dm-adapter-simpledb/record.rb",
-     "lib/dm-adapter-simpledb/sdb_array.rb",
-     "lib/dm-adapter-simpledb/table.rb",
-     "lib/dm-adapter-simpledb/utils.rb",
-     "lib/simpledb_adapter.rb",
-     "scripts/simple_benchmark.rb",
-     "spec/integration/associations_spec.rb",
-     "spec/integration/compliance_spec.rb",
-     "spec/integration/date_spec.rb",
-     "spec/integration/limit_and_order_spec.rb",
-     "spec/integration/migrations_spec.rb",
-     "spec/integration/multiple_records_spec.rb",
-     "spec/integration/nils_spec.rb",
-     "spec/integration/sdb_array_spec.rb",
-     "spec/integration/simpledb_adapter_spec.rb",
-     "spec/integration/spec_helper.rb",
-     "spec/spec.opts",
-     "spec/unit/record_spec.rb",
-     "spec/unit/simpledb_adapter_spec.rb",
-     "spec/unit/unit_spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/devver/dm-adapter-simpledb}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{DataMapper adapter for Amazon SimpleDB}
-  s.test_files = [
-    "spec/integration/nils_spec.rb",
-     "spec/integration/limit_and_order_spec.rb",
-     "spec/integration/compliance_spec.rb",
-     "spec/integration/simpledb_adapter_spec.rb",
-     "spec/integration/date_spec.rb",
-     "spec/integration/sdb_array_spec.rb",
-     "spec/integration/migrations_spec.rb",
-     "spec/integration/spec_helper.rb",
-     "spec/integration/multiple_records_spec.rb",
-     "spec/integration/associations_spec.rb",
-     "spec/unit/simpledb_adapter_spec.rb",
-     "spec/unit/unit_spec_helper.rb",
-     "spec/unit/record_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.0"])
-      s.add_runtime_dependency(%q<dm-aggregates>, ["~> 0.10.0"])
-      s.add_runtime_dependency(%q<dm-migrations>, ["~> 0.10.0"])
-      s.add_runtime_dependency(%q<dm-types>, ["~> 0.10.0"])
-      s.add_runtime_dependency(%q<uuidtools>, ["~> 2.0"])
-      s.add_runtime_dependency(%q<right_aws>, ["~> 1.10"])
-    else
-      s.add_dependency(%q<dm-core>, ["~> 0.10.0"])
-      s.add_dependency(%q<dm-aggregates>, ["~> 0.10.0"])
-      s.add_dependency(%q<dm-migrations>, ["~> 0.10.0"])
-      s.add_dependency(%q<dm-types>, ["~> 0.10.0"])
-      s.add_dependency(%q<uuidtools>, ["~> 2.0"])
-      s.add_dependency(%q<right_aws>, ["~> 1.10"])
-    end
-  else
-    s.add_dependency(%q<dm-core>, ["~> 0.10.0"])
-    s.add_dependency(%q<dm-aggregates>, ["~> 0.10.0"])
-    s.add_dependency(%q<dm-migrations>, ["~> 0.10.0"])
-    s.add_dependency(%q<dm-types>, ["~> 0.10.0"])
-    s.add_dependency(%q<uuidtools>, ["~> 2.0"])
-    s.add_dependency(%q<right_aws>, ["~> 1.10"])
-  end
-end
-