classiccms 0.3.6 → 0.3.7

data/lib/classiccms/helpers.rb

@@ -8,7 +8,9 @@ module Classiccms
 
     #insert the header for CMS to work
     def cms
-      show :header, views: File.join(Classiccms::ROOT, 'views/cms')
+      if defined? @user
+        show :header, views: File.join(Classiccms::ROOT, 'views/cms')
+      end
     end
 
     #insert the logout button

data/lib/classiccms/lib/routing.rb

@@ -21,7 +21,7 @@ module Classiccms
         end
         new = Array.new
         branches.each do |branch|
-          if new.count == 0 or new.count > branch.count
+          if branch != nil and (new.count == 0 or new.count > branches.count)
             new = branch
           end
         end

data/lib/classiccms/scaffold/.gitignore

@@ -2,3 +2,4 @@ vendor/**/*
 .bin/*
 .sass-cache/**
 .bundle/*
+assets/**/*

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

@@ -10,7 +10,7 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: $_production
+  database: $_development
 
 test:
   <<: *defaults

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/spec/helpers_spec.rb

@@ -28,8 +28,16 @@ describe Classiccms do
     end
   end
   describe 'cms helper' do
-    it 'should render cms' do
+    it 'should not render cms if not logged in' do
       with_constants :CONFIG => {:home => 'application/cms'} do
+        set_file 'views/application/cms.haml', "= cms"
+        get '/'
+        last_response.body.should_not match('script')
+      end
+    end
+    it 'should render cms if logged in' do
+      with_constants :CONFIG => {:home => 'application/cms'} do
+        login
         set_file 'views/application/cms.haml', "= cms"
         get '/'
         last_response.body.should match('script')

data/spec/lib/routing_spec.rb

@@ -71,5 +71,9 @@ describe Classiccms do
       m2 = Menu.create connections: [Connection.new(parent_id: m1.id)]
       get_route(m2).should  == [m2.id, m1.id]
     end
+    it 'should return something' do
+      m1 = Menu.create connections: [Connection.new(parent_id: nil)]
+      get_route(m1).should  == [m1.id]
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classiccms
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-07 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec