From 9ca92f42ac51beb2c96d8cefb6dc39a7920209cd Mon Sep 17 00:00:00 2001
From: John Chester <jchester@cmmc02th17xg8wl.innova.local>
Date: Fri, 9 Jun 2017 16:45:18 -0400
Subject: [PATCH 1/2] Completed releases 0, 1, and 2

---
 source/.DS_Store                              | Bin 0 -> 8196 bytes
 source/Gemfile                                |   2 -
 source/app/.DS_Store                          | Bin 0 -> 6148 bytes
 source/app/assets/javascripts/application.js  |   1 -
 source/app/controllers/urls_controller.rb     |  35 ++++++++++++++++++
 source/app/models/.DS_Store                   | Bin 0 -> 6148 bytes
 source/app/models/ur_lindex.rb                |   2 +
 source/app/models/url.rb                      |  18 +++++++++
 source/app/views/layouts/application.html.erb |   4 +-
 source/app/views/urls/index.html.erb          |  26 +++++++++++++
 source/config/routes.rb                       |   5 +++
 source/db/.DS_Store                           | Bin 0 -> 6148 bytes
 .../db/migrate/20170609180109_create_urls.rb  |  11 ++++++
 .../20170609192743_create_ur_lindices.rb      |   9 +++++
 source/db/schema.rb                           |  29 +++++++++++++++
 source/spec/models/original_and_count_spec.rb |   5 +++
 source/spec/models/ur_lindex_spec.rb          |   5 +++
 source/spec/models/url_spec.rb                |   5 +++
 18 files changed, 152 insertions(+), 5 deletions(-)
 create mode 100644 source/.DS_Store
 create mode 100644 source/app/.DS_Store
 create mode 100644 source/app/models/.DS_Store
 create mode 100644 source/app/models/ur_lindex.rb
 create mode 100644 source/app/models/url.rb
 create mode 100644 source/app/views/urls/index.html.erb
 create mode 100644 source/db/.DS_Store
 create mode 100644 source/db/migrate/20170609180109_create_urls.rb
 create mode 100644 source/db/migrate/20170609192743_create_ur_lindices.rb
 create mode 100644 source/db/schema.rb
 create mode 100644 source/spec/models/original_and_count_spec.rb
 create mode 100644 source/spec/models/ur_lindex_spec.rb
 create mode 100644 source/spec/models/url_spec.rb

diff --git a/source/.DS_Store b/source/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..abf42920cd616ba5860e2be19c11421e637d5837
GIT binary patch
literal 8196
zcmeHM%Wl&^6ulFN)KNiXfoPWAAhC#0N`Nj9QV6L~7f6U8SO9A6*tAw%J4&1e2tnEK
z55OPrDSQDR!Uw>)GecxMDZ8SoosnkFc;?)BoO#$cAtKQk`<p~{BC-(~YwJi>1g__}
z6iT|}I#9r#lD-!u9-eATTvK2aFbWt2i~>dhqrllv0Pk!L_6hHORclhCfKlK=D!})H
zgUHy{I9DjI4kXeA0G3fK1M>3YALwuau&r^f5G4pgnF5um&@P71zJpNasBdfjT%j^2
zA$vwUx@Vz16ro)Y;Yd1(wnCE{1&jjA3b5~PkxK&_>_j>L{XS}L{+2<SX_hw`4YZg4
z!y825C~Y=>ijq~nR9UmDRl9n{e$zWhCcV^6$D@urd?lYkKk#(^d6Gnnyz9LPgUN2~
z+M^^+-7pS@8T#v&VeBW9PBM=Dk!<Iwn;yVccC=foPp7Tc?S|93+nhC=>DE@W;oNE6
zo6T%{<HqKLoxP*?AEqB?pT4Sj3w?LcRrS0`zagimcibDsQ4;T?gxMB(6jEG}<~wS#
z(p0EV3B~jl-2FUPZ2XIRUd7A_QjoNo6^m}skj4ecJ{Ke_kxyQM^J^97yvivBD9E@*
zk13!dx#uDZ^70TL-Y=QMdpXaB>=AZspAHLlytA`*7I@*3_`Ii!tYm5D^D<^x6<ji7
zoF{IvpYK=ja%Q<UJ;SARh#B&kS~)*qXXdvK{x&_NE<FMArt*1y`CbUK%UP9agfRt0
z9*?HLOTijZns1NKc8+IJiWOOLk&1Vju~z69t;KSL!$OPDEY~7rF~KNsIto~-**g3G
z+b942e>$C;R*eEifit0iD0h3^4u<mg`?xqN_O%_vJwy)7n=6ziNTfRsl<qii@rNPu
e4ybI?);L#)5`_Q$LqO(DY~KHJ2~2VU75D?`70KcN

literal 0
HcmV?d00001

diff --git a/source/Gemfile b/source/Gemfile
index 9627b8b..fdd141d 100644
--- a/source/Gemfile
+++ b/source/Gemfile
@@ -16,8 +16,6 @@ gem 'coffee-rails', '~> 4.0.0'
 
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
-# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
-gem 'turbolinks'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
diff --git a/source/app/.DS_Store b/source/app/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6323a053e347ea1cae638abad669bbdd3b5f0d0e
GIT binary patch
literal 6148
zcmeHK&2G~`5T0$*#GyjufYcuMg2W+*lmI=TN>(U`-jIUe0I0QVi&%2KQS8)$5abK*
z(DDX63Qy1n=>xzwy9>%+5eI}&v}4VFv%52E@3((mA`-oEv`5q;A`i+~yM<(ha6Rji
zY}gWx6S|Fp@}pFphN%jdyj_7~z%lT@F~DoLP66e3VwzvSyeT|^-v6#efBH6^lA;Wr
zBVdXrhBdqDIqK`5MTKQPw0p(3aF`}}(dk@?jm_Ftz2P;RUh}s1wm(p1zX*zP-U~*r
zbuNkG(AqDQN`Kiw_%eyh<JR4$Dl38{i$^o=Z(b!?q{^NeXHl-(c^(u4#OfCvw{|C!
zZudc3b{}=7Z8_QB@3iH^?&Imy^LFm-9UPsUz5g)zIQ?{~X&`|OPs<&PKj90E8%R3u
zkFr!{@8H4F4H|&Fl!mJ)6g%*kCB8vt7^Y-3;o|dxcOBk}BHjMN;E3zr`L64b%n`CM
z5L<K(Vq+?o<}uIyi<#Mv>>7!k!rt~8^~rU`G2j^ZI}GstAfb%D#mb=GI*{lq0I-H)
zEwK3qfMcXZ-(qDDH4tG!fhJVgD~2%PD3{jHw^$i8;Uw(kL)bS9dqWZW?Py<WcM`rq
zmpTR<1M>`Qnrw^D|7SPf|L22T&N1K^SStoZ?XZ8?LznE?y3{#7YbEpq%EEq?K^=m`
i9>?0?qj(pp1$B}Qpl`7<h!TkV5zsWa#4+$s8TbJ#W#`!d

literal 0
HcmV?d00001

diff --git a/source/app/assets/javascripts/application.js b/source/app/assets/javascripts/application.js
index d6925fa..1ca0e3b 100644
--- a/source/app/assets/javascripts/application.js
+++ b/source/app/assets/javascripts/application.js
@@ -12,5 +12,4 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require turbolinks
 //= require_tree .
diff --git a/source/app/controllers/urls_controller.rb b/source/app/controllers/urls_controller.rb
index ef26710..bd684e1 100644
--- a/source/app/controllers/urls_controller.rb
+++ b/source/app/controllers/urls_controller.rb
@@ -1,2 +1,37 @@
 class UrlsController < ApplicationController
+  def new
+  end
+
+  def index
+    @urls = Url.all
+  end
+
+  def create
+    @url = Url.new(url_params)
+
+    @url.save
+    redirect_to '/'
+  end
+
+  def destroy
+    @url = Url.find(params[:id])
+    @url.destroy
+
+    redirect_to '/'
+  end
+
+  def click_link
+    @url = Url.find(params[:format])
+
+    new_count = @url.click_count + 1
+    @url.update_attribute(:click_count, new_count)
+
+    sleep 0.01
+    redirect_to @url.read_attribute('original')
+  end
+
+  private
+  def url_params
+    params.require(:url).permit(:original)
+  end
 end
diff --git a/source/app/models/.DS_Store b/source/app/models/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..eafdcad2fb5671e2e786c42d11f98f04f8306a9a
GIT binary patch
literal 6148
zcmeHKJxc^J5PhSE9B6T!mMN_SYn$ab3u}LXvU?W7;(~HuxsAVD-<ydacW$eQ%s}$y
zCi9ZbgG(|1Y`IyV0}B9iHlfLxFoh?F_G<Dz(R_|OJmLXQSN+gUO!OB+`t~_G4E*j6
zU%tQXhn8a!=7R0?)r}r-gbnw3gC6%}t;u@E86&Os{mHZA9o~WS`pMjvom{PxmI|Z-
zsX!`_3jBluyt8HV!@%rQfm9$B_)tLSLtzs(6~{n7I@oy$K%6n`Mqf{6aZ1Ie;uy#g
zngx{@RI4S11)cFy^O}ldV9;T;_^`V2d+}nvI_EE*4r>ClPX$teZ3R^O(iXb^FZq|5
zEb=`iyHp?*_^%4sY<0a_a(DG^{kBitwT11LO{Tn24vqfSBY;12j-2>lj2HRLYbuU`
TnniJ^6Z0Y9f@GHp{DJ~+*<Lja

literal 0
HcmV?d00001

diff --git a/source/app/models/ur_lindex.rb b/source/app/models/ur_lindex.rb
new file mode 100644
index 0000000..69f1f51
--- /dev/null
+++ b/source/app/models/ur_lindex.rb
@@ -0,0 +1,2 @@
+class UrLindex < ActiveRecord::Base
+end
diff --git a/source/app/models/url.rb b/source/app/models/url.rb
new file mode 100644
index 0000000..6e9e177
--- /dev/null
+++ b/source/app/models/url.rb
@@ -0,0 +1,18 @@
+class Url < ActiveRecord::Base
+  validates :original, presence: true,
+                    length: { minimum: 1 },
+                    format: {with: /\A((http|https):\/\/).*\Z/}
+
+
+  before_save :shortify
+
+  private
+  def shortify
+    if self.shortened == nil
+      self.click_count = 0
+      begin
+        self.shortened = "https://bit.ly/" + SecureRandom.hex(4)
+      end while Url.where(shortened: self.shortened).exists?
+    end
+  end
+end
diff --git a/source/app/views/layouts/application.html.erb b/source/app/views/layouts/application.html.erb
index f946432..d5124e5 100644
--- a/source/app/views/layouts/application.html.erb
+++ b/source/app/views/layouts/application.html.erb
@@ -2,8 +2,8 @@
 <html>
 <head>
   <title>Source</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <%= stylesheet_link_tag    'application', media: 'all' %>
+  <%= javascript_include_tag 'application' %>
   <%= csrf_meta_tags %>
 </head>
 <body>
diff --git a/source/app/views/urls/index.html.erb b/source/app/views/urls/index.html.erb
new file mode 100644
index 0000000..4e0b673
--- /dev/null
+++ b/source/app/views/urls/index.html.erb
@@ -0,0 +1,26 @@
+<h1>Bitly Clone</h1>
+
+<table>
+  <tr>
+    <th>Destination:</th>
+    <th>Short Url:</th>
+    <th>Clicks:</th>
+  </tr>
+ 
+  <% @urls.each do |url| %>
+    <tr>
+      <td><%= url.original %></td>
+      <td style="text-align: center"><%= link_to url.shortened, urls_click_link_path(url) %></td>
+      <td style="text-align: center"><%= url.click_count %></td>
+      <td><%= link_to 'Delete', url_path(url), method: :delete %></td>
+    </tr>
+  <% end %>
+</table>
+
+<%= form_for :url do |f| %>
+  <p>
+    <%= f.label :'Enter Url:' %><br>
+    <%= f.text_field :original %>
+    <%= f.submit %>
+  </p>
+<% end %>
\ No newline at end of file
diff --git a/source/config/routes.rb b/source/config/routes.rb
index 3f66539..733d8ab 100644
--- a/source/config/routes.rb
+++ b/source/config/routes.rb
@@ -1,4 +1,9 @@
 Rails.application.routes.draw do
+  get 'urls/click_link' => 'urls#click_link'
+
+  resources :urls
+
+  root 'urls#index'
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
 
diff --git a/source/db/.DS_Store b/source/db/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0cbababf149029a3b2f249ee41d9a2145759c65a
GIT binary patch
literal 6148
zcmeHKTTc@~6g~r0wp?VnR3Q4Wk(iJ`NU<mnhENMe8)B%IU<qK^ZHKa9yHj_!ARwkM
z{s12}@dxniqklkufltPtpovdD>6uHpw8*0|x~G}>&YsIm=i8i_9RMJyYH<QU2LKHl
z$4EPNX9)N6)+8;;!kt8n;Q)gQl!1cV6df8u20{k@HU@a@_CXOVb{pHt`VC+le0YjB
z8v^tt(he(F4zn<WZx^?*jr<gX8bBM?y$vPsz~u1_(TC?pTRVP5js4N8IJO_e<DW=N
zYvjVkHZ2;}qFvfrc9ZR712d@lDbrgKPj-=7N?&BmInqsQ$)-Dby?>UufoZ$cI}yJ6
z*mjF-C&j96(HG-n%wQ99#YB01aDP9MxG`oVZpIJBjQy#p_?R)7xOH%#X#>|Mrqk=?
z-M#(i2QOZWWdp&jPe`}II=n%pffT#2t(HmN)tC82*N+z3-qG20sax;q?d$39iN#`<
z2V#RmLs#;8pJf)dN*@2qv&>;$%Bj+ol4lpQ6|-QwrCdOt1zCHK=Jno&&_}fR<k+;h
zTfvzAV}ls(o=2%G##`9f@M(}cp)cq4Zol9$$H_3?4s7Nwulo2Z(g7`}-3^8_ZX?+X
z74GtvsOKX#<>Z!4&okW;P3^8ZrbV3vH^qX0m3br|t-#!jNBKxO8+E>x;hAre%i-jF
zT^W&z4#QHxqe&-=E^}!#I-JZXqXwgJ2Ohu@Y{4G9g12x8@8JV{hOh90w2>iljf|2>
zGEHX4eUc{gBtssOM>4ym{z9+Tr;tci5F1|TcGhzp=9bXIv!Ylr1=z%DDPt9kV=Y*x
z>wpYk)XA#RFoWW+h<H}~%ZB()QHwtI=T;~A-jIinO`_JRbu@WGL&!kL!2iww-yaNY
z9Fq!b62;bmowx!ZM$jw-b^dX{a}0$^g*A!jK_M~~QKk}g#UL^r?S_g=Dy&JA=|I%w
zgQ%H_x}gv;JC1LNa3D#EVIMLOGH{xKR{5y&^Z)Me@BgQh!l#gdkb!@S0TP+Z&ZTfk
z>TGRV96xIfZ0p##@VJ^pk%FB%j)lUH;z4Xe&}VQ3F{!X75iKa;hk&3V>_P_qC<DI$
DUq}_t

literal 0
HcmV?d00001

diff --git a/source/db/migrate/20170609180109_create_urls.rb b/source/db/migrate/20170609180109_create_urls.rb
new file mode 100644
index 0000000..e76c5fa
--- /dev/null
+++ b/source/db/migrate/20170609180109_create_urls.rb
@@ -0,0 +1,11 @@
+class CreateUrls < ActiveRecord::Migration
+  def change
+    create_table :urls do |t|
+      t.string :shortened
+      t.string :original
+      t.integer :click_count
+
+      t.timestamps
+    end
+  end
+end
diff --git a/source/db/migrate/20170609192743_create_ur_lindices.rb b/source/db/migrate/20170609192743_create_ur_lindices.rb
new file mode 100644
index 0000000..0eff0ae
--- /dev/null
+++ b/source/db/migrate/20170609192743_create_ur_lindices.rb
@@ -0,0 +1,9 @@
+class CreateUrLindices < ActiveRecord::Migration
+  def change
+    create_table :ur_lindices do |t|
+      
+      add_index :urls, unique: true
+
+    end
+  end
+end
diff --git a/source/db/schema.rb b/source/db/schema.rb
new file mode 100644
index 0000000..0db76da
--- /dev/null
+++ b/source/db/schema.rb
@@ -0,0 +1,29 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20170609192743) do
+
+  create_table "ur_lindices", force: true do |t|
+  end
+
+  create_table "urls", force: true do |t|
+    t.string   "shortened"
+    t.string   "original"
+    t.integer  "click_count"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "urls", [nil], name: "index_urls_on_unique_and_true"
+
+end
diff --git a/source/spec/models/original_and_count_spec.rb b/source/spec/models/original_and_count_spec.rb
new file mode 100644
index 0000000..84cf38c
--- /dev/null
+++ b/source/spec/models/original_and_count_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe OriginalAndCount, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/source/spec/models/ur_lindex_spec.rb b/source/spec/models/ur_lindex_spec.rb
new file mode 100644
index 0000000..29bbb69
--- /dev/null
+++ b/source/spec/models/ur_lindex_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe UrLindex, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/source/spec/models/url_spec.rb b/source/spec/models/url_spec.rb
new file mode 100644
index 0000000..209ca4c
--- /dev/null
+++ b/source/spec/models/url_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Url, :type => :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From c12a48072b6f16283feb048e518ae2acc6573d90 Mon Sep 17 00:00:00 2001
From: John Chester <jchester@cmmc02th17xg8wl.innova.local>
Date: Mon, 12 Jun 2017 10:31:29 -0400
Subject: [PATCH 2/2] Release 3

---
 source/app/controllers/urls_controller.rb |  13 +++++++++----
 source/app/models/url.rb                  |   8 ++++----
 source/app/views/urls/index.html.erb      |  12 ++++++++++--
 source/db/migrate/.DS_Store               | Bin 0 -> 6148 bytes
 4 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 source/db/migrate/.DS_Store

diff --git a/source/app/controllers/urls_controller.rb b/source/app/controllers/urls_controller.rb
index bd684e1..a7f8d33 100644
--- a/source/app/controllers/urls_controller.rb
+++ b/source/app/controllers/urls_controller.rb
@@ -1,16 +1,21 @@
 class UrlsController < ApplicationController
-  def new
-  end
 
   def index
     @urls = Url.all
   end
 
+  def new
+  end
+
   def create
     @url = Url.new(url_params)
 
-    @url.save
-    redirect_to '/'
+    if @url.save
+      redirect_to '/'
+    else
+      @urls = Url.all
+      render 'index'
+    end
   end
 
   def destroy
diff --git a/source/app/models/url.rb b/source/app/models/url.rb
index 6e9e177..c02e9da 100644
--- a/source/app/models/url.rb
+++ b/source/app/models/url.rb
@@ -1,7 +1,7 @@
 class Url < ActiveRecord::Base
-  validates :original, presence: true,
-                    length: { minimum: 1 },
-                    format: {with: /\A((http|https):\/\/).*\Z/}
+  validates :original, presence: true
+  validates :original, length: { minimum: 1 }
+  validates :original, format: {with: /\A((http|https):\/\/).*\Z/}
 
 
   before_save :shortify
@@ -11,7 +11,7 @@ def shortify
     if self.shortened == nil
       self.click_count = 0
       begin
-        self.shortened = "https://bit.ly/" + SecureRandom.hex(4)
+        self.shortened = "https://bit.ly/" + SecureRandom.hex(3)
       end while Url.where(shortened: self.shortened).exists?
     end
   end
diff --git a/source/app/views/urls/index.html.erb b/source/app/views/urls/index.html.erb
index 4e0b673..4f62629 100644
--- a/source/app/views/urls/index.html.erb
+++ b/source/app/views/urls/index.html.erb
@@ -6,7 +6,7 @@
     <th>Short Url:</th>
     <th>Clicks:</th>
   </tr>
- 
+  
   <% @urls.each do |url| %>
     <tr>
       <td><%= url.original %></td>
@@ -23,4 +23,12 @@
     <%= f.text_field :original %>
     <%= f.submit %>
   </p>
-<% end %>
\ No newline at end of file
+<% end %>
+
+<div>
+  <% if @url %>
+    <p>
+      <%= "Please enter a valid URL starting with 'http://' or 'https://'" if @url.errors.any? %>
+    </p>
+  <% end %>
+</div>
diff --git a/source/db/migrate/.DS_Store b/source/db/migrate/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..cf6553bb9c6b2656fd2ddf78f5b00e448d7683d7
GIT binary patch
literal 6148
zcmeHKJxc>Y5PhpD0yZgagexqpB&T8wHb;nswLjqET`YvdfSUgPj=xgh+gX*<Ev!Uj
z26o=;?9R;IgWC@PVX<A8zy!dUO&DZkMDFa+PMRzXF~=0=m|~6+7nwwV(WSK?;DoC#
zF{A!mzdZVu8Z91ihg&>T*VwYx;R(mY=DORoO}A;7MHF7L9lb`O1srBF&*_`t45!)5
zHFMwN0c+}(_40LIzSN1uTsZ^IfHU9>I0HXofM>R3yl3dz8E^)ife!|>KNM`jDq(LJ
zw+<>@pEW)bN@(jMEG!aM34241P=bXLEi|MjMzC=Di!`rF*c)0nLafX@sq*{dCB*9V
z7jZg5W$4-&a0Z49>{@rC^Z$y!O!kpK4Dp^b;0*jT2Eu50vt00_(%Jg$^K{l0Y%4a2
q=Jhftv<H^}cC?S|$3Yt}WOH7Xus2i|`C~ZIF9MMeSI)pMFz^O_B{RPO

literal 0
HcmV?d00001