ocean-rails 7.2.1 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf56cf8bce9166dcc5a120e197bbdcd615f5c79baec5c99fe9b672fc07f1852
-  data.tar.gz: 27f9e22eab32031c503ac330fbe664c2e2fefd6bf9f3c235889a47a5442d1b10
+  metadata.gz: 7d703c1b9eeb742809031eb05de80b67d9d1095605741b5846f1dfe3ec35ccdf
+  data.tar.gz: 38ec1bbd1abe2ca487ac2beae2de3e28e65560d9489b8a892fd212bddeec59f6
 SHA512:
-  metadata.gz: 95889ce4e8ebb8aaf40c42f868e0c219a29617e17ccd2433f440cb137ee0df6b5a2fef9e84058322028479fe306388be394638a6f10ac4d1caa9573d10adffa0
-  data.tar.gz: a3a08fc01c54b7a59391329f02cc641f0bb2454aa70310bddba99a59bef7a27931ae1d5e37c2143a777b726b1cf1037b83f3bcd3f4c9260d02b5cd1d9d0a59f2
+  metadata.gz: d2dbfc032c6b1774136e3a86e8bd073a6a5c820f8808dd3ee3eee561e68d0b7f0e8db439e16906d0a5f02a6da7645911afb20ff6c7eff259503d1502dbd5bb70
+  data.tar.gz: 9fbd5f15038821e33c3c2545a9738281cccaeb28b666616661212f75799ca54874722128adcb1c42c4657805f1e5ef2343e63a9f12efe2ed8508fa4eba6ef278

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2016 Peter Bengtson
+Copyright 2018 Peter Bengtson
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.rdoc

@@ -1,7 +1,7 @@
 == The Ocean gem
 
 This repository contains the Ocean ruby gem, containing common framework functionality
-for the Ruby on Rails part of the architecture. 
+for the Ruby on Rails part of the architecture.
 
 Ocean requires Ruby 2.2 and Ruby on Rails 4.2.0 or later.
 
@@ -31,36 +31,24 @@ Thus, the +ocean-rails+ gem provides all the abstractions you need for creating
 
 === Creating an Ocean Rails app
 
-Cf. the tutorial at http://wiki.oceanframework.net/index.php/Tutorial for information on about how to set up an Ocean Rails app and create Ocean Resources for it. 
+Cf. the tutorial at http://wiki.oceanframework.net/index.php/Tutorial for information on about how to set up an Ocean Rails app and create Ocean Resources for it.
 
 
 === Running the specs
 
-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 
+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.
 
 Download DynamoDB Local from the following location: http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Tools.DynamoDBLocal.html
 
-Next, copy the AWS configuration file from the template:
-
- cp spec/dummy/config/aws.yml.example spec/dummy/config/aws.yml
-
-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.
-
-You're now ready to start DynamoDB Local:
+Start DynamoDB Local:
 
  java -Djava.library.path=./DynamoDBLocal_lib -jar DynamoDBLocal.jar -sharedDb
 
 Replace +-sharedDb+ with +-inMemory+ to run the DB in RAM.
 
-Next, copy the +config.yml+ file from its template:
-
-  cp spec/dummy/config/config.yml.example spec/dummy/config/config.yml
-
-Edit the contents of +config.yml+ to suit your setup.
+Edit the contents of +config.yml+ to suit your setup, if necessary.
 
 You must now generate the SQLite databases:
 
@@ -69,7 +57,7 @@ You must now generate the SQLite databases:
 
 With DynamoDB Local running, you should now be able to do
 
- rspec
+ bundle exec rspec
 
 All tests should pass.
 
@@ -94,4 +82,3 @@ prevent traffic only to specific hosts (e.g. +localhost+).
 
 When you leave the console, you must navigate back to the Rails directory (<tt>cd ../..</tt>)
 in order to be able to run RSpec again.
-

data/lib/generators/ocean_setup/ocean_setup_generator.rb

@@ -35,13 +35,13 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
 
   def turn_off_locales
     application "# No locales
-    config.i18n.enforce_available_locales = false    
+    config.i18n.enforce_available_locales = false
     "
   end
 
   def turn_off_asset_pipeline
     application "# Disable the asset pipeline
-    config.assets.enabled = false    
+    config.assets.enabled = false
     "
   end
 
@@ -70,7 +70,7 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
       g.stylesheets false
       g.helper false
       g.test_framework :rspec, :fixture => true
-      g.fixture_replacement :factory_bot    
+      g.fixture_replacement :factory_bot
     end
     "
   end
@@ -81,7 +81,6 @@ class OceanSetupGenerator < Rails::Generators::NamedBase #:nodoc: all
   end
 
   def install_aws_yml_files
-    template  "aws.yml.example", "#{Rails.root}/config/aws.yml.example"
     template  "aws.yml.example", "#{Rails.root}/config/aws.yml"
   end
 

data/lib/generators/ocean_setup/templates/Gemfile

@@ -1,22 +1,33 @@
 source 'https://rubygems.org'
 
-gem "ocean-rails"
+gem 'dotenv-rails', groups: [:development, :test]
 
-gem "rails"
-gem "pg"
-gem "foreigner"
-gem "jbuilder"
+gem 'ocean-rails', '>= 7.0.0'
+gem 'rails'
+
+gem "puma"
+
+gem 'mysql2', '~> 0.4.0'
+
+gem 'jbuilder'
+gem 'oj'
 
 gem "spring", group: :development
 
-group :test, :development do
-  gem "sqlite3"
-  gem "memory_test_fix"
-  gem "rspec-rails"
-  gem "simplecov", require: false
-  gem "factory_bot_rails", "~> 4.0"
-  gem "immigrant"
-  gem "annotate", ">=2.5.0"
+gem 'protected_attributes' # Rails 3 compatibility
+
+group :development do
+  gem 'annotate', '>=2.5.0'
 end
 
-gem "protected_attributes"
+group :test do
+  gem 'factory_bot_rails', '~> 4.0'
+  gem 'rspec-rails'
+  gem 'simplecov', require: false
+end
+
+group :test , :development do
+  gem 'guard'#, require:false
+  gem 'guard-rspec'#, require: false
+  gem 'foreman'
+end

data/lib/generators/ocean_setup/templates/aws.yml.example

@@ -1,26 +1,13 @@
-##########################################################################################
-# In order for the application to work, a file named config/aws.yml must exist.
-# You can use this file as a template: simply copy it, rename it and tailor its
-# contents. Please note that both aws.yml and aws.yml.example must exist - don't
-# delete this example file, as its values will be used by TeamCity for tests.
-#
-# If your application doesn't use any AWS functionality, you should delete both
-# aws.yml.example and aws.yml. In that case, none of them may exist in your application.
-#
-# NB: On AWS, the contents of this file will be replaced by an auto-generated file.
-##########################################################################################
-
-
 fake_dynamo: &local
-  region:             eu-west-1
-  endpoint:           http://localhost:8000
+  region:             <%= ENV['AWS_REGION'] %>
+  endpoint:           <%= ENV['AWS_DYNAMODB_ENDPOINT'] %>
   access_key_id:      xxx
   secret_access_key:  xxx
 
 amazon: &amazon
-  region:             eu-west-1
-  access_key_id:      YOURACCESSKEYHERE
-  secret_access_key:  YOURSECRETKEYHERE
+  region:             <%= ENV['AWS_REGION'] %>
+  access_key_id:      <%= ENV['AWS_ACCESS_KEY_ID'] %>
+  secret_access_key:  <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
 
 
 #

data/lib/generators/ocean_setup/templates/gitignore

@@ -21,21 +21,12 @@
 # Ignore backup files
 *~
 
-# Ignore RubyMine local workspace settings
-/.idea/workspace.xml
-
-# Ignore any SQLite files
-/db/*.sqlite3
-
 # Ignore coverage artefacts
 /coverage
 
 # Ignore the tailored config.yml file
 config/config.yml
 
-# Ignore any tailored aws.yml file
-config/aws.yml
-
 # Ignore any tailored smtp.yml file
 config/smtp.yml
 

data/lib/generators/ocean_setup/templates/spec_helper.rb

@@ -13,20 +13,20 @@ require 'rspec/rails'
 # in spec/support/ and its subdirectories.
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
-# DynamoDB table cleaner
-OCEAN_ENV = "dev" unless defined?(OCEAN_ENV)
-regexp = Regexp.new("^.+_#{OCEAN_ENV}_[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}_(test|dev)$")
-cleaner = lambda {
-  c = Aws::DynamoDB::Client.new
-  c.list_tables.table_names.each do |t|
-    begin
-      c.delete_table({table_name: t}) if t =~ regexp
-    rescue Aws::DynamoDB::Errors::LimitExceededException
-      sleep 1
-      retry
-    end
-  end
-}
+# # DynamoDB table cleaner
+# OCEAN_ENV = "dev" unless defined?(OCEAN_ENV)
+# regexp = Regexp.new("^.+_#{OCEAN_ENV}_[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}-[0-9]{1,3}_(test|dev)$")
+# cleaner = lambda {
+#   c = Aws::DynamoDB::Client.new
+#   c.list_tables.table_names.each do |t|
+#     begin
+#       c.delete_table({table_name: t}) if t =~ regexp
+#     rescue Aws::DynamoDB::Errors::LimitExceededException
+#       sleep 1
+#       retry
+#     end
+#   end
+# }
 
 RSpec.configure do |config|
   # ## Mock Framework

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "7.2.1"
+  VERSION = "7.2.2"
 end

metadata

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