type_station 0.1.3 → 0.2.0

data/app/presenters/type_station/page_presenter.rb

@@ -1,50 +1,17 @@
 module TypeStation
-  class PagePresenter < BasePresenter
+  class PagePresenter < Presenter
     presents :page
     delegate :to_param, :title, :path, :slug, :type, :template_name, :template_name?, :visible?, :redirect_to, :redirect?, :position, to: :page
 
-    def initialize(object, template)
-      super(object, template)
-      build_content_methods
-    end
-
-    def edit_url
-      h.type_station.admin_page_url(page)
-    end
+    form_field :title, type: :text, label: 'Title', required: true
 
-    def new_url
-      h.type_station.admin_pages_url
-    end
-
-    def children(options = {})
-      children_criteria = page.children
-
-      options.each do |method, value|
-        children_criteria = children_criteria.send method, value
-      end
-
-      @children ||= children_criteria.map {|p| PagePresenter.new(p, @template)}
+    def children
+      TypeStation::Page.where(parent_id: page.id)
     end
 
     def parent
-      @parent ||= PagePresenter.new(page.parent, @template)
-    end
-
-    def root
-      @root ||= PagePresenter.new(TypeStation::Page.root, @template)
+      page.root
     end
 
-    private
-
-    def build_content_methods
-      page.content_attributes.each do |key, content_object|
-        unless page.page_fields? key
-          define_singleton_method key do
-            ContentPresenter.new(content_object, @template)
-          end
-        end
-      end
-    end
-    
   end
-end
+end

data/app/presenters/type_station/presenter.rb

@@ -0,0 +1,71 @@
+require 'type_station/blocks'
+
+module TypeStation
+  class Presenter < BasePresenter
+
+    class << self
+      attr_accessor :form_fields
+
+      def form_field(name, options)
+        @form_fields ||= []
+        @form_fields << {name: name, type: options[:type].to_s, label: options[:label], options: options[:options], default: options[:default], required: options[:required]}
+      end
+    end
+
+    def create(type, user_options = {}, &block)
+      options = { type: type == :page ? nil : type, model_parent_id: @object.to_param, action: :create }.merge(user_options)
+      entity_block(h.capture(&block), options)
+    end
+
+    def edit(user_options = {}, &block)
+      options = { action: :edit, presenter: self.class }.merge(user_options)
+      entity_block(h.capture(&block), options)
+    end
+
+    def delete(user_options = {}, &block)
+      options = { action: :delete }.merge(user_options)
+      entity_block(h.capture(&block), options)
+    end
+
+    def move(direction, user_options = {}, &block)
+      options = { action: :move, options: { direction: "move_#{direction}"} }.merge(user_options)
+      entity_block(h.capture(&block), options)
+    end
+
+    def field(name, user_options = {}, &block)
+      content = ''
+      options = { type: :text, field: name, url: h.type_station.admin_entity_url(@object) }.merge(user_options)
+
+      content_attribute = @object.get name
+
+      if content_attribute.present?
+        content_presenter = ContentPresenter.new(content_attribute, h)
+
+        if content_presenter.value.is_a? Hash
+          content += h.capture(content_presenter, &block)
+        else
+          content += content_presenter.value
+        end
+      else
+        content += h.capture(ContentPresenter.new(nil,h), &block)
+      end
+
+      TypeStation::Blocks::Field.new(h.type_station_authorise, @object, options).render(content)
+    end
+
+    private
+
+    def entity_block(content, options = {})
+      unless options[:fields]
+        presenter_klass = options[:presenter] || "#{(options[:type] || @object._type).to_s.classify}Presenter".constantize
+        options[:fields] = presenter_klass.form_fields || []
+      end
+
+      options[:url] = h.type_station.admin_entity_url(@object)
+      options[:create_url] = h.type_station.admin_entities_url
+
+      TypeStation::Blocks::Entity.new(h.type_station_authorise, @object, options).render(content)
+    end
+
+  end
+end

data/app/views/type_station/toolbars/_admin_bar.html.haml

@@ -1,125 +1,20 @@
-#ts-admin-bar-edit
-  %button.ts-button.ts-button-primary 
-    %i.ion-compose
+- present model, ::TypeStation::AdminBarPresenter do |p|
+  #ts-admin-bar-edit
+    %button.ts-button.ts-button-primary
+      %i.ion-compose
 
-#ts-admin-bar.ts-hidden
-  %ul
-    %li.ts-brand
-      %i.ion-ios-barcode-outline
-      -# %i.ion-android-add.smaller
-    %li.ts-title
-      = text_field_tag 'page_title', model.try(:title), data: {ts_id: model.to_param, ts_url: model.edit_url, ts_key: :title, ts_data: {}}
-    %li.ts-actions
-      .ts-button-group
-        %button.ts-button.ts-options
-          %i.ion-android-settings
-        %button#ts-admin-bar-cancel.ts-button
-          %i.ion-android-close
-        %button#ts-admin-bar-save.ts-button.ts-button-primary 
-          %i.ion-android-done
-
-  #insert-content
+  #ts-admin-bar.ts-hidden
     %ul
-      %li.insert-new
-        .insert-icon
-          %i.ion-quote
-        .insert-name
-          Text
-      %li.insert-new
-        .insert-icon
-          %i.ion-code
-        .insert-name
-          Html
-      %li.insert-new
-        .insert-icon
-          %i.ion-images
-        .insert-name
-          Image
-      %li.insert-new
-        .insert-icon
-          %i.ion-paperclip
-        .insert-name
-          File
-      %li.insert-new
-        .insert-icon
-          %i.ion-android-map
-        .insert-name
-          Map
-      %li.insert-new
-        .insert-icon
-          %i.ion-android-clipboard
-        .insert-name
-          Form
-      %li.insert-new
-        .insert-icon
-          %i.ion-gear-a
-        .insert-name
-          Custom
-
-
-#ts-admin-bar-options
-  %ul
-    -#%li
-      = link_to "#!ts-edit-enable" do
-        %span.icon
-          %i.ion-ios-paper-outline
-        %span.text
-          .large-text
-            New page
-          .sub-text
-            Create a new root page
-    -#%li
-      = link_to "#!ts-edit-enable" do
-        %span.icon
-          %i.ion-ios-photos-outline
-        %span.text
-          .large-text
-            New sub page
-          .sub-text
-            Create a new sub page
-    -#%li
-      = link_to "#!ts-edit-enable" do
-        %span.icon
-          %i.ion-ios-trash-outline
-        %span.text
-          .large-text
-            Delete page
-          .sub-text
-            Permantely delete this page
-    -#%li
-      = link_to "#!ts-edit-enable" do
-        %span.icon
-          %i.ion-ios-shuffle
-        %span.text
-          .large-text
-            Change structure
-          .sub-text
-            Reorder the site's pages
-    %li#ts-page-settings
-      = link_to "#!ts-edit-enable" do
-        %span.icon
-          %i.ion-ios-settings
-        %span.text
-          .large-text
-            Settings
-          .sub-text
-            Manage page settings
-
-#ts-admin-bar-settings{data: {ts_url: model.edit_url}}
-  .vex-custom-field-wrapper
-    %label{for: "type"} Type
-    .vex-custom-input-wrapper
-      = select_tag "type", options_for_select({hidden: 'Hidden', draft: 'Draft', published: 'Published'}.map {|(k,v)| [v,k.to_s]}, model.try(:type).to_s)
-
-  - if options[:show_name].present?
-    .vex-custom-field-wrapper
-      %label{for: "name"} Name
-      .vex-custom-input-wrapper
-        = text_field_tag 'name', model.try(:name)
-  - if options[:templates].present?
-    .vex-custom-field-wrapper
-      %label{for: "template_name"} Template
-      .vex-custom-input-wrapper
-        = select_tag "template_name", options_for_select(options[:templates].map {|(k,v)| [v,k.to_s]}, model.try(:template_name))
-
-
+      %li.ts-brand
+        %i.ion-document-text
+      %li.ts-title
+        = p.field :title, content_tag: :p, id: 'ts-admin-bar-title' do
+          Untitled
+      %li.ts-actions
+        .ts-button-group
+          = p.edit content_tag: :button, id: 'ts-admin-bar-settings', class: 'ts-button ts-options' do
+            %i.ion-android-settings
+          %button#ts-admin-bar-cancel.ts-button
+            %i.ion-android-close
+          %button#ts-admin-bar-save.ts-button.ts-button-primary
+            %i.ion-android-done

data/config/routes.rb

@@ -2,7 +2,9 @@ TypeStation::Engine.routes.draw do
   root :to => 'pages#index'
 
   namespace :admin, path: "_admin" do
-    resources :pages, only: [:index, :create, :update, :destroy] do
+    resources :pages, only: :index
+
+    resources :entities, only: [:create, :update, :destroy] do
       get :move, on: :member
     end
   end

data/lib/type_station/blocks/base.rb

@@ -5,48 +5,60 @@ module TypeStation
     class Base
       include ActionView::Helpers::TagHelper
 
-      attr_reader :model, :key, :options
+      attr_reader :authorise, :model, :options
 
-      def initialize(model, key, options)
+      def initialize(authorise, model, options)
+        @authorise = authorise
         @model = model
-        @key = key
         @options = options
       end
 
       def render(content)
-        content_tag(tag_name, content.html_safe, class: tag_class, id: tag_id, data: tag_data)
+        if showifblock
+          render_edit(content)
+        else
+          render_default(content)
+        end
+      end
+
+      def data
+        {}
       end
 
       private
 
-      def tag_id
-        options[:id] || "#{model.to_param}-#{key}-#{SecureRandom.hex(3)}"
+      def render_edit(content)
+        content_tag(tag_name, content.html_safe, class: tag_class, id: tag_id, data: tag_data)
       end
 
-      def tag_data
-        {ts_id: tag_ts_id, ts_url: tag_ts_url, ts_key: key, ts_data: tag_ts_data}
+      def render_default(content)
+        if options[:stick].present?
+          content_tag(tag_name, content.html_safe, class: tag_class, id: tag_id)
+        else
+          content.html_safe
+        end
       end
 
-      def tag_name
-        options[:content_tag] || :div
+      def showifblock
+        options[:if] || authorise
       end
 
-      def tag_class
-        [['ts', self.class.to_s.demodulize.underscore.dasherize].join('-'), options[:class]].compact
+      def tag_id
+        options[:id] || "#{model.to_param}-#{SecureRandom.hex(3)}"
       end
 
-      def tag_ts_data
-        (options[:data] || {})
+      def tag_name
+        options[:content_tag] || :div
       end
 
-      def tag_ts_id
-        model.to_param
+      def tag_class
+        options[:class]
       end
 
-      def tag_ts_url
-        nil
+      def tag_data
+        { ts: data.merge({url: options[:url] }) }
       end
-      
+
     end
   end
-end
+end

data/lib/type_station/blocks/entity.rb

@@ -0,0 +1,56 @@
+require 'type_station/blocks/base'
+
+module TypeStation
+  module Blocks
+    class Entity < Base
+
+      def data
+        {
+          action: options[:action],
+          id: options[:model_id] || model.to_param,
+          type: (options[:type] || model._type).to_s.classify,
+          parent_id: options[:model_parent_id] || model.parent_id.to_s,
+          fields: model_fields,
+          values: model_values,
+          create_url: options[:create_url],
+          position: model.position,
+          options: options[:options] || data_options
+        }
+      end
+
+      private
+
+      def data_options
+        nil
+      end
+
+      def render_default(content)
+        nil
+      end
+
+      def model_fields
+        lambda_binging = Struct.new(:model).new(model)
+        options[:fields].map do |field|
+          if field[:options] && field[:options].is_a?(Proc)
+            field[:options] = lambda_binging.instance_exec(&field[:options])
+          end
+          field
+        end
+      end
+
+      def model_values
+        values = options[:fields].map do |field|
+          content = model.get(field[:name])
+          value = content.is_a?(String) || content.is_a?(Symbol) || content.is_a?(Array) ? content.to_s : content.try(:value)
+          if value
+            [field[:name], value]
+          else
+            nil
+          end
+        end
+        Hash[*values.compact.flatten(1)]
+      end
+
+    end
+  end
+end

data/lib/type_station/blocks/field.rb

@@ -0,0 +1,34 @@
+require 'type_station/blocks/base'
+
+module TypeStation
+  module Blocks
+    class Field < Base
+
+      def data
+        {
+          type: options[:type],
+          id: model.to_param,
+          field:  options[:field],
+          options: data_options
+        }
+      end
+
+      private
+
+      def data_options
+        case options[:type]
+        when :image, :file
+          { cloudinary: (Cloudinary::Utils.sign_request(Cloudinary::Uploader.build_upload_params({}), {}) rescue {}) }
+        else
+          nil
+        end
+      end
+
+      def tag_name
+        default_tag = options[:type] == :text ? :span : :div
+        options[:content_tag] || default_tag
+      end
+
+    end
+  end
+end

data/lib/type_station/concerns/path_generator.rb

@@ -0,0 +1,69 @@
+module TypeStation
+  module Concerns
+    module PathGenerator
+      extend ActiveSupport::Concern
+
+      included do
+
+        field :title, type: String, default: 'Untitled'
+        field :slug, type: String
+        field :path, type: String
+        field :old_paths, type: Array, default: []
+
+        # VALIDATIONS
+
+        validates :slug, uniqueness: true, on: :update
+        validates :path, presence: true, uniqueness: true, on: :update
+
+         # CALLBACKS
+        before_create :generate_slug
+        before_destroy :destroy_children
+        after_rearrange :rebuild_path
+
+        # Rebuild self and children paths upon title change
+        before_save :generate_slug, if: :title_changed?
+        after_save :rebuild_child_paths, if: :has_children?
+
+      end
+
+      module ClassMethods
+
+        def find_by_path(path)
+          search_path = File.join('',path)
+          self.or({path: search_path}, {:old_paths.in  => [search_path]}).first
+        end
+      end
+
+      private
+
+      # Generates a slug based of the title give by the user
+      def generate_slug
+        self.slug = root? ? "" : title.parameterize
+        rebuild_path
+      end
+
+      # Rebuild a path based of a ancestors slugs
+      def rebuild_path
+        store_old_path
+        self.path = root? ? "/" : self.ancestors_and_self.collect(&:slug).join('/')
+      end
+
+      def store_old_path
+        if self.path.present?
+          self.old_paths << self.path
+          self.old_paths.uniq
+        end
+      end
+
+      def rebuild_child_paths
+        self.children.each do |child|
+          if child.respond_to?(:rebuild_path)
+            child.send :rebuild_path
+            child.save
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/type_station/concerns/templatable.rb

@@ -0,0 +1,16 @@
+module TypeStation
+  module Concerns
+    module Templatable
+      extend ActiveSupport::Concern
+
+      included do
+        field :template_name, type: String, default: 'undefined'
+      end
+
+      def template_name?
+        template_name.present? && template_name != 'undefined'
+      end
+
+    end
+  end
+end

data/lib/type_station/concerns.rb

@@ -0,0 +1,2 @@
+# will/should load the files in the directory!
+Dir[File.dirname(__FILE__) + "/concerns/*.rb"].each {|f| require f }

data/lib/type_station/configuration.rb

@@ -20,16 +20,20 @@ module TypeStation
     config_accessor :authenticate_with
     config_accessor :authorise_with
     config_accessor :current_user
-    
+
   end
 
   configure do |config|
     config.authenticate_with = Proc.new do
       request.env['warden'].try(:authenticate!)
     end
-    config.authorise_with = Proc.new {}
+    
+    config.authorise_with = Proc.new do
+      request.env["warden"].try(:user) || respond_to?(:current_user) && current_user
+    end
+
     config.current_user = Proc.new do
       request.env["warden"].try(:user) || respond_to?(:current_user) && current_user
-    end 
+    end
   end
-end
+end

data/lib/type_station/dsl.rb

@@ -1,7 +1,6 @@
-
 module TypeStation
   class DSL
-    
+
     def self.build(name, options = {}, &block)
       Page.new(name, options).call(&block)
     end
@@ -38,12 +37,12 @@ module TypeStation
         template_name = options[:template] || (parent ? title.parameterize('_') : 'index')
         redirect_to = options[:redirect_to]
         slug = options[:slug]
-        type = options[:type] || ::TypeStation::Page::TYPES.last
+        status = options[:status] || ::TypeStation::Page::STATUS.last
+
+        model = ::TypeStation::Page.create(title: title, name: name, template_name: template_name, status: status, redirect_to: redirect_to, parent_id: parent_id)
 
-        model = ::TypeStation::Page.create(title: title, name: name, template_name: template_name, type: type, redirect_to: redirect_to, parent_id: parent_id)
-        
         if slug.present?
-          model.slug = slug 
+          model.slug = slug
           model.save
         end
 
@@ -55,4 +54,4 @@ module TypeStation
   end
 
 
-end
+end

data/lib/type_station/engine.rb

@@ -3,6 +3,7 @@ require 'mongoid/tree'
 require 'jquery-fileupload-rails'
 require 'cloudinary'
 require 'ionicons-rails'
+require 'decorators'
 
 module TypeStation
   class Engine < ::Rails::Engine
@@ -15,5 +16,10 @@ module TypeStation
         ::TypeStation::ApplicationHelper.send :include, helper.classify.constantize
       end
     end
+
+    initializer 'load decorators' do
+      Decorators.register! Rails.root
+    end
+
   end
 end

data/lib/type_station/railtie.rb

@@ -1,13 +1,11 @@
 require 'type_station/view_helpers'
-require 'type_station/helpers'
+require 'type_station/concerns'
+require 'type_station/blocks'
 
 module TypeStation
   class Railtie < Rails::Railtie
     initializer "type_station.view_helpers" do
       ActionView::Base.send :include, ViewHelpers
-      ActionView::Base.send :include, Helpers::New
-      ActionView::Base.send :include, Helpers::Editable
-      ActionView::Base.send :include, Helpers::Utilities
     end
   end
-end
+end

data/lib/type_station/version.rb

@@ -1,8 +1,8 @@
 module TypeStation
   module Version
     MAJOR = 0
-    MINOR = 1
-    TINY  = 3
+    MINOR = 2
+    TINY  = 0
     PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end