para 0.4.0 → 0.5.0

data/lib/para/inputs/nested_one_input.rb

@@ -5,9 +5,19 @@ module Para
         input_html_options[:class] << "nested-one"
 
         parent_model = object.class
-        model = parent_model.reflect_on_association(attribute_name).klass
-        resource = object.send(:"#{ attribute_name }") ||
-                    object.send(:"#{ attribute_name }=", model.new)
+        association = object.association(attribute_name)
+        relation = parent_model.reflect_on_association(attribute_name)
+        model = relation.klass
+
+        unless (resource = object.send(:"#{ attribute_name }"))
+          # Build association without trying to save the new record
+          resource = case association
+          when ActiveRecord::Associations::HasOneAssociation
+            association.replace(model.new, false)
+          else
+            association.replace(model.new)
+          end
+        end
 
         template.render(
           partial: 'para/inputs/nested_one',

data/lib/para/markup/resources_table.rb

@@ -11,9 +11,7 @@ module Para
           @orderable = model.orderable?
         end
 
-        if !options.key?(:actions) || options.delete(:actions)
-          @actions = true
-        end
+        @actions = options.fetch(:actions, true)
 
         merge_class!(options, 'table')
         merge_class!(options, 'para-component-relation-table')
@@ -72,10 +70,23 @@ module Para
         cells.join("\n").html_safe
       end
 
-      def header_for(field_name, sort: field_name)
-        label = model.human_attribute_name(field_name)
+      def header_for(field_name = nil, options = {}, &block)
+        if Hash === field_name
+          options = field_name
+          field_name = nil
+        end
+
+        sort = options.delete(:sort) || field_name
 
-        content_tag(:th) do
+        label = if Symbol === field_name
+          model.human_attribute_name(field_name)
+        elsif block
+          capture { block.call }
+        else
+          field_name
+        end
+
+        content_tag(:th, options) do
           if sort != field_name
               view.sort_link(search, *sort, label, hide_indicator: true)
           elsif searchable?(field_name)
@@ -94,10 +105,12 @@ module Para
       #   - a single value : The value to display in the cell directly
       #       which will be processed to be shorter than 100 chars
       #
-      def data_for(*args)
+      def data_for(*args, &block)
         value = if args.length >= 2
           resource, field_name, type = args
           view.field_value_for(resource, field_name, type).to_s
+        elsif block
+          capture { block.call }
         else
           view.excerpt_value_for(args.first)
         end
@@ -119,9 +132,11 @@ module Para
       def actions_cell(resource)
         content_tag(:td) do
           content_tag(:div, class: 'pull-right btn-group') do
-            edit_button(resource) +
-            clone_button(resource) +
-            delete_button(resource)
+            edit = edit_button(resource) if action?(:edit)
+            clone = clone_button(resource) if action?(:clone)
+            delete = delete_button(resource) if action?(:delete)
+
+            edit + clone + delete
           end
         end
       end
@@ -129,37 +144,42 @@ module Para
       def clone_button(resource)
         return unless resource.class.cloneable?
 
-        view.link_to(
-          component.relation_path(
-            resource, action: :clone, return_to: view.request.fullpath
-          ),
+        path = component.relation_path(
+          resource, action: :clone, return_to: view.request.fullpath
+        )
+
+        options = {
           method: :post,
           class: 'btn btn-info'
-        ) do
+        }
+
+        view.link_to(path, options) do
           content_tag(:i, '', class: 'fa fa-refresh')
         end
       end
 
       def edit_button(resource)
-        view.link_to(
-          component.relation_path(
-            resource, action: :edit, return_to: view.request.fullpath
-          ),
-          class: 'btn btn-primary'
-        ) do
+        path = component.relation_path(
+          resource, action: :edit, return_to: view.request.fullpath
+        )
+
+        view.link_to(path, class: 'btn btn-primary') do
           content_tag(:i, '', class: 'fa fa-pencil')
         end
       end
 
       def delete_button(resource)
-        view.link_to(
-          component.relation_path(resource),
+        path = component.relation_path(resource)
+
+        options = {
           method: :delete,
           data: {
             confirm: I18n.t('para.list.delete_confirmation')
           },
           class: 'btn btn-danger'
-        ) do
+        }
+
+        view.link_to(path, options) do
           content_tag(:i, '', class: 'fa fa-trash')
         end
       end
@@ -173,6 +193,10 @@ module Para
       def searchable?(field_name)
         model.columns_hash.keys.include?(field_name.to_s)
       end
+
+      def action?(type)
+        actions == true || actions.include?(type)
+      end
     end
   end
 end

data/lib/para/markup/resources_tree.rb

@@ -0,0 +1,36 @@
+module Para
+  module Markup
+    class ResourceTree < Para::Markup::Component
+      def tree_list(resources, options = {}, &block)
+        options[:class] ||= ''
+        options[:class] << ' tree-list'
+
+        content_tag(:ul, options) do
+          resources.each do |resource|
+            block.call(resource)
+          end
+        end
+      end
+
+      def tree_node(resource: nil, label: nil, children: [], **options, &block)
+        options[:class] ||= ''
+        options[:class] << ' node'
+
+        content_tag(:li, options) do
+          node_row(resource, label) + 
+          node_children(children, &block)
+        end
+      end
+
+      def node_row(resource, label)
+        content_tag(:div, class: 'node-row') do
+          label
+        end
+      end
+
+      def node_children(children, &block)
+        tree_list(children, &block) if children.length > 0
+      end
+    end
+  end
+end

data/lib/para/model_field_parsers/store.rb

@@ -0,0 +1,23 @@
+module Para
+  module ModelFieldParsers
+    class Store < Para::ModelFieldParsers::Base
+      register :json, self
+
+      def parse!
+        model.stored_attributes.each do |store_key, field_names|
+          fields_hash.delete(store_key)
+
+          field_names.each do |field_name|
+            fields_hash[field_name] = AttributeField::Base.new(
+              model, name: field_name, type: :string
+            )
+          end
+        end
+      end
+
+      def applicable?
+        !model.stored_attributes.empty?
+      end
+    end
+  end
+end

data/lib/para/model_field_parsers.rb

@@ -20,3 +20,4 @@ require 'para/model_field_parsers/orderable'
 require 'para/model_field_parsers/relations'
 require 'para/model_field_parsers/redactor'
 require 'para/model_field_parsers/globalize'
+require 'para/model_field_parsers/store'

data/lib/para/orderable.rb

@@ -4,11 +4,14 @@ module Para
 
     included do
       scope :ordered, -> { order('position ASC') }
-      before_create :orederable_assign_position
+      before_create :orderable_assign_position
     end
 
-    def orederable_assign_position
-      last_resource = self.class.order('position DESC')
+    def orderable_assign_position
+      return if attribute_present?(:position)
+
+      last_resource = self.class.unscoped
+        .order('position DESC')
         .where.not(position: nil)
         .select(:position)
         .first

data/lib/para/plugins/routes.rb

@@ -0,0 +1,25 @@
+module Para
+  module Plugins
+    class Routes
+      attr_reader :router
+
+      def initialize(router)
+        @router = router
+      end
+
+      def plugin(identifier, &block)
+        # Store router reference in closure to allow accessing it from
+        # inside the below block
+        router = self.router
+
+        router.instance_eval do
+          namespace :admin do
+            scope module: :acl do
+              router.instance_eval(&block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/para/plugins.rb

@@ -0,0 +1,11 @@
+module Para
+  module Plugins
+    extend ActiveSupport::Autoload
+
+    autoload :Routes
+
+    def self.module_name_for(identifier)
+      ['Para', identifier.to_s.camelize].join('::')
+    end
+  end
+end

data/lib/para/routes.rb

@@ -7,37 +7,14 @@ module Para
     end
 
     def draw(mount_location = '/', &block)
-      routes = self
-
       router.instance_eval do
         scope mount_location do
           scope module: :para do
             namespace :admin do
               get '/' => 'main#index'
 
-              component :crud do
-                scope ':model' do
-                  resources :crud_resources, path: '/' do
-                    collection do
-                      patch :order
-                      patch :tree
-                      get :export
-                    end
-
-                    member do
-                      post :clone
-                    end
-                  end
-                end
-              end
-
-              component :singleton_resource, path: 'resource-form' do
-                resource :singleton_resource, path: 'resource', only: [:create, :update]
-              end
-
-              component :settings do
-                resource :settings_form, controller: 'settings_form', only: [:update]
-              end
+              crud_component :crud, scope: ':model'
+              singleton_resource_component :singleton, scope: ':model'
             end
           end
 

data/lib/para/version.rb

@@ -1,3 +1,3 @@
 module Para
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/para.rb

@@ -3,7 +3,6 @@ require 'paperclip'
 require 'simple_form'
 require 'simple_form_extension'
 require 'active_decorator'
-require 'friendly_id'
 require 'haml-rails'
 require 'truncate_html'
 require 'cocoon'
@@ -13,7 +12,6 @@ require 'request_store'
 require 'sass-rails'
 require 'selectize-rails'
 require 'bootstrap-sass'
-require 'compass-rails'
 require 'font-awesome-rails'
 
 require 'rails/routing_mapper'
@@ -23,6 +21,7 @@ require 'para/ext'
 require 'para/errors'
 require 'para/config'
 require 'para/model_field_parsers'
+require 'para/attribute_field'
 require 'para/attribute_field_mappings'
 require 'para/inputs'
 require 'para/cloneable'
@@ -32,6 +31,7 @@ require 'para/markup'
 require 'para/engine'
 require 'para/components_configuration'
 require 'para/exporter'
+require 'para/importer'
 
 module Para
   extend ActiveSupport::Autoload
@@ -41,6 +41,8 @@ module Para
     autoload :Component
     autoload :Generators
     autoload :Routes
+    autoload :Plugins
+    autoload :Breadcrumbs
   end
 
   def self.config(&block)

data/lib/rails/routing_mapper.rb

@@ -3,6 +3,10 @@ module ActionDispatch
     class Mapper
       def para_at(mount_location, &block)
         Para::Routes.new(self).draw(mount_location, &block)
+
+        Para::Config.plugins.each do |plugin|
+          draw_plugin_routes(plugin)
+        end
       end
 
       def para_plugin(plugin_name)
@@ -11,16 +15,71 @@ module ActionDispatch
       end
 
       def component(component_name, options = {}, &block)
+        as, controller, endpoint = component_informations_from(
+          component_name, options
+        )
+
+        get endpoint => "#{ controller }#show", as: as
+        scope(endpoint, as: component_name, &block) if block
+      end
+
+      def crud_component(component_name, options = {}, &block)
+        as, controller, endpoint = component_informations_from(
+          component_name, options
+        )
+
+        controller = [component_name.to_s.singularize, 'resources'].join('_')
+
+        scope endpoint, as: as do
+          resources :resources, controller: controller do
+            scope options[:scope] do
+              collection do
+                patch :order
+                patch :tree
+                get :export
+                post :import
+              end
+
+              member do
+                post :clone
+              end
+
+              instance_eval(&block) if block
+            end
+          end
+        end
+      end
+
+      def singleton_resource_component(component_name, options = {}, &block)
+        as, _, endpoint = component_informations_from(
+          component_name, options
+        )
+
+        controller = [component_name, 'resources'].join('_')
+
+        scope endpoint, as: as do
+          resource :resource, controller: controller, only: [:show, :create, :update]
+        end
+      end
+
+      private
+
+      def draw_plugin_routes(identifier)
+        routes = [
+          Para::Plugins.module_name_for(identifier),
+          'Routes'
+        ].join('::').constantize
+
+        routes.new(self).draw
+      end
+
+      def component_informations_from(component_name, options)
         path = options.fetch(:path, component_name.to_s)
         as = options.fetch(:as, component_name)
         controller = options.fetch(:controller, "#{ component_name }_component")
-
         endpoint = "#{ path }/:component_id"
 
-        get endpoint => "#{ controller }#show", as: as
-        delete endpoint => "#{ controller }#destroy", as: "destroy_#{as}"
-
-        scope(endpoint, as: component_name, &block) if block
+        [as, controller, endpoint]
       end
     end
   end