type_station 0.1.3 → 0.2.0

data/app/assets/stylesheets/type_station/admin_bar.css.scss

@@ -26,7 +26,7 @@ $admin-bar-icon-size: 26.5pt;
   position: fixed;
   z-index: 1000;
   background: #fff;
-  bottom: -100px;
+  bottom: 0px;
   left: 0px;
   right: 0px;
   padding: 0px;
@@ -35,8 +35,7 @@ $admin-bar-icon-size: 26.5pt;
   transition: bottom .5s;
   box-shadow: 0px 0px 20px rgba(0,0,0,0.4);
   border-top: 1px solid #ccc;
-  &.insert-open { bottom: 0px; }
-  ul { 
+  ul {
     display: table;
     width: 100%;
     height: $admin-bar-height;
@@ -61,13 +60,13 @@ $admin-bar-icon-size: 26.5pt;
 
       &.ts-title {
         width: 78%;
-        input {
+        p {
           display: block;
           width: 100%;
           border: 0px;
           outline: none;
-          padding: 7px 15px;
-          font-size: 1.4em;
+          padding: 0px 15px;
+          font-size: 1em;
         }
       }
 
@@ -93,14 +92,14 @@ $admin-bar-icon-size: 26.5pt;
       }
     }
 
-  } 
+  }
 }
 
 #insert-content {
   background: rgba(27, 33, 36, 0.67);
   height: 100px;
-  ul li.insert-new { 
-    cursor: pointer; 
+  ul li.insert-new {
+    cursor: pointer;
     margin: 5px 0 0 5px;
     width: 1.4em;
     display: inline-block;
@@ -123,17 +122,12 @@ $admin-bar-icon-size: 26.5pt;
       color: #fff;
       text-align: left;
     }
-    &:hover { 
+    &:hover {
       .insert-icon { background-color: #428bca; color: #fff; }
     }
   }
 }
 
-#ts-admin-bar-settings {
-  display: none;
-}
-
-
 #ts-admin-bar-options {
   font-family: Tahoma, Geneva, sans-serif;
   ul:after, li:after { clear: both; display: table; content: ''; }
@@ -175,4 +169,4 @@ $admin-bar-icon-size: 26.5pt;
       .sub-text { color: #444; }
     }
   }
-}
+}

data/app/assets/stylesheets/type_station/base.css.scss

@@ -1,4 +1,4 @@
-$primary-color: #fff; 
+$primary-color: #fff;
 $primary-border-color: #ccc;
 
 $secondary-color: #428bca;
@@ -45,14 +45,15 @@ $secondary-border-color: #357ebd;
   z-index: 100000;
 }
 
-.ts-editable-image, .ts-editable-file, .ts-edit-page, .ts-edit-link { position: relative;}
+.ts-block, .ts-block-text { position: relative; }
+.ts-block:focus, .ts-block-text:focus { outline: none;}
 
 .ts-editable-button {
   position: absolute;
   bottom:0px;
   left: 0px;
   z-index: 10;
-  display: none;
+  display: block;
   font-size: 17pt;
   box-sizing: content-box;
   line-height: 1;
@@ -66,52 +67,26 @@ $secondary-border-color: #357ebd;
   &:hover { background: rgba(27,33,36,0.87); }
 }
 
-.ts-edit-page-button {
-top: 0px;
-right: 40px;
-bottom: auto;
-left: auto;
-}
-
-.ts-delete-page-button {
-top: 0px;
-right: 0px;
-bottom: auto;
-left: auto;
-}
-
-.ts-move-up-button, .ts-move-down-button-invert {
-top: 0px;
-right: 120px;
-bottom: auto;
-left: auto;
-}
-
-.ts-move-down-button, .ts-move-up-button-invert {
-top: 0px;
-right: 80px;
-bottom: auto;
-left: auto;
-}
-
-.ts-editable-link-button {
-  bottom: auto;
-  top:0px;
-}
-
-body.ts-edit-mode {
-  .ts-editable-html, .ts-editable-image, .ts-editable-file, .ts-editable-text, .ts-edit-page, .ts-edit-link  {
+body.ts-enable {
+  .ts-block  {
     border: none;
     outline: none;
     -webkit-transition: border 0.5s;
     transition: border 0.5s;
-    &:hover { 
-      outline: 1px solid #428bca; 
+    &:hover {
+      outline: 2px solid #428bca;
+      .ts-editable-button { display: block; }
+    }
+  }
+
+  .ts-block-text {
+    &:hover {
+      outline: 2px dashed #428bca;
       .ts-editable-button { display: block; }
     }
   }
 
-  
+
 }
 
 .vex-custom-field-wrapper {
@@ -158,7 +133,7 @@ body.ts-edit-mode {
   font-weight: inherit;
   font-size: inherit;
   min-height: 2.5em;
-  margin: 0 0 0.25em; 
+  margin: 0 0 0.25em;
   box-shadow: none;
 
   .search-choice {
@@ -176,7 +151,7 @@ body.ts-edit-mode {
   border-top: 1px solid #999;
 
   .result-selected {
-    display: none !important; 
+    display: none !important;
   }
 
   .highlighted {
@@ -213,18 +188,18 @@ body.ts-edit-mode {
   ul.ts-model-fields {
     margin: 4px 15px;
     padding: 0;
-    &:after { 
+    &:after {
       content: '';
       display: table;
       clear: both;
     }
-    li { 
+    li {
       &.ts-inline-field { float: left; }
-      label { 
+      label {
         display: inline-block;
         padding-right: 10px;
       }
-      input { 
+      input {
         height: 2.5em;
         font-size: 13.5pt;
         padding: 5px;
@@ -232,7 +207,7 @@ body.ts-edit-mode {
         color: #444;
         outline: none;
       }
-      button { 
+      button {
         width: 1.8em;
         height: 1.7em;
         font-size: 1.5em;
@@ -281,9 +256,9 @@ body.ts-edit-mode {
   }
   &:hover { background-color: $secondary-border-color; }
 }
-.ts-save-url { 
+.ts-save-url {
   padding: 0.75em 2em;
-  margin: 8px 0px 0px; 
+  margin: 8px 0px 0px;
   letter-spacing: 0.1em;
   text-transform: uppercase;
   font-family: inherit;
@@ -339,4 +314,4 @@ body.ts-edit-mode {
     100% { -ms-transform: rotate(359deg); } }
 @keyframes spin { 0% { transform: rotate(0deg); }
     100% { transform: rotate(359deg); } }
-.ion-load-a.ion-spin-animation { -webkit-animation-timing-function: steps(8, start); -moz-animation-timing-function: steps(8, start); animation-timing-function: steps(8, start); }
+.ion-load-a.ion-spin-animation { -webkit-animation-timing-function: steps(8, start); -moz-animation-timing-function: steps(8, start); animation-timing-function: steps(8, start); }

data/app/controllers/type_station/admin/entities_controller.rb

@@ -0,0 +1,53 @@
+module TypeStation
+  module Admin
+    class EntitiesController < ::TypeStation::AdminController
+
+      def create
+        @entity = Mongoid::Factory.build TypeStation::Entity, '_type' => params[:_type].classify
+
+        if params[:parent_id]
+          parent_entity = TypeStation::Entity.find(params[:parent_id])
+          @entity.parent = parent_entity
+        end
+
+        if @entity.update_contents(contents)
+          render json: { status: :success, entity: @entity }, status: :ok
+        else
+          render json: @entity.errors, status: :unprocessable_entity
+        end
+      end
+
+      def update
+        @entity = TypeStation::Entity.find(params[:id])
+
+        if params[:direction]
+          @entity.move_entity params[:direction]
+        end
+
+        if @entity.update_contents(contents)
+          render json: { status: :success }, status: :ok
+        else
+          render json: @entity.errors, status: :unprocessable_entity
+        end
+      end
+
+      def destroy
+        @entity = TypeStation::Entity.find(params[:id])
+
+        if @entity.delete
+          render json: { status: :success }, status: :ok
+        else
+          render json: @entity.errors, status: :unprocessable_entity
+        end
+      end
+
+
+      private
+
+      def contents
+        [params[:contents]].compact.flatten
+      end
+
+    end
+  end
+end

data/app/controllers/type_station/admin/pages_controller.rb

@@ -3,59 +3,13 @@ module TypeStation
     class PagesController < ::TypeStation::AdminController
 
       def index
-        @pages = TypeStation::Page.in(type: [:draft, :published])
+        @pages = TypeStation::Page.in(status: [:draft, :published])
         @pages = @pages.where(title: /#{params[:title]}/i) if params[:title]
         @pages = @pages.where(path: /#{params[:path]}/i) if params[:path]
-
+  
         render json: { status: :success, pages: @pages }, status: :ok
       end
-
-      def create
-        @page = TypeStation::Page.new(title: params[:title])
-
-        if params[:parent_id]
-          parent_page = TypeStation::Page.find(params[:parent_id]) 
-          @page.parent = parent_page
-        end
-
-        if @page.update_contents(contents)
-          render json: { status: :success, url: @page.path }, status: :ok
-        else
-          render json: @page.errors, status: :unprocessable_entity
-        end
-      end
-      
-      def update
-        @page = TypeStation::Page.find(params[:id])
-
-        if params[:direction]
-          @page.move_page params[:direction]
-        end
-
-        if @page.update_contents(contents)
-          render json: { status: :success }, status: :ok
-        else
-          render json: @page.errors, status: :unprocessable_entity
-        end
-      end
-
-      def destroy
-        @page = TypeStation::Page.find(params[:id])
-
-        if @page.delete
-          render json: { status: :success }, status: :ok
-        else
-          render json: @page.errors, status: :unprocessable_entity
-        end
-      end
-      
-
-      private
-
-      def contents
-        [params[:contents]].compact.flatten
-      end
-
+    
     end
   end
-end
+end

data/app/controllers/type_station/application_controller.rb

@@ -1,6 +1,6 @@
 module TypeStation
   class ApplicationController < ActionController::Base
-    rescue_from TypeStation::PageNotFoundError, :with => :page_not_found
+    rescue_from ::TypeStation::PageNotFoundError, :with => :page_not_found
 
     private
 
@@ -12,15 +12,5 @@ module TypeStation
       render file: "#{Rails.root}/public/404.html", layout: false, status: 404 and return
     end
 
-    def present(object, klass = nil)
-      if object.present?
-        object_class = object.class.to_s.gsub(/TypeStation::/, '')
-        klass ||= "TypeStation::#{object_class}Presenter".constantize
-        klass.new(object, view_context)
-      else
-        nil
-      end
-    end
-
   end
 end

data/app/controllers/type_station/pages_controller.rb

@@ -1,14 +1,14 @@
 module TypeStation
   class PagesController < TypeStation::ApplicationController
     layout 'application'
-    
+
     def index
-      @page = present Page.root
+      @page = Page.root
       render_type_station
     end
 
     def show
-      @page = present Page.find_by_path(params[:path])
+      @page = Page.find_by_path(params[:path])
       render_type_station
     end
 
@@ -19,7 +19,7 @@ module TypeStation
         if @page.redirect?
           redirect_to @page.redirect_to
         else
-          if @page.template_name? 
+          if @page.template_name?
             render "pages/#{@page.template_name}"
           else
             raise TypeStation::PageTemplateNameUndefined
@@ -31,4 +31,4 @@ module TypeStation
     end
 
   end
-end
+end

data/app/models/type_station/content.rb

@@ -13,6 +13,8 @@ module TypeStation
     field :name, type: Symbol
     field :type, type: Symbol, default: TYPES.first
 
+    after_save :clean_up
+
     # VALIDATIONS
 
     validates :name, presence: true, uniqueness: { scope: :type }
@@ -48,5 +50,16 @@ module TypeStation
         raise 'Dont know who to covert value to array'
       end
     end
+
+    def clean_up
+      case type
+      when :image, :file
+        original = changes[type.to_s][0]
+        if original && original['identifier']
+          Cloudinary::Uploader.destroy(original['identifier'])
+        end
+      end
+    end
+
   end
-end
+end

data/app/models/type_station/entity.rb

@@ -0,0 +1,80 @@
+module TypeStation
+  class Entity
+    include ::Mongoid::Document
+    include ::Mongoid::Tree
+    include ::Mongoid::Tree::Ordering
+
+    # RELATIONS
+    embeds_many :contents, class_name: 'TypeStation::Content', cascade_callbacks: true
+
+    # FIELDS
+    field :name, type: Symbol, default: :unnamed
+
+    # CLASS METHODS
+
+    def self.find_by_name(name)
+      self.where(name: name).first
+    end
+
+    # INSTANT METHODS
+
+    def update_contents(params)
+      params.each do |data|
+        field, value, type = data[:field].to_sym, data[:value], data[:type].to_sym
+        set(field, value, type)
+      end
+
+      save
+    end
+
+    def content_attributes
+      @content_attributes ||= Hash[self.contents.map {|c| [c.name, c]}]
+    end
+
+    def get(key)
+      if entity_fields?(key)
+        self[key]
+      elsif content?(key)
+        content_attributes[key].get
+      else
+        nil
+      end
+    end
+
+    def set(key, value, type = 'text')
+      if entity_fields?(key) && !changed.include?(key) #and not changed already
+        self[key] = value
+      else
+        if content?(key)
+          content_attributes[key].set value
+        else
+          contents.build(name: key, type: type).set(value)
+        end
+      end
+    end
+
+    def content?(key)
+      content_attributes[key].present?
+    end
+
+    def entity_fields?(key)
+      entity_fields.include?(key)
+    end
+
+    def move_entity(direction)
+      case direction.to_sym
+      when :move_up
+        move_up
+      when :move_down
+        move_down
+      end
+    end
+
+    private
+
+    def entity_fields
+      @entity_fields ||= self.class.fields.keys.map(&:to_sym)
+    end
+
+  end
+end

data/app/models/type_station/page.rb

@@ -1,30 +1,12 @@
 module TypeStation
-  class Page
-    include ::Mongoid::Document
-    include ::Mongoid::Tree
-    include ::Mongoid::Tree::Ordering
+  class Page < Entity
+    include ::TypeStation::Concerns::PathGenerator
+    include ::TypeStation::Concerns::Templatable
 
-    TYPES = [:hidden, :draft, :published]
-
-    # RELATIONS
-
-    embeds_many :contents, class_name: 'TypeStation::Content'
-
-    # FIELDS
-    field :name, type: Symbol, default: :unnamed
-    field :title, type: String, default: 'Untitled'
-    field :template_name, type: String, default: 'undefined'
+    STATUS = [:hidden, :draft, :published]
 
     field :redirect_to, type: String, default: nil
-    field :type, type: Symbol, default: TYPES.last # always published unless stated
-
-    field :slug, type: String
-    field :path, type: String
-
-    # VALIDATIONS
-
-    validates :slug, uniqueness: true, on: :update
-    validates :path, presence: true, uniqueness: true, on: :update
+    field :status, type: Symbol, default: STATUS.last # always published unless stated
 
     # Validate that they is only one root page
     validates_each :parent_id do |model, attr, value|
@@ -32,115 +14,21 @@ module TypeStation
       model.errors.add(attr, 'already have a root page') if value == nil && root_page.present? && model.id != root_page.id
     end
 
-    # 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?
-
-    # CLASS METHODS
-
-    def self.find_by_path(path)
-      self.where(path: File.join('',path)).first
-    end
-
-    def self.find_by_name(name)
-      self.where(name: name).first
-    end
-
     # INSTANT METHODS
 
-    def update_contents(params)
-      params.each do |data|
-        field, value, type = data[:field].to_sym, data[:value], data[:type].to_sym
-
-        if page_fields?(field) && !changed.include?(field) #and not changed already
-          self[field] = value
-        else
-          if content?(field)
-            set(field, value)
-          else
-            contents.build(name: field, type: type).set(value)
-          end
-        end 
-      end
-
-      save
-    end
-
-    def move_page(direction)
-      case direction.to_sym
-      when :move_up
-        move_up
-      when :move_down
-        move_down
-      end
-    end
-
-    def get(key)
-      content_attributes[key].get
-    end
-
-    def set(key, value)
-      content_attributes[key].set value
-    end
-
-    def content?(key)
-      content_attributes[key].present?
-    end
-
-    def page_fields?(key)
-      page_fields.include?(key)
-    end
-
-    def content_attributes
-      @content_attributes ||= Hash[self.contents.map {|c| [c.name, c]}]
-    end
-
     def redirect?
       redirect_to.present?
     end
 
-    def template_name?
-      template_name.present? && template_name != 'undefined'
-    end
-
     def visible?(user)
       return true if parent_id == nil # The root page is always visible
 
       if user.present?
-        [:draft, :published].include?(type)
+        [:draft, :published].include?(status)
       else
-        type == :published
-      end
-    end
-
-    private
-
-    def page_fields
-      @page_fields ||= self.class.fields.keys.map(&:to_sym)
-    end
-
-    # 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
-      self.path = root? ? "/" : self.ancestors_and_self.collect(&:slug).join('/')
-    end
-    
-    def rebuild_child_paths    
-      self.children.each do |child|
-        child.send :rebuild_path
-        child.save
+        status == :published
       end
     end
 
   end
-end
+end

data/app/presenters/type_station/admin_bar_presenter.rb

@@ -0,0 +1,9 @@
+module TypeStation
+  class AdminBarPresenter < Presenter
+    presents :page
+
+    form_field :title, type: :text, label: 'Title'
+    form_field :status, type: :select, label: 'Status', options: [['Hidden', 'hidden'], ['Draft', 'draft'], ['Published', 'published']]
+
+  end
+end

data/app/presenters/type_station/content_presenter.rb

@@ -2,9 +2,19 @@ module TypeStation
   class ContentPresenter < BasePresenter
     presents :content
 
+    def tag(default, options = {})
+      css_class = options.delete(:class) if options.include?(:class)
+      cl_image_tag((value.present? ? value['identifier'] : default), options.merge({class: ['ts-editable-image-tag', css_class], data: options}))
+    end
+
+    def link(default, html_options = nil, &block)
+      css_class = html_options.delete(:class) if html_options.include?(:class)
+      content_tag(:a, nil, html_options.merge({class: ['ts-editable-link-tag', css_class], href: (value.present? ? cloudinary_url(value['identifier'], format: value['format']) : default)}), &block)
+    end
+
     def value
-      content.get
+      content
     end
 
   end
-end
+end