ocean-rails 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7956549c44a22d159ec86fe06cc90be8bd71636
-  data.tar.gz: 4ad871419b599e71c22ba893319068f5cbfa1fde
+  metadata.gz: d5c44b8c69112c22983de235e2f5132bd217ba76
+  data.tar.gz: bc171e271ad2b8e2a36edc9039d662da416d159c
 SHA512:
-  metadata.gz: e72c5b332cff1f9e34fe22d815edd4cad90eb72243a4162dc055c66a461319df4fde5a7f9ddd4279e01a6eecdeaad731673acc30b764a4002bf00a7746464973
-  data.tar.gz: 51b9c89cdb45a9cdbbac8fd6d405b6809cebcac887378ea40afc8aeccb0a4a4908b874af1669c668595d7498184c06a36194f4c71a143a714aae866d030df48b
+  metadata.gz: 64846dd878b0f1176007383dd028fac44570fa6c797e0e7f0519681709479c5e6f56127abdd6a2cef05e998e1836361fcaf13fcebda0b25c87e90bb190e8106c
+  data.tar.gz: faa9281445150744c0cf5d721d18def94e23e4c51d98f413df52bfeae67f2d9e8d21eebe71a99a89fbcb834f102609bc45c045b98859739d3b6e1925e94c79a0

data/README.rdoc

@@ -74,40 +74,25 @@ You can now proceed to tailor the new resource to your needs. You will want to a
 
 === Running the specs
 
-To run the specs for the ocean-rails gem, you must first install the bundle. It will download
-a gem called +fake_dynamo+, which runs a local, in-memory functional clone of Amazon DynamoDB.
-We use +fake_dynamo+ during development and testing.
+To run the specs for the +ocean-rails+ gem, you must first install DynamoDB Local. 
+It's a Java clone of Amazon DynamoDB which runs locally on your computer. We use 
+it for development and testing.
 
-First of all, copy the AWS configuration file from the template:
+Download DynamoDB Local from the following location: http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Tools.DynamoDBLocal.html
 
- cp spec/dummy/config/aws.yml.example spec/dummy/config/aws.yml
-
-NB: +aws.yml+ is excluded from source control. This allows you to enter your AWS credentials
-safely. Note that +aws.yml.example+ is under source control: don't edit it.
-
-Make sure your have version 0.1.3 of the +fake_dynamo+ gem. It implements the +2011-12-05+ version
-of the DynamoDB API. We're not yet using the +2012-08-10+ version, as the +aws-sdk+ ruby gem
-doesn't fully support it. We'll make the change as soon as +aws-sdk+ is updated. Reportedly,
-it's in the works.
-
-Next, start +fake_dynamo+:
+Next, copy the AWS configuration file from the template:
 
-  fake_dynamo --port 4567
-
-If this returns errors, make sure that <tt>/usr/local/var/fake_dynamo</tt> exists and
-is writable:
+ cp spec/dummy/config/aws.yml.example spec/dummy/config/aws.yml
 
- sudo mkdir -p /usr/local/var/fake_dynamo
- sudo chown peterb:staff /usr/local/var/fake_dynamo
+NB: +aws.yml+ should be excluded from source control. This allows you to enter your AWS 
+credentials safely. On the other hand, +aws.yml.example+ SHOULD be under source control. 
+Don't put sensitive information in it.
 
-When +fake_dynamo+ runs normally, open another window and issue the following command:
+You're now ready to start DynamoDB Local:
 
- curl -X DELETE http://localhost:4567
+ java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -sharedDb
 
-This will reset the +fake_dynamo+ database. It's not a required operation when starting
-+fake_dynamo+; we're just using it here as a test that the installation works. It will
-be issued automatically as part of the test suite, so don't expect test data to survive
-between runs.
+Replace +-sharedDb+ with +-inMemory+ to run the DB in RAM.
 
 Next, copy the +config.yml+ file from its template:
 
@@ -120,13 +105,35 @@ You must now generate the SQLite databases:
  rake db:migrate
  RAILS_ENV=test rake db:migrate
 
-With +fake_dynamo+ running, you should now be able to do
+With DynamoDB Local running, you should now be able to do
 
  rspec
 
 All tests should pass.
 
 
+=== Cleaning up the DB
+
+You might want to add the following to your spec_helper.rb file, before the +RSpec.configure+
+block:
+
+  # DynamoDB table cleaner
+  CHEF_ENV = "master" unless defined?(CHEF_ENV)
+  regexp = Regexp.new("^.+_#{CHEF_ENV}_[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}_test$")
+  cleaner = lambda { 
+    c = Aws::DynamoDB::Client.new
+    c.list_tables.table_names.each { |t| c.delete_table({table_name: t}) if t =~ regexp }
+  }
+
+Then, inside the +RSpec.configure+ block:
+
+  config.before(:suite) { cleaner.call }
+  config.after(:suite) { cleaner.call }
+
+This will remove only those tables created by the specs on this particular machine and
+environment. This is safe even on AWS and for parallel testing.
+
+
 === Rails console
 
 The Rails console is available from the built-in dummy application:

data/config/initializers/_aws_config.rb

@@ -2,8 +2,7 @@
 if (ENV['AWS_ACCESS_KEY_ID'].present? &&
     ENV['AWS_SECRET_ACCESS_KEY'].present? &&
     ENV['AWS_REGION'].present?)
-  #AWS.config if defined? AWS
-  #Aws.config if defined? Aws
+  Aws.config if defined? Aws
 else
 
   # The is the example file
@@ -27,8 +26,12 @@ else
       ENV['AWS_ACCESS_KEY_ID'] = options[:access_key_id] || options['access_key_id']
       ENV['AWS_SECRET_ACCESS_KEY'] = options[:secret_access_key] || options['secret_access_key']
       ENV['AWS_REGION'] = options[:region] || options['region']
-      #AWS.config options if defined? AWS
-      #Aws.config = options if defined? Aws
+      Aws.config.update(
+        region: options["region"],
+        credentials: Aws::Credentials.new(options["access_key_id"], options["secret_access_key"]),
+        endpoint: options["endpoint"]
+      )
+
     else
       # Otherwise print an error message and abort.
       puts

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "5.1.0"
+  VERSION = "5.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Peter Bengtson