コミット: 6795717c3801cc4d3503eeca5eff8ee2f775f65b - mmw_serv (git)

コミットメタ情報

• リビジョン: 6795717c3801cc4d3503eeca5eff8ee2f775f65b (tree)
• 日時: 2017-08-14 03:00:50
• 作者: HMML <hmml3939@gmai...>
• コミッター: HMML

ログメッセージ

Add theme class (WIP).

変更サマリ

• modified: .gitignore
• modified: Gemfile
• modified: Gemfile.lock
• add: app/assets/javascripts/themes.coffee
• add: app/assets/stylesheets/themes.scss
• add: app/controllers/themes_controller.rb
• add: app/helpers/themes_helper.rb
• modified: app/models/application_record.rb
• modified: app/models/draft.rb
• add: app/models/theme.rb
• add: app/models/theme_definition.rb
• modified: app/views/layouts/_topnav.html.haml
• add: app/views/themes/_form.html.haml
• add: app/views/themes/_theme.json.jbuilder
• add: app/views/themes/edit.html.haml
• add: app/views/themes/index.html.haml
• add: app/views/themes/index.json.jbuilder
• add: app/views/themes/new.html.haml
• add: app/views/themes/show.html.haml
• add: app/views/themes/show.json.jbuilder
• modified: config/application.rb
• modified: config/locales/en.yml
• modified: config/locales/ja.yml
• modified: config/routes.rb
• add: db/migrate/20170811160939_create_themes.rb
• add: db/migrate/20170813041825_add_author_to_draft.rb
• modified: db/schema.rb
• add: spec/controllers/themes_controller_spec.rb
• add: spec/factories/themes.rb
• add: spec/models/theme_spec.rb
• add: spec/routing/themes_routing_spec.rb
• add: test/system/themes_test.rb

差分

--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@
 /yarn-error.log
 /public/packs
 /public/system
+/private
 
 /.vagrant
 /erd.*

--- a/Gemfile
+++ b/Gemfile
@@ -57,6 +57,8 @@ gem 'daemons'
 gem 'exception_notification', group: :production
 gem 'paperclip'
 gem 'rqrcode', github: 'sugi/rqrcode', branch: 'inline-svg'
+gem 'rubyzip', '>= 1.0.0', require: 'zip'
+#gem 'counter_culture', '~> 1.0'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -472,6 +472,7 @@ DEPENDENCIES
   responders
   rqrcode!
   rspec-rails
+  rubyzip (>= 1.0.0)
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
   selenium-webdriver

--- /dev/null
+++ b/app/assets/javascripts/themes.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/

--- /dev/null
+++ b/app/assets/stylesheets/themes.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the Themes controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

--- /dev/null
+++ b/app/controllers/themes_controller.rb
@@ -0,0 +1,48 @@
+class ThemesController < ApplicationController
+  before_action :set_theme, only: [:show, :edit, :update, :destroy]
+  respond_to :html
+
+  load_and_authorize_resource
+
+  def index
+    @themes = Theme.all
+    respond_with(@themes)
+  end
+
+  def show
+    respond_with(@theme)
+  end
+
+  def new
+    @theme = Theme.new
+    respond_with(@theme)
+  end
+
+  def edit
+  end
+
+  def create
+    @theme = Theme.new(theme_params)
+    @theme.save
+    respond_with(@theme)
+  end
+
+  def update
+    @theme.update(theme_params)
+    respond_with(@theme)
+  end
+
+  def destroy
+    @theme.destroy
+    respond_with(@theme)
+  end
+
+  private
+    def set_theme
+      @theme = Theme.find(params[:id])
+    end
+
+    def theme_params
+      params.require(:theme).permit(:name, :short_desc, :disabled, :author, :url, :license, :user_id, :allow_orig_dl)
+    end
+end

--- /dev/null
+++ b/app/helpers/themes_helper.rb
@@ -0,0 +1,2 @@
+module ThemesHelper
+end

--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -1,3 +1,10 @@
+require 'fileutils'
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
+
+  def _zip_tmp_path(category)
+    path = Rails.root.join('tmp', 'archives', category, "#{self.class.to_s.downcase}-#{id}-#{SecureRandom.hex(6)}.zip")
+    FileUtils.mkdir_p path.dirname
+    path
+  end
 end

--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -31,7 +31,7 @@ class Draft < ApplicationRecord
   belongs_to :user, required: false
   before_save :renew_expire
   after_initialize :set_key
-  validates :title, :url, length: { maximum: 255 }
+  validates :title, length: { maximum: 60 }
   validates :url, format: { with: %r{\Ahttps?://[a-z0-9-]+(\.[a-z0-9-]+){1,}/}i }, allow_blank: true
   validates :key, uniqueness: true
 
@@ -48,6 +48,10 @@ class Draft < ApplicationRecord
     size: { less_than: 20.megabyte }
   end
 
+  def name
+    title
+  end
+
   def renew_expire
     self.expires_at = Time.now + EXPIRES_IN
   end
@@ -66,6 +70,35 @@ class Draft < ApplicationRecord
     key
   end
 
+  def theme_definition
+    ThemeDefinition.new(draft: self)
+  end
+
+  def theme_image_archive
+    ICONS.find { |ic| public_send("wi_#{ic}?") } or return nil
+    path = _zip_tmp_path('theme-archive')
+    Zip::File.open(path, Zip::File::CREATE) do |zf|
+      ICONS.each do |ic|
+        public_send("wi_#{ic}?") or next
+        zf.add "wi-#{ic.chars.map{|c| FILENAME_MAP[c]}.join('_')}.webp", public_send("wi_#{ic}").path(:webp500)
+      end
+    end
+    path
+  end
+
+  def orig_archive
+    ICONS.find { |ic| public_send("wi_#{ic}?") } or return nil
+    path = _zip_tmp_path('orig-archive')
+    Zip::File.open(path, Zip::File::CREATE) do |zf|
+      ICONS.each do |ic|
+        public_send("wi_#{ic}?") or next
+        attach = public_send("wi_#{ic}")
+        zf.add "Weather_#{ic.chars.map{|c| FILENAME_MAP[c]}.join('-')}#{File.extname(attach.path)}", attach.path
+      end
+    end
+    path
+  end
+
   def as_json(opts = {})
     ret = super(opts)
     ret["path"] = Rails.application.routes.url_helpers.draft_path(self, format: :json)

--- /dev/null
+++ b/app/models/theme.rb
@@ -0,0 +1,116 @@
+require 'fileutils'
+class Theme < ApplicationRecord
+  belongs_to :user, required: false
+
+  attr_accessor :archive_update_required
+  enum day_frame: {white: '@builtin/white', black: '@builtin/black'}, _prefix: 'day_frame'
+
+  preview_opts = {
+    styles: {
+      thumb500: '500x500>',
+      thumb300: '300x300>',
+      thumb120: '120x120>',
+    },
+  }
+  has_attached_file :preview1, preview_opts
+  has_attached_file :preview2, preview_opts
+  has_attached_file :preview3, preview_opts
+
+  archive_opts = {
+    path: ':rails_root/private/system/:class/:attachment/:id_partition/:style/:filename',
+    processors: [],
+  }
+  has_attached_file :orig_archive, archive_opts
+  has_attached_file :theme_archive, archive_opts
+
+  validates :name, :author, :license, presence: true
+  validates :name, length: {maximum: 60}
+  validates :url, format: { with: %r{\Ahttps?://[a-z0-9-]+(\.[a-z0-9-]+){1,}/}i }, allow_blank: true
+
+  validates_attachment :preview1, :preview2, :preview3, content_type: {content_type: /\Aimage\//}
+  validates_attachment :orig_archive, :theme_archive, content_type: {content_type: %w(application/zip)}
+
+  before_save :set_archive_update_required
+  after_save :auto_update_archive
+
+  def draft=(draft)
+    draft.kind_of?(Draft) or draft = Draft.find(draft)
+    %i(name author url).each do |attr|
+      self.public_send "#{attr}=", draft.public_send(attr)
+    end
+    self.day_frame = draft.read_attribute_before_type_cast(:day_frame)
+    {theme: :theme_image, orig: :orig}.each do |t_name, d_name|
+      fh = nil
+      begin
+        path = draft.public_send("#{d_name}_archive") or next
+        fh = File.open(path)
+        public_send "#{t_name}_archive=", fh
+      ensure
+        begin
+          fh && fh.close
+        rescue
+          # ignore
+        end
+      end
+    end
+    draft
+  end
+  alias_method :draft_id=, :draft=
+
+  def update_archives
+    update_orig_archive
+    update_theme_archive
+  end
+
+  def update_orig_archive
+    orig_archive? or return
+    if new_record?
+      self.archive_update_required = true
+      logger.warn "update_orig_archive is called before seve. Setting update hook and ignore..."
+      return
+    end
+    tmp_path = _zip_tmp_path('orig-archive')
+    FileUtils.cp (orig_archive.dirty? ? orig_archive.staged_path : orig_archive.path), tmp_path
+    Zip::File.open(tmp_path) do |zf|
+      zf.get_output_stream("ThemeDetails.html") do |o|
+        o << %Q{<!DOCTYPE html>\n<script>window.location.href="#{Rails.application.routes.url_helpers.theme_url(self)}";</script>}
+      end
+    end
+    tmp_path.open do |f|
+      self.orig_archive = f
+    end
+    save
+  end
+
+  def update_theme_archive
+    theme_archive? or return
+    if new_record?
+      self.archive_update_required = true
+      logger.warn "update_theme_archive is called before seve. Setting update hook and ignore..."
+      return
+    end
+    tmp_path = _zip_tmp_path('theme-archive')
+    FileUtils.cp theme_archive.path, tmp_path
+    Zip::File.open(tmp_path) do |zf|
+      zf.get_output_stream("theme.json") do |o|
+        o << ThemeDefinition.new(theme: self).to_json
+      end
+    end
+    tmp_path.open do |f|
+      self.theme_archive = f
+    end
+    save
+  end
+
+  def set_archive_update_required
+    new_record? or return true
+    self.archive_update_required = true
+  end
+
+  def auto_update_archive
+    self.archive_update_required or return true
+    self.archive_update_required = false
+    update_archives
+    true
+  end
+end

--- /dev/null
+++ b/app/models/theme_definition.rb
@@ -0,0 +1,41 @@
+class ThemeDefinition
+  include ActiveModel
+
+  attr_accessor :id, :name, :url, :author, :day_frame, :license, :short_desc
+
+  def initialize(attrs = {})
+    (attrs || {}).each do |k, v|
+      public_send "#{k}=", v
+    end
+  end
+
+  def draft=(draft)
+    draft.kind_of?(Draft) or theme = Draft.find(draft)
+    %i(name author url).each do |attr|
+      self.public_send "#{attr}=", draft.public_send(attr)
+    end
+    self.day_frame = draft.read_attribute_before_type_cast(:day_frame)
+    draft
+  end
+  alias_method :draft_id=, :draft=
+
+  def theme=(theme)
+    theme.kind_of?(Theme) or theme = Theme.find(theme)
+    %i(id name author url license short_desc).each do |attr|
+      self.public_send "#{attr}=", theme.public_send(attr)
+    end
+    self.day_frame = theme.read_attribute_before_type_cast(:day_frame)
+    theme
+  end
+  alias_method :theme_id=, :theme=
+
+  def as_json(opts = {})
+    ret = {
+      schema_version: 1,
+    }
+    %i(id name author url short_desc day_frame).each do |a|
+      ret[a] = public_send(a)
+    end
+    ret.stringify_keys
+  end
+end

--- a/app/views/layouts/_topnav.html.haml
+++ b/app/views/layouts/_topnav.html.haml
@@ -5,11 +5,11 @@
     root_path, class: "navbar-brand"
   .collapse.navbar-collapse#topnavbar-nav
     %ul.navbar-nav.mr-auto
+      %li.nav-item{class: controller_name == "themes" ? 'active' : ''}
+        = link_to t('activerecord.models.theme'), themes_path, class: 'nav-link'
       - if user_signed_in?
         %li.nav-item.active
           = link_to 'Signal', dist_signals_path, class: 'nav-link'
-      - if false # signed_in?
-        = render "layouts/topnav"
         // %li.visible-sm= link_to t('logout'), logout_path
       - else
         // %li.visible-sm= link_to t('login'), login_path

--- /dev/null
+++ b/app/views/themes/_form.html.haml
@@ -0,0 +1,15 @@
+= simple_form_for(@theme) do |f|
+  = f.error_notification
+
+  .form-inputs
+    = f.input :name
+    = f.input :short_desc
+    = f.input :disabled
+    = f.input :author
+    = f.input :url
+    = f.input :license
+    = f.association :user
+    = f.input :allow_orig_dl
+
+  .form-actions
+    = f.button :submit

--- /dev/null
+++ b/app/views/themes/_theme.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! theme, :id, :name, :short_desc, :disabled, :author, :url, :license, :user_id, :allow_orig_dl, :created_at, :updated_at
+json.url theme_url(theme, format: :json)

--- /dev/null
+++ b/app/views/themes/edit.html.haml
@@ -0,0 +1,7 @@
+%h1 Editing theme
+
+= render 'form'
+
+= link_to 'Show', @theme
+\|
+= link_to 'Back', themes_path

--- /dev/null
+++ b/app/views/themes/index.html.haml
@@ -0,0 +1,35 @@
+%h1 Listing themes
+
+%table
+  %thead
+    %tr
+      %th Name
+      %th Short desc
+      %th Disabled
+      %th Author
+      %th url
+      %th License
+      %th User
+      %th Allow orig dl
+      %th
+      %th
+      %th
+
+  %tbody
+    - @themes.each do |theme|
+      %tr
+        %td= theme.name
+        %td= theme.short_desc
+        %td= theme.disabled
+        %td= theme.author
+        %td= theme.url
+        %td= theme.license
+        %td= theme.user
+        %td= theme.allow_orig_dl
+        %td= link_to 'Show', theme
+        %td= link_to 'Edit', edit_theme_path(theme)
+        %td= link_to 'Destroy', theme, method: :delete, data: { confirm: 'Are you sure?' }
+
+%br
+
+= link_to 'New Theme', new_theme_path

--- /dev/null
+++ b/app/views/themes/index.json.jbuilder
@@ -0,0 +1 @@
+json.array! @themes, partial: 'themes/theme', as: :theme

--- /dev/null
+++ b/app/views/themes/new.html.haml
@@ -0,0 +1,5 @@
+%h1 New theme
+
+= render 'form'
+
+= link_to 'Back', themes_path

--- /dev/null
+++ b/app/views/themes/show.html.haml
@@ -0,0 +1,30 @@
+%p#notice= notice
+
+%p
+  %b Name:
+  = @theme.name
+%p
+  %b Short desc:
+  = @theme.short_desc
+%p
+  %b Disabled:
+  = @theme.disabled
+%p
+  %b Author:
+  = @theme.author
+%p
+  %b url:
+  = @theme.url
+%p
+  %b License:
+  = @theme.license
+%p
+  %b User:
+  = @theme.user
+%p
+  %b Allow orig dl:
+  = @theme.allow_orig_dl
+
+= link_to 'Edit', edit_theme_path(@theme)
+\|
+= link_to 'Back', themes_path

--- /dev/null
+++ b/app/views/themes/show.json.jbuilder
@@ -0,0 +1 @@
+json.partial! "themes/theme", theme: @theme

--- a/config/application.rb
+++ b/config/application.rb
@@ -31,6 +31,11 @@ module MmwPsh
       g.fixture_replacement :factory_girl, dir: "spec/factories"
     end
 
+    config.action_controller.default_url_options =
+      config.action_mailer.default_url_options = {
+      protocol: 'http', host: 'localhost', port: 3000,
+    }
+
     config.i18n.default_locale = :en
     config.i18n.available_locales = [:en, :ja]
     config.i18n.enforce_available_locales = true
@@ -40,3 +45,7 @@ module MmwPsh
     config.hub_secrets = {}
   end
 end
+
+Rails.application.routes.default_url_options = {
+  protocol: 'http', host: 'localhost', port: 3000,
+}

--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,6 +1,7 @@
 en:
   activerecord:
     models:
+      theme: Theme
     attributes:
 
   drafts:

--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1,7 +1,9 @@
 ja:
   activerecord:
     models:
+      theme: テーマ
     attributes:
+      
 
   drafts:
     show:

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,5 @@
 Rails.application.routes.draw do
+  resources :themes
   namespace :api, defaults: {format: :json}  do
     namespace :v1 do
       get 'forecasts/:area_ns/:area_code', to: 'forecasts#show', as: :forecasts

--- /dev/null
+++ b/db/migrate/20170811160939_create_themes.rb
@@ -0,0 +1,28 @@
+class CreateThemes < ActiveRecord::Migration[5.1]
+  def change
+    create_table :themes do |t|
+      t.string :name
+      t.text :short_desc
+      t.boolean :disabled, default: false, null: false
+      t.string :author
+      t.text :url
+      t.string :license, null: false
+      t.string :day_frame
+      t.references :user
+      t.boolean :allow_orig_dl, default: true, null: false
+      t.integer :revision, default: 1, null: false
+
+      t.timestamps
+
+      t.attachment :preview1
+      t.attachment :preview2
+      t.attachment :preview3
+      t.attachment :theme_archive
+      t.string :theme_archive_fingerprint
+      t.attachment :orig_archive
+      t.string :orig_archive_fingerprint
+
+      t.index :created_at
+    end
+  end
+end

--- /dev/null
+++ b/db/migrate/20170813041825_add_author_to_draft.rb
@@ -0,0 +1,5 @@
+class AddAuthorToDraft < ActiveRecord::Migration[5.1]
+  def change
+    add_column :drafts, :author, :string
+  end
+end

--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170807093054) do
+ActiveRecord::Schema.define(version: 20170813041825) do
 
   create_table "areas", force: :cascade do |t|
     t.string "ns"
@@ -195,6 +195,7 @@ ActiveRecord::Schema.define(version: 20170807093054) do
     t.string "wi_tc_content_type"
     t.integer "wi_tc_file_size"
     t.datetime "wi_tc_updated_at"
+    t.string "author"
     t.index ["key"], name: "index_drafts_on_key", unique: true
     t.index ["user_id"], name: "index_drafts_on_user_id"
   end
@@ -215,6 +216,45 @@ ActiveRecord::Schema.define(version: 20170807093054) do
     t.index ["area_id"], name: "index_forecasts_on_area_id"
   end
 
+  create_table "themes", force: :cascade do |t|
+    t.string "name"
+    t.text "short_desc"
+    t.boolean "disabled", default: false, null: false
+    t.string "author"
+    t.text "url"
+    t.string "license", null: false
+    t.string "day_frame"
+    t.integer "user_id"
+    t.boolean "allow_orig_dl", default: true, null: false
+    t.integer "revision", default: 1, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.string "preview1_file_name"
+    t.string "preview1_content_type"
+    t.integer "preview1_file_size"
+    t.datetime "preview1_updated_at"
+    t.string "preview2_file_name"
+    t.string "preview2_content_type"
+    t.integer "preview2_file_size"
+    t.datetime "preview2_updated_at"
+    t.string "preview3_file_name"
+    t.string "preview3_content_type"
+    t.integer "preview3_file_size"
+    t.datetime "preview3_updated_at"
+    t.string "theme_archive_file_name"
+    t.string "theme_archive_content_type"
+    t.integer "theme_archive_file_size"
+    t.datetime "theme_archive_updated_at"
+    t.string "theme_archive_fingerprint"
+    t.string "orig_archive_file_name"
+    t.string "orig_archive_content_type"
+    t.integer "orig_archive_file_size"
+    t.datetime "orig_archive_updated_at"
+    t.string "orig_archive_fingerprint"
+    t.index ["created_at"], name: "index_themes_on_created_at"
+    t.index ["user_id"], name: "index_themes_on_user_id"
+  end
+
   create_table "users", force: :cascade do |t|
     t.string "name"
     t.string "lang"

--- /dev/null
+++ b/spec/controllers/themes_controller_spec.rb
@@ -0,0 +1,141 @@
+require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to specify the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator.  If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails.  There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# is no simpler way to get a handle on the object needed for the example.
+# Message expectations are only used when there is no simpler way to specify
+# that an instance is receiving a specific message.
+#
+# Also compared to earlier versions of this generator, there are no longer any
+# expectations of assigns and templates rendered. These features have been
+# removed from Rails core in Rails 5, but can be added back in via the
+# `rails-controller-testing` gem.
+
+RSpec.describe ThemesController, type: :controller do
+
+  # This should return the minimal set of attributes required to create a valid
+  # Theme. As you add validations to Theme, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) {
+    skip("Add a hash of attributes valid for your model")
+  }
+
+  let(:invalid_attributes) {
+    skip("Add a hash of attributes invalid for your model")
+  }
+
+  # This should return the minimal set of values that should be in the session
+  # in order to pass any filters (e.g. authentication) defined in
+  # ThemesController. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+  describe "GET #index" do
+    it "returns a success response" do
+      theme = Theme.create! valid_attributes
+      get :index, params: {}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "GET #show" do
+    it "returns a success response" do
+      theme = Theme.create! valid_attributes
+      get :show, params: {id: theme.to_param}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "GET #new" do
+    it "returns a success response" do
+      get :new, params: {}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "GET #edit" do
+    it "returns a success response" do
+      theme = Theme.create! valid_attributes
+      get :edit, params: {id: theme.to_param}, session: valid_session
+      expect(response).to be_success
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      it "creates a new Theme" do
+        expect {
+          post :create, params: {theme: valid_attributes}, session: valid_session
+        }.to change(Theme, :count).by(1)
+      end
+
+      it "redirects to the created theme" do
+        post :create, params: {theme: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(Theme.last)
+      end
+    end
+
+    context "with invalid params" do
+      it "returns a success response (i.e. to display the 'new' template)" do
+        post :create, params: {theme: invalid_attributes}, session: valid_session
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe "PUT #update" do
+    context "with valid params" do
+      let(:new_attributes) {
+        skip("Add a hash of attributes valid for your model")
+      }
+
+      it "updates the requested theme" do
+        theme = Theme.create! valid_attributes
+        put :update, params: {id: theme.to_param, theme: new_attributes}, session: valid_session
+        theme.reload
+        skip("Add assertions for updated state")
+      end
+
+      it "redirects to the theme" do
+        theme = Theme.create! valid_attributes
+        put :update, params: {id: theme.to_param, theme: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(theme)
+      end
+    end
+
+    context "with invalid params" do
+      it "returns a success response (i.e. to display the 'edit' template)" do
+        theme = Theme.create! valid_attributes
+        put :update, params: {id: theme.to_param, theme: invalid_attributes}, session: valid_session
+        expect(response).to be_success
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+    it "destroys the requested theme" do
+      theme = Theme.create! valid_attributes
+      expect {
+        delete :destroy, params: {id: theme.to_param}, session: valid_session
+      }.to change(Theme, :count).by(-1)
+    end
+
+    it "redirects to the themes list" do
+      theme = Theme.create! valid_attributes
+      delete :destroy, params: {id: theme.to_param}, session: valid_session
+      expect(response).to redirect_to(themes_url)
+    end
+  end
+
+end

--- /dev/null
+++ b/spec/factories/themes.rb
@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :theme do
+    name "MyString"
+    short_desc "MyText"
+    disabled false
+    author "MyString"
+    url "MyText"
+    license "MyString"
+    user nil
+    allow_orig_dl false
+  end
+end

--- /dev/null
+++ b/spec/models/theme_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Theme, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

--- /dev/null
+++ b/spec/routing/themes_routing_spec.rb
@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.describe ThemesController, type: :routing do
+  describe "routing" do
+
+    it "routes to #index" do
+      expect(:get => "/themes").to route_to("themes#index")
+    end
+
+    it "routes to #new" do
+      expect(:get => "/themes/new").to route_to("themes#new")
+    end
+
+    it "routes to #show" do
+      expect(:get => "/themes/1").to route_to("themes#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      expect(:get => "/themes/1/edit").to route_to("themes#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      expect(:post => "/themes").to route_to("themes#create")
+    end
+
+    it "routes to #update via PUT" do
+      expect(:put => "/themes/1").to route_to("themes#update", :id => "1")
+    end
+
+    it "routes to #update via PATCH" do
+      expect(:patch => "/themes/1").to route_to("themes#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      expect(:delete => "/themes/1").to route_to("themes#destroy", :id => "1")
+    end
+
+  end
+end

--- /dev/null
+++ b/test/system/themes_test.rb
@@ -0,0 +1,9 @@
+require "application_system_test_case"
+
+class ThemesTest < ApplicationSystemTestCase
+  # test "visiting the index" do
+  #   visit themes_url
+  #
+  #   assert_selector "h1", text: "Theme"
+  # end
+end