carraway 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e122c09ebf92ff9ddceb03a2568fca044c3fe35626707dc6b32b87db417f5ccc
-  data.tar.gz: d41f83895d578a171c7816064b8cefd9da0e1a612320dc7ae7777d88ff0e5513
+  metadata.gz: 724e3bc4ea01e06cffc062e3468f7cfe1e35006f8e90c0319ffec322d04eacc6
+  data.tar.gz: a95d020769b4e5d78a88f883c03fd0c691d6ed37304fd4ebf00be2f6686be18a
 SHA512:
-  metadata.gz: ea135d574dd9a6b5338b440b8fc80ab88003685ce7ad0d731de7f265d4341ac0d916a5145e8b522f2b2687ebe7719ede2f52f787bce3bfb3f2fe8e9083ed9955
-  data.tar.gz: ca9c9ce46aeb111d063a6d716df73cda9856aa5bb564b2cd61dcde5bd9c8213257539857af59c26064869a1ffde9cb5fe993e4c252e57269cad6bf2f04fcc276
+  metadata.gz: 80985cd730b4a99672165a15a458ed4253b7b9056dd1b3c765cdce0d90cb3bf2524704adeae733c8c24b44484d60a0d103c16658ae197df6d2924feff194c95c
+  data.tar.gz: bdc5eb40307d682ebc96a963450763c406e50eab73ea2e5e0f6476032b658e1955c3c304a717a714d2acb7986cc92314b7a5177ed9baf9283936e97600b0c462

data/lib/carraway/post.rb

@@ -32,21 +32,29 @@ module Carraway
           path: category.fullpath(path),
           category: category,
           created: at.to_i,
-          updated: at.to_i
+          updated: at.to_i,
+          published: nil
         )
         post.save(at: at)
         post
       end
 
-      def all
-        client.scan(table_name: Config.backend['table_name']).items.map do |item|
+      def all(published_only: false)
+        query = { table_name: Config.backend['table_name'] }
+        if published_only
+          query[:filter_expression] = 'attribute_exists(published) AND (NOT attribute_type(published, :t))'
+          query[:expression_attribute_values] = { ':t' => 'NULL' }
+        end
+
+        client.scan(query).items.map do |item|
           new(
             title: item['title'],
             body: item['body'],
             path: item['path'],
             category: Category.find(item['category']),
             created: Time.at(item['created']),
-            updated: Time.at(item['updated'])
+            updated: Time.at(item['updated']),
+            published: item['published'] && Time.at(item['published'])
           )
         end
       end
@@ -65,7 +73,8 @@ module Carraway
             path: item['path'],
             category: Category.find(item['category']),
             created: Time.at(item['created']),
-            updated: Time.at(item['updated'])
+            updated: Time.at(item['updated']),
+            published: item['published'] && Time.at(item['published'])
           )
         end
       end
@@ -85,14 +94,23 @@ module Carraway
     end
 
     attr_reader :title, :body, :path, :category, :created, :updated
+    attr_accessor :published
 
-    def initialize(title:, body:, path:, category:, created:, updated:)
+    def initialize(title:, body:, path:, category:, created:, updated:, published:)
       @title = title
       @body = body
       @path = path
       @category = category
       @created = created
       @updated = updated
+      @published = published
+    end
+
+    %i(created updated published).each do |col|
+      define_method("#{col}_at") do
+        at = send(col)
+        at && Time.at(at)
+      end
     end
 
     def assign(title:, body:)
@@ -124,6 +142,7 @@ module Carraway
         category: @category.key,
         created: @created.to_i,
         updated: @updated.to_i,
+        published: @published && @published.to_i
       }
     end
   end

data/lib/carraway/server.rb

@@ -20,7 +20,7 @@ module Carraway
     end
 
     get '/carraway/api/posts' do
-      posts = Post.all.map(&:to_h)
+      posts = Post.all(published_only: true).map(&:to_h)
       { data: { posts: posts } }.to_json
     end
 
@@ -72,6 +72,26 @@ module Carraway
       redirect "/carraway/edit#{@post.path}"
     end
 
+    patch '/carraway/publish' do
+      @post = Post.find(params[:path])
+      # FIXME handle not found
+      @post.published = Time.now.to_i
+      # FIXME validation
+      @post.save
+      flash[:message] = 'Published'
+      redirect "/carraway/edit#{@post.path}"
+    end
+
+    patch '/carraway/unpublish' do
+      @post = Post.find(params[:path])
+      # FIXME handle not found
+      @post.published = nil
+      # FIXME validation
+      @post.save
+      flash[:message] = 'Unpublished'
+      redirect "/carraway/edit#{@post.path}"
+    end
+
     delete '/carraway/destroy' do
       @post = Post.find(params[:path]) # FIXME handle not found
       @post.destroy

data/lib/carraway/version.rb

@@ -1,3 +1,3 @@
 module Carraway
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/carraway/views/edit.erb

@@ -33,6 +33,23 @@
     </div>
   </form>
   <a class="waves-effect waves-light btn blue" href="<%= "/carraway/preview#{@post.path}" %>" target="_blank">プレビュー</a>
+  <% if @post.published %>
+    <form action="/carraway/unpublish" method="POST" class="col s12">
+      <input type="hidden" name="_method" value="PATCH">
+      <input type="hidden" name="path" value="<%= @post.path %>">
+      <div class="col s6">
+        <button type="submit" class="waves-effect waves-light btn orange">非公開</button>
+      </div>
+    </form>
+  <% else %>
+    <form action="/carraway/publish" method="POST" class="col s12">
+      <input type="hidden" name="_method" value="PATCH">
+      <input type="hidden" name="path" value="<%= @post.path %>">
+      <div class="col s6">
+        <button type="submit" class="waves-effect waves-light btn orange">公開</button>
+      </div>
+    </form>
+  <% end %>
   <form action="/carraway/destroy" method="POST" class="col s12">
     <input type="hidden" name="_method" value="DELETE">
     <input type="hidden" name="path" value="<%= @post.path %>">

data/lib/carraway/views/layout.erb

@@ -10,7 +10,7 @@
       <header>
         <nav>
           <div class="nav-wrapper">
-            <a href="/carraway" class="brand-logo">Carraway</a>
+            <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/new">新規作成</a></li>

data/lib/carraway/views/top.erb

@@ -1,12 +1,23 @@
 <% @categories.each do |category| %>
-  <ul class="collection with-header">
-    <li class="collection-header">
-      <%= category.title %>
-    </li>
+  <h3><%= category.title %></h2>
+  <table>
+    <thead>
+      <tr>
+        <th>タイトル</th>
+        <th>作成日</th>
+        <th>更新日</th>
+        <th>公開日</th>
+      </tr>
+    </thead>
+    <tbody>
     <% Array(@category_posts[category.key]).each do |post| %>
-      <li class="collection-item">
-        <a href="/carraway/edit<%= post.path %>"><%= post.title %></a>
-      </li>
+      <tr>
+        <td><a href="/carraway/edit<%= post.path %>"><%= post.title %></a></td>
+        <td><%= post.created_at %></td>
+        <td><%= post.updated_at %></td>
+        <td><%= post.published_at %></td>
+      </tr>
     <% end %>
-  </ul>
+    </tbody>
+  </table>
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carraway
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - adorechic
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor