honey-cms 0.3.8 → 0.3.9

data/app/controllers/cms/base_controller.rb

@@ -0,0 +1,78 @@
+class CMS::BaseController < ApplicationController
+  before_filter :admin!
+  before_filter :set_active
+  layout 'cms'
+
+  before_filter :find_record, only: [:show, :edit, :update, :destroy]
+  before_filter :set_element_variable, only: [:show, :edit, :update, :destroy]
+  respond_to :html, :json
+
+  def index
+    @records = if params[:search].blank?
+      subject.order('id asc')        .page(params[:page]).per(100)
+    else
+      subject.search(params[:search]).page(params[:page]).per(100)
+    end
+
+    set_collection_variable
+    respond_with(@records)
+  end
+
+  def new
+    @record = subject.new
+    set_element_variable
+    respond_with(@record)
+  end
+
+  def create
+    @record = subject.create(params[subject.model_name.element])
+    set_element_variable
+    respond_with @record
+  end
+
+  def show
+    respond_with @record
+  end
+
+  def edit
+    respond_with @record
+  end
+
+  def update
+    @record.update_attributes params[subject.model_name.element]
+    respond_with @record
+  end
+
+  def destroy
+    @record.destroy
+    respond_with @record
+  end
+
+  protected
+
+  def respond_with object
+    super [:cms, object]
+  end
+
+  def find_record
+    @record = subject.find(params[:id])
+  end
+
+  def set_collection_variable
+    instance_variable_set :"@#{subject.model_name.collection}", @records
+  end
+
+  def set_element_variable
+    instance_variable_set :"@#{subject.model_name.element}", @record
+  end
+
+  def admin!
+    unless signed_in? && current_user.role.admin?
+      auth_failed
+    end
+  end
+
+  def set_active
+    @active_page = /cms/
+  end
+end

data/app/controllers/cms/root_controller.rb

@@ -0,0 +1,23 @@
+class CMS::RootController < ApplicationController
+  before_filter :admin!
+  before_filter :set_active
+  layout 'cms'
+
+  def description
+  end
+
+  def index
+  end
+
+  protected
+
+  def admin!
+    unless signed_in? && current_user.role.admin?
+      auth_failed
+    end
+  end
+
+  def set_active
+    @active_page = /cms/
+  end
+end

data/app/views/cms/root/description.html.haml

@@ -0,0 +1,10 @@
+%ul
+  - CMS::Configuration.types.each do |type|
+    %li
+      = type.name.underscore.humanize
+      %ul
+        - type.attributes.each do |property|
+          %li= property.name.humanize
+      %ul
+        - type.options.each do |option|
+          %li= option.humanize

data/app/views/layouts/_flash.html.haml

@@ -0,0 +1,13 @@
+.alerts
+  - if flash[:notice]
+    .alert.alert-info
+      <button type="button" class="close" data-dismiss="alert">×</button>
+      = flash[:notice]
+  - if flash[:success]
+    .alert.alert-success
+      <button type="button" class="close" data-dismiss="alert">×</button>
+      = flash[:success]
+  - if flash[:error] || flash[:alert]
+    .alert.alert-error
+      <button type="button" class="close" data-dismiss="alert">×</button>
+      = flash[:error] || flash[:alert]

data/app/views/layouts/cms.html.haml

@@ -0,0 +1,38 @@
+!!!
+%html
+  %head
+    = stylesheet_link_tag    'cms', media: 'all'
+    = javascript_include_tag 'application'
+    = stylesheet_link_tag 'codemirror'
+    = javascript_include_tag 'cms'
+    = csrf_meta_tags
+
+  %body.cms
+    .navbar.navbar-fixed-top.main-navigation
+      .navbar-inner
+        .container
+          %button.btn.btn-navbar{type: 'button', :'data-toggle' => 'collapse', :'data-target' => '.nav-collapse'}
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
+
+          .nav-collapse.collapse
+            %ul.nav
+              %li= link_to 'Home', root_path
+            %ul.nav.pull-right
+              %li= link_to 'Sign out', session_path, method: 'delete', class: 'session'
+
+    .container
+      = render partial: 'layouts/flash', locals: { flash: flash }
+
+      .row
+        .span3
+          %h5 CMS
+          %ul.nav.nav-list
+            - CMS::Configuration.types.each do |type|
+              %li{class: "#{if defined?(subject) && type.subject == subject.name then 'active' end}"}
+                = link_to send("cms_#{type.model_name.collection}_path") do
+                  %i.icon-chevron-right
+                  = type.model_name.human.pluralize
+
+        .span9= yield

data/lib/cms.rb

@@ -9,4 +9,5 @@ module CMS
   autoload :ViewTags,      'cms/view_tags'
   autoload :FormBuilder,   'cms/form_builder'
   autoload :Page,          'cms/page'
+  autoload :Template,      'cms/template'
 end

data/lib/cms/attribute.rb

@@ -72,7 +72,7 @@ class CMS::Attribute
   end
 
   def inject_options
-    "".tap { |s| @attr_options.each { |k,v| s << ", :#{k} => #{v.inspect}" } }
+    CMS::Template.inject_options(@attr_options)
   end
 
   def inject_index_options

data/lib/cms/configuration.rb

@@ -3,7 +3,7 @@ module CMS::Configuration
 
   def data
     @data ||= if yaml_string_data.present?
-      YAML.load(yaml_string_data)
+      YAML.load(yaml_string_data).reverse_merge(default_empty_data)
     else
       default_empty_data
     end

data/lib/cms/engine.rb

@@ -2,6 +2,12 @@ require 'cms/inflections'
 
 module CMS
   class Engine < ::Rails::Engine
-    # stubbed for assets.. ?
+    initializer 'cms.markdown' do |app|
+      ::Markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML,
+        autolink: true,
+        space_after_headers: true,
+        superscript: true,
+        tables: true)
+    end
   end
 end

data/lib/cms/orderable.rb

@@ -2,13 +2,18 @@ module CMS::Orderable
   extend ActiveSupport::Concern
 
   def order_scope
-    self.class
+    if self.class.order_scope && (scoped = send(self.class.order_scope))
+      scoped.send(self.class.model_name.collection)
+    else
+      self.class
+    end
   end
 
   module ClassMethods
-    def orderable name
+    def orderable name, options
       default_scope order(name)
       after_save :"order_#{name}"
+      if options[:order_scope] then order_scope(options[:order_scope]) end
 
       define_method :"order_#{name}" do
         order_scope.where("#{name} >= #{send(name)}").where("id != #{id}").select(:id).select(name).inject(send(name)) do |i, record|
@@ -20,5 +25,9 @@ module CMS::Orderable
         end
       end
     end
+
+    def order_scope scope = false
+      if scope then @order_scope = scope else @order_scope end
+    end
   end
 end

data/lib/cms/template.rb

@@ -0,0 +1,27 @@
+module CMS::Template
+  extend self
+
+  class InvalidOptionKey < Exception ; end
+
+  def inject_options options
+    "".tap { |s| options.each { |k,v| s << ", #{_validate_option_key(k)}: #{v.inspect}" } }
+  end
+
+  def add_comma content
+    if content.strip.present?
+      ", #{content}"
+    else
+      content
+    end
+  end
+
+  private
+
+  def _validate_option_key key
+    unless key =~ /^[a-z0-9_]+$/
+      raise CMS::Template::InvalidOptionKey, "Key #{key} is not valid."
+    end
+
+    key
+  end
+end

data/lib/cms/type.rb

@@ -34,6 +34,10 @@ class CMS::Type
     orderable_attributes.first
   end
 
+  def order_options
+    CMS::Template.inject_options(order_attribute.options)
+  end
+
   def to_s
     name
   end

data/lib/generators/cms/admin_area_generator.rb

@@ -19,7 +19,7 @@ module CMS
           template 'type_controller.rb', "app/controllers/cms/#{@name.collection}_controller.rb"
           template 'type_model.rb',      "app/models/cms/#{@name.element}.rb"
 
-          %w(index new show edit).each do |view|
+          %w(index new show edit _fields).each do |view|
             template "views/#{view}.html.haml", "app/views/cms/#{@name.collection}/#{view}.html.haml"
           end
         end

data/lib/generators/cms/templates/type_model.rb

@@ -11,7 +11,7 @@ class CMS::<%= @name %> < ActiveRecord::Base
   attr_accessible <%= @type.accessible_attributes.map {|a| ":#{a.field_name}" }.sort.join(', ') %>
 <% if @type.orderable? -%>
   include CMS::Orderable
-  orderable(:<%= @type.order_attribute.name %>)
+  orderable(:<%= @type.order_attribute.name %><%= @type.order_options %>)
 <% end -%>
 <% @type.file_attributes.each do |attribute| -%>
   mount_uploader :<%= attribute.name %>, CMS::Uploader

data/lib/generators/cms/templates/views/_fields.html.haml

@@ -0,0 +1,16 @@
+<% @type.attributes.each do |attribute| -%>
+.control-group
+  = f.label :<%= attribute.field_name %>, class: 'control-label'
+<% if attribute.orderable? -%>
+  .controls
+    = f.<%= attribute.form_type %> :<%= attribute.name %>, 1.upto(f.object.order_scope.count + 1).to_a
+<% elsif attribute.reference? -%>
+  .controls
+    = f.<%= attribute.form_type %> :<%= attribute.field_name %>, CMS::<%= attribute.reference_to %>.all.collect {|r| [ r.<%= attribute.options['reference_label'] %>, r.id ] }
+<% else -%>
+  .controls
+    = f.<%= attribute.form_type %> :<%= attribute.name %>
+<% end -%>
+<% end -%>
+.form-actions
+  = f.submit 'Save', class: 'btn btn-primary', :'data-disable-with' => 'Saving...'

data/lib/generators/cms/templates/views/edit.html.haml

@@ -1,19 +1,4 @@
 %h2 Edit <%= @name.human.downcase %>
 
 = form_for @<%= @name.element %>, url: cms_<%= @name.element %>_path(@<%= @name.element %>), html: {class: 'form-horizontal'} do |f|
-<% @type.attributes.each do |attribute| -%>
-  .control-group
-    = f.label :<%= attribute.field_name %>, class: 'control-label'
-<% if attribute.orderable? -%>
-    .controls
-      = f.<%= attribute.form_type %> :<%= attribute.name %>, 1.upto(CMS::<%= @name %>.count).to_a
-<% elsif attribute.reference? -%>
-    .controls
-      = f.<%= attribute.form_type %> :<%= attribute.field_name %>, CMS::<%= attribute.reference_to %>.all.collect {|r| [ r.<%= attribute.options['reference_label'] %>, r.id ] }
-<% else -%>
-    .controls
-      = f.<%= attribute.form_type %> :<%= attribute.name %>
-<% end -%>
-<% end -%>
-  .form-actions
-    = f.submit 'Save', class: 'btn btn-primary', :'data-disable-with' => 'Saving...'
+  = render partial: 'fields', locals: { f: f }

data/lib/generators/cms/templates/views/new.html.haml

@@ -1,19 +1,4 @@
 %h2 New <%= @name.human.downcase %>
 
 = form_for @<%= @name.element %>, url: cms_<%= @name.collection %>_path, html: {class: 'form-horizontal'} do |f|
-<% @type.attributes.each do |attribute| -%>
-  .control-group
-    = f.label :<%= attribute.field_name %>, class: 'control-label'
-<% if attribute.orderable? -%>
-    .controls
-      = f.<%= attribute.form_type %> :<%= attribute.name %>, 1.upto(CMS::<%= @name %>.count + 1).to_a
-<% elsif attribute.reference? -%>
-    .controls
-      = f.<%= attribute.form_type %> :<%= attribute.field_name %>, CMS::<%= attribute.reference_to %>.all.collect {|r| [ r.<%= attribute.options['reference_label'] %>, r.id ] }
-<% else -%>
-    .controls
-      = f.<%= attribute.form_type %> :<%= attribute.name %>
-<% end -%>
-<% end -%>
-  .form-actions
-    = f.submit 'Save', class: 'btn btn-primary', :'data-disable-with' => 'Saving...'
+  = render partial: 'fields', locals: { f: f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honey-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-16 00:00:00.000000000 Z
+date: 2012-12-08 00:00:00.000000000 Z
 dependencies: []
 description: Some CMS functionality
 email: quinn@tastehoneyco.com
@@ -44,6 +44,7 @@ files:
 - lib/cms/orderable.rb
 - lib/cms/page.rb
 - lib/cms/routes.rb
+- lib/cms/template.rb
 - lib/cms/type.rb
 - lib/cms/uploader.rb
 - lib/cms/view_tags.rb
@@ -59,14 +60,21 @@ files:
 - lib/generators/cms/templates/migration.rb
 - lib/generators/cms/templates/type_controller.rb
 - lib/generators/cms/templates/type_model.rb
+- lib/generators/cms/templates/views/_fields.html.haml
 - lib/generators/cms/templates/views/edit.html.haml
 - lib/generators/cms/templates/views/index.html.haml
 - lib/generators/cms/templates/views/new.html.haml
 - lib/generators/cms/templates/views/show.html.haml
 - lib/generators/cms/USAGE
 - lib/honey-cms.rb
+- app/controllers/cms/base_controller.rb
 - app/controllers/cms/pages_controller.rb
+- app/controllers/cms/root_controller.rb
 - app/views/cms/pages/show.html.haml
+- app/views/cms/root/description.html.haml
+- app/views/cms/root/index.html.haml
+- app/views/layouts/_flash.html.haml
+- app/views/layouts/cms.html.haml
 homepage: https://github.com/honeyco/honey-cms
 licenses: []
 post_install_message: