classiccms 0.2.4.pre → 0.3.0

data/.gitignore

@@ -6,3 +6,4 @@ pkg/*
 .bin
 .rspec
 tmp
+.sass-cache

data/README.md

@@ -1,26 +1,18 @@
-## ClassicCMS
+## Classiccms
 
 To install:
-    gem install classicCMS
+    gem install classiccms
 
 Generate new website:
-    classicCMS new [app name]
+    classiccms new [app name]
+
+change directory:
+    cd [app name]
+
+Start server
+    classiccms server
+
 
 
 ## TODO
-- Write Models and specs
-  + Base
-  + Connections
-  + Slugs
-  - Asset handeling
-  - Authentication
-    - Users
-    - Groups
-    - Rights
-- Create startup procedure
-- Write Controllers and specs
-  - ApplicationController
-  - CMSController
-- Create helper methods
-- Finalize Scaffold app and decide on level of spec coverage
-- Document!
+  - Document!

data/classiccms.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Classiccms::VERSION
   s.authors     = ["jeljer te Wies"]
   s.email       = ["heldopslippers@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "http://github.com/heldopslippers/classiccms"
   s.summary     = %q{An easy to use wrapper for creating basic and more complicated websites}
   s.description = %q{Webcms is a wrapper that automatigically will create a layer. It enables programmers to quickly build and release websites with CRUD CMS capabilities}
 
@@ -33,6 +33,15 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "sinatra-support"
   s.add_runtime_dependency "thin"
 
+  #background processing
+  s.add_runtime_dependency "resque"
+
+  #file upload
+  s.add_runtime_dependency "dragonfly"
+
+  #mail
+  s.add_runtime_dependency "mail"
+
   #templating
   s.add_runtime_dependency "tilt"
   s.add_runtime_dependency "haml"

data/lib/classiccms/application.rb

@@ -11,11 +11,21 @@ require "sass"
 require "slim"
 require "coffee-script"
 require 'encryptor'
+require 'resque'
+require 'resque/server'
+require 'dragonfly'
+
+$app = Dragonfly[:image]
+$app.define_macro_on_include(Mongoid::Document, :image_accessor)
+$app.configure_with(:imagemagick)
 
 CONFIG = {}
 module Classiccms
   ROOT = File.dirname(__FILE__)
   def self.boot
+    #registrer cms special types
+    require File.join(File.dirname(__FILE__), 'custom.rb')
+
     #In order to get css and js files to "render"
     Tilt.register Tilt::ERBTemplate, 'css'
     Tilt.register Tilt::ERBTemplate, 'js'
@@ -29,7 +39,7 @@ module Classiccms
 
     #FROM App
     #Set config.yml
-    if !defined? CONFIG or CONFIG == []
+    if !defined? CONFIG or CONFIG.empty? and ENV['RACK_ENV'] != 'test'
       value = YAML.load_file(File.join(Dir.pwd, 'config/config.yml'))[ENV['RACK_ENV']]
       const_set "CONFIG", value.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
     end
@@ -45,18 +55,38 @@ module Classiccms
 
     #FROM App
     #require models
-    Dir[File.join(Dir.pwd, 'models/*.rb')].each {|file| require file }
+    Dir[File.join(Dir.pwd, 'app/models/*.rb')].each {|file| require file }
 
     #FROM Gem
     #require mongoid
     Mongoid.load!(File.join(ROOT, 'mongoid.yml'))
-    #require File.join(File.dirname(__FILE__), 'mongoid.rb')
+
+
+    $app.configure do |d|
+      d.url_format = '/assets/:job'
+    end
+    $app.datastore.configure do |d|
+      d.root_path = File.join(Dir.pwd, 'assets')
+    end
+
+    #from gem
+    #require resque
+    Resque.redis = YAML.load_file(File.join(ROOT, 'resque.yml'))[ENV['RACK_ENV']]
+    Resque.redis.namespace = CONFIG[:database]
 
     #require helpers
     require File.join(File.dirname(__FILE__), 'helpers.rb')
+
+    #FROM App
+    #require queue
+    Dir[File.join(Dir.pwd, 'app/queue/*.rb')].each {|file| require file }
+
     #FROM Gem
     #require controllers
     Dir[File.join(File.dirname(__FILE__), 'controllers/*.rb')].each {|file| require file }
 
+    #FROM App
+    #require controllers
+    Dir[File.join(Dir.pwd, 'app/controllers/*.rb')].each {|file| require file }
   end
 end

data/lib/classiccms/cli.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'classiccms/version'
 
 module Classiccms
   class Cli
@@ -6,6 +7,8 @@ module Classiccms
       case arguments[0]
       when 'new'    then self.new arguments[1]
       when 'server' then self.server
+      when 's'      then self.server
+      when '-v' then puts "version #{VERSION}"
       else
         puts "you are so smart! I don't know what you mean! (try using new or server)"
       end
@@ -25,16 +28,7 @@ module Classiccms
     end
     def self.server
       #first check if this is actualy an app
-      if File.directory? 'config'  and  File.directory? 'models'
-        puts 'Going to start server...'
-
-        #Initialize app with application file
-        require 'classiccms/application'
-        Classiccms.boot
-      else
-        puts 'not an app! Try running:'
-        puts 'classicCMS new [app name]'
-      end
+      system('rackup')
     end
   end
 end

data/lib/classiccms/controllers/application.rb

@@ -4,9 +4,9 @@ require 'sinatra/support'
 
 module Classiccms
   class ApplicationController < Sinatra::Base
-    include Classiccms::Routing
+    include  Classiccms::Routing
     register Sinatra::MultiRender
-    helpers Classiccms::Helpers
+    helpers  Classiccms::Helpers
 
     set :multi_views,   [ File.join(Dir.pwd, 'views')]
     set :root, Dir.pwd
@@ -14,6 +14,7 @@ module Classiccms
     set :session_secret, '427a474a206b616e5c4f2a4f3c7d2d517e2a564e21556e24593363253e'
 
     enable :sessions
+
     before do
       @user = User.find(session[:user_id]) if session[:user_id] != nil
     end
@@ -27,7 +28,7 @@ module Classiccms
         session[:user_id] = user.id
         redirect to(params[:correct] != nil ? params[:correct] : '/')
       else
-        redirect to(params[:incorrect] != nil ? params[:incorrect] : '/')
+        redirect to(params[:incorrect] != nil ? params[:incorrect] : '/login')
       end
     end
     get '/logout' do

data/lib/classiccms/controllers/cms.rb

@@ -12,19 +12,26 @@ module Classiccms
     set :public_folder, Proc.new { File.join(Classiccms::ROOT, 'public') }
 
     post '/add' do
-      if !params['cms'].nil?
+      if params['cms'] != nil and params['cms'].length > 2
         begin
-          record = Kernel.const_get(params['cms']['model']).new
+          params['cms'] = Base64.decode64(params['cms']).decrypt
+          new = eval(params['cms']).first
+          record = new[0].new
 
-          record.connections << Connection.new(:parent => params['cms']['position'], :section => params['cms']['section'], :files => params['cms']['files'])
+          record.connections << Connection.new(:parent_id => new[1], :section => new[2], :files => new[2..new.length])
           show :add_window, {}, {:record => record}
-        rescue TypeError
+        rescue TypeError, ArgumentError
           ''
         end
       end
     end
     post '/edit' do
-      records = Base.where(_id: params['id'])
+      begin
+        params['cms'] = Base64.decode64(params['cms']).decrypt
+      rescue
+        ''
+      end
+      records = Base.where(_id: params['cms'])
       if records.count > 0
         record = records.first
         show :add_window, {}, {:record => record}
@@ -46,23 +53,14 @@ module Classiccms
       end
     end
 
-    post '/create' do
-      params.each do |key, value|
-        begin
-          record = Kernel.const_get(key).new(value)
-        rescue Typeerror
-          ''
-        end
-        if !record.save
-          content_type :json
-          return record.errors.messages.to_json
-        end
-      end
-    end
-    post '/update' do
+    post '/save' do
       params.each do |key, value|
         begin
-          record = Kernel.const_get(key).find(value['id'])
+          if value['id'] != nil
+            record = Kernel.const_get(key).find(value['id'])
+          else
+            record = Kernel.const_get(key).new
+          end
           record.update_attributes(value)
         rescue TypeError
           ''
@@ -73,10 +71,28 @@ module Classiccms
         end
       end
     end
+    post '/upload/image' do
+      image = Image.new
+      image.file = params[:Filedata][:tempfile].read
+      image.file.name = params[:Filedata][:filename]
+      image.save
+      show :images
+    end
+    get '/images' do
+      show :browse
+    end
+    post '/image/destroy' do
+      image = Image.find(params[:id])
+      image.destroy
+    end
+    get '/ckeditor/images' do
+      show :ckeditor
+    end
 
     get '/*.:extention' do
       pass unless ['css', 'js'].include? params[:extention]
       response.headers['Cache-Control'] = 'public, max-age=86400'
+      content_type params[:extention]
       show params[:splat].join
     end
   end

data/lib/classiccms/controllers/website.rb

@@ -2,7 +2,7 @@ require 'classiccms/controllers/application'
 
 module Classiccms
   class WebsiteController < ApplicationController
-    set :multi_views,   [ File.join(Dir.pwd, 'views')]
+    set :multi_views,   [ File.join(Dir.pwd, 'app/views')]
     set :root, Dir.pwd
     set :public_folder, Proc.new { File.join(Dir.pwd, 'public') }
 
@@ -11,24 +11,32 @@ module Classiccms
 
       index = CONFIG[:home].kind_of?(String) ? CONFIG[:home] : 'application/index'
       @routes = get_route(get_first_item)
+      @routes << nil
       show index
     end
-    get '/js/*.js' do
+    get '/javascripts/*.js' do
       response.headers['Cache-Control'] = ENV['RACK_ENV'] == 'development' ? 'no-cache' : 'public, max-age=86400'
-      show params[:splat].join, :views => [File.join(Dir.pwd, 'assets/js')]
+      show params[:splat].join, :views => [File.join(Dir.pwd, 'public/javascripts')]
     end
-    get '/css/*.css' do
+    get '/stylesheets/*.css' do
       response.headers['Cache-Control'] = ENV['RACK_ENV'] == 'development' ? 'no-cache' : 'public, max-age=86400'
-      show params[:splat].join, :views => [File.join(Dir.pwd, 'assets/css')]
+      show params[:splat].join, :views => [File.join(Dir.pwd, 'public/stylesheets')]
     end
     get '/:id/?*' do
       response.headers['Cache-Control'] = 'no-cache'
       pass unless Slug.exists?(conditions: {_id: params[:id]})
       index = CONFIG[:home].kind_of?(String) ? CONFIG[:home] : 'application/index'
 
+
       item = Base.find(Slug.find(params[:id]).document_id)
       @routes = get_route(item)
+      @routes << nil
       show index
     end
+
+    use Dragonfly::Middleware, :image
+    not_found do
+      show :'404', views: File.join(Classiccms::ROOT, 'views/cms')
+    end
   end
 end

data/lib/classiccms/custom.rb

@@ -0,0 +1,16 @@
+class ImageField
+  include Mongoid::Fields::Serializable
+
+  def deserialize(object)
+    Image.find(object).file
+  end
+
+  def serialize(object)
+    if object.class == BSON::ObjectId
+      return object
+    else
+      return BSON::ObjectId(object)
+    end
+  end
+end
+

data/lib/classiccms/helpers.rb

@@ -11,6 +11,13 @@ module Classiccms
       show :header, views: File.join(Classiccms::ROOT, 'views/cms')
     end
 
+    #insert the logout button
+    def logout
+      if @user != nil
+        show :logout, views: File.join(Classiccms::ROOT, 'views/cms')
+      end
+    end
+
     #generates url for a document
     def link(document, url)
       url = url.gsub(/[^a-zA-Z0-9\-\/]+/, '-').downcase
@@ -29,7 +36,7 @@ module Classiccms
     #renders a specific page
     def layout(section_name, position)
       id = get_parent_id(position)
-      records = Base.where(_id: id)
+      records = Base.where(:'connection.parent_id' => id)
       if records.count > 0 and records.first.connections.where(:section => section_name, :file.ne => nil).count > 0
         file_name = records.first.connections.where(:section => section_name, :file.ne => nil).first.file
         show "#{records.first._type}/#{file_name}", {}, {record: records.first}
@@ -42,8 +49,8 @@ module Classiccms
     def section(section_name, parent_id = nil)
       html = []
       parent_id = get_parent_id(parent_id)
-      Base.where(:'connections.parent'=> parent_id, :'connections.section' => section_name, :'connections.file'.ne => nil).each do |record|
-        connection = record.connections.where(:parent => parent_id, :section => section_name, :file.ne => nil).first
+      Base.where(:'connections.parent_id' => parent_id, :'connections.section' => section_name, :'connections.file'.ne => nil).each do |record|
+        connection = record.connections.where(:parent_id => parent_id, :section => section_name, :file.ne => nil).first
 
         #render html
         rendering = show "#{record._type}/#{connection.file}", {}, {record: record}
@@ -54,9 +61,14 @@ module Classiccms
     end
 
     #returns the html for add button
-    def add(model, position, section, *files)
-      if model.kind_of? Class and @user != nil
-        info = Base64.encode64({:model => model, :position => get_parent_id(position), :section => section, :files => files}.to_s.encrypt)
+    def add(*items)
+      items.each do |item|
+        if item.class == Array
+          item[1] = get_parent_id(item[1])
+        end
+      end
+      if @user != nil
+        info = Base64.encode64(items.to_s.encrypt)
         show :add, {views: File.join(Classiccms::ROOT, 'views/cms')}, {encrypteddata: info}
       end
     end
@@ -65,7 +77,7 @@ module Classiccms
     def edit(id)
       records = Base.where(_id: id)
       if records.count > 0 and @user != nil
-        info = Base64.encode64 records.first.to_s.encrypt
+        info = Base64.encode64 records.first.id.to_s.encrypt
 
         show :edit, {views: File.join(Classiccms::ROOT, 'views/cms')}, {encrypteddata: info}
       end
@@ -86,7 +98,7 @@ module Classiccms
     def get_parent_id(position)
       if position.kind_of? Integer
         routes = @routes.reverse
-        if routes[position] != nil
+        if routes.length > position
           return routes[position]
         elsif routes.count > 0
           return get_parent_id(position-1)

data/lib/classiccms/lib/routing.rb

@@ -15,7 +15,7 @@ module Classiccms
         routes << current.id
         branches = Array.new
         current.connections.each_with_index do |connection, i|
-          if connection.parent_id != nil
+          if connection.parent_id != nil and Base.where(:_id => connection.parent_id).count > 0
             branches[i] = get_route(Base.find(connection.parent_id))
           end
         end

data/lib/classiccms/models/base.rb

@@ -9,4 +9,18 @@ class Base
   #associations
   embeds_many :connections
   accepts_nested_attributes_for :connections
+
+  after_destroy :remove_slugs
+  after_destroy :remove_connections
+
+
+  def remove_slugs
+    Slug.where(:document_id => id).destroy
+  end
+  def remove_connections
+    records = Base.where(:'connections.parent_id' => id)
+    records.each do |record|
+      record.connections.where(:parent_id => id).destroy_all
+    end
+  end
 end

data/lib/classiccms/models/image.rb

@@ -0,0 +1,9 @@
+class Image
+  include Mongoid::Document
+
+  field :file_uid
+  field :file_name
+
+  image_accessor :file
+  validates_property :format, :of => :file, :in => [:jpg, :jpeg, :png, :gif]
+end

data/lib/classiccms/models/uploader.rb

@@ -0,0 +1,17 @@
+#require 'carrierwave/mongoid'
+#
+#class Uploader< CarrierWave::Uploader::Base
+#  include Mongoid::Document
+#  #include CarrierWave::RMagick
+#  storage :file
+#
+#  def filename
+#    "#{id}.#{file.extension}" if original_filename.present?
+#  end 
+#  def extension_white_list
+#    %w(jpg jpeg gif png)
+#  end
+#  def store_dir
+#    File.join(Dir.pwd, 'public/assets/images')
+#  end
+#end

data/lib/classiccms/public/css/images.sass

@@ -0,0 +1,20 @@
+#iki
+  img
+    :display inline
+    :cursor pointer
+    :float left
+  #file_upload
+    :clear both
+  .image
+    :position relative
+    :float left
+    :padding 10px
+    :cursor pointer
+    .destroy
+      :display none
+      :background url('/cms/images/image_delete.png')
+      :position absolute
+      :top 0px
+      :left 0px
+      :width 20px
+      :height 20px

data/lib/classiccms/public/css/style.sass

@@ -6,12 +6,23 @@
   -webkit-opacity: #{"." + $value}
   -moz-opacity: #{"." + $value}
 
+#iki_logout
+  :position fixed
+  :right 0px
+  :width 28px
+  :height 62px
+  :background url('/cms/images/logout.png')
+  &:hover
+    :background url('/cms/images/logout_hover.png')
 #iki
-  :position relative
+  :position fixed
+  :top 0px
+  :left 0px
   :width 100%
   :height 100%
   :color #fff
   :font-family AllerRegular
+  :overflow auto
   label, label a
     :font-family AllerBold
     :font-size 12px
@@ -22,7 +33,7 @@
     :background-color #000
     @include opacity(70)
     :position fixed
-    :z-index 1010
+    :z-index 110
 
   #logo
     :width 203px
@@ -63,7 +74,7 @@
     input.top
       :margin-top 109px
     input.bottom
-      :margin-top 56px
+      :margin-top 60px
 
     input.button
       :margin-left 200px
@@ -128,7 +139,7 @@
             :width auto
             :height 18px
             :float left
-            
+
           .right
             :background-image url('/cms/images/menu_right.png')
             :width 14px
@@ -161,6 +172,27 @@
         :padding-right 5px
         :margin-bottom 10px
       input.radiobuttons
+      .images
+        :width 684px
+        :max-height 400px
+        :overflow auto
+        .image
+          :position relative
+          :float left
+          :padding 10px
+          :cursor pointer
+          .destroy
+            :display none
+            :background url('/cms/images/image_delete.png')
+            :position absolute
+            :top 0px
+            :left 0px
+            :width 20px
+            :height 20px
+          img
+            :display inline
+        .image.selected
+          :background white
       #text_editor
         :float left
         :height 50px
@@ -373,4 +405,82 @@
     :font-size 10px
     position: relative
     float: left
-    
+ 
+#iki
+  .uploadify
+    position: relative
+    float: left
+    margin-bottom: 1em
+  
+  .uploadify-button
+    background-color: #505050
+    background-image: linear-gradient(bottom, #505050 0%, #707070 100%)
+    background-image: -o-linear-gradient(bottom, #505050 0%, #707070 100%)
+    background-image: -moz-linear-gradient(bottom, #505050 0%, #707070 100%)
+    background-image: -webkit-linear-gradient(bottom, #505050 0%, #707070 100%)
+    background-image: -ms-linear-gradient(bottom, #505050 0%, #707070 100%)
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #505050), color-stop(1, #707070))
+    background-position: center top
+    background-repeat: no-repeat
+    -webkit-border-radius: 30px
+    -moz-border-radius: 30px
+    border-radius: 30px
+    border: 2px solid #808080
+    color: #FFF
+    font: bold 12px Arial, Helvetica, sans-serif
+    text-align: center
+    text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25)
+    width: 100%
+  
+  .uploadify:hover .uploadify-button
+    background-color: #606060
+    background-image: linear-gradient(top, #606060 0%, gray 100%)
+    background-image: -o-linear-gradient(top, #606060 0%, gray 100%)
+    background-image: -moz-linear-gradient(top, #606060 0%, gray 100%)
+    background-image: -webkit-linear-gradient(top, #606060 0%, gray 100%)
+    background-image: -ms-linear-gradient(top, #606060 0%, gray 100%)
+    background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #606060), color-stop(1, gray))
+    background-position: center bottom
+  
+  .uploadify-button.disabled
+    background-color: #D0D0D0
+    color: #808080
+  
+  .uploadify-queue
+    margin-bottom: 1em
+    position: fixed
+    top: 0px
+    right: 0px
+  
+  .uploadify-queue-item
+    @include opacity(70)
+    background: #000000
+    color: white
+    border: 1px solid white
+    -webkit-border-radius: 3px
+    -moz-border-radius: 3px
+    border-radius: 3px
+    font: 11px Verdana, Geneva, sans-serif
+    margin-top: 5px
+    max-width: 350px
+    padding: 10px
+  
+  .uploadify-error
+    background-color: #FDE5DD !important
+  
+  .uploadify-queue-item
+    .cancel
+      display: none
+    &.completed
+      background-color: #E5E5E5
+  
+  .uploadify-progress
+    background-color: #E5E5E5
+    margin-top: 10px
+    width: 100%
+  
+  .uploadify-progress-bar
+    background-color: #0099FF
+    height: 3px
+    width: 1px
+