classiccms 0.6.7 → 0.6.8

data/lib/classiccms/helpers.rb

@@ -8,14 +8,14 @@ module Classiccms
 
     #insert the header for CMS to work
     def cms
-      if defined? @user
+      if @user != nil and @user.admin?
         show :header, views: File.join(Classiccms::ROOT, 'views/cms')
       end
     end
 
     #insert the logout button
     def logout
-      if @user != nil
+      if @user != nil and @user.admin?
         show :logout, views: File.join(Classiccms::ROOT, 'views/cms')
       end
     end
@@ -92,7 +92,7 @@ module Classiccms
           item[1] = get_parent_id(item[1])
         end
       end
-      if @user != nil
+      if @user != nil and @user.admin?
         info = Base64.encode64(items.to_s.encrypt)
         show :add, {views: File.join(Classiccms::ROOT, 'views/cms')}, {encrypteddata: info}
       end
@@ -101,7 +101,7 @@ module Classiccms
     #returns the html for edit button
     def edit(id)
       records = Base.where(_id: id)
-      if records.count > 0 and @user != nil
+      if records.count > 0 and @user != nil and @user.admin?
         info = Base64.encode64 records.first.id.to_s.encrypt
 
         show :edit, {views: File.join(Classiccms::ROOT, 'views/cms')}, {encrypteddata: info}
@@ -113,7 +113,7 @@ module Classiccms
       if object.kind_of? Moped::BSON::ObjectId or object.kind_of? String
         object = Base.where(:_id => object).first
       end
-      if @user != nil
+      if @user != nil and @user.admin?
         object.id.to_s
       end
     end

data/lib/classiccms/scaffold/app/models/user.rb

@@ -0,0 +1,16 @@
+class User
+  include Mongoid::Document
+
+  field :username, type: String
+  field :password
+
+  ##validations
+  validates_uniqueness_of :username
+  validates_length_of     :username, minimum: 3, maximum: 25
+  validates_length_of     :password, minimum: 3, maximum: 25
+
+
+  def admin?
+    return true
+  end
+end

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classiccms
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -329,8 +329,6 @@ files:
 - lib/classiccms/models/connection.rb
 - lib/classiccms/models/image.rb
 - lib/classiccms/models/slug.rb
-- lib/classiccms/models/uploader.rb
-- lib/classiccms/models/user.rb
 - lib/classiccms/public/admin/bootstrap/css/bootstrap-responsive.css
 - lib/classiccms/public/admin/bootstrap/css/bootstrap-responsive.min.css
 - lib/classiccms/public/admin/bootstrap/css/bootstrap.css
@@ -1523,6 +1521,7 @@ files:
 - lib/classiccms/scaffold/Rakefile
 - lib/classiccms/scaffold/app/controllers/form.rb
 - lib/classiccms/scaffold/app/models/Article.rb
+- lib/classiccms/scaffold/app/models/user.rb
 - lib/classiccms/scaffold/app/queue/mail.rb
 - lib/classiccms/scaffold/app/views/application/index.haml
 - lib/classiccms/scaffold/config.ru

data/lib/classiccms/models/uploader.rb

@@ -1,17 +0,0 @@
-#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/models/user.rb

@@ -1,11 +0,0 @@
-class User
-	include Mongoid::Document
-
-	field :username, type: String
-	field :password
-
-	##validations
-  validates_uniqueness_of :username
-	validates_length_of     :username, minimum: 3, maximum: 25
-	validates_length_of     :password, minimum: 3, maximum: 25
-end