handcart 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27d609f5f8801213d67ddae823d59976c0016abf
-  data.tar.gz: 01bce062c8bee95eb38ecbe931a1c4ce160e663b
+  metadata.gz: eb847b75e15d920aed108be9b5bb359f9a703ac2
+  data.tar.gz: a5597cab534cc5df286c77a117729caa44ee142b
 SHA512:
-  metadata.gz: 633fd074412c2d921ab93775d34e00c61602bca5a2655a5c8da97cd2de17f10e4827242310017373fd201a81833993226bc6f75b9ca6507f0a4279bcf03d34ec
-  data.tar.gz: 9c708debf635ce439e11c5358333d9987b40235cc649f6b63fd23949dc3e1d3167696164ade139158018421a67f1d3dced27c8dbfe6b231446246b37bc090639
+  metadata.gz: ff06fc331c819cdcb2089d16368152158869938f44a346b53c02b93eef10739b5950cb229392618cdbc73b156e49dcaf899ddf0244a0178205171107105f1063
+  data.tar.gz: cb817519edcc91c7430dbb48105c1a6a4cdc1fb4205c7b4e6f71c4dc4b2c80d786a159d98cbd629b56fad7faf1b2b11d76515ef3ec9052e1c2d853ac663bcafe

data/README.md

@@ -4,10 +4,18 @@
 
 ### Installation
 
+###### RubyGems
+
 ```ruby
 gem 'handcart'
 ```
 
+###### Github
+
+```ruby
+gem 'handcart', git: 'https://github.com/mark-d-holmberg/handcart'
+```
+
 ### Copy Migrations
 
 Handcart requires that you copy over its migrations in the following manner:
@@ -238,7 +246,7 @@ the franchisee:
 
 ```ruby
   # app/controllers/sessions_controller.rb
-  enable_blocking("public#forbidden")
+  enable_blocking("public#blocked")
 ```
 
 The first argument indicates the controller and action which will be redirected to should the IP authorization strategy indicate

data/app/assets/stylesheets/handcart/application.css

@@ -9,7 +9,7 @@
  * 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 twitter-bootstrap-static/bootstrap
+ *= require twitter-bootstrap-static/fontawesome
  *= require_tree .
  */

data/app/controllers/handcart/application_controller.rb

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

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

@@ -14,18 +14,13 @@
       %th= Handcart::IpAddress.human_attribute_name(:blacklisted)
       %th
       %th
-      %th
   %tbody
     - @ip_addresses.each do |ip_address|
       %tr
-        %td= ip_address.address
+        %td= link_to ip_address.address, ip_address, title: t(".view_ip_address")
         %td= ip_address.subnet_mask
         %td= ip_address.handcart
         %td= ip_address.blacklisted? ? "Yes" : "No"
-        %td.action-button
-          .pull-right
-            = link_to ip_address, class: 'btn', title: t(".view_ip_address") do
-              %i.icon-eye-open
         %td.action-button
           .pull-right
             = link_to edit_ip_address_path(ip_address), class: 'btn', title: t(".edit_ip_address") do

data/config/locales/en.bootstrap.yml

@@ -0,0 +1,18 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  helpers:
+    actions: "Actions"
+    links:
+      back: "Back"
+      cancel: "Cancel"
+      confirm: "Are you sure?"
+      destroy: "Delete"
+      new: "New"
+      edit: "Edit"
+    titles:
+      edit: "Edit %{model}"
+      save: "Save %{model}"
+      new: "New %{model}"
+      delete: "Delete %{model}"

data/lib/handcart/version.rb

@@ -1,3 +1,3 @@
 module Handcart
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/handcart.rb

@@ -6,6 +6,7 @@ require 'haml'
 require 'sass/rails'
 require "handcart/simple_form"
 require 'jquery-rails'
+require 'twitter-bootstrap-rails'
 
 module Handcart
   module Strategies

data/spec/dummy/app/assets/stylesheets/layout.css.scss

@@ -2,3 +2,7 @@ footer {
   text-align: center;
   margin-top: 1em;
 }
+
+td.action-button {
+  width: 2em;
+}

data/spec/dummy/app/controllers/master/companies_controller.rb

@@ -45,7 +45,7 @@ class Master::CompaniesController < MasterController
   end
 
   def safe_params
-    safe_attributes =[:name, :subdomain_id]
+    safe_attributes =[:name, :subdomain_id, :active]
     params.require(:company).permit(safe_attributes)
   end
 end

data/spec/dummy/app/controllers/master_controller.rb

@@ -1,2 +1,3 @@
 class MasterController < ApplicationController
+  layout 'master'
 end

data/spec/dummy/app/controllers/public_controller.rb

@@ -9,4 +9,8 @@ class PublicController < ApplicationController
   def forbidden
   end
 
+  def blocked
+    flash[:error] = "Your IP address has been blocked from accessing the system."
+  end
+
 end

data/spec/dummy/app/controllers/subdomain_controller.rb

@@ -1,6 +1,6 @@
 class SubdomainController < ApplicationController
 
-  enable_blocking("public#forbidden")
+  enable_blocking("public#blocked")
 
   def index
   end

data/spec/dummy/app/views/ip_addresses/index.html.haml

@@ -3,10 +3,12 @@
 %table.table.table-striped
   %thead
     %tr
-      %th IP Address
-      %th Subnet Mask
+      %th= Handcart::IpAddress.human_attribute_name(:address)
+      %th= Handcart::IpAddress.human_attribute_name(:subnet_mask)
+      %th= Handcart::IpAddress.human_attribute_name(:blacklisted)
   %tbody
     - @ip_addresses.each do |ip_address|
       %tr
         %td= ip_address.address
         %td= ip_address.subnet_mask
+        %td= ip_address.blacklisted? ? "Yes" : "No"

data/spec/dummy/app/views/layouts/_navbar.html.haml

@@ -1,11 +1,7 @@
 %ul.nav
-  %li
-    = link_to handcart_path do
-      %i.icon-heart
-      Handcart
   - unless (Handcart.ip_authorization.ip_authorization_strategy == :none)
     %li{class: (params[:controller] == "ip_addresses") ? "active" : nil}
       = link_to main_app.ip_addresses_path do
         %i.icon-screenshot
-        IP Addresses
+        My IP Addresses
 

data/spec/dummy/app/views/layouts/application.html.haml

@@ -17,14 +17,14 @@
     = javascript_include_tag "application"
 
   %body
-    .navbar.navbar-fluid-top.navbar-inverse
+    .navbar.navbar-fluid-top
       .navbar-inner
         .container-fluid
           %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")
             %span.icon-bar
             %span.icon-bar
             %span.icon-bar
-          %a.brand(href="#") Dummy
+          %a.brand(href=subdomain_root_path) Dummy
           = render "layouts/navbar"
 
     .container-fluid

data/spec/dummy/app/views/layouts/master/_navbar.html.haml

@@ -0,0 +1,9 @@
+%ul.nav
+  %li
+    = link_to handcart_path do
+      %i.icon-heart
+      Handcart
+  %li{class: (params[:controller] == "companies") ? "active" : nil}
+    = link_to main_app.companies_path do
+      %i.icon-briefcase
+      Companies

data/spec/dummy/app/views/layouts/master.html.haml

@@ -0,0 +1,54 @@
+!!! 5
+%html(lang="en")
+  %head
+    %meta(charset="utf-8")
+    %meta(http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1")
+    %meta(name="viewport" content="width=device-width, initial-scale=1.0")
+    %title= content_for?(:title) ? t('.title', title: yield(:title)) : t('.default_title')
+    = csrf_meta_tags
+    / Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"
+    = stylesheet_link_tag "application", media: "all"
+    = favicon_link_tag 'apple-touch-icon-144x144-precomposed.png', rel: 'apple-touch-icon-precomposed', type: 'image/png', sizes: '144x144'
+    = favicon_link_tag 'apple-touch-icon-114x114-precomposed.png', rel: 'apple-touch-icon-precomposed', type: 'image/png', sizes: '114x114'
+    = favicon_link_tag 'apple-touch-icon-72x72-precomposed.png', rel: 'apple-touch-icon-precomposed', type: 'image/png', sizes: '72x72'
+    = favicon_link_tag 'apple-touch-icon-precomposed.png', rel: 'apple-touch-icon-precomposed', type: 'image/png'
+    = javascript_include_tag "application"
+
+  %body
+    .navbar.navbar-fluid-top.navbar-inverse
+      .navbar-inner
+        .container-fluid
+          %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
+          %a.brand(href=master_root_path)
+            Master Dummy Backend
+          = render "layouts/master/navbar"
+
+    .container-fluid
+      .row-fluid
+        - if content_for?(:sidebar)
+          .span9
+            %div.flash-message
+              = bootstrap_flash
+            - if content_for?(:sub_title)
+              .page-header
+                %h3.sub-title.inline= content_for?(:sub_title) ? yield(:sub_title) : t('.default_sub_title')
+            %div= yield
+          .span3
+            .well.sidebar-nav
+              %ul.nav.nav-list= yield(:sidebar)
+        - else
+          .span12
+            %div.flash-message
+              = bootstrap_flash
+            - if content_for?(:sub_title)
+              .page-header
+                %h3.sub-title.inline= content_for?(:sub_title) ? yield(:sub_title) : t('.default_sub_title')
+            %div= yield
+
+      %footer
+        %p © Handcart #{Date.today.year}

data/spec/dummy/app/views/layouts/public.html.haml

@@ -17,25 +17,22 @@
     = javascript_include_tag "application"
 
   %body
+    .navbar.navbar-fluid-top
+      .navbar-inner
+        .container-fluid
+          %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
+          %a.brand(href=root_url) Public Dummy Frontend
     .container-fluid
       .row-fluid
-        - if content_for?(:sidebar)
-          .span9
-            %div.flash-message= bootstrap_flash
-            - if content_for?(:sub_title)
-              .page-header
-                %h3.sub-title.inline= content_for?(:sub_title) ? yield(:sub_title) : t('.default_sub_title')
-            %div= yield
-          .span3
-            .well.sidebar-nav
-              %ul.nav.nav-list= yield(:sidebar)
-        - else
-          .span12
-            %div.flash-message= bootstrap_flash
-            - if content_for?(:sub_title)
-              .page-header
-                %h3.sub-title.inline= content_for?(:sub_title) ? yield(:sub_title) : t('.default_sub_title')
-            %div= yield
+        .span12
+          %div.flash-message= bootstrap_flash
+          - if content_for?(:sub_title)
+            .page-header
+              %h3.sub-title.inline= content_for?(:sub_title) ? yield(:sub_title) : t('.default_sub_title')
+          %div= yield
 
       %footer
         %p © Handcart #{Date.today.year}

data/spec/dummy/app/views/master/companies/_form.html.haml

@@ -1,19 +1,11 @@
-= form_for @company do |f|
-  - if @company.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@company.errors.count, "error")} prohibited this company from being saved:"
-      %ul
-        - @company.errors.full_messages.each do |msg|
-          %li= msg
+= simple_form_for @company, html: { class: 'form-horizontal' }  do |f|
+  = f.error_notification
 
-  .field
-    = f.label :name
-    = f.text_field :name
-  .field
-    = f.label :subdomain_id
-    - if f.object.new_record?
-      = f.collection_select :subdomain_id, Handcart::Subdomain.unallocated, :id, :name
-    - else
-      = f.collection_select :subdomain_id, Handcart::Subdomain.unallocated_or_current(@company), :id, :name
-  .actions
-    = f.submit 'Save'
+  .form-inputs
+    = f.input :name
+    = f.association :subdomain, collection: f.object.new_record? ? Handcart::Subdomain.unallocated : Handcart::Subdomain.unallocated_or_current(@company)
+    = f.input :active, as: :select, include_blank: false
+
+  .form-actions
+    = f.button :submit, class: 'btn btn-primary'
+    = link_to 'Cancel', companies_path, class: 'btn'

data/spec/dummy/app/views/master/companies/edit.html.haml

@@ -1,7 +1,3 @@
-%h1 Editing company
+- title "Edit Company"
 
 = render 'form'
-
-= link_to 'Show', @company
-\|
-= link_to 'Back', companies_path

data/spec/dummy/app/views/master/companies/index.html.haml

@@ -1,25 +1,33 @@
-%h1 Listing companies
+- title "Companies", false
 
-%table.table
-  %tr
-    %th Name
-    %th Subdomain
-    %th
-    %th
-    %th
+.page-header
+  %h3.sub-title.inline
+    Companies
+    %span
+      = link_to new_company_path, class: 'btn btn-primary', title: 'New Company' do
+        %i.icon-plus
 
-  - @companies.each do |company|
+%table.table.table-striped.table-hover#companies_index
+  %thead
     %tr
-      %td= company.name
-      %td
-        - if company.subdomain
-          = company.subdomain.name
-        - else
-          None
-      %td= link_to 'Show', company
-      %td= link_to 'Edit', edit_company_path(company)
-      %td= link_to 'Destroy', company, method: :delete, data: { confirm: 'Are you sure?' }
-
-%br
-
-= link_to 'New Company', new_company_path
+      %th Name
+      %th Subdomain
+      %th Active
+      %th
+      %th
+  %tbody
+    - @companies.each do |company|
+      %tr
+        %td= link_to company.name, company
+        %td
+          - if company.subdomain
+            = link_to company.subdomain.name, handcart.subdomain_path(company.subdomain)
+          - else
+            None
+        %td= company.active? ? "Yes" : "No"
+        %td.action-button
+          = link_to edit_company_path(company), class: 'btn', title: "Edit Company" do
+            %i.icon-pencil
+        %td.action-button
+          = link_to company, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', title: "Remove Company" do
+            %i.icon-remove

data/spec/dummy/app/views/master/companies/new.html.haml

@@ -1,5 +1,3 @@
-%h1 New company
+- title "New Company"
 
 = render 'form'
-
-= link_to 'Back', companies_path

data/spec/dummy/app/views/master/companies/show.html.haml

@@ -1,12 +1,21 @@
-%p#notice= notice
+- title "Company : #{@company.to_s}"
 
-%p
-  %b Name:
-  = @company.name
-%p
-  %b Subdomain:
-  = @company.subdomain_id
-
-= link_to 'Edit', edit_company_path(@company)
-\|
-= link_to 'Back', companies_path
+%table.table.table-striped
+  %thead
+    %tr
+      %th= Company.human_attribute_name(:name)
+      %th= Company.human_attribute_name(:subdomain)
+      %th= Company.human_attribute_name(:active)
+      %th
+  %tbody
+    %tr
+      %td= @company.name
+      %td
+        - if @company.subdomain.present?
+          = link_to @company.subdomain.name, handcart.subdomain_path(@company.subdomain)
+        - else
+          None
+      %td= @company.active? ? "Yes" : "No"
+      %td.action-button
+        = link_to edit_company_path(@company), class: 'btn', title: "Edit Company" do
+          %i.icon-pencil

data/spec/dummy/app/views/public/blocked.html.haml

@@ -0,0 +1,3 @@
+- title "Blocked"
+
+This is where people who are IP blocked will be redirected to.

data/spec/dummy/config/locales/en.yml

@@ -1,5 +1,16 @@
 en:
+  activerecord:
+    attributes:
+      company:
+        name: "Name"
+        subdomain: "Subdomain"
   layouts:
+    master:
+      navbar:
+        main_app: 'Master Dummy Backend'
+      default_title: 'Master Dummy Backend'
+      default_sub_title: ''
+      title: "Master Dummy Backend : %{title}"
     application:
       navbar:
         main_app: 'Dummy'

data/spec/dummy/config/routes.rb

@@ -1,8 +1,9 @@
 Rails.application.routes.draw do
 
-  mount Handcart::Engine => "/handcart"
-
   constraints(subdomain: /master/) do
+    # Handcart is managed from the master backend
+    mount Handcart::Engine => "/handcart"
+
     scope module: 'master' do
       resources :companies
       match '/', to: 'dashboard#index', via: [:get], as: :master_root
@@ -17,6 +18,7 @@ Rails.application.routes.draw do
 
   constraints Handcart::DomainConstraint.default_constraint do
     match '/forbidden', to: 'public#forbidden', as: :public_forbidden, via: [:get]
+    match '/blocked', to: 'public#blocked', as: :public_blocked, via: [:get]
     root to: 'public#index'
   end