carraway 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7413bee588bc81463c7f6157ec89072fa668e57fb3dc82a9ac44d9122dbf1f75
-  data.tar.gz: 882068dfc6f541197e5090bb06fbd1deba5c878888cdbe75c1e4e43e1966dbee
+  metadata.gz: e471f5dd46965102f05fa1ea09778a917a597ab013e3bafccf65609985a047b3
+  data.tar.gz: 8b3a5647ec657e5536bc5a66081bfdbb46355f3ddf153dc2bea13af53c9d25b0
 SHA512:
-  metadata.gz: 1f2ae24be1f374f31f169b0a4df78ef67d663930b2822c8a3f2383efa8dc73c41d3f8fa28de9a0948c5a5f493154b747b46a368643b2346ca36d098e1ea1996b
-  data.tar.gz: 21e46ee4e9f196e3eb3f8469c0931f4f9551a066388115c04b6d73d1e8d1e0213dee6b0dfb3428dc0dc4684773f9ba459a62e385236b8603d1db221b3caa6092
+  metadata.gz: aac3ab9b4b42cd867ea13618e61950ff9178be52f3ea768e6ed78e8d7087c38a3a7cc2c4ff050d8ef072028ed6e8ef1aebe48b4cfce626ad23dc9658d87050a5
+  data.tar.gz: dbd5e5c8a049a62b139dfb55082bcc50cfa74b7dd80d8bdebc4a78b056ce23720c6344d479391275bf9c43a613d0a7524df18ab898534d0c0d8c7f57e37ba87e

data/carraway.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor'
   spec.add_dependency 'sinatra'
   spec.add_dependency 'aws-sdk-dynamodb'
+  spec.add_dependency 'aws-sdk-s3'
   spec.add_dependency 'rack-flash3'
 
   spec.add_development_dependency "bundler", "~> 1.16"

data/lib/carraway.rb

@@ -4,5 +4,6 @@ end
 require 'carraway/version'
 require 'carraway/category'
 require 'carraway/post'
+require 'carraway/file'
 require 'carraway/config'
 require 'carraway/server'

data/lib/carraway/config.rb

@@ -19,6 +19,10 @@ module Carraway
       def gatsby_endpoint
         @config['gatsby_endpoint'] || 'http://localhost:8000'
       end
+
+      def file_backend
+        @config['file_backend']
+      end
     end
   end
 end

data/lib/carraway/file.rb

@@ -0,0 +1,85 @@
+require 'aws-sdk-dynamodb'
+require 'aws-sdk-s3'
+
+module Carraway
+  class File
+    class << self
+      def all
+        query = { table_name: Config.backend['table_name'] }
+        query[:filter_expression] = <<~FILTER
+          record_type = :type
+        FILTER
+        query[:expression_attribute_values] = { ':type' => 'file' }
+
+        dynamo_client.scan(query).items.map do |item|
+          new(
+            uid: item['uid'],
+            title: item['title'],
+            created: item['created']
+          )
+        end
+      end
+
+      def dynamo_client
+        if Config.backend['endpoint']
+          Aws::DynamoDB::Client.new(
+            endpoint: Config.backend['endpoint'],
+            region: Config.backend['region'],
+            access_key_id: 'dummy',
+            secret_access_key: 'dummy'
+          )
+        else
+          Aws::DynamoDB::Client.new
+        end
+      end
+    end
+
+    attr_reader :title, :uid, :created
+
+    def initialize(title:, file: nil, uid: nil, created: nil)
+      @title = title
+      @file = file
+      @uid = uid || generate_uid
+      @created = created
+    end
+
+    %i(created).each do |col|
+      define_method("#{col}_at") do
+        at = send(col)
+        at && Time.at(at)
+      end
+    end
+
+    # FIXME duplicate impl on Post
+    def generate_uid
+      [Time.now.strftime('%Y%m%d%H%M%S'), "%05d" % rand(10000)].join
+    end
+
+    def s3_client
+      Aws::S3::Client.new
+    end
+
+    def path
+      ext = '.pdf' # FIXME Accept other type
+      [Config.file_backend['prefix'], '/', @uid, ext].join
+    end
+
+    def save(at = Time.now)
+      self.class.dynamo_client.put_item(
+        table_name: Config.backend['table_name'],
+        item: {
+          uid: @uid,
+          record_type: 'file',
+          title: @title,
+          created: at.to_i
+        }
+      )
+      s3_client.put_object(
+        body: @file[:tempfile],
+        bucket: Config.file_backend['bucket'],
+        acl: 'public-read',
+        key: path
+      )
+    end
+  end
+end

data/lib/carraway/post.rb

@@ -47,11 +47,17 @@ module Carraway
         query = { table_name: Config.backend['table_name'] }
         if published_only
           query[:filter_expression] = <<~FILTER
-            attribute_exists(published)
+            record_type = :type
+            AND attribute_exists(published)
             AND (NOT attribute_type(published, :t))
             AND published < :now
           FILTER
-          query[:expression_attribute_values] = { ':t' => 'NULL', ':now' => Time.now.to_i }
+          query[:expression_attribute_values] = { ':t' => 'NULL', ':now' => Time.now.to_i, ':type' => 'post' }
+        else
+          query[:filter_expression] = <<~FILTER
+            record_type = :type
+          FILTER
+          query[:expression_attribute_values] = { ':type' => 'post' }
         end
 
         client.scan(query).items.map do |item|
@@ -152,6 +158,7 @@ module Carraway
         title: @title,
         body: @body,
         path: path,
+        record_type: 'post',
         category: @category.key,
         created: @created.to_i,
         updated: @updated.to_i,

data/lib/carraway/server.rb

@@ -5,7 +5,7 @@ require 'time'
 
 module Carraway
   class Server < Sinatra::Base
-    set :views, File.expand_path('../views', __FILE__)
+    set :views, ::File.expand_path('../views', __FILE__)
     set :method_override, true
     enable :sessions
     use Rack::Flash
@@ -26,11 +26,13 @@ module Carraway
     end
 
     get '/carraway/new' do
+      @files = File.all
       erb :new
     end
 
     get %r{/carraway/edit/(\d+)} do |uid|
       @post = Post.find(uid)
+      @files = File.all
       # FIXME handle not found
       erb :edit
     end
@@ -105,5 +107,17 @@ module Carraway
       flash[:message] = "Deleted #{@post.uid}"
       redirect "/carraway/"
     end
+
+    get '/carraway/files' do
+      @files = File.all
+      erb :files
+    end
+
+    post '/carraway/files' do
+      file = File.new(title: params[:title], file: params[:file])
+      file.save # FIXME validation and error
+      flash[:message] = "Saved #{file.path}"
+      redirect "/carraway/files"
+    end
   end
 end

data/lib/carraway/version.rb

@@ -1,3 +1,3 @@
 module Carraway
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/carraway/views/edit.erb

@@ -32,6 +32,8 @@
       <button type="submit" class="waves-effect waves-light btn">保存</button>
     </div>
   </form>
+  <%= erb :file_modal, layout: false %>
+
   <a class="waves-effect waves-light btn blue" href="<%= "/carraway/preview/#{@post.uid}" %>" target="_blank">プレビュー</a>
   <% if @post.published %>
     <form action="/carraway/unpublish" method="POST" class="col s12">

data/lib/carraway/views/file_modal.erb

@@ -0,0 +1,39 @@
+<a class="waves-effect waves-light btn modal-trigger" href="#file-modal">ファイルをリンク</a>
+<div id="file-modal" class="modal">
+  <div class="modal-content">
+    <table>
+      <thead>
+        <tr>
+          <th></th>
+          <th>タイトル</th>
+          <th>作成日</th>
+          <th>パス</th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @files.each do |file| %>
+          <tr>
+            <td><button onclick="useFile('<%= file.title %>', '<%= file.path%>')">使う</button></td>
+            <td><%= file.title %></td>
+            <td><%= file.created_at %></td>
+            <td><%= file.path %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+  <div class="modal-footer">
+    <a href="#!" class="modal-close waves-effect waves-green btn-flat">閉じる</a>
+  </div>
+</div>
+<script>
+ var useFile = function(title, path) {
+   var body = document.getElementById('body');
+   body.value = body.value + '[' + title + '](/' + path + ')'
+ }
+
+ document.addEventListener('DOMContentLoaded', function() {
+   var elems = document.querySelectorAll('.modal');
+   var instances = M.Modal.init(elems);
+ });
+</script>

data/lib/carraway/views/files.erb

@@ -0,0 +1,34 @@
+<h3>Files</h3>
+<div class="row">
+  <form action="/carraway/files" method="POST" class="col s12" enctype="multipart/form-data">
+    <div class="row">
+      <div class="input-field col s12">
+        <input type="text" id="title" name="title" placeholder="ファイルタイトル">
+        <label for="title">ファイルタイトル</label>
+      </div>
+      <div class="input-field col s12">
+        <input type="file" id="file" name="file" placeholder="ファイル">
+      </div>
+    </div>
+
+    <button type="submit" class="waves-effect waves-light btn">保存</button>
+  </form>
+</div>
+<table>
+  <thead>
+    <tr>
+      <th>タイトル</th>
+      <th>作成日</th>
+      <th>パス</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @files.each do |file| %>
+      <tr>
+        <td><%= file.title %></td>
+        <td><%= file.created_at %></td>
+        <td><%= file.path %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/lib/carraway/views/layout.erb

@@ -13,6 +13,7 @@
             <a href="/carraway/" class="brand-logo">Carraway</a>
             <ul id="nav-mobile" class="right hide-on-med-and-down">
               <li><a href="/carraway/">記事一覧</a></li>
+              <li><a href="/carraway/files">ファイル一覧</a></li>
               <li><a href="/carraway/new">新規作成</a></li>
             </ul>
           </div>

data/lib/carraway/views/new.erb

@@ -20,4 +20,5 @@
 
     <button type="submit" class="waves-effect waves-light btn">保存</button>
   </form>
+  <%= erb :file_modal, layout: false %>
 </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carraway
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - adorechic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-03 00:00:00.000000000 Z
+date: 2018-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-flash3
   requirement: !ruby/object:Gem::Requirement
@@ -147,10 +161,13 @@ files:
 - lib/carraway/category.rb
 - lib/carraway/cli.rb
 - lib/carraway/config.rb
+- lib/carraway/file.rb
 - lib/carraway/post.rb
 - lib/carraway/server.rb
 - lib/carraway/version.rb
 - lib/carraway/views/edit.erb
+- lib/carraway/views/file_modal.erb
+- lib/carraway/views/files.erb
 - lib/carraway/views/layout.erb
 - lib/carraway/views/new.erb
 - lib/carraway/views/top.erb