carraway 0.12.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65b145b7f19885a00a7a1cc9d3ed65bd274471107ee7a48cd2c27c5626bca3bb
-  data.tar.gz: ed4141eb373c87f621c7b44f3fd6f6faf0e3dfbad768a0171201c48c40dc5cd5
+  metadata.gz: 9d55ca828b081c8af517e0428c2e6b4f24fa424415ad58da906ed1cb033dff9f
+  data.tar.gz: 28018ed8298581837bdb3e8084592d6ed1568d6d226d3e2898382440a1fd7022
 SHA512:
-  metadata.gz: a9a6c383f5e5b8d07af2dcb214008bcf458ea0c623e9d3aaf358396ec94904ebf6055d1521f3b8b2d5dc9a3322adc2e56f29a6b89a591d9d7367728c2fb88b7d
-  data.tar.gz: 6cd84e4f3de7b32302e1094d01fa13e3d6ec050580cfb31642772bddb17e3ceecb45ae4594905f210daa285da1869a57b3e3e156150b225d0e1b2e3275f0a49c
+  metadata.gz: 10031f4a10f37eeccf44a5aae91417e5919649a8bb50bb7651b9ecd40389ec8e0d80fe54971c561277b0e6460d573080da0ca306427497b4d20c87984a11cfd7
+  data.tar.gz: ace24608943448fc411f2cd7e7a29d1e3e6f86f63607b290ec7d2a95b67c5208b13e1b5e06147053e525014225e4eea4cac498ffbac315bf12a7c35e2c69b898

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.12.0](https://github.com/adorechic/carraway/tree/v0.12.0) (2019-02-15)
+[Full Changelog](https://github.com/adorechic/carraway/compare/v0.11.0...v0.12.0)
+
+**Implemented enhancements:**
+
+- Support labels on file [\#9](https://github.com/adorechic/carraway/pull/9) ([adorechic](https://github.com/adorechic))
+
 ## [v0.11.0](https://github.com/adorechic/carraway/tree/v0.11.0) (2019-02-15)
 [Full Changelog](https://github.com/adorechic/carraway/compare/v0.10.0...v0.11.0)
 

data/lib/carraway/file.rb

@@ -3,15 +3,17 @@ require 'aws-sdk-s3'
 
 module Carraway
   class File
-    attr_reader :uid, :created, :file
-    attr_accessor :title, :labels
+    attr_reader :uid, :created, :file, :published
+    attr_accessor :title, :labels, :category
 
-    def initialize(title:, file: nil, uid: nil, created: nil, labels: nil)
+    def initialize(title:, file: nil, uid: nil, created: Time.now.to_i, labels: nil, published: nil, category: nil)
       @title = title
       @file = file
       @uid = uid || generate_uid
       @created = created
       @labels = labels
+      @published = published || created
+      @category = category || Category.all.first # FIXME validation
     end
 
     %i(created).each do |col|
@@ -27,6 +29,19 @@ module Carraway
       [Config.file_backend['prefix'], '/', @uid, ext].join
     end
 
+    def to_h
+      {
+        uid: @uid,
+        title: @title,
+        path: path,
+        labels: @labels,
+        record_type: 'file',
+        created: @created.to_i,
+        published: @published && @published.to_i,
+        category: @category.key,
+      }
+    end
+
     private
 
     # FIXME duplicate impl on Post

data/lib/carraway/file_repository.rb

@@ -14,7 +14,9 @@ module Carraway
           uid: item['uid'],
           title: item['title'],
           created: item['created'],
-          labels: item['labels']
+          labels: item['labels'],
+          published: item['published'],
+          category: Carraway::Category.find(item['category'])
         )
       end
     end
@@ -31,7 +33,9 @@ module Carraway
           uid: item['uid'],
           title: item['title'],
           created: item['created'],
-          labels: item['labels']
+          labels: item['labels'],
+          published: item['published'],
+          category: Carraway::Category.find(item['category'])
         )
       end
     end
@@ -54,7 +58,9 @@ module Carraway
           record_type: 'file',
           title: file.title,
           created: file.created || at.to_i,
-          labels: file.labels
+          labels: file.labels,
+          published: file.published,
+          category: file.category.key
         }
       )
       if file.file

data/lib/carraway/post.rb

@@ -44,35 +44,56 @@ module Carraway
         post
       end
 
-      def all(published_only: false)
-        query = { table_name: Config.backend['table_name'] }
+      def all(published_only: false, include_file: false)
+        filter_expressions = []
+        expression_attribute_values = {}
+
+        unless include_file
+          filter_expressions << 'record_type = :type'
+          expression_attribute_values.merge!(':type' => 'post')
+        end
+
         if published_only
-          query[:filter_expression] = <<~FILTER
-            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, ':type' => 'post' }
-        else
-          query[:filter_expression] = <<~FILTER
-            record_type = :type
-          FILTER
-          query[:expression_attribute_values] = { ':type' => 'post' }
+          filter_expressions << 'attribute_exists(published)'
+          filter_expressions << '(NOT attribute_type(published, :t))'
+          filter_expressions << 'published < :now'
+          expression_attribute_values.merge!(':t' => 'NULL', ':now' => Time.now.to_i)
         end
 
-        client.scan(query).items.map do |item|
-          new(
-            uid: item['uid'],
-            title: item['title'],
-            body: item['body'],
-            labels: item['labels'],
-            category: Category.find(item['category']),
-            created: Time.at(item['created']),
-            updated: Time.at(item['updated']),
-            published: item['published'] && Time.at(item['published'])
+        query = { table_name: Config.backend['table_name'] }
+        unless filter_expressions.empty?
+          query.merge!(
+            filter_expression: filter_expressions.join(' AND '),
+            expression_attribute_values: expression_attribute_values
           )
         end
+
+        client.scan(query).items.map do |item|
+          case item['record_type']
+          when 'post'
+            new(
+              uid: item['uid'],
+              title: item['title'],
+              body: item['body'],
+              labels: item['labels'],
+              category: Category.find(item['category']),
+              created: Time.at(item['created']),
+              updated: Time.at(item['updated']),
+              published: item['published'] && Time.at(item['published'])
+            )
+          when 'file'
+            Carraway::File.new(
+              uid: item['uid'],
+              title: item['title'],
+              created: item['created'],
+              labels: item['labels'],
+              published: item['published'],
+              category: Category.find(item['category']),
+            )
+          else
+            raise 'Unknown record_type'
+          end
+        end
       end
 
       def find(uid)

data/lib/carraway/server.rb

@@ -25,8 +25,7 @@ module Carraway
     end
 
     get '/carraway/api/posts' do
-      posts = Post.all(published_only: true).map(&:to_h)
-
+      posts = Post.all(published_only: true, include_file: true).map(&:to_h)
       # HACK Expand plugin
       transformed = params[:view] == 'html'
       if transformed
@@ -140,6 +139,7 @@ module Carraway
       # FIXME validation
       file.title = params[:title]
       file.labels = params[:labels]
+      file.category = Category.find(params[:category])
       repository.save(file)
       redirect "/carraway/files/#{file.uid}"
     end
@@ -153,7 +153,12 @@ module Carraway
     end
 
     post '/carraway/files' do
-      file = File.new(title: params[:title], file: params[:file], labels: params[:labels])
+      file = File.new(
+        title: params[:title],
+        file: params[:file],
+        labels: params[:labels],
+        category: Category.find(params[:category]),
+      )
       # FIXME validation and error
       FileRepository.new.save(file)
       flash[:message] = "Saved #{file.path}"

data/lib/carraway/version.rb

@@ -1,3 +1,3 @@
 module Carraway
-  VERSION = "0.12.0"
+  VERSION = "1.0.0"
 end

data/lib/carraway/views/file_edit.erb

@@ -9,6 +9,12 @@
         <label for="title">ファイルタイトル</label>
       </div>
     </div>
+    <label>記事カテゴリー</label>
+    <select name="category" class="browser-default">
+      <% Carraway::Category.all.each do |category| %>
+        <option value="<%= category.key %>"<%= category == @file.category ? 'selected' : nil%>><%= category.title %></option>
+      <% end %>
+    </select>
     <% Carraway::Config.labels.each do |key, title| %>
       <p>
         <label>

data/lib/carraway/views/files.erb

@@ -9,6 +9,13 @@
       <div class="input-field col s12">
         <input type="file" id="file" name="file" placeholder="ファイル">
       </div>
+      <label>記事カテゴリー</label>
+      <select name="category" class="browser-default">
+        <option value="" disabled selected>記事カテゴリーを選択</option>
+        <% Carraway::Category.all.each do |category| %>
+          <option value="<%= category.key %>"><%= category.title %></option>
+        <% end %>
+      </select>
       <% Carraway::Config.labels.each do |key, title| %>
         <p>
           <label>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carraway
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 1.0.0
 platform: ruby
 authors:
 - adorechic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor