carraway 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d415ec6e6ae471fa9ae3efa61f5def1465f9ee389f4493c79fa9346b6a48403f
-  data.tar.gz: afbdce1993f0df85e123a52c700b9752ddc211a294a49ec79e25db4450dcd1f4
+  metadata.gz: 36a15e8b79a0687aed5a10830b95266d42c335fe44d89c5c9d437fe25d142ebc
+  data.tar.gz: ff04bf837c8be068eb9402ff2c9c50270d047947befa4053ead816cfb9baa14d
 SHA512:
-  metadata.gz: 54455684723a8cf69b68c04625340d84efe035fd2787d3b5d36fd971ec23b9b97b30f6909cc97f83c690343848805d613c6b2f0527bcb1a27435580e0d0fbe14
-  data.tar.gz: be647d4c395a25a290ae1c93d12f9d5ff0b72aabe379ce609dcaa94b035d200552fcb157cc242f1758099a1c69bcd6c4b35717b744bc4af0b6041187b48c34f8
+  metadata.gz: 31243a8f655fccb76aacc36bb6e029118bcf2d725b29bfadffd322fe3540c183033fdeb5431c4d10934592e2090c092e34082adf1202fc9eb676045667903d81
+  data.tar.gz: 125910fed0d17842f64b8adff09388d0568c5cf46667f6a46b02192bb7e4cc58ad29a8e188424a8a34a284bf31056b7c9d0b45c8fcd242e8aec800bed0ca5a52

data/CHANGELOG.md

@@ -0,0 +1,58 @@
+# Change Log
+
+## [v0.10.0](https://github.com/adorechic/carraway/tree/v0.10.0) (2019-02-11)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.9.0...v0.10.0)
+
+**Merged pull requests:**
+
+- Post labeling [\#4](https://github.com/adorechic/carraway/pull/4) ([adorechic](https://github.com/adorechic))
+- Extract file repository [\#3](https://github.com/adorechic/carraway/pull/3) ([adorechic](https://github.com/adorechic))
+- Improve README documents [\#2](https://github.com/adorechic/carraway/pull/2) ([adorechic](https://github.com/adorechic))
+
+## [v0.9.0](https://github.com/adorechic/carraway/tree/v0.9.0) (2018-11-07)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.8.0...v0.9.0)
+
+## [v0.8.0](https://github.com/adorechic/carraway/tree/v0.8.0) (2018-09-05)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.7.0...v0.8.0)
+
+**Merged pull requests:**
+
+- Add render HTML using Markdown option [\#1](https://github.com/adorechic/carraway/pull/1) ([autumo](https://github.com/autumo))
+
+## [v0.7.0](https://github.com/adorechic/carraway/tree/v0.7.0) (2018-09-04)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.6.0...v0.7.0)
+
+## [v0.6.0](https://github.com/adorechic/carraway/tree/v0.6.0) (2018-09-03)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.5.0...v0.6.0)
+
+## [v0.5.0](https://github.com/adorechic/carraway/tree/v0.5.0) (2018-09-03)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.4.0...v0.5.0)
+
+## [v0.4.0](https://github.com/adorechic/carraway/tree/v0.4.0) (2018-09-03)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.3.1...v0.4.0)
+
+## [v0.3.1](https://github.com/adorechic/carraway/tree/v0.3.1) (2018-08-31)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.3.0...v0.3.1)
+
+## [v0.3.0](https://github.com/adorechic/carraway/tree/v0.3.0) (2018-08-31)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.2.1...v0.3.0)
+
+## [v0.2.1](https://github.com/adorechic/carraway/tree/v0.2.1) (2018-08-31)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.2.0...v0.2.1)
+
+## [v0.2.0](https://github.com/adorechic/carraway/tree/v0.2.0) (2018-08-30)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.1.3...v0.2.0)
+
+## [v0.1.3](https://github.com/adorechic/carraway/tree/v0.1.3) (2018-08-30)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.1.2...v0.1.3)
+
+## [v0.1.2](https://github.com/adorechic/carraway/tree/v0.1.2) (2018-08-27)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.1.1...v0.1.2)
+
+## [v0.1.1](https://github.com/adorechic/carraway/tree/v0.1.1) (2018-08-27)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.1.0...v0.1.1)
+
+## [v0.1.0](https://github.com/adorechic/carraway/tree/v0.1.0) (2018-08-27)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -69,6 +69,8 @@ backend: # Required
 file_backend:
   bucket: 'carraway_bucket' # Required
   prefix: 'files' # Required.
+  endpoint: http://localhost:6001 # Optional. Set if you use local S3 like mineo
+  region: ap-northeast-1 # Optional.
 categories: # Least one category is required
   category_key:
     title: 'Category Name'

data/docker/docker-compose.yml

@@ -7,3 +7,11 @@ services:
     command: -jar DynamoDBLocal.jar -dbPath /var/lib/dynamodb -port 6000
     volumes:
       - /tmp:/var/lib/dynamodb
+  minio:
+    image: minio/minio
+    ports:
+      - '6001:9000'
+    environment:
+      MINIO_ACCESS_KEY: dummy
+      MINIO_SECRET_KEY: dummy_secret
+    command: server /data

data/lib/carraway/cli.rb

@@ -15,6 +15,7 @@ module Carraway
     def setup
       Carraway::Config.load(options[:config])
       Carraway::Post.setup
+      Carraway::FileRepository.new.setup
     end
 
     desc 'drop', 'Drop backend'
@@ -22,6 +23,7 @@ module Carraway
     def drop
       Carraway::Config.load(options[:config])
       Carraway::Post.drop
+      Carraway::FileRepository.new.drop
     end
   end
 end

data/lib/carraway/file.rb

@@ -3,7 +3,8 @@ require 'aws-sdk-s3'
 
 module Carraway
   class File
-    attr_reader :title, :uid, :created, :file
+    attr_reader :uid, :created, :file
+    attr_accessor :title
 
     def initialize(title:, file: nil, uid: nil, created: nil)
       @title = title

data/lib/carraway/file_repository.rb

@@ -18,6 +18,32 @@ module Carraway
       end
     end
 
+    def find(uid)
+      item = client.get_item(
+        key: {
+          uid: uid
+        },
+        table_name: Config.backend['table_name'],
+      ).item
+      if item && item['record_type'] == 'file'
+        Carraway::File.new(
+          uid: item['uid'],
+          title: item['title'],
+          created: item['created']
+        )
+      end
+    end
+
+    def persisted?(file)
+      s3_client.head_object(
+        bucket: Config.file_backend['bucket'],
+        key: file.path
+      )
+      true
+    rescue Aws::S3::Errors::NotFound
+      false
+    end
+
     def save(file, at: Time.now)
       client.put_item(
         table_name: Config.backend['table_name'],
@@ -25,15 +51,50 @@ module Carraway
           uid: file.uid,
           record_type: 'file',
           title: file.title,
-          created: at.to_i
+          created: file.created || at.to_i
         }
       )
-      s3_client.put_object(
-        body: file.file[:tempfile],
+      if file.file
+        s3_client.put_object(
+          body: file.file[:tempfile],
+          bucket: Config.file_backend['bucket'],
+          acl: 'public-read',
+          key: file.path
+        )
+      end
+    end
+
+    def destroy(file)
+      s3_client.delete_object(
         bucket: Config.file_backend['bucket'],
-        acl: 'public-read',
         key: file.path
       )
+      client.delete_item(
+        table_name: Config.backend['table_name'],
+        key: {
+          uid: file.uid
+        }
+      )
+    end
+
+    def setup
+      s3_client.create_bucket(
+        bucket: Config.file_backend['bucket']
+      )
+    end
+
+    def drop
+      s3_client.list_objects(
+        bucket: Config.file_backend['bucket']
+      ).contents.each do |content|
+        s3_client.delete_object(
+          bucket: Config.file_backend['bucket'],
+          key: content.key
+        )
+      end
+      s3_client.delete_bucket(
+        bucket: Config.file_backend['bucket']
+      )
     end
 
     private
@@ -52,7 +113,17 @@ module Carraway
     end
 
     def s3_client
-      Aws::S3::Client.new
+      if Config.file_backend['endpoint']
+        Aws::S3::Client.new(
+          endpoint: Config.file_backend['endpoint'],
+          region: Config.file_backend['region'],
+          access_key_id: 'dummy',
+          secret_access_key: 'dummy_secret',
+          force_path_style: true,
+        )
+      else
+        Aws::S3::Client.new
+      end
     end
   end
 end

data/lib/carraway/server.rb

@@ -122,11 +122,35 @@ module Carraway
       redirect "/carraway/"
     end
 
+    get %r{/carraway/files/(\d+)} do |uid|
+      # FIXME handle not found
+      @file = FileRepository.new.find(uid)
+      erb :file_edit
+    end
+
     get '/carraway/files' do
       @files = FileRepository.new.all
       erb :files
     end
 
+    patch %r{/carraway/files/(\d+)} do |uid|
+      repository = FileRepository.new
+      file = repository.find(uid)
+      # FIXME handle not found
+      # FIXME validation
+      file.title = params[:title]
+      repository.save(file)
+      redirect "/carraway/files/#{file.uid}"
+    end
+
+    delete %r{/carraway/files/(\d+)} do |uid|
+      repository = FileRepository.new
+      file = repository.find(uid)
+      # FIXME handle not found
+      repository.destroy(file)
+      redirect "/carraway/files"
+    end
+
     post '/carraway/files' do
       file = File.new(title: params[:title], file: params[:file])
       # FIXME validation and error

data/lib/carraway/version.rb

@@ -1,3 +1,3 @@
 module Carraway
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/lib/carraway/views/file_edit.erb

@@ -0,0 +1,21 @@
+<h3><%= @file.title %></h3>
+<p><%= @file.path %></p>
+<div class="row">
+  <form action="/carraway/files/<%= @file.uid %>" method="POST" class="col s12" enctype="multipart/form-data">
+    <input type="hidden" name="_method" value="PATCH">
+    <div class="row">
+      <div class="input-field col s12">
+        <input type="text" id="title" name="title" placeholder="ファイルタイトル" value="<%= @file.title %>" >
+        <label for="title">ファイルタイトル</label>
+      </div>
+    </div>
+
+    <button type="submit" class="waves-effect waves-light btn">保存</button>
+  </form>
+  <form action="/carraway/files/<%= @file.uid %>" method="POST" class="col s12">
+    <input type="hidden" name="_method" value="DELETE">
+    <div class="col s6">
+      <button type="submit" class="waves-effect waves-light btn red">削除</button>
+    </div>
+  </form>
+</div>

data/lib/carraway/views/files.erb

@@ -25,7 +25,11 @@
   <tbody>
     <% @files.each do |file| %>
       <tr>
-        <td><%= file.title %></td>
+        <td>
+          <a href="/carraway/files/<%= file.uid%>">
+            <%= file.title %>
+          </a>
+        </td>
         <td><%= file.created_at %></td>
         <td><%= file.path %></td>
       </tr>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carraway
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - adorechic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-11 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -203,6 +203,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -224,6 +225,7 @@ files:
 - lib/carraway/server.rb
 - lib/carraway/version.rb
 - lib/carraway/views/edit.erb
+- lib/carraway/views/file_edit.erb
 - lib/carraway/views/file_modal.erb
 - lib/carraway/views/files.erb
 - lib/carraway/views/layout.erb
@@ -248,8 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: GatsbyJS backend