corpshort 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce1c5cb4260354eab2378678868bca210fe36dd8871011a3271218610288388c
-  data.tar.gz: ec55ae522fc7e049ac7c038a25c74d6fe1c76b2018e3b666ebf27fbc0942feb2
+  metadata.gz: 05aa697749fa6aa8a335a07eca4da3e91aeb0ceb231b699d7e47a019c2894a2f
+  data.tar.gz: ffe3816d9caade8ba866f69c2fbe8f8145aecd6271ec47821d4a9c5a7f7c95e1
 SHA512:
-  metadata.gz: b4aa037b354953e3fbef0a231c88808d65e1c2a46a6637090975c3640f91efa237a8454f1a8a853c3f9290584227657cb3cb3443df2a03a11209464ffad1e0a3
-  data.tar.gz: 78d5510996b5c6221553bfd932f620b3b908cc776b6524f2ad26adff8c5fee2a66dc3aec8a5b55882768103114d2accf7562abec915d6a276f63e230b786fd15
+  metadata.gz: 39c7de94d9c1291c6b54eb7820947466d8e2a4bc4b660e553c14f7c2c32c95171ec7da50218f7ba920fab5d951842b9f1d4036eb5278465be18c37e20000bb3d
+  data.tar.gz: 3bd7f264425161ec818b349c8aae7b52d0305faf93f4484f919fdef96ee522d55e94054f72440d515ac13d5782e5a0d9efd29a9d8ae6411082dac7ea4a81e318

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    corpshort (0.1.0)
+    corpshort (0.2.0)
       aws-sdk-dynamodb
       erubi
       prawn
@@ -15,8 +15,8 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.0.1)
-    aws-partitions (1.91.0)
-    aws-sdk-core (3.21.2)
+    aws-partitions (1.92.0)
+    aws-sdk-core (3.21.3)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)

data/app/views/404.erb

@@ -0,0 +1,11 @@
+<p>Ooh! Link you've request doesn't exist. Create it for someone?</p>
+
+<section class='new-link'>
+  <form action='/+/links' method='POST'>
+    <p><input type='text' name='url' placeholder='https://...' class='new-link-url' autocomplete=off></p>
+    <p class='new-link-down'>⬇︎</p>
+    <p><input type='text' name='linkname' placeholder='Choose a short name (Recommended)' class='new-link-name' autocomplete=off></p>
+    <p><input type='submit' value='Shorten'></p>
+  </form>
+</section>
+

data/app/views/index.erb

@@ -1,8 +1,8 @@
 <section class='new-link'>
   <form action='/+/links' method='POST'>
-    <p><input type='text' name='url' placeholder='https://...' class='new-link-url'></p>
+    <p><input type='text' name='url' placeholder='https://...' value="<%= session[:last_form]&.dig(:url)&.sub(?", '') %>" class='new-link-url' autocomplete=off></p>
     <p class='new-link-down'>⬇︎</p>
-    <p><input type='text' name='name' placeholder='Short name' class='new-link-name'></p>
+    <p><input type='text' name='linkname' placeholder='Choose a short name (Recommended)' value="<%= session[:last_form]&.dig(:linkname)&.sub(?", '') %>" class='new-link-name' autocomplete=off></p>
     <p><input type='submit' value='Shorten'></p>
   </form>
 </section>

data/lib/corpshort/app.rb

@@ -86,6 +86,12 @@ module Corpshort
         @backend ||= conf.fetch(:backend)
       end
 
+      def random_name
+        chars_a = [*('A'..'Z')]
+        chars_b = [*('a'..'z'), *('0'..'9')]
+        [*1.times.map { |_| chars_a.sample }, *3.times.map { |_| chars_b.sample }].shuffle.join
+      end
+
       def link_name(name = params[:name])
         name.tr('_', '-')
       end
@@ -136,19 +142,40 @@ module Corpshort
     end
 
     post '/+/links' do
-      unless params[:name] && params[:url]
+      unless params[:url]
         session[:error] = "Name and URL are required"
         redirect '/'
       end
 
+      name_given = params[:linkname] && !params[:linkname].strip.empty?
+      name = link_name(name_given ? params[:linkname] : random_name)
+      retries = 0
       begin
-        link = Link.new({name: link_name, url: params[:url]})
+        link = Link.new({name: name, url: params[:url]})
         link.save!(backend, create_only: true)
-      rescue Corpshort::Link::ValidationError, Corpshort::Backends::Base::ConflictError
+      rescue Corpshort::Link::ValidationError
+        session[:last_form] = {linkname: link.name, url: link.url}
         session[:error] = $!.message
         redirect '/'
+      rescue Corpshort::Backends::Base::ConflictError
+        if name_given
+          session[:last_form] = {linkname: link.name, url: link.url}
+          session[:error] = 'Link with the specified name already exists'
+          redirect '/'
+        else
+          name = link_name(random_name)
+          retries += 1
+          if retries > 20
+            session[:error] = 'Could not generate unique name. Try again later.'
+            redirect '/'
+          else
+            sleep 0.1
+            retry
+          end
+        end
       end
 
+      session[:last_form] = nil
       redirect "/#{link.name}+"
     end
 
@@ -333,10 +360,12 @@ module Corpshort
         name = name[0..-2]
       end
 
-      @link = backend.get_link(link_name(name))
+      @link_name = link_name(name)
+      @link = backend.get_link(@link_name)
 
       unless @link
-        halt 404, 'not found'
+        status 404
+        return erb(:'404')
       end
 
       if show

data/lib/corpshort/backends/dynamodb.rb

@@ -83,7 +83,7 @@ module Corpshort
             exclusive_start_key: last_key ? last_key : nil,
             key_condition_expression: 'updated_at_partition = :partition',
             expression_attribute_values: {":partition" => partition.strftime('%Y-%m')},
-            limit: 1 || limit,
+            limit: limit,
           )
 
           unless result.items.empty?
@@ -94,6 +94,7 @@ module Corpshort
           last_key = nil
           sleep 0.05
         end
+        return [[], nil]
       end
 
       private

data/lib/corpshort/version.rb

@@ -1,3 +1,3 @@
 module Corpshort
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corpshort
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sorah Fukumori
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -194,6 +194,7 @@ files:
 - README.md
 - Rakefile
 - app/public/style.css
+- app/views/404.erb
 - app/views/edit.erb
 - app/views/index.erb
 - app/views/layout.erb