handcart 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb847b75e15d920aed108be9b5bb359f9a703ac2
-  data.tar.gz: a5597cab534cc5df286c77a117729caa44ee142b
+  metadata.gz: 21e33478d7c882e5c4c97e20ea389784c2c368e8
+  data.tar.gz: 8a0f185ec1e3e7a31af4f23405ffb9bca7622764
 SHA512:
-  metadata.gz: ff06fc331c819cdcb2089d16368152158869938f44a346b53c02b93eef10739b5950cb229392618cdbc73b156e49dcaf899ddf0244a0178205171107105f1063
-  data.tar.gz: cb817519edcc91c7430dbb48105c1a6a4cdc1fb4205c7b4e6f71c4dc4b2c80d786a159d98cbd629b56fad7faf1b2b11d76515ef3ec9052e1c2d853ac663bcafe
+  metadata.gz: 6e16b0550dc3064a94057fbc2d1aaf9202983d915fc17315d38cb4b7ba9a683e3f3260aeda13db5aa63680e7edb5ab016edf3a172a3144b11efdc742773a8b0b
+  data.tar.gz: f75273742f9bc879d4988dcf847400e4aebec9cf82aaf4d898efb2f0f7d3f5ddea6d4d4818a21d334ae549d207116d425564fc322d2b729cbfa0be61cb560aec

data/README.md

@@ -224,7 +224,7 @@ To have Handcart enable IP forwarding, the following method must be invoked in t
 
 ```ruby
   # app/controllers/public_controller.rb
-  enable_forwarding("subdomain#forwarding", "public#forbidden", only: [:index])
+  enable_forwarding("subdomain#index", "public#forbidden", only: [:index])
 ```
 
 The first argument indicates what controller and action should be invoked inside the franchisee namespace. The second

data/app/assets/javascripts/handcart/application.js

@@ -12,5 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require twitter/bootstrap
+//= require bootstrap
 //= require_tree .

data/app/assets/stylesheets/handcart/{application.css → application.css.scss}

@@ -9,7 +9,6 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= require twitter-bootstrap-static/bootstrap
- *= require twitter-bootstrap-static/fontawesome
  *= require_tree .
  */
+@import "bootstrap";

data/app/assets/stylesheets/handcart/layout.css.scss

@@ -4,7 +4,7 @@ footer p {
 }
 
 td.action-button {
-  width: 2em;
+  width: 3em;
 }
 
 .page-header {
@@ -19,3 +19,11 @@ td.action-button {
   color: #FFFFFF;
   background-color: #424242;
 }
+
+.well {
+  padding: 10px !important;
+}
+
+.no-margin-bottom {
+  margin-bottom: 0em !important;
+}

data/app/controllers/handcart/application_controller.rb

@@ -1,5 +1,4 @@
 module Handcart
   class ApplicationController < ActionController::Base
-    helper BootstrapFlashHelper
   end
 end

data/app/controllers/handcart/ip_addresses_controller.rb

@@ -5,7 +5,7 @@ module Handcart
     before_action :set_ip_address, only: [:show, :edit, :update, :destroy]
 
     def index
-      @ip_addresses = IpAddress.all
+      @ip_addresses = IpAddress.ordered.page(params[:page])
     end
 
     def show
@@ -22,7 +22,7 @@ module Handcart
       @ip_address = IpAddress.new(safe_params)
 
       if @ip_address.save
-        redirect_to @ip_address, notice: 'Ip address was successfully created.'
+        redirect_to @ip_address, notice: 'IP Address was successfully created.'
       else
         render :new
       end
@@ -30,7 +30,7 @@ module Handcart
 
     def update
       if @ip_address.update(safe_params)
-        redirect_to @ip_address, notice: 'Ip address was successfully updated.'
+        redirect_to @ip_address, notice: 'IP Address was successfully updated.'
       else
         render :edit
       end
@@ -38,7 +38,7 @@ module Handcart
 
     def destroy
       @ip_address.destroy
-      redirect_to ip_addresses_url, notice: 'Ip address was successfully removed.'
+      redirect_to ip_addresses_url, notice: 'IP Address was successfully removed.'
     end
 
     private

data/app/controllers/handcart/subdomains_controller.rb

@@ -5,7 +5,7 @@ module Handcart
     before_action :set_subdomain, only: [:show, :edit, :update, :destroy]
 
     def index
-      @subdomains = Subdomain.all
+      @subdomains = Subdomain.ordered.page(params[:page])
     end
 
     def show
@@ -38,7 +38,7 @@ module Handcart
 
     def destroy
       @subdomain.destroy
-      redirect_to subdomains_url, notice: 'Subdomain was successfully destroyed.'
+      redirect_to subdomains_url, notice: 'Subdomain was successfully removed.'
     end
 
     private

data/app/helpers/handcart/bootstrap_flash_helper.rb

@@ -0,0 +1,26 @@
+module Handcart
+  module BootstrapFlashHelper
+    ALERT_TYPES = [:danger, :info, :success, :warning] unless const_defined?(:ALERT_TYPES)
+
+    def bootstrap_flash
+      flash_messages = []
+      flash.each do |type, message|
+        # Skip empty messages, e.g. for devise messages set to nothing in a locale file.
+        next if message.blank?
+
+        type = type.to_sym
+        type = :success if type == :notice
+        type = :danger if type == :error
+        next unless ALERT_TYPES.include?(type)
+
+        Array(message).each do |msg|
+          text = content_tag(:div,
+                             content_tag(:button, raw("×"), class: "close", "data-dismiss" => "alert") +
+                             msg.html_safe, class: "alert fade in alert-#{type}")
+          flash_messages << text if msg
+        end
+      end
+      flash_messages.join("\n").html_safe
+    end
+  end
+end

data/app/models/handcart/concerns/handcarts.rb

@@ -6,7 +6,7 @@ module Handcart::Concerns::Handcarts
     has_many :ip_addresses, dependent: :destroy, class_name: "Handcart::IpAddress", foreign_key: "handcart_id"
 
     # Nuke the subdomain
-    before_destroy { |handcart| handcart.subdomain.destroy }
+    before_destroy { |handcart| handcart.subdomain.destroy if handcart.subdomain.present? }
   end
 
   module ClassMethods

data/app/models/handcart/ip_address.rb

@@ -14,5 +14,6 @@ module Handcart
     scope :blacklisted, -> { where(blacklisted: true) }
     scope :permitted, -> { where.not(blacklisted: true) }
     scope :with_handcart, lambda { |handcart| where(handcart_id: handcart.try(:id)) }
+    scope :ordered, -> { order("handcart_ip_addresses.address ASC") }
   end
 end

data/app/models/handcart/subdomain.rb

@@ -10,6 +10,7 @@ module Handcart
     scope :allocated, -> { Subdomain.includes(:handcart).where("#{Handcart.handcart_class.model_name.plural}.subdomain_id IS NOT NULL").references(:handcart) }
     scope :unallocated, -> { Subdomain.includes(:handcart).where("#{Handcart.handcart_class.model_name.plural}.subdomain_id IS NULL").references(:handcart) }
     scope :unallocated_or_current, lambda { |handcart| Subdomain.includes(:handcart).where("#{Handcart.handcart_class.model_name.plural}.subdomain_id IS NULL OR #{Handcart.handcart_class.model_name.plural}.subdomain_id IN (?)", handcart.try(:subdomain_id)).references(:handcart) }
+    scope :ordered, -> { order("handcart_subdomains.name ASC") }
 
     before_save :normalize_name
 

data/app/views/handcart/ip_addresses/_form.html.haml

@@ -1,12 +1,12 @@
-= simple_form_for @ip_address, html: { class: 'form-horizontal' }  do |f|
+= simple_form_for @ip_address do |f|
   = f.error_notification
 
-  .form-inputs
-    = f.input :address
-    = f.input :subnet_mask
-    = f.association :handcart, collection: Company.all
-    = f.input :blacklisted, as: :select, include_blank: false
+  = f.input :address
+  = f.input :subnet_mask
+  = f.association :handcart, collection: Handcart.handcart_class.all, label: Handcart.handcart_class.model_name.human
+  = f.input :blacklisted, as: :select, include_blank: false
 
-  .form-actions
-    = f.button :submit, class: 'btn btn-primary'
-    = link_to 'Cancel', ip_addresses_path, class: 'btn'
+  .form-group
+    .col-sm-offset-2.col-sm-10
+      = f.button :submit, class: 'btn btn-primary'
+      = link_to 'Cancel', @ip_address.new_record? ? ip_addresses_path : ip_address_path(@ip_address), class: 'btn btn-default'

data/app/views/handcart/ip_addresses/index.html.haml

@@ -3,9 +3,11 @@
 - content_for(:toolbar) do
   .btn-group
     = link_to new_ip_address_path, class: 'btn btn-primary', title: t(".new_ip_address") do
-      %i.icon-plus
+      %span.glyphicon.glyphicon-plus
 
-%table.table.table-striped
+= paginate @ip_addresses
+
+%table.table.table-striped.table-hover.table-condensed
   %thead
     %tr
       %th= Handcart::IpAddress.human_attribute_name(:address)
@@ -19,13 +21,17 @@
       %tr
         %td= link_to ip_address.address, ip_address, title: t(".view_ip_address")
         %td= ip_address.subnet_mask
-        %td= ip_address.handcart
+        %td
+          - if ip_address.handcart.present?
+            = link_to ip_address.handcart.to_s, Handcart.handcart_class.handcart_show_path(ip_address.handcart)
+          - else
+            None
         %td= ip_address.blacklisted? ? "Yes" : "No"
         %td.action-button
-          .pull-right
-            = link_to edit_ip_address_path(ip_address), class: 'btn', title: t(".edit_ip_address") do
-              %i.icon-pencil
+          = link_to edit_ip_address_path(ip_address), class: 'btn btn-xs btn-warning', title: t(".edit_ip_address") do
+            %span.glyphicon.glyphicon-edit
         %td.action-button
-          .pull-right
-            = link_to ip_address, method: :delete, data: { confirm: t(".confirm") }, class: 'btn btn-danger', title: t(".remove_ip_address") do
-              %i.icon-remove
+          = link_to ip_address, method: :delete, data: { confirm: t(".confirm") }, class: 'btn btn-danger btn-xs', title: t(".remove_ip_address") do
+            %span.glyphicon.glyphicon-remove
+
+= paginate @ip_addresses

data/app/views/handcart/ip_addresses/show.html.haml

@@ -1,20 +1,38 @@
-- title t(".title", address: @ip_address.address)
+- title t(".title", address: @ip_address.address), false
 
-%table.table.table-striped
-  %thead
-    %tr
-      %th= Handcart::IpAddress.human_attribute_name(:address)
-      %th= Handcart::IpAddress.human_attribute_name(:subnet_mask)
-      %th= Handcart::IpAddress.human_attribute_name(:handcart)
-      %th= Handcart::IpAddress.human_attribute_name(:blacklisted)
-      %th
-  %tbody
-    %tr
-      %td= @ip_address.address
-      %td= @ip_address.subnet_mask
-      %td= @ip_address.handcart
-      %td= @ip_address.blacklisted? ? "Yes" : "No"
-      %td.action-button
-        .pull-right
-          = link_to edit_ip_address_path(@ip_address), class: 'btn', title: t(".edit_ip_address") do
-            %i.icon-pencil
+.page-header
+  %h3.sub-title.inline
+    = t(".title", address: @ip_address.address)
+    %span
+      = link_to edit_ip_address_path(@ip_address), class: 'btn btn-warning', title: t(".edit_ip_address") do
+        %span.glyphicon.glyphicon-edit
+
+.row
+  .col-lg-3.well
+    %table.table.table-striped.table-condensed.table-hover.no-margin-bottom
+      %tbody
+        %tr
+          %th= Handcart::IpAddress.human_attribute_name(:address)
+          %td= @ip_address.address
+        %tr
+          %th= Handcart::IpAddress.human_attribute_name(:subnet_mask)
+          %td= @ip_address.subnet_mask
+        %tr
+          %th= Handcart::IpAddress.human_attribute_name(:handcart)
+          %td
+            - if @ip_address.handcart.present?
+              = link_to @ip_address.handcart.to_s, Handcart.handcart_class.handcart_show_path(@ip_address.handcart)
+            - else
+              None
+        %tr
+          %th= Handcart::IpAddress.human_attribute_name(:blacklisted)
+          %td= @ip_address.blacklisted? ? "Yes" : "No"
+        %tr
+          %th Created At
+          %td= l(@ip_address.created_at, format: :short)
+        %tr
+          %th Updated At
+          %td= l(@ip_address.updated_at, format: :short)
+
+  .col-lg-9
+    Other stuff here

data/app/views/handcart/subdomains/_form.html.haml

@@ -1,9 +1,9 @@
-= simple_form_for @subdomain, html: { class: 'form-horizontal' }  do |f|
+= simple_form_for @subdomain do |f|
   = f.error_notification
 
-  .form-inputs
-    = f.input :name
+  = f.input :name
 
-  .form-actions
-    = f.button :submit, class: 'btn btn-primary'
-    = link_to 'Cancel', subdomains_path, class: 'btn'
+  .form-group
+    .col-sm-offset-2.col-sm-10
+      = f.button :submit, class: 'btn btn-primary'
+      = link_to 'Cancel', @subdomain.new_record? ? subdomains_path : subdomain_path(@subdomain), class: 'btn btn-default'

data/app/views/handcart/subdomains/index.html.haml

@@ -3,9 +3,11 @@
 - content_for(:toolbar) do
   .btn-group
     = link_to new_subdomain_path, class: 'btn btn-primary', title: t(".new_subdomain") do
-      %i.icon-plus
+      %span.glyphicon.glyphicon-plus
 
-%table.table.table-striped
+= paginate @subdomains
+
+%table.table.table-striped.table-hover.table-condensed
   %thead
     %tr
       %th= Handcart.subdomain_class.human_attribute_name(:name)
@@ -22,10 +24,10 @@
           - else
             None
         %td.action-button
-          .pull-right
-            = link_to edit_subdomain_path(subdomain), class: 'btn', title: t(".edit_subdomain") do
-              %i.icon-pencil
+          = link_to edit_subdomain_path(subdomain), class: 'btn btn-warning btn-xs', title: t(".edit_subdomain") do
+            %span.glyphicon.glyphicon-edit
         %td.action-button
-          .pull-right
-            = link_to subdomain, method: :delete, data: { confirm: t(".confirm") }, class: 'btn btn-danger', title: t(".remove_subdomain") do
-              %i.icon-remove
+          = link_to subdomain, method: :delete, data: { confirm: t(".confirm") }, class: 'btn btn-danger btn-xs', title: t(".remove_subdomain") do
+            %span.glyphicon.glyphicon-remove
+
+= paginate @subdomains

data/app/views/handcart/subdomains/show.html.haml

@@ -1,20 +1,31 @@
-- title t(".title", subdomain: @subdomain.name)
+- title t(".title", subdomain: @subdomain.name), false
 
-%table.table.table-striped
-  %thead
-    %tr
-      %th= Handcart.subdomain_class.human_attribute_name(:name)
-      %th= Handcart.handcart_class.model_name.human
-      %th
-  %tbody
-    %tr
-      %td= @subdomain.name
-      %td
-        - if @subdomain.handcart
-          = link_to @subdomain.handcart.try(:to_s), Handcart.handcart_class.handcart_show_path(@subdomain.handcart)
-        - else
-          None
-      %td.action-button
-        .pull-right
-          = link_to edit_subdomain_path(@subdomain), class: 'btn', title: t(".edit_subdomain") do
-            %i.icon-pencil
+.page-header
+  %h3.sub-title.inline
+    = t(".title", subdomain: @subdomain.name)
+    %span
+      = link_to edit_subdomain_path(@subdomain), class: 'btn btn-warning', title: t(".edit_subdomain") do
+        %span.glyphicon.glyphicon-edit
+
+.row-fluid
+  .col-lg-3.well
+    %table.table.table-striped.table-hover.table-condensed.no-margin-bottom
+      %tbody
+        %tr
+          %th= Handcart.subdomain_class.human_attribute_name(:name)
+          %td= @subdomain.name
+        %tr
+          %th= Handcart.handcart_class.model_name.human
+          %td
+            - if @subdomain.handcart
+              = link_to @subdomain.handcart.try(:to_s), Handcart.handcart_class.handcart_show_path(@subdomain.handcart)
+            - else
+              None
+        %tr
+          %th Created At
+          %td= l(@subdomain.created_at, format: :short)
+        %tr
+          %th Updated At
+          %td= l(@subdomain.updated_at, format: :short)
+  .col-lg-9
+    Other stuff here

data/app/views/layouts/handcart/_navbar.html.haml

@@ -1,15 +1,16 @@
-%ul.nav
-  %li
-    = link_to main_app.root_path do
-      %i.icon-arrow-left
-      Back to
-      = t(".main_app")
-  %li{class: (params[:controller] == "handcart/subdomains") ? "active" : nil}
-    = link_to handcart.root_path do
-      %i.icon-th-list
-      = t(".subdomains")
-  - unless (Handcart.ip_authorization.ip_authorization_strategy == :none)
-    %li{class: (params[:controller] == "handcart/ip_addresses") ? "active" : nil}
-      = link_to handcart.ip_addresses_path do
-        %i.icon-screenshot
-        = t(".ip_addresses")
+#navbar-collapse-1.collapse.navbar-collapse
+  %ul.nav.navbar-nav
+    %li
+      = link_to main_app.root_path do
+        %span.glyphicon.glyphicon-arrow-left
+        Back to
+        = t(".main_app")
+    %li{class: (params[:controller] == "handcart/subdomains") ? "active" : nil}
+      = link_to handcart.root_path do
+        %span.glyphicon.glyphicon-th-list
+        = t(".subdomains")
+    - unless (Handcart.ip_authorization.ip_authorization_strategy == :none)
+      %li{class: (params[:controller] == "handcart/ip_addresses") ? "active" : nil}
+        = link_to handcart.ip_addresses_path do
+          %span.glyphicon.glyphicon-screenshot
+          = t(".ip_addresses")

data/app/views/layouts/handcart/application.html.haml

@@ -17,22 +17,22 @@
     = javascript_include_tag "handcart/application"
 
   %body
-    .navbar.navbar-fluid-top.navbar-inverse
-      .navbar-inner
-        .container-fluid
-          %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")
+    %nav.navbar.navbar-inverse{role: "navigation"}
+      .container-fluid
+        .navbar-header
+          %button.navbar-toggle{"data-target" => "#navbar-collapse-1", "data-toggle" => "collapse", type: "button"}
             %span.icon-bar
             %span.icon-bar
             %span.icon-bar
-          %a.brand(href= root_path)
-            %i.icon-heart
+          %a.navbar-brand{href: root_path}
+            %span.glyphicon.glyphicon-heart
             = t(".handcart_brand")
-          = render "layouts/handcart/navbar"
+        = render "layouts/handcart/navbar"
 
-    .container-fluid
-      .row-fluid
+    .container
+      .row
         - if content_for?(:sidebar)
-          .span9
+          .col-lg-9
             %div.flash-message
               = bootstrap_flash
             - if content_for?(:sub_title)
@@ -41,11 +41,11 @@
             - if content_for?(:toolbar)
               %div#button-toolbar= yield(:toolbar)
             %div= yield
-          .span3
+          .col-lg-3
             .well.sidebar-nav
               %ul.nav.nav-list= yield(:sidebar)
         - else
-          .span12
+          .col-lg-12
             %div.flash-message
               = bootstrap_flash
             - if content_for?(:sub_title)