imagine_cms 4.2.4 → 5.2.0

data/db/migrate/20121115083748_add_logs_table.rb

@@ -1,28 +1,23 @@
-class AddLogsTable < ActiveRecord::Migration
+class AddLogsTable < ActiveRecord::Migration[4.2]
   
-  def up
-    create_table "logs" do |t|
-      t.column "name",              :string
-      t.column "description",       :text
+  def change
+    create_table :logs do |t|
+      t.string :name
+      t.text :description
       
-      t.column "created_on",        :timestamp
+      t.datetime :created_on
     end
     
-    create_table "log_entries" do |t|
-      t.column "log_id",            :integer, :null => false
+    create_table :log_entries do |t|
+      t.integer :log_id, null: false
       
-      t.column "type",              :string, :null => false
-      t.column "description",       :text
-      t.column "data",              :text
+      t.string :type, null: false
+      t.text :description
+      t.text :data
       
-      t.column "created_on",        :timestamp
+      t.datetime :created_on
     end
-    add_index "log_entries", ["type"], :name => "IDX_log_entries_type"
-  end
-  
-  def down
-    drop_table "log_entries"
-    drop_table "logs"
+    add_index "log_entries", ["type"], name: "IDX_log_entries_type"
   end
   
 end

data/db/migrate/20121115083811_add_users_tables.rb

@@ -1,43 +1,43 @@
-class AddUsersTables < ActiveRecord::Migration
+class AddUsersTables < ActiveRecord::Migration[4.2]
   
-  def self.up
-    create_table "users" do |t|
-      t.column "username",          :string
-      t.column "password_hash",     :string, :limit => 100
+  def up
+    create_table :users do |t|
+      t.string :username
+      t.string :password_hash, limit: 100
       
-      t.column "first_name",        :string, :limit => 100
-      t.column "last_name",         :string, :limit => 100
+      t.string :first_name, limit: 100
+      t.string :last_name, limit: 100
       
-      t.column "dynamic_fields",    :text
+      t.text :dynamic_fields
       
-      t.column "active",            :integer, :default => 1, :null => false
-      t.column "is_superuser",      :integer, :default => 0, :null => false
+      t.boolean :active, null: false, default: true
+      t.boolean :is_superuser, null: false, default: true
       
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+      t.datetime :created_on
+      t.datetime :updated_on
     end
-    add_index "users", ["username"], :name => "UN_users_username", :unique => true
+    add_index "users", ["username"], name: "UN_users_username", unique: true
     
-    create_table "user_groups" do |t|
-      t.column "name",              :string
+    create_table :user_groups do |t|
+      t.string :name
       
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+      t.datetime :created_on
+      t.datetime :updated_on
     end
-    add_index "user_groups", ["name"], :name => "UN_user_groups_name", :unique => true
+    add_index "user_groups", ["name"], name: "UN_user_groups_name", unique: true
     
-    create_table "user_group_memberships", :id => false do |t|
-      t.column "user_id",           :integer, :null => false
-      t.column "user_group_id",     :integer, :null => false
-      t.column "created_on",        :timestamp
+    create_table :user_group_memberships, id: false do |t|
+      t.integer :user_id, null: false
+      t.integer :user_group_id, null: false
+      t.datetime :created_on
     end
     execute 'alter table user_group_memberships add constraint PK_user_group_memberships primary key (user_id, user_group_id)'
   end
   
-  def self.down
-    drop_table "user_group_memberships"
-    drop_table "user_groups"
-    drop_table "users"
+  def down
+    drop_table :user_group_memberships
+    drop_table :user_groups
+    drop_table :users
   end
   
 end

data/db/migrate/20121115084028_add_cms_tables.rb

@@ -1,113 +1,114 @@
-class AddCmsTables < ActiveRecord::Migration
+class AddCmsTables < ActiveRecord::Migration[4.2]
   
   class CmsTemplate < ActiveRecord::Base ; acts_as_versioned ; end
   class CmsSnippet < ActiveRecord::Base ; acts_as_versioned ; end
   class CmsPage < ActiveRecord::Base ; acts_as_versioned ; end
   
-  def self.up
-    create_table "cms_templates" do |t|
-      t.column "name",              :string
-      t.column "content",           :text
-      t.column "options_yaml",      :text
+  def up
+    create_table :cms_templates do |t|
+      t.string :name
+      t.text :content
+      t.text :options_yaml
       
-      t.column "version",           :integer, :default => 0, :null => false
+      t.integer :version, default: 0, null: false
       
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+      t.datetime :created_on
+      t.datetime :updated_on
     end
     CmsTemplate.create_versioned_table  # => CmsTemplateVersions
     
-    create_table "cms_snippets" do |t|
-      t.column "name",              :string
-      t.column "content",           :text
+    create_table :cms_snippets do |t|
+      t.string :name
+      t.text :content
       
-      t.column "version",           :integer, :default => 0, :null => false
+      t.integer :version, default: 0, null: false
       
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+      t.datetime :created_on
+      t.datetime :updated_on
     end
     CmsSnippet.create_versioned_table  # => CmsSnippetVersions
     
-    create_table "cms_pages" do |t|
-      t.column "cms_template_id",   :integer, :null => false
-      t.column "cms_template_version", :integer, :null => false
-      
-      t.column "parent_id",         :integer, :references => :cms_pages
-      
-      t.column "name",              :string
-      t.column "title",             :string
-      t.column "path",              :text
-      t.column "article_date",      :datetime
-      t.column "article_end_date",  :datetime
-      
-      t.column "summary",           :text
-      t.column "thumbnail_path",    :string, :limit => 255
-      t.column "feature_image_path", :string, :limit => 255
-      t.column "position",          :integer, :default => 0
-      t.column "comment_count",     :integer, :default => 0
-      
-      t.column "version",           :integer, :default => 0, :null => false
-      t.column "published_version", :integer, :default => 0, :null => false
-      t.column "published_date",    :datetime, :null => false
-      t.column "expiration_date",   :datetime
-      t.column "expires",           :boolean, :default => false
-      t.column "search_index",      :text
-      t.column "html_head",         :text
-      
-      t.column "updated_by",        :integer, :null => false
-      t.column "updated_by_username", :string, :null => false
-      
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+    create_table :cms_pages do |t|
+      t.integer :cms_template_id, null: false
+      t.integer :cms_template_version, null: false
+      
+      t.integer :parent_id, references: :cms_pages
+      
+      t.string :name
+      t.string :title
+      t.string :path
+      t.datetime :article_date
+      t.datetime :article_end_date
+      
+      t.text :summary
+      t.string :thumbnail_path
+      t.string :feature_image_path
+      t.integer :position, default: 0
+      t.integer :comment_count, default: 0
+      
+      t.integer :version, default: 0, null: false
+      t.integer :published_version, default: 0, null: false
+      t.datetime :published_date, null: false
+      t.datetime :expiration_date
+      t.boolean :expires, default: false
+      t.text :search_index
+      t.text :html_head
+      
+      t.integer :updated_by, null: false
+      t.string :updated_by_username, null: false
+      
+      t.datetime :created_on
+      t.datetime :updated_on
     end
     CmsPage.create_versioned_table  # => CmsPageVersions
     
-    create_table "cms_page_objects" do |t|
-      t.column "cms_page_id",       :integer, :null => false
-      t.column "cms_page_version",  :integer, :null => false
+    create_table :cms_page_objects do |t|
+      t.integer :cms_page_id, null: false
+      t.integer :cms_page_version, null: false
       
-      t.column "name",              :string
-      t.column "obj_type",          :string # one of [ :text, :asset ]
-      t.column "content",           :text   # if :text, then text; if :asset, then asset_id
-      t.column "options",           :text   # options hash
+      t.string :name
+      t.string :obj_type    # one of [ :text, :asset ]
+      t.text :content       # if :text, then text; if :asset, then asset_id
+      t.text :options       # options hash
       
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+      t.datetime :created_on
+      t.datetime :updated_on
     end
     
-    create_table "cms_page_tags" do |t|
-      t.column "cms_page_id",       :integer, :null => false
-      t.column "name",              :string, :null => false
-      t.column "created_on",        :timestamp
+    create_table :cms_page_tags do |t|
+      t.integer :cms_page_id, null: false
+      t.string :name, null: false
+      
+      t.datetime :created_on
     end
     
-    create_table "cms_page_comments" do |t|
-      t.column "cms_page_id",       :integer, :null => false
+    create_table :cms_page_comments do |t|
+      t.integer :cms_page_id, null: false
       
-      t.column "owner",             :string, :null => false
-      t.column "owner_url",         :string, :limit => 255
-      t.column "owner_email",       :string, :limit => 255
-      t.column "content",           :text
+      t.string :owner, null: false
+      t.string :owner_url
+      t.string :owner_email
+      t.text :content
       
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+      t.datetime :created_on
+      t.datetime :updated_on
     end
     
-    create_table "cms_assets" do |t|
-      t.column "name",              :string
-      t.column "content_type",      :string
+    create_table :cms_assets do |t|
+      t.string :name
+      t.string :content_type
       
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+      t.datetime :created_on
+      t.datetime :updated_on
     end
     
-    create_table "cms_asset_tags" do |t|
-      t.column "cms_asset_id",      :integer, :null => false
-      t.column "user_id",           :integer, :null => false
-      t.column "name",              :string
+    create_table :cms_asset_tags do |t|
+      t.integer :cms_asset_id, null: false
+      t.integer :user_id, null: false
+      t.string :name
       
-      t.column "created_on",        :timestamp
-      t.column "updated_on",        :timestamp
+      t.datetime :created_on
+      t.datetime :updated_on
     end
     
     execute 'create index cms_snippets_name_index on cms_snippets (name(255))'
@@ -116,23 +117,23 @@ class AddCmsTables < ActiveRecord::Migration
     execute 'create index cms_page_objects_cms_page_id_cms_page_version_index on cms_page_objects (cms_page_id, cms_page_version)'
   end
   
-  def self.down
+  def down
     execute 'drop index cms_page_objects_cms_page_id_cms_page_version_index on cms_page_objects'
     execute 'drop index cms_page_objects_cms_page_id_obj_type_index on cms_page_objects'
     execute 'drop index cms_pages_path_index on cms_pages'
     execute 'drop index cms_snippets_name_index on cms_snippets'
     
-    drop_table "cms_asset_tags"
-    drop_table "cms_assets"
-    drop_table "cms_page_comments"
-    drop_table "cms_page_tags"
-    drop_table "cms_page_objects"
-    drop_table "cms_page_versions"
-    drop_table "cms_pages"
-    drop_table "cms_snippet_versions"
-    drop_table "cms_snippets"
-    drop_table "cms_template_versions"
-    drop_table "cms_templates"
+    drop_table :cms_asset_tags
+    drop_table :cms_assets
+    drop_table :cms_page_comments
+    drop_table :cms_page_tags
+    drop_table :cms_page_objects
+    drop_table :cms_page_versions
+    drop_table :cms_pages
+    drop_table :cms_snippet_versions
+    drop_table :cms_snippets
+    drop_table :cms_template_versions
+    drop_table :cms_templates
   end
   
 end

data/db/migrate/20140423085357_add_redirect_fields_to_cms_pages.rb

@@ -1,6 +1,6 @@
-class AddRedirectFieldsToCmsPages < ActiveRecord::Migration
+class AddRedirectFieldsToCmsPages < ActiveRecord::Migration[4.2]
   def change
-    add_column :cms_pages, :redirect_enabled, :boolean, :null => false, :default => false
+    add_column :cms_pages, :redirect_enabled, :boolean, null: false, default: false
     add_column :cms_pages, :redirect_to, :text
   end
 end

data/db/migrate/20140423085358_add_redirect_fields_to_cms_page_versions.rb

@@ -1,6 +1,6 @@
-class AddRedirectFieldsToCmsPageVersions < ActiveRecord::Migration
+class AddRedirectFieldsToCmsPageVersions < ActiveRecord::Migration[4.2]
   def change
-    add_column :cms_page_versions, :redirect_enabled, :boolean, :null => false, :default => false
+    add_column :cms_page_versions, :redirect_enabled, :boolean, null: false, default: false
     add_column :cms_page_versions, :redirect_to, :text
   end
 end

data/docker-compose.override.yml.example

@@ -0,0 +1,43 @@
+# copy this to docker-compose.override.yml and uncomment lines as needed to override default settings
+#
+# reminder: use `docker ps` to see the list of running containers and their port mappings
+#
+version: '3'
+
+services:
+  web:
+    ports:
+      - '3000:80'        # <---- change the first number to set your local port (on 127.0.0.1)
+    volumes:
+      - ../mysite:/home/app/myapp:delegated                      # set to (relative) path to site you want to run
+      # - .:/home/app/imagine_cms:delegated                      # when working on imagine itself
+      # - ./prototype-rails:/home/app/prototype-rails:delegated  # when working on imagine dependency prototype-rails
+      - log:/home/app/myapp/log
+      - node_modules:/home/app/myapp/node_modules
+      - rvm:/usr/local/rvm
+      - ~/.gitconfig:/home/app/.gitconfig                        # if you want to commit from within the container
+    # environment:
+    #   PASSENGER_APP_ENV: production
+    # networks:  # to use traefik, uncomment this along with the networks section at the bottom
+    #   - traefik
+    #   - default
+    # labels:
+    #   traefik.docker.network: traefik
+
+  db:
+    ports:               # access using mysql -P (not -p), ex: mysql -h 127.0.0.1 -P 33060 -u root
+      # - '33060:3306'   # <---- change the first number to set your local port
+      - '3306'           # <---- or omit the first number entirely to use a random local port (use `docker ps`)
+    volumes:
+      - db-data:/var/lib/mysql
+
+volumes:
+  db-data:
+  log:
+  node_modules:
+  tmp:
+  rvm:
+
+# networks:
+#   traefik:
+#     external: true

data/docker-compose.yml

@@ -0,0 +1,21 @@
+version: '3'
+
+services:
+  web:  # (passenger + sidekiq)
+    build: .
+    volumes:
+      - ./docker/conf/nginx-vhost.conf:/etc/nginx/sites-enabled/webapp.conf:delegated
+    environment:
+      PASSENGER_APP_ENV: development
+      MYSQL_HOST: db                    # if this is changed, update nginx-vhost.conf as well
+      REDIS_URL: redis://redis:6379/1   # if this is changed, update nginx-vhost.conf as well
+      
+  db:
+    image: mariadb:10.3
+    volumes:
+      - ./docker/conf/my.local.cnf:/etc/mysql/conf.d/my.local.cnf
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: 1
+      
+  # redis:
+  #   image: redis:4.0-32bit  # not really 32-bit, just compiled that way to reduce memory usage

data/docker/conf/.my.cnf

@@ -0,0 +1,3 @@
+[client]
+host = db
+user = root

data/docker/conf/my.local.cnf

@@ -0,0 +1,14 @@
+[mysqld]
+max_connections = 10
+performance_schema = 0
+
+# innodb
+innodb_buffer_pool_size = 5M
+
+# myisam, which we don't really use
+key_buffer_size = 8
+
+# slow_query_log = 1
+# slow_query_log_file = /var/log/mysql/mariadb-slow.log
+# long_query_time = 5
+# log_queries_not_using_indexes = 1

data/docker/conf/my.prod.cnf

@@ -0,0 +1,9 @@
+[mysqld]
+max_connections = 100
+performance_schema = 0
+
+# innodb
+innodb_buffer_pool_size = 64M
+
+# myisam, which we don't really use
+key_buffer_size = 8M