classiccms 0.5.6 → 0.5.7

data/Guardfile

@@ -1,5 +1,6 @@
 
 # --drb
-guard 'rspec', :cli => "--fail-fast", :notification => false do
-  watch /(lib|spec).*/
+guard :rspec, :cli => "--fail-fast" do
+  #watch(%r{^.*$}) #{|m| "spec/#{m[1]}_spec.rb" }
+  #watch(%r{^spec/(.+)\.rb$}) #{|m| "spec/#{m[1]}_spec.rb" }
 end

data/classiccms.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rack-test"
 
   #database
-  s.add_runtime_dependency "mongoid", '2.4.11'
+  s.add_runtime_dependency "mongoid", '3.0.3'
   s.add_runtime_dependency "mongo", '1.6.2'
   s.add_runtime_dependency "bson_ext", '1.5'
 

data/lib/classiccms/application.rb

@@ -58,7 +58,7 @@ module Classiccms
 
     #FROM App
     #require mongoid
-    Mongoid.load!(File.join(Dir.pwd, 'config/mongoid.yml'))
+    Mongoid.load!(File.join(Dir.pwd, 'config/mongoid.yml'), ENV['RACK_ENV'])
 
     $app.configure do |d|
       d.url_format = '/assets/:job'

data/lib/classiccms/controllers/website.rb

@@ -26,7 +26,7 @@ module Classiccms
     end
     get '/:id/?*' do
       response.headers['Cache-Control'] = 'no-cache'
-      pass unless Slug.exists?(conditions: {_id: params[:id]})
+      pass unless Slug.where(_id: params[:id]).exists?
       index = CONFIG[:home].kind_of?(String) ? CONFIG[:home] : 'application/index'
 
 

data/lib/classiccms/custom.rb

@@ -1,16 +1,25 @@
 class ImageField
-  include Mongoid::Fields::Serializable
+  #include Mongoid::Fields::Serializable
 
-  def deserialize(object)
-    Image.find(object).file
-  end
+  class << self
+
+    # Get the object as it was stored in the database, and instantiate
+    # this custom class from it.
+    def demongoize(object)
+      Image.find(object).file
+    end
 
-  def serialize(object)
-    if object.class == BSON::ObjectId
-      return object
-    else
-      return BSON::ObjectId(object)
+    # Takes any possible object and converts it to how it would be
+    # stored in the database.
+    def mongoize(object)
+      case object
+      when BSON::ObjectId then object
+      else BSON::ObjectId(object)
+      end
     end
+
+    # Converts the object that was supplied to a criteria and converts it
+    # into a database friendly form.
   end
 end
 

data/lib/classiccms/helpers.rb

@@ -108,7 +108,7 @@ module Classiccms
 
     #simple function that return id if user is allowed to sort the item
     def sort(object)
-      if object.kind_of? BSON::ObjectId or object.kind_of? String
+      if object.kind_of? Moped::BSON::ObjectId or object.kind_of? String
         object = Base.where(:_id => object).first
       end
       if @user != nil

data/lib/classiccms/lib/routing.rb

@@ -3,7 +3,7 @@ module Classiccms
 
     #in charge of get the first item of a given model (for menu items etc.)
     def get_first_item
-      Base.where(:_type => CONFIG[:model], :connections.matches => {:parent => nil, :section => CONFIG[:section], :order_id.lte => 1}).first
+      Base.where(:_type => CONFIG[:model], :'connections.parrent' => nil, :'connections.section' => CONFIG[:section], :'connections.order_id'.lte => 1).first
     end
 
     #This method will get you the most awesome route through a tree! (OMG!)

data/lib/classiccms/models/base.rb

@@ -1,5 +1,7 @@
 require 'mongoid'
-
+Mongoid::Fields.option :input do |model, field, value|
+  #model.validates_presence_of field if value
+end
 class Base
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -15,7 +17,7 @@ class Base
 
 
   def remove_slugs
-    Slug.where(:document_id => id).destroy
+    Slug.delete_all(:document_id => id)
   end
   def remove_connections
     records = Base.where(:'connections.parent_id' => id)

data/lib/classiccms/models/connection.rb

@@ -3,7 +3,7 @@ class Connection
   embedded_in :base
 
 	field :order_id,  type: Integer, default: 0
-	field	:parent_id, type: BSON::ObjectId
+	field	:parent_id, type: Moped::BSON::ObjectId
   field :file,      type: String
   field :section,   type: String
 
@@ -12,7 +12,7 @@ class Connection
   validate :parent_id_should_exist
 
 	def parent_id_should_exist
-    if parent_id != nil and !Base.exists?(conditions: {id: parent_id})
+    if parent_id != nil and !Base.where(_id: parent_id).exists?
       errors.add :parent_id, "id doesn't exist"
     end
 	end

data/lib/classiccms/models/slug.rb

@@ -2,25 +2,25 @@ require 'cgi'
 
 class Slug
 	include Mongoid::Document
-  identity :type => String
-	field :document_id, type: BSON::ObjectId
+  field :_id, :type => String
+	field :document_id, type: Moped::BSON::ObjectId
 
   #validations
   validate :document_id_should_exist
 
   def document_id_should_exist
-    if !Base.exists?(conditions: {id: document_id})
+    if !Base.where(_id: document_id).exists?
       errors.add :document_id, "id doesn't exist"
     end
   end
 
   def generate_id
     i = 0
-    i+=1 while Slug.exists? conditions: {id: i.to_s}
+    i+=1 while Slug.where(_id: i.to_s).exists?
     self.id = i.to_s
   end
   def set_id(url)
-    Slug.where(id: url).delete_all
-    self.id = url.gsub(/[^a-zA-Z0-9\-\/]+/, '-').downcase
+    Slug.delete_all(_id: url)
+    self._id = url.gsub(/[^a-zA-Z0-9\-\/]+/, '-').downcase
   end
 end

data/lib/classiccms/scaffold/config/mongoid.yml

@@ -1,7 +1,7 @@
 defaults: &defaults
-  host: 127.0.0.1
-  port: 27017
   logger: false
+  hosts:
+    - localhost:27017
   # slaves:
   #   - host: slave1.local
   #     port: 27018
@@ -9,14 +9,23 @@ defaults: &defaults
   #     port: 27019
 
 development:
-  <<: *defaults
-  database: $_development
+  sessions:
+    default:
+      hosts:
+      - localhost:27017
+      database: $_development
 
 test:
-  <<: *defaults
-  database: $_test
+  sessions:
+    default:
+      hosts:
+      - localhost:27017
+      database: $_test
 
 # set these environment variables on your prod server
 production:
-  <<: *defaults
-  database: $
+  sessions:
+    default:
+      hosts:
+      - localhost:27017
+      database: $

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/lib/classiccms/views/cms/add_window.haml

@@ -7,7 +7,7 @@
     = show :form, {}, {:record => record}
     #edit_bottom
     #edit_bottom_nav
-      - if !record.new?
+      - if !record.new_record?
         .delete{:id => record.id}
         .delete_item item verwijderen
       .cancel

data/lib/classiccms/views/cms/form.haml

@@ -1,7 +1,7 @@
-%form{:action=>"/cms/#{record.new? ? 'create' : 'update' }", :method=>'post', :enctype=>'multypart/form-date'}
+%form{:action=>"/cms/#{record.new_record? ? 'create' : 'update' }", :method=>'post', :enctype=>'multypart/form-date'}
   #edit_bg
     - model = record.class
-    - if !record.new?
+    - if !record.new_record?
       %input{:type=>'hidden', :name=> "[#{model}][id]", :value=> record.id}
     - model.fields.each do |key, info|
       .item
@@ -23,7 +23,7 @@
           - when 'images'
           - else
             %label Comming soon
-    - if record.new?
+    - if record.new_record?
       - record.connections.each do |connection|
         %input{:type=> 'hidden', :name=> "[#{record.class}][connections][][id]",      :value => connection.id}
         %input{:type=> 'hidden', :name=> "[#{record.class}][connections][][parent_id]",  :value => connection.parent_id}

data/spec/config/mongoid.yml

@@ -1,22 +1,11 @@
-defaults: &defaults
-  host: 127.0.0.1
-  port: 27017
-  logger: false
-  # slaves:
-  #   - host: slave1.local
-  #     port: 27018
-  #   - host: slave2.local
-  #     port: 27019
-
 development:
-  <<: *defaults
-  database: ClassicCMS_development
-
+  sessions:
+    default:
+      database: mongoid
+        - localhost:27017
 test:
-  <<: *defaults
-  database: ClassicCMS_test
-
-# set these environment variables on your prod server
-production:
-  <<: *defaults
-  database: ClassicCMS
+  sessions:
+    default:
+      database: mongoid
+      hosts:
+        - localhost:27017

data/spec/controllers/appliction_spec.rb

@@ -63,6 +63,7 @@ describe Classiccms do
   end
   it 'logout should destroy all session variables' do
     file 'haml', "= session[:user_id]" do
+      User.all.destroy
       u = create :user
       post '/login', {:username => u.username, :password => u.password}
       follow_redirect!

data/spec/helpers_spec.rb

@@ -99,11 +99,10 @@ describe Classiccms do
     it 'should return the rendered file' do
       with_constants :CONFIG => {home: 'application/index4', model: 'Menu', section: 'menu'} do
         set_file "views/application/index4.haml", "= layout 'menu', 1"
-        create_dir 'views/Menu'
-        set_file "views/Menu/index.haml", "%h1 menu"
+        create_dir 'views/menu'
+        set_file "views/menu/index.haml", "%h1 menu"
 
         m = Menu.create connections: [Connection.new(section: 'menu', file: 'index')]
-        m.connections
 
         get '/'
         last_response.body.should == "<h1>menu</h1>\n"

data/spec/models/base_spec.rb

@@ -37,7 +37,7 @@ describe 'Base' do
     b1 = Base.create
     Slug.create(:document_id => b1.id)
     Slug.count.should == 1
-    b1.destroy
+    b1.destroy!
 
     Slug.count.should == 0
   end

data/spec/models/connection_spec.rb

@@ -30,7 +30,7 @@ describe :Connection do
     end
     it 'should not allow a string' do
       @connection.order_id = 'string'
-      @connection.valid?.should == false
+      @connection.order_id.should == 0
     end
     it 'should set 0 as default' do
       @connection.order_id.should == 0

data/spec/models/slug_spec.rb

@@ -69,14 +69,13 @@ describe :Slug do
       @slug.id.should == 'string'
     end
     it 'should remove exissting slugs with the same id' do
-      slug = Slug.new document_id: Base.create.id
-      slug.set_id 'string'
-      slug.save
+      slug = Slug.create _id: 'string', document_id: Base.create.id
+      
 
       @slug.set_id 'string'
       @slug.save
 
-      Slug.count.should == 1
+      Slug.all.count.should == 1
     end
     it 'should sanetize the slug' do
       @slug.set_id 'test test'

data/spec/spec_helper.rb

@@ -18,10 +18,10 @@ require 'sinatra'
 set :environment, :test
 
 RSpec.configure do |config|
-  Mongoid.load!("spec/config/mongoid.yml")
+  Mongoid.load!("spec/config/mongoid.yml", :test)
 
   config.before(:each) do
-  	Mongoid.master.collections.reject { |c|  c.name =~ /^system./ }.each(&:drop)
+  	Mongoid.default_session.collections.select {|c| c.name !~ /system/ }.each(&:drop)
   end
   config.include Rack::Test::Methods
   config.include FactoryGirl::Syntax::Methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classiccms
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.11
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.11
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: mongo
   requirement: !ruby/object:Gem::Requirement