carraway 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630db530c2d4fd60f788682c30192399ff1715fe6c5ea9557e43731bb028d146
-  data.tar.gz: 51488217d06c4711073d1d31cc4349a97e05bdbb9110b0bf89595079b2320e03
+  metadata.gz: 7413bee588bc81463c7f6157ec89072fa668e57fb3dc82a9ac44d9122dbf1f75
+  data.tar.gz: 882068dfc6f541197e5090bb06fbd1deba5c878888cdbe75c1e4e43e1966dbee
 SHA512:
-  metadata.gz: db4b164f096d6937c5b9a5123b96ec3f22e7ac16a23a188c57a44e55175efef3b70ebe79eabef2a1dedc3f9863236d72e45508465eaacbb2672b565770fed2a2
-  data.tar.gz: 0e2205c2da121dcfeb52d5f43200076e26ca4d7204fd7fdf3a63fa34b3f00037ea1bc0900c106128cda44b7ebdfd6c4a94fa08f9ce11db8758893ac58bfdc4ac
+  metadata.gz: 1f2ae24be1f374f31f169b0a4df78ef67d663930b2822c8a3f2383efa8dc73c41d3f8fa28de9a0948c5a5f493154b747b46a368643b2346ca36d098e1ea1996b
+  data.tar.gz: 21e46ee4e9f196e3eb3f8469c0931f4f9551a066388115c04b6d73d1e8d1e0213dee6b0dfb3428dc0dc4684773f9ba459a62e385236b8603d1db221b3caa6092

data/lib/carraway/category.rb

@@ -25,8 +25,8 @@ module Carraway
       @dir = dir
     end
 
-    def fullpath(path)
-      [@dir, path].join
+    def fullpath(uid)
+      [@dir, uid].join
     end
   end
 end

data/lib/carraway/post.rb

@@ -6,10 +6,10 @@ module Carraway
       def setup
         client.create_table(
           attribute_definitions: [
-            { attribute_name: :path, attribute_type: "S" },
+            { attribute_name: :uid, attribute_type: "S" },
           ],
           key_schema: [
-            { attribute_name: :path, key_type: "HASH" },
+            { attribute_name: :uid, key_type: "HASH" },
           ],
           provisioned_throughput: {
             read_capacity_units: 5, # FIXME configurable
@@ -23,13 +23,17 @@ module Carraway
         client.delete_table(table_name: Config.backend['table_name'])
       end
 
-      def create(title:, path:, body:, category_key:, at: Time.now)
+      def generate_uid
+        [Time.now.strftime('%Y%m%d%H%M%S'), "%05d" % rand(10000)].join
+      end
+
+      def create(title:, body:, category_key:, at: Time.now)
         category = Category.find(category_key)
         # FIXME check path to prevent overwriting
         post = new(
+          uid: generate_uid,
           title: title,
           body: body,
-          path: category.fullpath(path),
           category: category,
           created: at.to_i,
           updated: at.to_i,
@@ -52,9 +56,9 @@ module Carraway
 
         client.scan(query).items.map do |item|
           new(
+            uid: item['uid'],
             title: item['title'],
             body: item['body'],
-            path: item['path'],
             category: Category.find(item['category']),
             created: Time.at(item['created']),
             updated: Time.at(item['updated']),
@@ -63,18 +67,18 @@ module Carraway
         end
       end
 
-      def find(path)
+      def find(uid)
         item = client.get_item(
           key: {
-            path: path
+            uid: uid
           },
           table_name: Config.backend['table_name'],
         ).item
         if item
           new(
+            uid: item['uid'],
             title: item['title'],
             body: item['body'],
-            path: item['path'],
             category: Category.find(item['category']),
             created: Time.at(item['created']),
             updated: Time.at(item['updated']),
@@ -97,13 +101,13 @@ module Carraway
       end
     end
 
-    attr_reader :title, :body, :path, :category, :created, :updated
+    attr_reader :uid, :title, :body, :category, :created, :updated
     attr_accessor :published
 
-    def initialize(title:, body:, path:, category:, created:, updated:, published:)
+    def initialize(uid:, title:, body:, category:, created:, updated:, published:)
+      @uid = uid
       @title = title
       @body = body
-      @path = path
       @category = category
       @created = created
       @updated = updated
@@ -133,16 +137,21 @@ module Carraway
       self.class.client.delete_item(
         table_name: Config.backend['table_name'],
         key: {
-          path: @path
+          uid: @uid
         }
       )
     end
 
+    def path
+      @category.fullpath(@uid)
+    end
+
     def to_h
       {
+        uid: @uid,
         title: @title,
         body: @body,
-        path: @path,
+        path: path,
         category: @category.key,
         created: @created.to_i,
         updated: @updated.to_i,

data/lib/carraway/server.rb

@@ -29,14 +29,14 @@ module Carraway
       erb :new
     end
 
-    get %r{/carraway/edit([\w\./]+)} do |path|
-      @post = Post.find(path)
+    get %r{/carraway/edit/(\d+)} do |uid|
+      @post = Post.find(uid)
       # FIXME handle not found
       erb :edit
     end
 
-    get %r{/carraway/preview([\w\./]+)} do |path|
-      @post = Post.find(path)
+    get %r{/carraway/preview/(\d+)} do |uid|
+      @post = Post.find(uid)
       # FIXME handle not found
 
       # Refresh GatsbyJS
@@ -52,16 +52,15 @@ module Carraway
     post '/carraway/' do
       @post = Post.create(
         title: params[:title],
-        path: params[:path],
         body: params[:body],
         category_key: params[:category]
       )
       flash[:message] = 'Created'
-      redirect "/carraway/edit#{@post.path}"
+      redirect "/carraway/edit/#{@post.uid}"
     end
 
     patch '/carraway/update' do
-      @post = Post.find(params[:path])
+      @post = Post.find(params[:uid])
       # FIXME handle not found
       @post.assign(
         title: params[:title],
@@ -70,11 +69,11 @@ module Carraway
       # FIXME validation
       @post.save
       flash[:message] = 'Updated'
-      redirect "/carraway/edit#{@post.path}"
+      redirect "/carraway/edit/#{@post.uid}"
     end
 
     patch '/carraway/publish' do
-      @post = Post.find(params[:path])
+      @post = Post.find(params[:uid])
       # FIXME handle not found
       published =
         if params[:published] && params[:published].size > 0
@@ -87,24 +86,24 @@ module Carraway
       # FIXME validation
       @post.save
       flash[:message] = 'Published'
-      redirect "/carraway/edit#{@post.path}"
+      redirect "/carraway/edit/#{@post.uid}"
     end
 
     patch '/carraway/unpublish' do
-      @post = Post.find(params[:path])
+      @post = Post.find(params[:uid])
       # FIXME handle not found
       @post.published = nil
       # FIXME validation
       @post.save
       flash[:message] = 'Unpublished'
-      redirect "/carraway/edit#{@post.path}"
+      redirect "/carraway/edit/#{@post.uid}"
     end
 
     delete '/carraway/destroy' do
-      @post = Post.find(params[:path]) # FIXME handle not found
+      @post = Post.find(params[:uid]) # FIXME handle not found
       @post.destroy
-      flash[:message] = "Deleted #{@post.path}"
-      redirect "/carraway"
+      flash[:message] = "Deleted #{@post.uid}"
+      redirect "/carraway/"
     end
   end
 end

data/lib/carraway/version.rb

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

data/lib/carraway/views/edit.erb

@@ -14,7 +14,7 @@
             <td><%= @post.category.title %></td>
             <td>
               <%= @post.path %>
-              <input type="hidden" name="path" value="<%= @post.path %>">
+              <input type="hidden" name="uid" value="<%= @post.uid %>">
             </td>
           </tr>
         </tbody>
@@ -32,11 +32,11 @@
       <button type="submit" class="waves-effect waves-light btn">保存</button>
     </div>
   </form>
-  <a class="waves-effect waves-light btn blue" href="<%= "/carraway/preview#{@post.path}" %>" target="_blank">プレビュー</a>
+  <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">
       <input type="hidden" name="_method" value="PATCH">
-      <input type="hidden" name="path" value="<%= @post.path %>">
+      <input type="hidden" name="uid" value="<%= @post.uid %>">
       <div class="col s6">
         <button type="submit" class="waves-effect waves-light btn orange">非公開</button>
       </div>
@@ -44,7 +44,7 @@
   <% 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 %>">
+      <input type="hidden" name="uid" value="<%= @post.uid %>">
       <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>
@@ -56,7 +56,7 @@
   <% 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 %>">
+    <input type="hidden" name="uid" value="<%= @post.uid %>">
     <div class="col s6">
       <button type="submit" class="waves-effect waves-light btn red">削除</button>
     </div>

data/lib/carraway/views/new.erb

@@ -8,10 +8,6 @@
           <option value="<%= category.key %>"><%= category.title %></option>
         <% end %>
       </select>
-      <div class="input-field col s12">
-        <input type="text" id="path" name="path" placeholder="post_url_path">
-        <label for="path">Path</label>
-      </div>
       <div class="input-field col s12">
         <input type="text" id="title" name="title" placeholder="記事タイトル">
         <label for="title">記事タイトル</label>

data/lib/carraway/views/top.erb

@@ -12,7 +12,7 @@
     <tbody>
     <% Array(@category_posts[category.key]).each do |post| %>
       <tr>
-        <td><a href="/carraway/edit<%= post.path %>"><%= post.title %></a></td>
+        <td><a href="/carraway/edit/<%= post.uid %>"><%= post.title %></a></td>
         <td><%= post.created_at %></td>
         <td><%= post.updated_at %></td>
         <td><%= post.published_at %></td>

metadata

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