devape_cms 0.1.7 → 0.1.8

data/app/controllers/abstract_member_controller.rb

@@ -1,7 +1,7 @@
 class AbstractMemberController < ApplicationController
   protect_from_forgery
   layout "member/layout"
-  before_filter :authenticate_user!, :except => [:thanks]
+  before_filter :authenticate_member!, :except => [:thanks]
   before_filter :page_filter
 
   def page_filter

data/app/controllers/posts_controller.rb

@@ -1,4 +1,4 @@
-class PostsController < ApplicationController
+class PostsController < AbstractAdminController
   before_filter :authenticate_admin!, :except => [:show, :cms, :index]
   # GET /posts
   # GET /posts.xml
@@ -67,7 +67,7 @@ class PostsController < ApplicationController
 
     respond_to do |format|
       if @post.save
-        format.html { redirect_to(@post, :notice => 'Post was successfully created.') }
+        format.html { redirect_to([:admin, @post], :notice => 'Post was successfully created.') }
         format.xml  { render :xml => @post, :status => :created, :location => @post }
       else
         format.html { render :action => "new" }
@@ -83,7 +83,7 @@ class PostsController < ApplicationController
 
     respond_to do |format|
       if @post.update_attributes(params[:post])
-        format.html { redirect_to(@post, :notice => 'Post was successfully updated.') }
+        format.html { redirect_to([:admin, @post], :notice => 'Post was successfully updated.') }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }
@@ -99,7 +99,7 @@ class PostsController < ApplicationController
     @post.destroy
 
     respond_to do |format|
-      format.html { redirect_to(posts_url) }
+      format.html { redirect_to(admin_posts_url) }
       format.xml  { head :ok }
     end
   end

data/app/models/admin.rb

@@ -1,3 +1,5 @@
 class Admin < User
   has_many :posts
+  devise :database_authenticatable,
+         :recoverable, :rememberable, :trackable, :validatable
 end

data/app/models/member.rb

@@ -0,0 +1,4 @@
+class Member < User
+  devise :database_authenticatable,:registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+end

data/app/models/user.rb

@@ -0,0 +1,8 @@
+class User < ActiveRecord::Base
+ attr_accessible :firstname, :lastname
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
+
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation, :remember_me
+end

data/app/views/layouts/_devise_nav_with_settings.html.erb

@@ -1,9 +1,9 @@
 <div class="devise-nav-right">
-  <% if current_user %>
-    Welcome, <%= current_user.firstname %> | <a href="/member/settings">Settings</a> |
-    <%= link_to :logout, destroy_user_session_path, :method => :delete  %>
+  <% if current_member %>
+    Welcome, <%= current_member.firstname %> | <a href="/member/settings">Settings</a> |
+    <%= link_to :logout, destroy_member_session_path, :method => :delete  %>
 
   <% else %>
-    <a href="/users/sign_in">Sign In</a> | <a href="/users/sign_up">Sign Up</a>
+    <a href="/members/sign_in">Sign In</a> | <a href="/members/sign_up">Sign Up</a>
   <% end %>
 </div>

data/app/views/posts/_form.html.erb

@@ -1,5 +1,5 @@
 <%= render 'js' %>
-<%= form_for(@post) do |f| %>
+<%= form_for([:admin, @post]) do |f| %>
   <% if @post.errors.any? %>
     <div id="error_explanation">
       <h2><%= pluralize(@post.errors.count, "error") %> prohibited this post from being saved:</h2>

data/app/views/posts/base.html.erb

@@ -0,0 +1,2 @@
+<%= raw @post.contents.where(:title=>'guns').first.content %>
+<%= raw @post.contents.where(:title=>'more').first.content %>

data/app/views/posts/edit.html.erb

@@ -2,5 +2,5 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Show', @post %> |
-<%= link_to 'Back', posts_path %>
+<%= link_to 'Show', [:admin, @post] %> |
+<%= link_to 'Back', admin_posts_path %>

data/app/views/posts/index.html.erb

@@ -17,10 +17,10 @@
         <%= post.parent.title %>
         <% end %>
     </td>
-    <td><%= link_to 'show', post %></td>
+    <td><%= link_to 'show', [:admin, post] %></td>
     <% if admin_signed_in? %>
-      <td><%= link_to 'Edit', edit_post_path(post) %></td>
-      <td><%= link_to 'Destroy', post, :confirm => 'Are you sure?', :method => :delete %></td>
+      <td><%= link_to 'Edit', edit_admin_post_path(post) %></td>
+      <td><%= link_to 'Destroy', [:admin, post], :confirm => 'Are you sure?', :method => :delete %></td>
     <% end %>
   </tr>
 <% end %>
@@ -29,5 +29,5 @@
 <br />
 
     <% if admin_signed_in? %>
-<%= link_to 'New Post', new_post_path %>
+<%= link_to 'New Post', new_admin_post_path %>
     <% end %>

data/app/views/posts/new.html.erb

@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', posts_path %>
+<%= link_to 'Back', admin_posts_path %>

data/app/views/posts/show.html.erb

@@ -18,6 +18,6 @@
 
 
 <% if (current_admin) %>
-<%= link_to 'Edit', edit_post_path(@post) %> |
+<%= link_to 'Edit', edit_admin_post_path(@post) %> |
 <% end %>
-<%= link_to 'Back', posts_path %>
+<%= link_to 'Back', admin_posts_path %>

data/config/routes.rb

@@ -1,13 +1,13 @@
 Rails.application.routes.draw do
   namespace "admin" do
     root :to => "home#dashboard"
+    resources :posts
   end
   namespace "member" do
     root :to => "home#dashboard"
     match '/settings' => 'settings#index'
   end
   resources :categories
-  resources :posts
   match '/:title' => 'categories#cms'
   match '/:id'    => 'posts#cms'
 end

data/lib/devape_cms.rb

@@ -26,5 +26,5 @@ module DevapeCms
   extend DevapeAdminNavigation::Hooks
 end
 
-DevapeCms.register_navigation_item('/member/posts')
-DevapeCms.register_admin_item('/posts')
+#DevapeCms.register_navigation_item('/member/posts')
+DevapeCms.register_admin_item('/admin/posts')

data/lib/rails/generators/devape_cms/devape_cms_generator.rb

@@ -14,10 +14,14 @@ class DevapeCmsGenerator < Rails::Generators::Base
     generate "devise user" # or whatever you want here
     generate "migration add_name_to_users firstname:string lastname:string type:string"
     generate "friendly_id"
-    route "devise_for :admins"
     route "root :to => 'home#index'"
 
     copy_file "admin.rb", "app/models/admin.rb"
+    copy_file "member.rb", "app/models/member.rb"
+    copy_file "user.rb", "app/models/user.rb"
+
+    route "devise_for :admins"
+    route "devise_for :members"
 
     if(!File.directory?  'public/javascripts')
         puts 'create public/javascripts'
@@ -34,6 +38,5 @@ class DevapeCmsGenerator < Rails::Generators::Base
     FileUtils.cp_r current_root + '/tiny_mce', 'public/javascripts/tiny_mce'
     generate "devape_cms_after"
     FileUtils.rm 'app/views/layouts/application.html.erb'
-
   end
 end

data/lib/rails/generators/devape_cms/templates/member.rb

@@ -0,0 +1,3 @@
+class Member < User
+  devise :registerable
+end

data/lib/rails/generators/devape_cms/templates/user.rb

@@ -0,0 +1,10 @@
+class User < ActiveRecord::Base
+ attr_accessible :firstname, :lastname
+  # Include default devise modules. Others available are:
+  # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation, :remember_me
+end

data/lib/rails/generators/devape_cms_after/devape_cms_after_generator.rb

@@ -4,8 +4,8 @@ require 'rails/generators/migration'
 class DevapeCmsAfterGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
   def setup
-     inject_into_class "app/models/user.rb", User do
-       " attr_accessible :firstname, :lastname \n"
-     end
+     #inject_into_class "app/models/user.rb", User do
+     #  " attr_accessible :firstname, :lastname \n"
+     #end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devape_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-12 00:00:00.000000000Z
+date: 2011-08-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8190840 !ruby/object:Gem::Requirement
+  requirement: &24414280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8190840
+  version_requirements: *24414280
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &8190400 !ruby/object:Gem::Requirement
+  requirement: &24413840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8190400
+  version_requirements: *24413840
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &8189980 !ruby/object:Gem::Requirement
+  requirement: &24413420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8189980
+  version_requirements: *24413420
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &8189480 !ruby/object:Gem::Requirement
+  requirement: &24445740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 3.3.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *8189480
+  version_requirements: *24445740
 description: Insert DevapeCms description.
 email: 
 executables: []
@@ -328,6 +328,8 @@ files:
 - lib/rails/generators/devape_cms/templates/tiny_mce/license.txt
 - lib/rails/generators/devape_cms/templates/new.html.erb
 - lib/rails/generators/devape_cms/templates/initializer.rb
+- lib/rails/generators/devape_cms/templates/user.rb
+- lib/rails/generators/devape_cms/templates/member.rb
 - lib/rails/generators/devape_cms/templates/jquery-ui-1.8.14.custom.css
 - MIT-LICENSE
 - Rakefile
@@ -361,6 +363,7 @@ files:
 - app/views/categories/index.html.erb
 - app/views/posts/edit.html.erb
 - app/views/posts/cms.html.erb
+- app/views/posts/base.html.erb
 - app/views/posts/_js.html.erb
 - app/views/posts/notfound.html.erb
 - app/views/posts/new.html.erb
@@ -382,6 +385,8 @@ files:
 - app/models/post.rb
 - app/models/category.rb
 - app/models/content.rb
+- app/models/user.rb
+- app/models/member.rb
 - config/routes.rb
 - public/javascripts/tiny_mce/utils/form_utils.js
 - public/javascripts/tiny_mce/utils/editable_selects.js