ocean-rails 7.0.2 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a66e2a136d72e0bafa09abdd0407853983cf8e
-  data.tar.gz: ce22aebe3003f330b67866d3ba0c1012c61b87bc
+  metadata.gz: 55ee0d2e59d628299a0b7c3d1b5736d20a2c7378
+  data.tar.gz: 1954c7bbf968b5cfc53a66acb9763a840853107e
 SHA512:
-  metadata.gz: 6ea14c9908f22b5406543ec72924f0f4deb9f210f5d0078a8c8066632f66900a6d7db74cc3f65955051b8c98c0d02a699b7b8340f751c3165d3442c6e7d3f6ee
-  data.tar.gz: 18b5fd5362ac0dc71a60f902e064f9852ae21b0a0e79d988da214289d0a9df19fb11049a25a0d1bef0b4521c087234d2c49aaa6085d92b0cd3693dd2a5d80d9d
+  metadata.gz: 78b5ccb8d16d7451f3499d475ed2171efbc13251e32f1b1b07dc226fd800aaf80842bfa77d4b0c57f742c2aa99fff167421a69e75c897a5c6ee9a50df77f1553
+  data.tar.gz: 33ca5a629222de0b358e924caec26ffe26a3f179d982a2f43e3345c6e139ef75b94bfea6a826e37a8e0905af5562c1fcc7d7df897c699791238cdee864df4678

data/config/initializers/_ocean_constants.rb

@@ -14,25 +14,18 @@
 # make calls to partners' systems, such as for hotel bookings).
 # 
 # Thus, if you are a frontend developer, you override the string
-# constant here to reflect the Chef environment (master, staging)
+# constant here to reflect the Ocean environment (dev, staging)
 # you wish to run your local tests against by defining the environment
 # variable OCEAN_API_HOST.
 #
-# When TeamCity runs its tests, it will set these constants to values
-# appropriate for the Chef environment for which the tests are run.
-# Thus, TeamCity will always run master branch frontend tests against
-# the master Chef environment. However, you can run a personal build
-# and specify the OCEAN_API_HOST value as an environment param in the
-# build dialog.
-#
 
 BASE_DOMAIN = "example.com" unless defined?(BASE_DOMAIN)  # For the Rails template generator
 
 OCEAN_API_HOST = (ENV['OCEAN_API_HOST'] || 
                   (Rails.env == 'test' && "forbidden.#{BASE_DOMAIN}") || 
-                  "master-api.#{BASE_DOMAIN}"
-                 ).sub("<default>", "master")
+                  "dev-api.#{BASE_DOMAIN}"
+                 ).sub("<default>", "dev")
                 
 OCEAN_API_URL = "https://#{OCEAN_API_HOST}"
 
-INTERNAL_OCEAN_API_URL = OCEAN_API_URL.sub("https", "http").sub("api.", "lb.")
+INTERNAL_OCEAN_API_URL = OCEAN_API_URL.sub("https://", "http://")

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

@@ -7,8 +7,7 @@
 # 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: the Chef recipes used to deploy the application to its Chef environment (master,
-# staging, prod) will replace the contents of config/aws.yml with an auto-generated file.
+# NB: On AWS, the contents of this file will be replaced by an auto-generated file.
 ##########################################################################################
 
 
@@ -27,7 +26,7 @@ amazon: &amazon
 #
 # It is safe to set any of the following three environments to
 # *amazon, as table names will be suffixed according to the
-# environment (CHEF_ENV and Rails.env). See Api.basename_suffix.
+# environment (OCEAN_ENV and Rails.env). See Api.basename_suffix.
 # You can use *amazon instead of *local if you wish.
 #
 

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

@@ -2,17 +2,15 @@
 # In order for the application to work, a file named config/config.yml must exist.
 # You can use this file as a template: simply copy it, rename it and tailor its
 # contents. All data in this file will be used to define constants in your application
-# namespace. Please note that both config.yml and config.yml.example must exist - don't
-# delete this example file, as its values will be used by TeamCity for tests.
+# namespace. Please note that both config.yml and config.yml.example must exist.
 # 
 # Any constants declared here can be overridden by corresponding environment variables
 # starting with OVERRIDE_. Thus, BASE_DOMAIN can be overridden by the environment
 # variable OVERRIDE_BASE_DOMAIN, and so forth. The API_PASSWORD receives special
 # treatment: you can pass both the master and the staging password separated by a comma,
-# and Ocean will choose the appropriate one to use depending on the Chef environment.
+# and Ocean will choose the appropriate one to use depending on the Ocean environment.
 #
-# NB: the Chef recipes used to deploy this to the production environment will
-# replace the contents of config/config.yml with an auto-generated file.
+# NB: The contents of this file will be replaced by an auto-generated file on AWS.
 ##########################################################################################
 
 
@@ -40,8 +38,8 @@ LOAD_BALANCERS: []
 # This is the list of IP numbers for the ZeroMQ log hosts. (Only used in production.)
 LOG_HOSTS: []
 
-# The Chef environment
-CHEF_ENV: master
+# The Ocean environment
+OCEAN_ENV: master
 
 
 ##########################################################################################

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

@@ -14,8 +14,8 @@ require 'rspec/rails'
 Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
 # 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|dev)$")
+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| 

data/lib/ocean/api.rb

@@ -10,7 +10,7 @@ class Api
   # in master and staging, as the https URIs aren't available for CronJobs,
   # etc.
   #
-  def self.internalize_uri(uri, chef_env=CHEF_ENV)
+  def self.internalize_uri(uri, ocean_env=OCEAN_ENV)
     uri.sub(OCEAN_API_URL, INTERNAL_OCEAN_API_URL)
   end
 
@@ -26,12 +26,12 @@ class Api
 
   #
   # Adds environment info to the basename, so that testing and execution in various combinations
-  # of the Rails env and the Chef environment can be done without collision. 
+  # of the Rails env and the Ocean environment can be done without collision. 
   #
-  # The chef_env will always be appended to the basename, since we never want to share queues 
-  # between different Chef environments. 
+  # The ocean_env will always be appended to the basename, since we never want to share queues 
+  # between different Ocean environments. 
   #
-  # If the chef_env is 'dev' or 'ci', we must separate things as much as
+  # If the ocean_env is 'dev' or 'ci', we must separate things as much as
   # possible: therefore, we add the local IP number and the Rails environment. 
   #
   # We also add the same information if by any chance the Rails environment isn't 'production'. 
@@ -40,10 +40,10 @@ class Api
   #
   # If +suffix_only+ is true, the basename will be excluded from the returned string.
   #
-  def self.adorn_basename(basename, chef_env: "dev", rails_env: "development",
+  def self.adorn_basename(basename, ocean_env: "dev", rails_env: "development",
                           suffix_only: false)
-    fullname = suffix_only ? "_#{chef_env}" : "#{basename}_#{chef_env}"
-    if rails_env != 'production' || chef_env == 'dev' || chef_env == 'ci'
+    fullname = suffix_only ? "_#{ocean_env}" : "#{basename}_#{ocean_env}"
+    if rails_env != 'production' || ocean_env == 'dev' || ocean_env == 'ci'
       local_ip = UDPSocket.open {|s| s.connect("64.233.187.99", 1); s.addr.last}.gsub('.', '-')
       fullname += "_#{local_ip}_#{rails_env}"
     end
@@ -52,10 +52,10 @@ class Api
 
 
   #
-  # Like +adorn_basename+, but returns only the suffix. Uses CHEF_ENV and Rails.env.
+  # Like +adorn_basename+, but returns only the suffix. Uses OCEAN_ENV and Rails.env.
   #
   def self.basename_suffix
-    adorn_basename '', suffix_only: true, chef_env: CHEF_ENV, rails_env: Rails.env
+    adorn_basename '', suffix_only: true, ocean_env: OCEAN_ENV, rails_env: Rails.env
   end
 
 

data/lib/ocean/api_resource.rb

@@ -120,8 +120,8 @@ module ApiResource
     end
 
     #
-    # Invalidate all members of this class in Varnish using a +BAN+ requests to all
-    # caches in the Chef environment. The +BAN+ requests are done in parallel.
+    # Invalidate all members of this class in Varnish using a +BAN+ requests to the
+    # caches in the Ocean environment. The +BAN+ requests are done in parallel.
     # The number of +BAN+ requests, and the exact +URI+ composition in each request,
     # is determined by the +invalidate_collection:+ arg to the +ocean_resource_model+
     # declaration in the model.
@@ -151,7 +151,7 @@ module ApiResource
 
   #
   # Invalidate the member and all its collections in Varnish using a +BAN+ requests to all
-  # caches in the Chef environment. The +BAN+ request are done in parallel.
+  # caches in the Ocean environment. The +BAN+ request are done in parallel.
   # The number of +BAN+ requests, and the exact +URI+ composition in each request,
   # is determined by the +invalidate_member:+ arg to the +ocean_resource_model+
   # declaration in the model.

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "7.0.2"
+  VERSION = "7.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.3
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus