Commit: ce3282006b6f1e30ca41326c089a7a4ffaa3a1a8 - mmw_serv (git)

Commit MetaInfo

• Revision: ce3282006b6f1e30ca41326c089a7a4ffaa3a1a8 (tree)
• Time: 2017-03-02 22:18:34
• Author: HMML <hmml3939@gmai...>
• Commiter: Tatsuki Sugiura

Log Message

Create DistSignal on accept content distribution request.

Change Summary

• add: app/assets/javascripts/dist_signals.coffee
• modified: app/assets/stylesheets/application.scss
• add: app/assets/stylesheets/common.scss
• add: app/assets/stylesheets/dist_signals.scss
• add: app/assets/stylesheets/scaffolds.scss
• add: app/controllers/dist_signals_controller.rb
• modified: app/controllers/subscribe_controller.rb
• modified: app/helpers/application_helper.rb
• add: app/helpers/dist_signals_helper.rb
• add: app/helpers/resource_helper.rb
• add: app/models/dist_signal.rb
• add: app/views/dist_signals/_dist_signal.json.jbuilder
• add: app/views/dist_signals/_form.html.haml
• add: app/views/dist_signals/edit.html.haml
• add: app/views/dist_signals/index.html.haml
• add: app/views/dist_signals/index.json.jbuilder
• add: app/views/dist_signals/new.html.haml
• add: app/views/dist_signals/show.html.haml
• add: app/views/dist_signals/show.json.jbuilder
• modified: app/views/layouts/application.html.haml
• modified: config/routes.rb
• add: db/migrate/20170302111148_create_dist_signals.rb
• add: db/schema.rb
• add: spec/controllers/dist_signals_controller_spec.rb
• modified: spec/controllers/subscribe_controller_spec.rb
• add: spec/factories/dist_signals.rb
• add: spec/models/dist_signal_spec.rb
• add: spec/routing/dist_signals_routing_spec.rb

Incremental Difference

--- /dev/null
+++ b/app/assets/javascripts/dist_signals.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/

--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1,5 +1,5 @@
 @import "bootstrap-sprockets";
 @import "bootstrap";
-/*
- *= require_tree .
- */
+
+@import "common";
+@import "dist_signals";
\ No newline at end of file

--- /dev/null
+++ b/app/assets/stylesheets/common.scss
@@ -0,0 +1,6 @@
+#main-header {
+    display: none;
+}
+#main-container {
+    //margin-top: 48px;
+}
\ No newline at end of file

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

--- /dev/null
+++ b/app/assets/stylesheets/scaffolds.scss
@@ -0,0 +1,89 @@
+body {
+  background-color: #fff;
+  color: #333;
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  margin: 33px;
+}
+
+p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size: 13px;
+  line-height: 18px;
+  margin: 33px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a {
+  color: #000;
+
+  &:visited {
+    color: #666;
+  }
+
+  &:hover {
+    color: #fff;
+    background-color: #000;
+  }
+}
+
+th {
+  padding-bottom: 5px;
+}
+
+td {
+  padding-bottom: 7px;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+div {
+  &.field, &.actions {
+    margin-bottom: 10px;
+  }
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+
+  h2 {
+    text-align: left;
+    font-weight: bold;
+    padding: 5px 5px 5px 15px;
+    font-size: 12px;
+    margin: -7px;
+    margin-bottom: 0;
+    background-color: #c00;
+    color: #fff;
+  }
+
+  ul li {
+    font-size: 12px;
+    list-style: square;
+  }
+}
+
+label {
+  display: block;
+}

--- /dev/null
+++ b/app/controllers/dist_signals_controller.rb
@@ -0,0 +1,47 @@
+class DistSignalsController < ApplicationController
+  before_action :set_dist_signal, only: [:show, :edit, :update, :destroy]
+
+  respond_to :html
+
+  def index
+    @dist_signals = DistSignal.all.page(params[:page])
+    respond_with(@dist_signals)
+  end
+
+  def show
+    respond_with(@dist_signal)
+  end
+
+  def new
+    @dist_signal = DistSignal.new
+    respond_with(@dist_signal)
+  end
+
+  def edit
+  end
+
+  def create
+    @dist_signal = DistSignal.new(dist_signal_params)
+    @dist_signal.save
+    respond_with(@dist_signal)
+  end
+
+  def update
+    @dist_signal.update(dist_signal_params)
+    respond_with(@dist_signal)
+  end
+
+  def destroy
+    @dist_signal.destroy
+    respond_with(@dist_signal)
+  end
+
+  private
+    def set_dist_signal
+      @dist_signal = DistSignal.find(params[:id])
+    end
+
+    def dist_signal_params
+      params.require(:dist_signal).permit(:signature, :link, :content_type, :body)
+    end
+end

--- a/app/controllers/subscribe_controller.rb
+++ b/app/controllers/subscribe_controller.rb
@@ -1,4 +1,5 @@
 class SubscribeController < ApplicationController
+  skip_before_action :verify_authenticity_token
   def verify
     _log :info, "Verify request: #{params.inspect}"
 
@@ -18,7 +19,8 @@ class SubscribeController < ApplicationController
   def distribute
     req_body = request.body.read
     if req_body.blank?
-      _log :warn, "Empty body for distribute request!"
+      _log :warn, "Empty body for distribute request! Skip all"
+      return head 200
     end
 
     sig = request.headers['X-Hub-Signature']
@@ -28,6 +30,10 @@ class SubscribeController < ApplicationController
       #hmac = OpenSSL::HMAC::hexdigest(OpenSSL::Digest::SHA1.new, secret, req_body)
     end
 
+    DistSignal.create! signature: sig, body: req_body,
+      content_type: request.headers['Content-Type'],
+      link: request.headers['Link']
+
     head 200
   end
 end

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,2 +1,7 @@
 module ApplicationHelper
+  def bs_icon(sym, opts = {})
+    opts[:class] ||= ""
+    opts[:class] += " glyphicon glyphicon-#{sym}"
+    content_tag :span, ''.html_safe, opts
+  end
 end

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

--- /dev/null
+++ b/app/helpers/resource_helper.rb
@@ -0,0 +1,45 @@
+module ResourceHelper
+  def res_link_show(obj, opts = {})
+    if defined? can?
+      can? :show, obj or return ''
+    end
+    label = bs_icon :search, title: t('res_actions.show', default: 'Show')
+    if {show_text_label: true}.merge(opts)[:show_text_label]
+      label += t('res_actions.show')
+    end
+    link_to label, obj, class: 'ar-action btn btn-default btn-xs'
+  end
+
+  def res_link_edit(obj, opts = {})
+    if defined? can?
+      can? :update, obj or return ''
+    end
+    label = bs_icon :edit, title: t('res_actions.edit', default: 'Edit')
+    if {show_text_label: true}.merge(opts)[:show_text_label]
+      label += t('res_actions.edit')
+    end
+    link_to label, edit_polymorphic_path(obj), class: 'ar-action btn btn-default btn-xs'
+  end
+
+  def res_actions(obj, opts = {})
+    opts = {:actions => [:edit, :destroy], :show_text_label => true}.merge opts
+    btns = []
+    opts[:actions].member? :show and
+      btns.push res_link_show(obj, opts)
+    opts[:actions].member? :edit and
+      btns.push res_link_edit(obj, opts)
+    opts[:actions].member? :destroy and
+      btns.push res_link_destroy(obj, opts)
+    content_tag :span, btns.join(' ').html_safe, class: 'ar-actions'
+  end
+
+  def res_label(obj, field)
+    t "activerecord.attributes.#{(Class === obj.class ? obj.name : obj.class.name).underscore}.#{field}"
+  end
+
+  def res_name(obj)
+    obj or return ''
+    obj.respond_to?(:name) and return obj.name
+    "#{t "activerecord.objs.#{obj.class.name.underscore}"} ##{obj.id}"
+  end
+end

--- /dev/null
+++ b/app/models/dist_signal.rb
@@ -0,0 +1,4 @@
+class DistSignal < ApplicationRecord
+  default_scope -> { order(id: :desc) }
+  enum status: {new: 0, complete: 1, failed: 2, progress: 3, ignored: 4}, _prefix: true
+end

--- /dev/null
+++ b/app/views/dist_signals/_dist_signal.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! dist_signal, :id, :signature, :link, :content_type, :body, :created_at, :updated_at
+json.url dist_signal_url(dist_signal, format: :json)

--- /dev/null
+++ b/app/views/dist_signals/_form.html.haml
@@ -0,0 +1,11 @@
+= simple_form_for(@dist_signal) do |f|
+  = f.error_notification
+
+  .form-inputs
+    = f.input :signature
+    = f.input :link
+    = f.input :content_type
+    = f.input :body
+
+  .form-actions
+    = f.button :submit

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

--- /dev/null
+++ b/app/views/dist_signals/index.html.haml
@@ -0,0 +1,27 @@
+%h1 Listing dist_signals
+
+= paginate @dist_signals
+
+%table.table
+  %thead
+    %tr
+      %th Status
+      %th Signature
+      %th Link
+      %th Content type
+      %th Body
+      %th
+
+  %tbody
+    - @dist_signals.each do |dist_signal|
+      %tr
+        %td= dist_signal.status
+        %td= dist_signal.signature
+        %td= dist_signal.link
+        %td= dist_signal.content_type
+        %td= dist_signal.body.truncate(80)
+        %td= res_actions dist_signal, actions: %i(show)
+
+= paginate @dist_signals
+
+//= link_to 'New Dist signal', new_dist_signal_path

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

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

--- /dev/null
+++ b/app/views/dist_signals/show.html.haml
@@ -0,0 +1,21 @@
+%p#notice= notice
+
+%p
+  %b Status:
+  = @dist_signal.status
+%p
+  %b Signature:
+  = @dist_signal.signature
+%p
+  %b Link:
+  = @dist_signal.link
+%p
+  %b Content type:
+  = @dist_signal.content_type
+%p
+  %b Body:
+  = simple_format @dist_signal.body
+
+//= link_to 'Edit', edit_dist_signal_path(@dist_signal)
+\|
+= link_to 'Back', dist_signals_path

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

--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -21,14 +21,13 @@
             = link_to t('site_title'), root_path, class: "navbar-brand"
           .collapse.navbar-collapse
             %ul.nav.navbar-nav
-              - if signed_in?
+              - if false # signed_in?
                 = render "layouts/topnav"
                 // %li.visible-xs= link_to t('logout'), logout_path
               - else
                 // %li.visible-xs= link_to t('login'), login_path
             %ul.nav.navbar-nav.pull-right.hidden-xs
-              /-
-              - if signed_in?
+              - if false # signed_in?
                 %li.dropdown
                   %a.dropdown-toggle{href: '#', data: {toggle: 'dropdown'}}
                     //= current_user.name

--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,5 +2,8 @@ Rails.application.routes.draw do
   get  'sub', to: 'subscribe#verify'
   post 'sub', to: 'subscribe#distribute'
 
+  resources :dist_signals, only: %i(index show)
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+
+  root 'dummy_error_controller#index'
 end

--- /dev/null
+++ b/db/migrate/20170302111148_create_dist_signals.rb
@@ -0,0 +1,14 @@
+class CreateDistSignals < ActiveRecord::Migration[5.0]
+  def change
+    create_table :dist_signals do |t|
+      t.string :signature
+      t.string :link
+      t.string :content_type
+      t.integer :status, default: 0, null: false
+      t.text :body
+
+      t.timestamps
+    end
+    add_index :dist_signals, :status
+  end
+end

--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,26 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20170302111148) do
+
+  create_table "dist_signals", force: :cascade do |t|
+    t.string   "signature"
+    t.string   "link"
+    t.string   "content_type"
+    t.integer  "status",       default: 0, null: false
+    t.text     "body"
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
+    t.index ["status"], name: "index_dist_signals_on_status"
+  end
+
+end

--- /dev/null
+++ b/spec/controllers/dist_signals_controller_spec.rb
@@ -0,0 +1,159 @@
+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.
+
+RSpec.describe DistSignalsController, type: :controller do
+
+  # This should return the minimal set of attributes required to create a valid
+  # DistSignal. As you add validations to DistSignal, 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
+  # DistSignalsController. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+  describe "GET #index" do
+    it "assigns all dist_signals as @dist_signals" do
+      dist_signal = DistSignal.create! valid_attributes
+      get :index, params: {}, session: valid_session
+      expect(assigns(:dist_signals)).to eq([dist_signal])
+    end
+  end
+
+  describe "GET #show" do
+    it "assigns the requested dist_signal as @dist_signal" do
+      dist_signal = DistSignal.create! valid_attributes
+      get :show, params: {id: dist_signal.to_param}, session: valid_session
+      expect(assigns(:dist_signal)).to eq(dist_signal)
+    end
+  end
+
+  describe "GET #new" do
+    xit "assigns a new dist_signal as @dist_signal" do
+      get :new, params: {}, session: valid_session
+      expect(assigns(:dist_signal)).to be_a_new(DistSignal)
+    end
+  end
+
+  describe "GET #edit" do
+    xit "assigns the requested dist_signal as @dist_signal" do
+      dist_signal = DistSignal.create! valid_attributes
+      get :edit, params: {id: dist_signal.to_param}, session: valid_session
+      expect(assigns(:dist_signal)).to eq(dist_signal)
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      xit "creates a new DistSignal" do
+        expect {
+          post :create, params: {dist_signal: valid_attributes}, session: valid_session
+        }.to change(DistSignal, :count).by(1)
+      end
+
+      xit "assigns a newly created dist_signal as @dist_signal" do
+        post :create, params: {dist_signal: valid_attributes}, session: valid_session
+        expect(assigns(:dist_signal)).to be_a(DistSignal)
+        expect(assigns(:dist_signal)).to be_persisted
+      end
+
+      xit "redirects to the created dist_signal" do
+        post :create, params: {dist_signal: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(DistSignal.last)
+      end
+    end
+
+    context "with invalid params" do
+      xit "assigns a newly created but unsaved dist_signal as @dist_signal" do
+        post :create, params: {dist_signal: invalid_attributes}, session: valid_session
+        expect(assigns(:dist_signal)).to be_a_new(DistSignal)
+      end
+
+      xit "re-renders the 'new' template" do
+        post :create, params: {dist_signal: invalid_attributes}, session: valid_session
+        expect(response).to render_template("new")
+      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")
+      }
+
+      xit "updates the requested dist_signal" do
+        dist_signal = DistSignal.create! valid_attributes
+        put :update, params: {id: dist_signal.to_param, dist_signal: new_attributes}, session: valid_session
+        dist_signal.reload
+        skip("Add assertions for updated state")
+      end
+
+      xit "assigns the requested dist_signal as @dist_signal" do
+        dist_signal = DistSignal.create! valid_attributes
+        put :update, params: {id: dist_signal.to_param, dist_signal: valid_attributes}, session: valid_session
+        expect(assigns(:dist_signal)).to eq(dist_signal)
+      end
+
+      xit "redirects to the dist_signal" do
+        dist_signal = DistSignal.create! valid_attributes
+        put :update, params: {id: dist_signal.to_param, dist_signal: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(dist_signal)
+      end
+    end
+
+    context "with invalid params" do
+      xit "assigns the dist_signal as @dist_signal" do
+        dist_signal = DistSignal.create! valid_attributes
+        put :update, params: {id: dist_signal.to_param, dist_signal: invalid_attributes}, session: valid_session
+        expect(assigns(:dist_signal)).to eq(dist_signal)
+      end
+
+      xit "re-renders the 'edit' template" do
+        dist_signal = DistSignal.create! valid_attributes
+        put :update, params: {id: dist_signal.to_param, dist_signal: invalid_attributes}, session: valid_session
+        expect(response).to render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+    xit "destroys the requested dist_signal" do
+      dist_signal = DistSignal.create! valid_attributes
+      expect {
+        delete :destroy, params: {id: dist_signal.to_param}, session: valid_session
+      }.to change(DistSignal, :count).by(-1)
+    end
+
+    xit "redirects to the dist_signals list" do
+      dist_signal = DistSignal.create! valid_attributes
+      delete :destroy, params: {id: dist_signal.to_param}, session: valid_session
+      expect(response).to redirect_to(dist_signals_url)
+    end
+  end
+
+end

--- a/spec/controllers/subscribe_controller_spec.rb
+++ b/spec/controllers/subscribe_controller_spec.rb
@@ -34,5 +34,29 @@ RSpec.describe SubscribeController, type: :controller do
       post :distribute
       expect(response).to have_http_status(:success)
     end
+
+    it "dose not create DistSignal instance with empty body" do
+      id1 = DistSignal.reorder(id: :desc).last.try(:id)
+      post :distribute
+      id2 = DistSignal.reorder(id: :desc).last.try(:id)
+      expect(id1).to eq id2
+    end
+
+    it "creates DistSignal instance with body" do
+      sig  = "sig-" + SecureRandom.hex(32)
+      body = "body-" + SecureRandom.hex(32)
+      link = "link-" + SecureRandom.hex(32)
+      @request.headers['Content-Type'] = 'application/atom+xml'
+      @request.headers['Link'] = link
+      @request.headers['X-Hub-Signature'] = sig
+      post :distribute, body: body
+      expect(response).to have_http_status(:success)
+
+      ds = DistSignal.reorder(id: :desc).last
+      expect(ds.body).to eq body
+      expect(ds.content_type).to eq 'application/atom+xml'
+      expect(ds.signature).to eq sig
+      expect(ds.link).to eq link
+    end
   end
 end

--- /dev/null
+++ b/spec/factories/dist_signals.rb
@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :dist_signal do
+    signature "MyString"
+    link "MyString"
+    content_type "MyString"
+    body "MyText"
+  end
+end

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

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