para 0.5.4 → 0.6.2

data/app/assets/stylesheets/para/admin/theme/_navigation.sass

@@ -1,5 +1,10 @@
 @import "variables"
 
+@import "compass/css3/box-shadow"
+@import "compass/css3/transition"
+@import "compass/css3/text-shadow"
+@import "compass/css3/border-radius"
+
 .page-sidebar 
   position: fixed
   height: 100%
@@ -9,7 +14,7 @@
   width: $left-menu-width-open
   float: left
   z-index: 3
-  box-shadow: 2px 0 5px #fafafa
+  +box-shadow(2px 0 5px #fafafa)
   &.navbar-collapse
     padding: 0
 
@@ -56,7 +61,7 @@
   display: block
   z-index: 3
   background-color: $navbar-default-bg
-  box-shadow: 0 2px 5px #fafafa
+  +box-shadow(0 2px 5px #fafafa)
   .ul-navbar li
     float: left
     display: block
@@ -131,7 +136,7 @@
         border-bottom: 0
         line-height: 19px
         color: $navbar-default-link-color
-        text-shadow: none
+        +text-shadow(none)
         display: block
         
         &:hover
@@ -156,8 +161,8 @@
         width: $left-menu-width-open
         position: absolute
         overflow: visible
-        border-radius: 3px
-        box-shadow: 0 2px 1px 0 rgba(0, 0, 0, 0.1)
+        +border-radius(3px)
+        +box-shadow(0 2px 1px 0 rgba(0, 0, 0, 0.1))
         z-index: 3
         li
           width: 100%
@@ -188,7 +193,7 @@
           img
             width: 36px
             border: 2px solid #FFF
-            border-radius: 50%
+            +border-radius(50%)
     .informer
       font-size: 11px
       position: absolute
@@ -199,7 +204,7 @@
       right: 10px
       top: 15px
       color: #FFF
-      border-radius: 3px
+      +border-radius(3px)
       &.pulsate
         animation: pulsate 1s ease-out
         animation-iteration-count: infinite
@@ -222,62 +227,3 @@
       top: 5px
 
 
-/*
- * Profile
-
-.profile
-  width: 100%
-  float: left
-  padding: 15px 10px
-  position: relative
-  background: #2d3945
-  .profile-image
-    float: left
-    width: 100%
-    margin: 0 0 10px
-    text-align: center
-    img
-      width: 100px
-      border: 3px solid #FFF
-      border-radius: 50%
-  .profile-data
-    width: 100%
-    float: left
-    text-align: center
-    .profile-data-name
-      width: 100%
-      float: left
-      font-size: 14px
-      font-weight: 500
-      color: #FFF
-    .profile-data-title
-      width: 100%
-      float: left
-      font-size: 11px
-      font-weight: 400
-      color: $gray-dark
-  .profile-controls a
-    width: 30px
-    height: 30px
-    font-size: 14px
-    color: #DDD
-    border: 2px solid #DDD
-    line-height: 25px
-    position: absolute
-    border-radius: 50%
-    padding: 0
-    transition: all 200ms ease
-    &.profile-control-left
-      left: 15px
-      top: 53px
-      text-align: center
-    &.profile-control-right
-      right: 15px
-      top: 53px
-      text-align: center
-    .fa, .glyphicon
-      width: auto
-      margin-right: auto
-    &:hover
-      border-color: #FFF
-      color: #FFF

data/app/assets/stylesheets/para/admin/theme/_navtabs.sass

@@ -1,5 +1,9 @@
 @import 'variables'
 
+@import "compass/css3/box-shadow"
+@import "compass/css3/transition"
+@import "compass/css3/border-radius"
+
 .tabs
   float: left
   width: 100%
@@ -29,13 +33,13 @@
         border: 0
         font-size: 14px
         border-top: 2px solid transparent
-        border-radius: 0
+        +border-radius(0)
         color: #333
-        transition: all 200ms ease
+        +single-transition(all 200ms ease)
         background: $btn-default-bg
         padding: 9px 15px
       &:first-child > a
-        border-radius: 5px 0 0
+        +border-radius(5px 0 0)
       > a:hover
         border-color: transparent
         background: #FFF
@@ -43,24 +47,24 @@
       border: 0
       border-top: 2px solid $brand-primary
       background: #FFF
-      border-radius: 3px 3px 0 0
+      +border-radius( 3px 3px 0 0)
     li.active > a
       border: 0
       border-top: 2px solid $brand-primary
       background: #FFF
-      border-radius: 3px 3px 0 0
+      +border-radius( 3px 3px 0 0)
       &:focus, &:hover
         border: 0
         border-top: 2px solid $brand-primary
         background: #FFF
-        border-radius: 3px 3px 0 0
+        +border-radius( 3px 3px 0 0)
   &.nav-justified >
     li > a
       border: 0
       border-top: 2px solid transparent
-      border-radius: 0
+      +border-radius( 0)
       color: #333
-      transition: all 200ms ease
+      +single-transition(all 200ms ease)
       &:hover
         border-color: $brand-primary
         background: 0 0
@@ -68,12 +72,12 @@
       border: 0
       border-top: 2px solid $brand-primary
       background: #FFF
-      border-radius: 3px 3px 0 0
+      +border-radius( 3px 3px 0 0)
       &:focus, &:hover
         border: 0
         border-top: 2px solid $brand-primary
         background: #FFF
-        border-radius: 3px 3px 0 0
+        +border-radius( 3px 3px 0 0)
   a
     .caret, &:hover .caret
       color: $brand-primary
@@ -94,7 +98,7 @@
         width: 100%
         > a
           width: 100%
-          border-radius: 0
+          +border-radius( 0)
           border-top: 0
           border-left: 2px solid transparent
           background: #FFF
@@ -115,9 +119,9 @@
             border-left: 2px solid $brand-primary
             background: $btn-default-bg
         &:first-child > a
-          border-top-left-radius: 3px
+          +border-top-left-radius(3px)
         &:last-child > a
-          border-bottom-left-radius: 3px
+          +border-bottom-left-radius(3px)
   .tab-content
     width: auto
     margin-left: 150px
@@ -127,7 +131,7 @@
 .form-tabs
   .navbar
     margin-bottom: 0
-    border-radius: 0
+    +border-radius( 0)
     .nav li
       border-top: none
       &.active

data/app/assets/stylesheets/para/admin/theme/_orderable.sass

@@ -1,12 +1,16 @@
 @import "variables"
 
+@import "compass/css3/transition"
+@import "compass/css3/transform"
+@import "compass/css3/inline-block"
+
 .order-anchor
   float: left
   margin-right: 10px
   color: $gray-darker
   cursor: move
   outline: 0
-  transition: all, .2s, ease-out
+  +single-transition(all, .2s, ease-out)
   &:hover
     color: $gray-darker
   &:focus,
@@ -19,13 +23,13 @@
     .btn-group
       display: none
     .order-anchor
-      display: inline-block
+      +inline-block
       position: relative  
 
 .panel
   .collapsed
     .caret
-      transform: rotate(270deg)
+      +rotate(270deg)
 
 .nested-many-field
   &.orderable

data/app/assets/stylesheets/para/admin/theme/_panel.sass

@@ -1,14 +1,20 @@
 @import "variables"
 
+@import "compass/css3/border-radius"
+@import "compass/css3/box-shadow"
+@import "compass/css3/inline-block"
+@import "compass/css3/transition"
+@import "compass/css3/transform"
+
 .panel
   float: left
   width: 100%
-  border-radius: $panel-border-radius
+  +border-radius($panel-border-radius)
   border: 0
   border-top: 2px solid $panel-default-border
   margin-bottom: 20px
   position: relative
-  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.2)
+  +box-shadow(0 1px 1px 0 rgba(0, 0, 0, 0.2))
   &.panel-default
     border-top-color: $panel-default-border
     border-top-width: 1px
@@ -28,7 +34,7 @@
       float: left
       width: 30px
       border: 2px solid $gray-lighter
-      border-radius: 50%
+      +border-radius(50%)
       margin-right: 5px
     .panel-title
       margin-left: 7px
@@ -81,7 +87,7 @@
       margin-bottom: 10px
       position: relative
       img
-        border-radius: 5px 5px 0 0
+        +border-radius(5px 5px 0 0)
         width: 100%
       .panel-body-inform
         width: 30px
@@ -91,13 +97,13 @@
         left: 50%
         background: $brand-info
         color: #FFF
-        border-radius: 5px
+        +border-radius(5px)
         margin-left: -15px
         text-align: center
         line-height: 30px
         padding-left: 1px
         padding-top: 1px
-        transform: rotate(45deg)
+        +rotate(45deg)
         &.inform-primary
           background: $brand-primary
         &.inform-success
@@ -109,11 +115,11 @@
         .fa
           font-size: 16px
           color: #FFF
-          transform: rotate(-45deg)
+          +rotate(-45deg)
     &.list-group
       padding: 0
     &.profile
-      border-radius: 5px 5px 0 0
+      +border-radius(5px 5px 0 0)
     &.panel-body-search
       padding: 5px
     &.panel-body-half .panel-body
@@ -181,9 +187,9 @@ ul.panel-controls
       line-height: 28px
       color: $breadcrumb-active-color
       border: 1px solid #BBB
-      border-radius: 50%
+      +border-radius(50%)
       margin-left: 3px
-      transition: all 200ms ease
+      +single-transition(all, 200ms, ease)
       &.control-primary
         color: $brand-primary
         border-color: $brand-primary
@@ -204,7 +210,7 @@ ul.panel-controls
         color: $title-color
 
 .label-form
-  display: inline-block
+  +inline-block
   font-size: 11px
   padding: 5px 10px
   line-height: 12px
@@ -215,8 +221,8 @@ ul.panel-controls
   padding: 4px 10px
   margin: 3px 0 3px 5px
   font-size: 12px
-  display: inline-block
-  border-radius: 3px
+  +inline-block
+  +border-radius(3px)
   &.pulsate
     animation: pulsate 1s ease-out
     animation-iteration-count: infinite

data/app/assets/stylesheets/para/admin/theme/_tree.sass

@@ -1,5 +1,7 @@
 @import "variables"
 
+@import "compass/css3/inline-block"
+
 .root-tree
   padding-left: 0
   > .node
@@ -27,7 +29,7 @@
     padding: 5px
     text-align: center
     width: 32px
-    display: inline-block
+    +inline-block
     margin-top: 3px
     &:focus,
     &:active,
@@ -36,7 +38,7 @@
 
   .node-name
     margin-top: 3px
-    display: inline-block
+    +inline-block
 
   .placeholder
     height: 30px

data/app/assets/stylesheets/para/overrides/theme.sass

@@ -1,5 +1,9 @@
 @import "para/admin/theme/variables"
 
+@import "compass/css3/box-shadow"
+@import "compass/css3/transition"
+
+
 .animated
   animation-duration: 100ms
 
@@ -11,11 +15,11 @@
 
 @mixin button-hover-focus-active($color-border, $color-bg)
   position: relative
-  box-shadow: 0px 2px darken($color-border, 10%)
-  transition: none
+  +box-shadow(0px 2px darken($color-border, 10%))
+  +single-transition(none)
   &:hover
     top: 1px
-    box-shadow: 0px 1px darken($color-border, 10%)
+    +box-shadow(0px 1px darken($color-border, 10%))
     background-color: $color-bg
     border-color: $color-border
   &:focus,
@@ -24,7 +28,7 @@
   .open &.dropdown-toggle
     background-color: darken($color-bg, 7%)
     top: 2px
-    box-shadow: 0px 0 darken($color-border, 10%)
+    +box-shadow(0px 0 darken($color-border, 10%))
     border-color: $color-border
     &:hover
       background-color: darken($color-bg, 7%)
@@ -32,8 +36,8 @@
 @mixin button-variant-inverse($color-border, $color-bg)
   color: $color-border
   background-color: transparent
-  box-shadow: none
-  transition: all, .2s, linear
+  +box-shadow(none)
+  +single-transition(all, .2s, linear)
   &:hover
     box-shadow: none
     top: 0
@@ -45,7 +49,7 @@
   &:active,
   &.active,
   .open &.dropdown-toggle
-    box-shadow: none
+    +box-shadow(none)
     top: 0
     color: #fff
     background-color: darken($color-bg, 7%)
@@ -57,7 +61,7 @@ input,
 textarea,
 select,
 button
-  transition: all, .1s, linear
+  +single-transition(all, .1s, linear)
   &,
   &:active,
   &.active
@@ -132,7 +136,7 @@ button
     height: 50px
 
 .pull-right.btn-group
-  min-width: 145px
+  min-width: 146px
   text-align: right
   > .btn
     float: none
@@ -144,7 +148,7 @@ button
   .btn:focus,
   .btn:active,
     top: 0
-    box-shadow: none
+    +box-shadow(none)
 
 .form-group-separated
   &:after

data/app/controllers/para/admin/base_controller.rb

@@ -8,7 +8,6 @@ module Para
       end
 
       before_action :authorize_admin_access
-      before_action :load_component_sections
 
       layout 'para/admin'
 
@@ -32,10 +31,6 @@ module Para
         authorize! :access, :admin
       end
 
-      def load_component_sections
-        @component_sections = Para::ComponentSection.ordered.includes(:components)
-      end
-
       def self.load_and_authorize_component(options = {})
         before_action do
           load_and_authorize_component(options)

data/app/controllers/para/admin/crud_resources_controller.rb

@@ -6,11 +6,11 @@ module Para
       include Para::Admin::ResourceControllerConcerns
       include Para::SearchHelper
 
-      before_filter :load_and_authorize_crud_resource
-      before_filter :add_breadcrumbs, only: [:show, :index, :edit, :new]
+      before_action :load_and_authorize_crud_resource
+      before_action :add_breadcrumbs, only: [:show, :index, :edit, :new]
 
-      after_filter :attach_resource_to_component, only: [:create]
-      after_filter :remove_resource_from_component, only: [:destroy]
+      after_action :attach_resource_to_component, only: [:create]
+      after_action :remove_resource_from_component, only: [:destroy]
 
       def index
         @q = @component.resources.search(params[:q])
@@ -41,7 +41,7 @@ module Para
           end
 
           flash_message(:success, new_resource)
-          redirect_to after_form_submit_path
+          redirect_to @component.relation_path(new_resource, action: :edit)
         else
           flash_message(:error, new_resource)
           render after_form_submit_path
@@ -62,20 +62,6 @@ module Para
         end
       end
 
-      def import
-        if @component.importable?
-          file = params[:file]
-          if file
-            importer = params[:importer].constantize.new(file.tempfile)
-            importer.run
-            flash_message(:success)
-          else
-            flash_message(:error)
-          end
-        end
-        redirect_to @component.path
-      end
-
       private
 
       def resource_model

data/app/controllers/para/admin/{singleton_resources_controller.rb → form_resources_controller.rb}

@@ -2,11 +2,11 @@ require_dependency "para/application_controller"
 
 module Para
   module Admin
-    class SingletonResourcesController < Para::Admin::ResourcesController
+    class FormResourcesController < Para::Admin::ResourcesController
       include Para::Admin::ResourceControllerConcerns
 
-      before_filter :load_and_authorize_singleton_resource
-      after_filter :attach_resource_to_component, only: [:create]
+      before_action :load_and_authorize_form
+      after_action :attach_resource_to_component, only: [:create]
 
       private
 
@@ -16,7 +16,7 @@ module Para
         @component.save
       end
 
-      def load_and_authorize_singleton_resource
+      def load_and_authorize_form
         loader = self.class.cancan_resource_class.new(
           self, :resource, parent: false, class: resource_model.name,
           singleton: true, through: :component

data/app/controllers/para/admin/imports_controller.rb

@@ -0,0 +1,68 @@
+module Para
+  module Admin
+    class ImportsController < Para::Admin::ComponentController
+      include Para::Admin::ResourceControllerConcerns
+
+      layout false
+
+      before_action :load_importer
+
+      def show
+        @status = ActiveJob::Status.get(params[:id])
+
+        respond_to do |format|
+          format.json do
+            if @status.failed?
+              render json: { status: @status.status }, status: 422
+            else
+              render json: { status: @status.status, progress: @status.progress * 100 }
+            end
+          end
+
+          format.html
+        end
+      end
+
+      def new
+        @file = Para::Library::File.new
+        @model = resource_model
+      end
+
+      def create
+        @file = Para::Library::File.new(file_params)
+
+        if @file.save
+          job = @importer.perform_later(@file)
+          @status = ActiveJob::Status.get(job)
+
+          render 'show'
+        else
+          render 'new'
+        end
+      end
+
+      private
+
+      def load_importer
+        importer_name = params[:importer]&.camelize
+
+        @importer = @component.importers.find do |importer|
+          importer.name == importer_name
+        end
+
+        unless @importer
+          raise "Requested importer (#{ importer_name }) not found for " +
+                ":#{ @component.identifier } component."
+        end
+      end
+
+      def file_params
+        @file_params ||= if params[:file]
+          params.require(:file).permit(:attachment)
+        else
+          {}
+        end
+      end
+    end
+  end
+end

data/app/controllers/para/admin/resources_controller.rb

@@ -122,7 +122,6 @@ module Para
       def self.resource(name, options = {})
         default_options = {
           class: name.to_s.camelize,
-          through: :component,
           parent: false
         }
 

data/app/decorators/para/component/base_decorator.rb

@@ -27,27 +27,15 @@ module Para
       # The only problem is if we have engines that declare the same routes
       #
       def find_path(path, options)
-        polymorphic_path(path, options)
-      rescue NoMethodError, NameError => original_error
-        mounted_proxy_methods.each do |proxy_method|
-          begin
-            proxy = send(proxy_method)
-            return polymorphic_path(([proxy] + path), options)
-          rescue NoMethodError, NameError => e
-            next
-          end
+        safe_polymorphic_path(path, options).tap do |result|
+          raise result.class, result.message if Exception === result
         end
-
-        raise original_error
       end
 
-      def mounted_proxy_methods
-        @mounted_proxy_methods ||= begin
-          routes = Rails.application.routes
-          routes.mounted_helpers.instance_methods.select do |name|
-            /^[^_]/ =~ name
-          end
-        end
+      def safe_polymorphic_path(path, options)
+        polymorphic_path(path, options)
+      rescue => exception
+        exception
       end
     end
   end

data/app/decorators/para/component/crud_decorator.rb

@@ -3,9 +3,9 @@ module Para
     module CrudDecorator
       include Para::Component::BaseDecorator
 
-      def path(options = {})
+      def path(namespace: :resources, **options)
         options[:model] ||= model_singular_route_key
-        find_path([:admin, self, :resources], options)
+        find_path([:admin, self, namespace], options)
       end
 
       def relation_path(controller_or_resource, *nested_resources, **options)
@@ -25,7 +25,7 @@ module Para
 
         options[:action] = action_option_for(options, nested: nested)
 
-        polymorphic_path(data, options)
+        find_path(data, options)
       end
 
       private