Index Page
+ +<% if @url.errors %> +<%= url.address %> - <%= "#{request.base_url}/#{url.slug}" %> - Clicks: <%= url.click_count %>
+<% end %> + +<%= form_for @url do |f| %> + <%= f.text_field :address %> + <%= f.submit "Shorten URL" %> +<% end %> \ No newline at end of file diff --git a/source/config/routes.rb b/source/config/routes.rb index 3f66539..4ce6c58 100644 --- a/source/config/routes.rb +++ b/source/config/routes.rb @@ -1,56 +1,7 @@ Rails.application.routes.draw do - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". + root "urls#index" - # You can have the root of your site routed with "root" - # root 'welcome#index' + resources :urls, only: [:index, :create] - # Example of regular route: - # get 'products/:id' => 'catalog#view' - - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end - - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable - - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end + get '/:slug', to: 'urls#show' end diff --git a/source/db/migrate/20180123175724_create_urls.rb b/source/db/migrate/20180123175724_create_urls.rb new file mode 100644 index 0000000..fb4a6f4 --- /dev/null +++ b/source/db/migrate/20180123175724_create_urls.rb @@ -0,0 +1,9 @@ +class CreateUrls < ActiveRecord::Migration + def change + create_table :urls do |t| + t.string :address + + t.timestamps + end + end +end diff --git a/source/db/migrate/20180123194146_add_click_count_to_urls.rb b/source/db/migrate/20180123194146_add_click_count_to_urls.rb new file mode 100644 index 0000000..f70faec --- /dev/null +++ b/source/db/migrate/20180123194146_add_click_count_to_urls.rb @@ -0,0 +1,5 @@ +class AddClickCountToUrls < ActiveRecord::Migration + def change + add_column :urls, :click_count, :integer + end +end diff --git a/source/db/migrate/20180124154857_add_shortened_address_suffix_to_url.rb b/source/db/migrate/20180124154857_add_shortened_address_suffix_to_url.rb new file mode 100644 index 0000000..19a6902 --- /dev/null +++ b/source/db/migrate/20180124154857_add_shortened_address_suffix_to_url.rb @@ -0,0 +1,5 @@ +class AddShortenedAddressSuffixToUrl < ActiveRecord::Migration + def change + add_column :urls, :shortened_address_suffix, :string + end +end diff --git a/source/db/migrate/20180124180333_change_shortened_address_suffix_to_slug.rb b/source/db/migrate/20180124180333_change_shortened_address_suffix_to_slug.rb new file mode 100644 index 0000000..1f00ed0 --- /dev/null +++ b/source/db/migrate/20180124180333_change_shortened_address_suffix_to_slug.rb @@ -0,0 +1,5 @@ +class ChangeShortenedAddressSuffixToSlug < ActiveRecord::Migration + def change + rename_column :urls, :shortened_address_suffix, :slug + end +end diff --git a/source/db/migrate/20180125162712_add_index_to_slug.rb b/source/db/migrate/20180125162712_add_index_to_slug.rb new file mode 100644 index 0000000..b0f62ae --- /dev/null +++ b/source/db/migrate/20180125162712_add_index_to_slug.rb @@ -0,0 +1,5 @@ +class AddIndexToSlug < ActiveRecord::Migration + def change + add_index :urls, :slug + end +end diff --git a/source/db/migrate/20180130212955_add_default_value_to_click_count.rb b/source/db/migrate/20180130212955_add_default_value_to_click_count.rb new file mode 100644 index 0000000..042820d --- /dev/null +++ b/source/db/migrate/20180130212955_add_default_value_to_click_count.rb @@ -0,0 +1,5 @@ +class AddDefaultValueToClickCount < ActiveRecord::Migration + def change + change_column :urls, :click_count, :integer, default: 0 + end +end diff --git a/source/db/schema.rb b/source/db/schema.rb new file mode 100644 index 0000000..90e75a0 --- /dev/null +++ b/source/db/schema.rb @@ -0,0 +1,26 @@ +# 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: 20180130212955) do + + create_table "urls", force: true do |t| + t.string "address" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "click_count", default: 0 + t.string "slug" + end + + add_index "urls", ["slug"], name: "index_urls_on_slug" + +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