wcc-contentful 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a48cb096dc5f511308f9ac747349bde4b79fe43
-  data.tar.gz: 981ea6e61c9af9f2da0f9a590ec70f9563d0303b
+  metadata.gz: 00a9e00e55f441463939d98fd8b8542120976dc4
+  data.tar.gz: 5eac07eb53c3e3a8b943c56c072c2f0cde90afe0
 SHA512:
-  metadata.gz: 05fdef20e3e9efce2dcda906059b815fa360a34caa7733d4b1cd6170ef31ab4ca3f0989517c05c5a0970aea0ec4aa08b8f1dfe625d452bbf354a468145a9fde3
-  data.tar.gz: 52e05e8c6f6011f9c3387e5e721b3459d31b92547b49f8c944eba2aef4a78ab87542fd36e7b5dd8fad18b4420dbe2190a3e3d15cfef337e5c5b75d80f59d27c6
+  metadata.gz: a9bc2e68d9d4159a87284d8c90a7262539a057962682b605e608a602344e2d5aff2d3e1738961324175b93423c6fa82a221fca9b36277172d50c6a246e36eed9
+  data.tar.gz: d5458f48090f6a234d035e6cd4b0887ffeab7024ebff4502a49559d0f98c9e5a969bbfc7516d4b61d6067e68f74ada91b9bd389393ebb3c36b2b12f921ed0dd0

data/.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
         environment:
           RAILS_ENV: test
           POSTGRES_CONNECTION: postgresql://ubuntu:@127.0.0.1:5432/circle_ruby_test
-      - image: postgres:9.5
+      - image: postgres:10
         environment:
         - POSTGRES_USER: ubuntu
         - POSTGRES_DB: circle_ruby_test

data/.gitignore

@@ -19,3 +19,8 @@ contentful-*-error-log-*
 # User local env
 .envrc
 .env*
+
+node_modules
+
+log/
+tmp/

data/.rubocop.yml

@@ -20,6 +20,9 @@ AllCops:
     - '**/templates/**/*'
     - 'tmp/**/*'
 
+    # dummy app for testing
+    - 'spec/dummy/**/*'
+
 Style/Documentation:
   Enabled: false
 

data/CHANGELOG.md

@@ -16,4 +16,11 @@
 
 * Models are built dynamically from downloading the content_types via Contentful CDN
 * 'Menu' and 'MenuItem' are defined and their structures are enforced via validation
-* A GraphQL schema can optionally be generated to execute queries against Contentful
+* A GraphQL schema can optionally be generated to execute queries against Contentful
+
+# v0.2.0
+
+* Application models can be registered to be instantiated for a given content type
+* New 'lazy sync' delivery method acts as a cache that is kept up to date by the sync API
+* 'eager sync' is now hooked up to a webhook which can be mounted to receive publish events
+* Major changes to configuration methods

data/Guardfile

@@ -11,13 +11,35 @@ group :red_green_refactor, halt_on_fail: true do
     # RSpec files
     rspec = dsl.rspec
     watch(rspec.spec_helper) { rspec.spec_dir }
-    watch(rspec.spec_support) { rspec.spec_dir }
+    # watch(rspec.spec_support) { rspec.spec_dir }
     watch(rspec.spec_files)
 
     # Ruby files
     ruby = dsl.ruby
     watch(%r{lib/wcc/(.+)\.rb$}) { |m| rspec.spec.call("wcc/#{m[1]}") }
     watch(%r{lib/generators/(.+)\.rb$}) { |m| rspec.spec.call("generators/#{m[1]}") }
+
+    # Rails files
+    rails = dsl.rails(view_extensions: %w[erb haml slim])
+    dsl.watch_spec_files_for(rails.app_files)
+    dsl.watch_spec_files_for(rails.views)
+
+    watch(rails.controllers) do |m|
+      [
+        rspec.spec.call("routing/#{m[1]}_routing"),
+        rspec.spec.call("controllers/#{m[1]}_controller"),
+        rspec.spec.call("acceptance/#{m[1]}")
+      ]
+    end
+
+    # Rails config changes
+    watch(rails.spec_helper)     { rspec.spec_dir }
+    watch(rails.routes)          { "#{rspec.spec_dir}/routing" }
+    watch(rails.app_controller)  { "#{rspec.spec_dir}/controllers" }
+
+    # Capybara features specs
+    watch(rails.view_dirs)     { |m| rspec.spec.call("features/#{m[1]}") }
+    watch(rails.layouts)       { |m| rspec.spec.call("features/#{m[1]}") }
   end
 
   guard :rubocop, cli: ['--display-cop-names'] do

data/app/controllers/wcc/contentful/application_controller.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module WCC::Contentful
+  class ApplicationController < ActionController::Base
+    protect_from_forgery with: :exception
+  end
+end

data/app/controllers/wcc/contentful/webhook_controller.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_dependency 'wcc/contentful/application_controller'
+
+module WCC::Contentful
+  class WebhookController < ApplicationController
+    before_action :authorize_contentful
+
+    def receive
+      WCC::Contentful.sync!(up_to_id: params.dig('sys', 'id'))
+    end
+
+    def authorize_contentful
+      config = WCC::Contentful.configuration
+
+      if config.webhook_username.present? && config.webhook_password.present?
+        unless authenticate_with_http_basic do |u, p|
+                 u == config.webhook_username &&
+                     p == config.webhook_password
+               end
+          request_http_basic_authentication
+          return
+        end
+      end
+
+      return if request.content_type == 'application/vnd.contentful.management.v1+json'
+      render json: { msg: 'This endpoint only responds to webhooks from Contentful' }, status: 406
+    end
+  end
+end

data/app/jobs/wcc/contentful/delayed_sync_job.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require 'active_job'
+
+module WCC::Contentful
+  class DelayedSyncJob < ActiveJob::Base
+    queue_as :default
+
+    def perform(*args)
+      sync_options = args.first || {}
+      WCC::Contentful.sync!(**sync_options)
+    end
+  end
+end

data/bin/rails

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/wcc/contentful/engine', __FILE__)
+APP_PATH = File.expand_path('../../spec/dummy/config/application', __FILE__)
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/all'
+require 'rails/engine/commands'

data/config/initializers/mime_types.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Mime::Type.register 'application/vnd.contentful.management.v1+json', :json

data/config/routes.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+WCC::Contentful::Engine.routes.draw do
+  post 'webhook/receive', to: 'webhook#receive'
+end

data/lib/generators/wcc/menu_generator.rb

@@ -17,7 +17,7 @@ module Wcc
         deps = package['dependencies']
 
         unless deps.try(:[], 'contentful-migration-cli').present?
-          run 'npm install --save watermarkchurch/migration-cli'
+          run 'npm install --save watermarkchurch/migration-cli ts-node typescript'
         end
       end
     end
@@ -59,9 +59,9 @@ module Wcc
       copy_file 'wcc_contentful.rb', 'config/initializers/wcc_contentful.rb'
     end
 
-    def drop_model_overrides_in_lib_dir
-      copy_file 'menu/menu.rb', 'lib/wcc/contentful/model/menu.rb'
-      copy_file 'menu/menu_button.rb', 'lib/wcc/contentful/model/menu_button.rb'
+    def drop_model_overrides_in_app_models
+      copy_file 'menu/menu.rb', 'app/models/menu.rb'
+      copy_file 'menu/menu_button.rb', 'app/models/menu_button.rb'
     end
   end
 end

data/lib/generators/wcc/templates/contentful_shell_wrapper

@@ -8,13 +8,26 @@ COLOR_YELLOW='\033[1;33m'
 COLOR_LGREEN='\033[1;32m'
 
 logv() {
-  ([[ ! -z "$VERBOSE" ]] && >&2 echo -e "${COLOR_GRAY}$@${COLOR_NC}") || true
+  [[ -z "$VERBOSE" ]] && return 0;
+
+  local msg=$(echo "$@" | sed "s/$CONTENTFUL_MANAGEMENT_TOKEN/\*\*\*\*\*/" )
+  >&2 echo -e "${COLOR_GRAY}$msg${COLOR_NC}" || true
 }
 
 logerr() {
   >&2 echo -e "${COLOR_RED}$@${COLOR_NC}"
 }
 
+curlv() {
+  logv "curl" $@
+  curl "$@"
+}
+
+execv() {
+  logv "$@"
+  "$@"
+}
+
 ## *** Argument Parsing & validation ***
 
 usage() {
@@ -41,10 +54,9 @@ usage() {
       restores a given backup file into the current space
         * [file] optional - default: the most recent backup file in the current directory
 
-    restore_from -s [to space ID] <from space ID>
-      restores all data from the given space into the current space
-        * <space ID> required - the ID of the space to receive data from
-        * -s [to space ID] optional - the current working space.  Default: \$CONTENTFUL_SPACE_ID
+    new_env
+      deletes the current working environment if it exists and makes a new clone of 'master'.
+        * -e [to environment ID] optional - the current working environment.  Default: \$USER
 
     generate [name]
       Creates a sample migration in the db/migrate directory
@@ -61,14 +73,14 @@ parse_args() {
   OPTIND=1
   local s=$(echo "$1" | tr '[:upper:]' '[:lower:]')
   case "$s" in
-    migrate|setup|backup|export|restore|restore_from|import|generate|clean|help|h|\?)
+    migrate|setup|backup|export|restore|new_env|import|generate|clean|help|h|\?)
       export subcommand=$s
       OPTIND=2
       ;;
   esac
 
   # Parse flags
-  while getopts ":hyvs:a:" arg; do
+  while getopts ":hyvse:a:" arg; do
     case $arg in
       y) # Yes - skip prompts
         export YES="-y"
@@ -79,6 +91,9 @@ parse_args() {
       a) # Contentful Mgmt Token - overrides env var CONTENTFUL_MANAGEMENT_TOKEN
         export CONTENTFUL_MANAGEMENT_TOKEN=$OPTARG
         ;;
+      e) # Contentful environment ID - overrides env var CONTENTFUL_ENVIRONMENT
+        export CONTENTFUL_ENVIRONMENT=$OPTARG
+        ;;
       v) # Verbose mode - extra output
         export VERBOSE=true
         ;;
@@ -106,8 +121,7 @@ require_environment() {
   [[ -z "$CONTENTFUL_MANAGEMENT_TOKEN" ]] && logerr "Please set CONTENTFUL_MANAGEMENT_TOKEN environment variable or use '-a' flag." && exit -1;
   if [[ ! -f node_modules/.bin/contentful-migration ]]; then
     command -v npm >/dev/null 2>&1 || (logerr "I require 'npm' but it's not installed.  Please install nodejs."; exit -1)
-    logv "npm install"
-    npm install
+    execv npm install
     [[ -f node_modules/.bin/contentful-migration ]] || (logerr "Failed installing node modules - please ensure contentful CLI is installed"; exit -1)
   fi
 }
@@ -133,8 +147,20 @@ confirm() {
 }
 
 get_space_name() {
-  logv "curl -s https://api.contentful.com/spaces/$1?access_token=****"
-  curl -s https://api.contentful.com/spaces/$1?access_token=$CONTENTFUL_MANAGEMENT_TOKEN | jq -r .name | tr '[:upper:]' '[:lower:]'
+  curlv -s https://api.contentful.com/spaces/$1?access_token=$CONTENTFUL_MANAGEMENT_TOKEN | jq -r .name | tr '[:upper:]' '[:lower:]'
+}
+
+# Man I wish I understood sed... https://stackoverflow.com/a/29060802
+# $1 File
+# $2 Find
+# $3 Replace / Append
+replace_append() {
+  if grep -q "^$2" "$1"
+  then
+      sed -i.bak "s/^$2.*$/$3/" "$1"
+  else
+      echo "\n$3" >> "$1"
+  fi
 }
 
 set -e
@@ -150,14 +176,12 @@ migrate() {
 
   require_environment
 
-  logv "contentful-migration -s $CONTENTFUL_SPACE_ID -a ***** $YES -p $ARG"
-  node_modules/.bin/ts-node node_modules/.bin/contentful-migration \
+  execv node_modules/.bin/ts-node node_modules/.bin/contentful-migration \
     -s $CONTENTFUL_SPACE_ID -a $CONTENTFUL_MANAGEMENT_TOKEN \
     $YES -p $ARG
 
   mkdir -p db
-  logv "contentful-export -s  --export-dir db --content-file contentful-schema.json --space-id $CONTENTFUL_SPACE_ID --management-token ***** --query-entries 'content_type=migrationHistory' --query-assets 'sys.id=false'"
-  node_modules/.bin/contentful-export --export-dir db --content-file contentful-schema.json \
+  execv node_modules/.bin/contentful-export --export-dir db --content-file contentful-schema.json \
     --space-id $CONTENTFUL_SPACE_ID --management-token $CONTENTFUL_MANAGEMENT_TOKEN \
     --query-entries 'content_type=migrationHistory' \
     --query-assets 'sys.id=false'
@@ -177,9 +201,10 @@ backup() {
 
   require_environment
 
-  logv "contentful-export $FILE --space-id $CONTENTFUL_SPACE_ID --management-token ***** $@"
-  node_modules/.bin/contentful-export $FILE \
-    --space-id $CONTENTFUL_SPACE_ID --management-token $CONTENTFUL_MANAGEMENT_TOKEN \
+  [[ ! -z "$CONTENTFUL_ENVIRONMENT" ]] && ENV="--environment-id $CONTENTFUL_ENVIRONMENT"
+
+  execv node_modules/.bin/contentful-export $FILE \
+    --space-id $CONTENTFUL_SPACE_ID $ENV --management-token $CONTENTFUL_MANAGEMENT_TOKEN \
     $@
 }
 
@@ -192,13 +217,17 @@ restore() {
     [[ -z "$FILE" ]] && logerr "No file given on command line" && exit -1
   fi
 
-  confirm "Import $FILE into $CONTENTFUL_SPACE_ID?" || exit -1
+  name=$(get_space_name $CONTENTFUL_SPACE_ID)
+  if [[ ! -z "$CONTENTFUL_ENVIRONMENT" ]]; then
+    ENV="--environment-id $CONTENTFUL_ENVIRONMENT"
+    name="$name/$CONTENTFUL_ENVIRONMENT"
+  fi
+  confirm "Import $FILE into $name?" || exit -1
 
   require_environment
 
-  logv "contentful-import  --space-id $CONTENTFUL_SPACE_ID --management-token ***** --content-file $FILE"
-  node_modules/.bin/contentful-import \
-    --space-id $CONTENTFUL_SPACE_ID --management-token $CONTENTFUL_MANAGEMENT_TOKEN \
+  execv node_modules/.bin/contentful-import \
+    --space-id $CONTENTFUL_SPACE_ID $ENV --management-token $CONTENTFUL_MANAGEMENT_TOKEN \
     --content-file $FILE
 }
 
@@ -208,13 +237,18 @@ setup() {
   FILE="$1"
   [[ -z "$FILE" ]] && FILE=db/contentful-schema.json
 
-  confirm "Initialize space $CONTENTFUL_SPACE_ID from seed file $FILE?" || exit -1
+  name=$(get_space_name $CONTENTFUL_SPACE_ID)
+  if [[ ! -z "$CONTENTFUL_ENVIRONMENT" ]]; then
+    ENV="--environment-id $CONTENTFUL_ENVIRONMENT"
+    name="$name/$CONTENTFUL_ENVIRONMENT"
+  fi
+
+  confirm "Initialize space $name from seed file $FILE?" || exit -1
 
   require_environment
 
-  logv "contentful-import  --space-id $CONTENTFUL_SPACE_ID --management-token ***** --content-file $FILE"
-  node_modules/.bin/contentful-import \
-    --space-id $CONTENTFUL_SPACE_ID --management-token $CONTENTFUL_MANAGEMENT_TOKEN \
+  execv node_modules/.bin/contentful-import \
+    --space-id $CONTENTFUL_SPACE_ID $ENV --management-token $CONTENTFUL_MANAGEMENT_TOKEN \
     --content-file $FILE
 
   migrate
@@ -226,60 +260,67 @@ clean() {
 
   require_environment
 
+  [[ -z "$CONTENTFUL_ENVIRONMENT" ]] && CONTENTFUL_ENVIRONMENT="$USER"
+  [[ "$CONTENTFUL_ENVIRONMENT" == "master" ]] && logerr "cannot delete the master environment" && exit -1
+
   name=$(get_space_name $CONTENTFUL_SPACE_ID)
+  code=$(curlv -s -o /dev/null -w "%{http_code}" https://api.contentful.com/spaces/$CONTENTFUL_SPACE_ID/environments/$CONTENTFUL_ENVIRONMENT\?access_token\=$CONTENTFUL_MANAGEMENT_TOKEN)
+  [[ $code == "404" ]] && logerr "$CONTENTFUL_ENVIRONMENT does not exist in $name" && return 0;
   
-  confirm "This will delete all data and content types from $name.  Are you sure?" || exit -1
-  [[ "$name" != *staging ]] && [[ "$name" != *test ]] && confirm "$name is not a staging or test environment!  Are you really sure?" dangerous!
-
-  local bkup_file="contentful-export-$CONTENTFUL_SPACE_ID-`date +"%Y-%m-%dT%H-%M-%S"`.json"
+  confirm "This will delete the '$CONTENTFUL_ENVIRONMENT' environment from $name.  Are you sure?" || exit -1
+    
+  local bkup_file="contentful-export-$CONTENTFUL_SPACE_ID-${CONTENTFUL_ENVIRONMENT}-`date +"%Y-%m-%dT%H-%M-%S"`.json"
   backup $bkup_file
-  content_types=$(cat $bkup_file | jq -r '.contentTypes[].sys.id')
-  entries=$(cat $bkup_file | jq -r '.entries[].sys.id')
-  assets=$(cat $bkup_file | jq -r '.assets[].sys.id')
-
-  delete() {
-    logv "curl -XDELETE https://api.contentful.com/spaces/$CONTENTFUL_SPACE_ID/$1/$2/published\?access_token\=*****"
-    curl -s --fail -XDELETE https://api.contentful.com/spaces/$CONTENTFUL_SPACE_ID/$1/$2/published\?access_token\=$CONTENTFUL_MANAGEMENT_TOKEN > /dev/null
-    logv "curl -XDELETE https://api.contentful.com/spaces/$CONTENTFUL_SPACE_ID/$1/$2\?access_token\=*****"
-    curl -s --fail -XDELETE https://api.contentful.com/spaces/$CONTENTFUL_SPACE_ID/$1/$2\?access_token\=$CONTENTFUL_MANAGEMENT_TOKEN > /dev/null
-  }
-
-  [[ ! -z "$assets" ]] && while read -r id; do delete 'assets' $id; done <<< "${assets}"
-  [[ ! -z "$entries" ]] && while read -r id; do delete 'entries' $id; done <<< "${entries}"
-  [[ ! -z "$content_types" ]] && while read -r id; do delete 'content_types' $id; done <<< "${content_types}"
-
-  echo -e "${COLOR_LGREEN}All content deleted - prior content saved at${COLOR_NC} $bkup_file"
-  [[ "$1" == "no-init" ]] || (setup || logerr "Error setting up space $name!")
+  
+  curlv --fail -XDELETE https://api.contentful.com/spaces/$CONTENTFUL_SPACE_ID/environments/$CONTENTFUL_ENVIRONMENT\?access_token\=$CONTENTFUL_MANAGEMENT_TOKEN
 }
 
-# Example: bin/contentful restore_from -s $staging_space_id -a $MY_TOKEN $production_space_id
-restore_from() {
+# Example: bin/contentful new_env -e gordon_dev
+new_env() {
   command -v jq >/dev/null 2>&1 || (logerr "I require 'jq' but it's not installed.  Please run 'brew install jq'"; exit -1)
 
   require_environment
+  name=$(get_space_name $CONTENTFUL_SPACE_ID)
+  [[ -z "$CONTENTFUL_ENVIRONMENT" ]] && CONTENTFUL_ENVIRONMENT="$USER"
+  [[ "$CONTENTFUL_ENVIRONMENT" == "master" ]] && logerr "cannot delete the master environment" && exit -1
 
-  from_space_id=$1
-  [[ -z "$from_space_id" ]] && logerr "Please provide the space ID from which to restore data" && exit -1
-  to_space_id=$CONTENTFUL_SPACE_ID
-
-  from_name=$(get_space_name $from_space_id)
-  to_name=$(get_space_name $CONTENTFUL_SPACE_ID)
-
-  echo -e "${COLOR_LCYAN}This will backup all data from $from_name, delete all data in $to_name, and then write the $from_name data over it.${COLOR_NC}"
+  echo -e "${COLOR_LCYAN}This will delete '$CONTENTFUL_ENVIRONMENT' and recreate it from master.${COLOR_NC}"
   confirm "Continue?" || exit -1
   export YES='-y' # don't keep bugging the user
 
-  export CONTENTFUL_SPACE_ID=$from_space_id
-  local bkup_file="contentful-export-$from_space_id-`date +"%Y-%m-%dT%H-%M-%S"`.json"
-  logv "bin/contentful backup -s $CONTENTFUL_SPACE_ID $bkup_file"
-  backup $bkup_file --skip-roles --skip-webhooks
+  clean
+
+  # make the environment
+  resp=$(curlv -s --fail -XPUT https://api.contentful.com/spaces/$CONTENTFUL_SPACE_ID/environments/$CONTENTFUL_ENVIRONMENT \
+    -H "Authorization: Bearer ${CONTENTFUL_MANAGEMENT_TOKEN}" \
+    -H "Content-Type: application/vnd.contentful.management.v1+json" \
+    -d "{ \"name\": \"${CONTENTFUL_ENVIRONMENT}\" }")
+  
+  while [ ! $(echo "$resp" | jq -r .sys.status.sys.id) == "ready" ]
+  do
+    logv "waiting for environment $CONTENTFUL_ENVIRONMENT to be ready..."
+    sleep 1
+    resp=$(curlv -s https://api.contentful.com/spaces/$CONTENTFUL_SPACE_ID/environments/$CONTENTFUL_ENVIRONMENT \
+      -H "Authorization: Bearer ${CONTENTFUL_MANAGEMENT_TOKEN}")
+  done
+  
+  logv "get the API keys and update the one matching ours to point to the new environment"
+  keys=$(curlv -s --fail https://api.contentful.com/spaces/$CONTENTFUL_SPACE_ID/api_keys\?access_token\=$CONTENTFUL_MANAGEMENT_TOKEN)
+  my_key=$(echo "$keys" | jq -r ".items[] | select(.accessToken == \"$CONTENTFUL_ACCESS_TOKEN\")")
+  my_key_id=$(echo "$my_key" | jq -r ".sys.id")
+  my_key_version=$(echo "$my_key" | jq -r ".sys.version")
+  new_env_links=$(echo "$my_key" | jq ".environments + [{ \"sys\": { \"id\": \"$CONTENTFUL_ENVIRONMENT\", \"type\": \"Link\", \"linkType\": \"Environment\" } }] | { \"environments\": . }")
+  
+  curlv -s -o /dev/null --fail -XPUT https://api.contentful.com/spaces/$CONTENTFUL_SPACE_ID/api_keys/$my_key_id \
+    -H "Authorization: Bearer ${CONTENTFUL_MANAGEMENT_TOKEN}" \
+    -H "Content-Type: application/vnd.contentful.management.v1+json" \
+    -H "X-Contentful-Version: ${my_key_version}" \
+    -d "${new_env_links}"
 
-  export CONTENTFUL_SPACE_ID=$to_space_id
-  logv "bin/contentful clean -s $CONTENTFUL_SPACE_ID"
-  clean no-init
+  execv replace_append .env.local "CONTENTFUL_ENVIRONMENT\=" "CONTENTFUL_ENVIRONMENT=$CONTENTFUL_ENVIRONMENT"
+  execv replace_append .env.test.local "CONTENTFUL_ENVIRONMENT\=" "CONTENTFUL_ENVIRONMENT=$CONTENTFUL_ENVIRONMENT"
 
-  logv "bin/contentful restore -s $CONTENTFUL_SPACE_ID $bkup_file"
-  restore $bkup_file
+  echo "Environment ${CONTENTFUL_ENVIRONMENT} successfully created!"
 }
 
 # Example: bin/contentful generate add content type dog
@@ -328,8 +369,8 @@ case $subcommand in
   clean)
     clean $@
     ;;
-  restore_from)
-    restore_from $@
+  new_env)
+    new_env $@
     ;;
   help|h|\?)
     usage

data/lib/generators/wcc/templates/menu/menu.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-# This file reopens the "Menu" class which was dynamically
-# created by the WCC::Contentful gem.  This class does not need to do anything,
-# the attributes have already been defined based on the `content_type` returned
-# from the Contentful API.  However you can reopen the class to add functionality.
-class WCC::Contentful::Model::Menu < WCC::Contentful::Model
-
+# This model represents the 'menu' content type in Contentful.  Any linked
+# entries of the 'menu' content type will be resolved as instances of this class.
+# It exposes #find, #find_by, and #find_all methods to query Contentful.
+class Menu < WCC::Contentful::Model::Menu
   # Add custom validations to ensure that app-specific properties exist:
   # validate_field :foo, :String, :required
   # validate_field :bar_links, :Array, link_to: %w[bar baz]

data/lib/generators/wcc/templates/menu/menu_button.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-# This file reopens the "MenuButton" class which was dynamically
-# created by the WCC::Contentful gem.  This class does not need to do anything,
-# the attributes have already been defined based on the `content_type` returned
-# from the Contentful API.  However you can reopen the class to add functionality.
-class WCC::Contentful::Model::MenuButton < WCC::Contentful::Model
-
+# This model represents the 'menuButton' content type in Contentful.  Any linked
+# entries of the 'menuButton' content type will be resolved as instances of this class.
+# It exposes #find, #find_by, and #find_all methods to query Contentful.
+class MenuButton < WCC::Contentful::Model::MenuButton
   # Add custom validations to ensure that app-specific properties exist:
   # validate_field :foo, :String, :required
   # validate_field :bar_links, :Array, link_to: %w[bar baz]

data/lib/generators/wcc/templates/release

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
@@ -6,4 +6,4 @@ echo "Migrating database..."
 bundle exec rake db:migrate
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-$DIR/contentful migrate -y
+$DIR/contentful migrate -y

data/lib/generators/wcc/templates/wcc_contentful.rb

@@ -8,7 +8,6 @@ WCC::Contentful.configure do |config|
   config.management_token = # Contentful API management token
   config.default_locale = # Set default locale, if left blank this is 'en-US'
   config.content_delivery = # :direct, :eager_sync, or :lazy_sync
-  config.sync_store = # :memory, :postgres, or a custom implementation
 end
 
 # Download content types, build models, and sync content

data/lib/wcc/contentful/client_ext.rb

@@ -6,7 +6,7 @@ class Contentful::Client
   end
 
   def self.get_http(url, query, headers = {}, proxy = {})
-    if override = WCC::Contentful.configuration.override_get_http
+    if override = WCC::Contentful.configuration.http_adapter
       override.call(url, query, headers, proxy)
     else
       old_get_http(url, query, headers, proxy)