Permalink
Browse files

Merge pull request #53 from afrojas/use_ssl

use_ssl option added in preparation for fake_dynamo (or equivalent)
  • Loading branch information...
2 parents 08ad19e + 82dedb9 commit b5a339557d911443a0978ecdda1ee5de673a6e58 @Veraticus committed May 22, 2012
Showing with 5 additions and 4 deletions.
  1. +1 −1 lib/dynamoid/adapter/aws_sdk.rb
  2. +4 −3 lib/dynamoid/config.rb
@@ -18,7 +18,7 @@ module AwsSdk
#
# @since 0.2.0
def connect!
- @@connection = AWS::DynamoDB.new(:access_key_id => Dynamoid::Config.access_key, :secret_access_key => Dynamoid::Config.secret_key, :dynamo_db_endpoint => Dynamoid::Config.endpoint)
+ @@connection = AWS::DynamoDB.new(:access_key_id => Dynamoid::Config.access_key, :secret_access_key => Dynamoid::Config.secret_key, :dynamo_db_endpoint => Dynamoid::Config.endpoint, :use_ssl => Dynamoid::Config.use_ssl)
end
# Return the established connection.
View
@@ -3,7 +3,7 @@
require "dynamoid/config/options"
module Dynamoid
-
+
# Contains all the basic configuration information required for Dynamoid: both sensible defaults and required fields.
module Config
extend self
@@ -22,8 +22,9 @@ module Config
option :partitioning, :default => false
option :partition_size, :default => 200
option :endpoint, :default => 'dynamodb.us-east-1.amazonaws.com'
+ option :use_ssl, :default => true
option :included_models, :default => []
-
+
# The default logger for Dynamoid: either the Rails logger or just stdout.
#
# @since 0.2.0
@@ -37,7 +38,7 @@ def default_logger
def logger
@logger ||= default_logger
end
-
+
# If you want to, set the logger manually to any output you'd like. Or pass false or nil to disable logging entirely.
#
# @since 0.2.0

0 comments on commit b5a3395

Please sign in to comment.