para 0.5.4 → 0.6.2

data/lib/para.rb

@@ -1,3 +1,4 @@
+require 'rails-i18n'
 require 'devise'
 require 'paperclip'
 require 'simple_form'
@@ -9,15 +10,22 @@ require 'cocoon'
 require 'cancan'
 require 'request_store'
 require 'roo'
+require 'activejob-status'
+require 'deep_cloneable'
 
 require 'sass-rails'
 require 'selectize-rails'
 require 'bootstrap-sass'
+require 'compass-rails'
 require 'font-awesome-rails'
 
+require 'vertebra'
+
 require 'rails/routing_mapper'
 require 'rails/relation_length_validator'
 
+require 'para/postgres_extensions_checker'
+
 require 'para/ext'
 require 'para/errors'
 require 'para/config'
@@ -44,9 +52,11 @@ module Para
     autoload :Config
     autoload :Component
     autoload :Generators
+    autoload :Routing
     autoload :Routes
     autoload :Plugins
     autoload :Breadcrumbs
+    autoload :Logging
   end
 
   def self.config(&block)

data/lib/rails/routing_mapper.rb

@@ -19,52 +19,84 @@ module ActionDispatch
           component_name, options
         )
 
-        get endpoint => "#{ controller }#show", as: as
+        actions = options.fetch(:actions, [:show])
 
-        scope(endpoint, as: component_name) do
-          instance_eval(&block) if block
-          add_extensions_for(:component)
+        namespace :admin do
+          resource endpoint, controller: controller, as: as
+
+          scope(endpoint, as: component_name) do
+            instance_eval(&block) if block
+            add_extensions_for(:component)
+          end
         end
       end
 
-      def crud_component(component_name, options = {}, &block)
+      def crud_component(component_name = nil, options = {}, &block)
+        if !component_name || Hash === component_name
+          options = component_name || {}
+          component_name = :crud
+          options[:scope] ||= ':model'
+        end
+
         as, controller, endpoint = component_informations_from(
           component_name, options
         )
 
-        controller = [component_name.to_s.singularize, 'resources'].join('_')
-
-        scope endpoint, as: as do
-          scope options[:scope] do
-            resources :resources, controller: controller do
-              collection do
-                patch :order
-                patch :tree
-                get :export
-                post :import
-              end
-
-              member do
-                post :clone
+        # By default, use absolute paths to para default controllers, avoiding
+        # namespacing issues in plugins and other module namespaced scenarios
+        #
+        controller = options.fetch(:controller, '/para/admin/crud_resources')
+        imports_controller = options.fetch(:imports_controller, '/para/admin/imports')
+
+        namespace :admin do
+          constraints Para::Routing::ComponentControllerConstraint.new(controller) do
+            scope endpoint, as: as do
+              scope options[:scope] do
+                resources :resources, controller: controller do
+                  collection do
+                    patch :order
+                    patch :tree
+                    get :export
+                  end
+
+                  member do
+                    post :clone
+                  end
+
+                  instance_eval(&block) if block
+                  add_extensions_for(:crud_component)
+                end
+
+                scope ':importer' do
+                  resources :imports, controller: imports_controller
+                end
               end
-
-              instance_eval(&block) if block
-              add_extensions_for(:crud_component)
             end
           end
         end
       end
 
-      def singleton_resource_component(component_name, options = {}, &block)
+      def form_component(component_name = nil, options = {}, &block)
+        if !component_name || Hash === component_name
+          options = component_name || {}
+          component_name = :form
+          options[:scope] ||= ':model'
+        end
+
         as, _, endpoint = component_informations_from(
           component_name, options
         )
 
-        controller = [component_name, 'resources'].join('_')
+        controller = options.fetch(:controller, '/para/admin/form_resources')
 
-        scope endpoint, as: as do
-          resource :resource, controller: controller, only: [:show, :create, :update]
-          add_extensions_for(:singleton_resource_component)
+        namespace :admin do
+          constraints Para::Routing::ComponentControllerConstraint.new(controller) do
+            scope endpoint, as: as do
+              resource :resource, controller: controller, only: [:show, :create, :update] do
+                add_extensions_for(:form_component)
+              end
+            end
+          end
         end
       end
 

data/lib/tasks/para_tasks.rake

@@ -1,4 +1,23 @@
 namespace :para do
+  namespace :upgrade do
+    desc <<-DESC
+      Update database from SingletonResource to Form component without losing data
+    DESC
+
+    task singleton_to_form: :environment do
+      class Para::Component::SingletonResource < Para::Component::Base
+      end
+
+      Para::Component::Base.where(type: 'Para::Component::SingletonResource').pluck(:identifier, :id).each do |identifier, id|
+        Para::ComponentResource.where(component_id: id).update_all(
+          component_id: Para::Component::Form.find_by_identifier(identifier: identifier).id
+        )
+
+        Para::Component::Base.where(id: id).destroy_all
+      end
+    end
+  end
+
   namespace :components do
     desc <<-DESC
       Remove all components that are no longer referenced in the components.rb
@@ -6,17 +25,8 @@ namespace :para do
     DESC
 
     task clean: :environment do
-      Para::Component::Base.find_each do |component|
-        unless Para.components.component_for(component.identifier)
-          component.destroy
-        end
-      end
-
-      Para::ComponentSection.find_each do |section|
-        unless Para.components.section_for(section.identifier)
-          section.destroy
-        end
-      end
+      require 'para/components_cleaner'
+      Para::ComponentsCleaner.run
     end
   end
 end

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.2
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: rails-i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +182,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +232,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activejob-status
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +275,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: selectize-rails
+  name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -255,7 +289,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: haml-rails
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -269,7 +303,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -283,7 +317,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: font-awesome-sass
+  name: compass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -297,7 +331,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
+  name: vertebra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -352,7 +386,9 @@ files:
 - app/assets/images/para/admin/loading-spinner.gif
 - app/assets/javascripts/admin/app.coffee
 - app/assets/javascripts/para/admin.coffee
+- app/assets/javascripts/para/admin/async-progress.coffee
 - app/assets/javascripts/para/admin/filters-form.coffee
+- app/assets/javascripts/para/admin/importers.coffee
 - app/assets/javascripts/para/admin/table.coffee
 - app/assets/javascripts/para/admin/tabs.coffee
 - app/assets/javascripts/para/admin/theme_actions.coffee
@@ -360,14 +396,17 @@ files:
 - app/assets/javascripts/para/application.js
 - app/assets/javascripts/para/inputs/nested_many.coffee
 - app/assets/javascripts/para/lib/ajax.coffee
+- app/assets/javascripts/para/lib/remote-file-forms.coffee
 - app/assets/javascripts/para/lib/turbolinks-forms.coffee
 - app/assets/javascripts/para/lib/turbolinks-loading.coffee
+- app/assets/javascripts/para/lib/turbolinks-reloader.coffee
 - app/assets/stylesheets/admin/app.sass
 - app/assets/stylesheets/admin/theme.sass
 - app/assets/stylesheets/para/admin.sass
 - app/assets/stylesheets/para/admin/src/datetimepicker.sass
 - app/assets/stylesheets/para/admin/src/fuelux.sass
 - app/assets/stylesheets/para/admin/src/jasny.bootstrap.sass
+- app/assets/stylesheets/para/admin/src/nested_many.sass
 - app/assets/stylesheets/para/admin/src/page-loading.sass
 - app/assets/stylesheets/para/admin/src/page-top-bar.sass
 - app/assets/stylesheets/para/admin/src/redactor.sass
@@ -399,19 +438,21 @@ files:
 - app/controllers/para/admin/base_controller.rb
 - app/controllers/para/admin/component_controller.rb
 - app/controllers/para/admin/crud_resources_controller.rb
+- app/controllers/para/admin/form_resources_controller.rb
+- app/controllers/para/admin/imports_controller.rb
 - app/controllers/para/admin/main_controller.rb
 - app/controllers/para/admin/resources_controller.rb
 - app/controllers/para/admin/settings_component_controller.rb
-- app/controllers/para/admin/singleton_resources_controller.rb
 - app/controllers/para/application_controller.rb
 - app/decorators/para/component/base_decorator.rb
 - app/decorators/para/component/crud_decorator.rb
+- app/decorators/para/component/form_decorator.rb
 - app/decorators/para/component/settings_decorator.rb
-- app/decorators/para/component/singleton_resource_decorator.rb
 - app/decorators/para/component_section_decorator.rb
 - app/helpers/para/admin/base_helper.rb
 - app/helpers/para/admin/component_groups_helper.rb
 - app/helpers/para/admin/components_helper.rb
+- app/helpers/para/admin/decorators_helper.rb
 - app/helpers/para/admin/page_helper.rb
 - app/helpers/para/admin/resources_helper.rb
 - app/helpers/para/application_helper.rb
@@ -428,16 +469,24 @@ files:
 - app/models/para/ability.rb
 - app/models/para/component/base.rb
 - app/models/para/component/crud.rb
+- app/models/para/component/form.rb
 - app/models/para/component/resource.rb
 - app/models/para/component/settings.rb
-- app/models/para/component/singleton_resource.rb
 - app/models/para/component_resource.rb
 - app/models/para/component_section.rb
+- app/models/para/library.rb
+- app/models/para/library/file.rb
 - app/models/para/page/section.rb
 - app/views/layouts/para/admin.html.haml
 - app/views/layouts/para/application.html.erb
 - app/views/para/admin/crud_resources/index.html.haml
 - app/views/para/admin/dashboard.html.haml
+- app/views/para/admin/form_resources/show.html.haml
+- app/views/para/admin/imports/_completed.html.haml
+- app/views/para/admin/imports/_failed.html.haml
+- app/views/para/admin/imports/_progress.html.haml
+- app/views/para/admin/imports/new.html.haml
+- app/views/para/admin/imports/show.html.haml
 - app/views/para/admin/main/index.html.haml
 - app/views/para/admin/resources/_actions.html.haml
 - app/views/para/admin/resources/_add_button.html.haml
@@ -457,7 +506,6 @@ files:
 - app/views/para/admin/shared/_breadcrumbs.html.haml
 - app/views/para/admin/shared/_header.html.haml
 - app/views/para/admin/shared/_navigation.html.haml
-- app/views/para/admin/singleton_resources/show.html.haml
 - app/views/para/form/_tabs.html.haml
 - app/views/para/inputs/_nested_many.html.haml
 - app/views/para/inputs/_nested_one.html.haml
@@ -476,6 +524,7 @@ files:
 - db/migrate/20160304113055_add_json_equality_operator_patch_to_postgres.rb
 - db/migrate/20160419145254_create_para_page_sections.rb
 - db/migrate/20160613172154_create_unaccent_extension.rb
+- db/migrate/20160905134106_create_para_library_files.rb
 - lib/generators/para/admin_user/admin_user_generator.rb
 - lib/generators/para/component/component_generator.rb
 - lib/generators/para/component/crud/crud_generator.rb
@@ -506,6 +555,7 @@ files:
 - lib/generators/para/resource/templates/resource_controller.rb
 - lib/generators/para/table/table_generator.rb
 - lib/generators/para/table/templates/_table.html.haml
+- lib/generators/para/tree_item/tree_item_generator.rb
 - lib/para.rb
 - lib/para/attribute_field.rb
 - lib/para/attribute_field/base.rb
@@ -532,6 +582,7 @@ files:
 - lib/para/component/exportable.rb
 - lib/para/component/importable.rb
 - lib/para/component/subclassable.rb
+- lib/para/components_cleaner.rb
 - lib/para/components_configuration.rb
 - lib/para/config.rb
 - lib/para/engine.rb
@@ -540,6 +591,7 @@ files:
 - lib/para/exporter/base.rb
 - lib/para/exporter/csv.rb
 - lib/para/ext.rb
+- lib/para/ext/active_job_status.rb
 - lib/para/ext/cancan.rb
 - lib/para/ext/paperclip.rb
 - lib/para/ext/simple_form_extension.rb
@@ -560,6 +612,8 @@ files:
 - lib/para/inputs.rb
 - lib/para/inputs/nested_many_input.rb
 - lib/para/inputs/nested_one_input.rb
+- lib/para/logging.rb
+- lib/para/logging/active_job_log_subscriber.rb
 - lib/para/markup.rb
 - lib/para/markup/alert.rb
 - lib/para/markup/component.rb
@@ -570,6 +624,7 @@ files:
 - lib/para/model_field_parsers.rb
 - lib/para/model_field_parsers/base.rb
 - lib/para/model_field_parsers/devise.rb
+- lib/para/model_field_parsers/enums.rb
 - lib/para/model_field_parsers/globalize.rb
 - lib/para/model_field_parsers/orderable.rb
 - lib/para/model_field_parsers/paperclip.rb
@@ -581,7 +636,10 @@ files:
 - lib/para/page/model.rb
 - lib/para/plugins.rb
 - lib/para/plugins/routes.rb
+- lib/para/postgres_extensions_checker.rb
 - lib/para/routes.rb
+- lib/para/routing.rb
+- lib/para/routing/component_controller_constraint.rb
 - lib/para/search.rb
 - lib/para/search/distinct.rb
 - lib/para/sti.rb

data/app/models/para/component/singleton_resource.rb

@@ -1,35 +0,0 @@
-module Para
-  module Component
-    class SingletonResource < Para::Component::Resource
-      register :singleton_resource, self
-
-      configurable_on :model_type, as: :selectize, collection: :available_models
-
-      has_one :component_resource, class_name: 'Para::ComponentResource',
-              foreign_key: :component_id, autosave: true, dependent: :destroy
-
-      def resource
-        build_component_resource(resource: model.new) unless component_resource
-        component_resource.resource ||= model.new
-      end
-
-      def resource=(value)
-        build_component_resource(resource: value) unless component_resource
-      end
-
-      def default_form_actions
-        [:submit]
-      end
-
-      def model_name
-        ModelName.new(self)
-      end
-
-      class ModelName < ActiveModel::Name
-        def singular_route_key
-          'singleton'
-        end
-      end
-    end
-  end
-end

data/app/views/para/admin/singleton_resources/show.html.haml

@@ -1,4 +0,0 @@
-= page_top_bar(title: @component.name, type: 'singleton_resource/show')
-
-.page-content-wrap
-  = render find_partial_for(resource, :form)