carraway 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 724e3bc4ea01e06cffc062e3468f7cfe1e35006f8e90c0319ffec322d04eacc6
-  data.tar.gz: a95d020769b4e5d78a88f883c03fd0c691d6ed37304fd4ebf00be2f6686be18a
+  metadata.gz: 630db530c2d4fd60f788682c30192399ff1715fe6c5ea9557e43731bb028d146
+  data.tar.gz: 51488217d06c4711073d1d31cc4349a97e05bdbb9110b0bf89595079b2320e03
 SHA512:
-  metadata.gz: 80985cd730b4a99672165a15a458ed4253b7b9056dd1b3c765cdce0d90cb3bf2524704adeae733c8c24b44484d60a0d103c16658ae197df6d2924feff194c95c
-  data.tar.gz: bdc5eb40307d682ebc96a963450763c406e50eab73ea2e5e0f6476032b658e1955c3c304a717a714d2acb7986cc92314b7a5177ed9baf9283936e97600b0c462
+  metadata.gz: db4b164f096d6937c5b9a5123b96ec3f22e7ac16a23a188c57a44e55175efef3b70ebe79eabef2a1dedc3f9863236d72e45508465eaacbb2672b565770fed2a2
+  data.tar.gz: 0e2205c2da121dcfeb52d5f43200076e26ca4d7204fd7fdf3a63fa34b3f00037ea1bc0900c106128cda44b7ebdfd6c4a94fa08f9ce11db8758893ac58bfdc4ac

data/lib/carraway/post.rb

@@ -42,8 +42,12 @@ module Carraway
       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' }
+          query[:filter_expression] = <<~FILTER
+            attribute_exists(published)
+            AND (NOT attribute_type(published, :t))
+            AND published < :now
+          FILTER
+          query[:expression_attribute_values] = { ':t' => 'NULL', ':now' => Time.now.to_i }
         end
 
         client.scan(query).items.map do |item|

data/lib/carraway/server.rb

@@ -1,6 +1,7 @@
 require 'sinatra'
 require 'json'
 require 'rack/flash'
+require 'time'
 
 module Carraway
   class Server < Sinatra::Base
@@ -75,7 +76,14 @@ module Carraway
     patch '/carraway/publish' do
       @post = Post.find(params[:path])
       # FIXME handle not found
-      @post.published = Time.now.to_i
+      published =
+        if params[:published] && params[:published].size > 0
+          Time.parse(params[:published]).to_i
+        else
+          Time.now.to_i
+        end
+
+      @post.published = published
       # FIXME validation
       @post.save
       flash[:message] = 'Published'

data/lib/carraway/version.rb

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

data/lib/carraway/views/edit.erb

@@ -45,6 +45,10 @@
     <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="input-field col s12">
+        <input type="text" id="published" name="published" value="<%= @post.published_at %>" placeholder="2018-09-01 12:00:00">
+        <label for="published">公開日</label>
+      </div>
       <div class="col s6">
         <button type="submit" class="waves-effect waves-light btn orange">公開</button>
       </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carraway
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - adorechic