stiki 0.1.3 → 0.1.4

data/app/assets/stylesheets/stiki/spaces.css

@@ -2,3 +2,25 @@
   Place all the styles related to the matching controller here.
   They will automatically be included in application.css.
 */
+
+.stiki {
+    .space {
+        .action {
+          float: right; 
+        
+          .update {
+            margin-right: 5px; 
+          }
+          
+          .delete {
+            border: 0;
+            background-color: white;
+          }
+        }
+      
+      
+      .title {
+        float: left;
+      }
+    }
+}

data/app/controllers/stiki/spaces_controller.rb

@@ -8,6 +8,9 @@ module Stiki
     end
     
     # def show handled by PageController#index
+    def edit
+      @space = Space.find(params[:id])
+    end
     
     def create
       @space = Space.new(params[:space])
@@ -26,6 +29,26 @@ module Stiki
       redirect_to stiki_routes.spaces_path
     end
     
+    def update
+      @space = Space.find(params[:id])
+      @space.attributes = params[:space]
+      
+      if Stiki.authenticate_by == :devise
+        author = Author.new
+        author.user = self.send( "current_#{Stiki::Helper.user_model_name}".to_sym )
+        @space.authors << author
+      end
+      
+      if @space.save
+        flash[:notice] = "Space Updated"
+        
+        redirect_to stiki_routes.spaces_path
+      else
+        flash[:error] = "Error creating new Space"
+        render :template => 'stiki/spaces/edit'
+      end
+    end
+    
     def destroy
       @space = Space.find( params[:id] )
       
@@ -33,7 +56,7 @@ module Stiki
         flash[:error] = "Cannot delete a Wiki Space that has Wiki Pages"
       else
         @space.destroy
-        flash[:info] = "The Space #{@space.name} has been deleted"
+        flash[:notice] = "The Space #{@space.name} has been deleted"
       end
       
       redirect_to stiki_routes.spaces_path

data/app/helpers/stiki/application_helper.rb

@@ -17,7 +17,9 @@ module Stiki
     end
     
     def user_name( author )
-      author.user.send( Stiki.user_name_via ) if author && author.user
+      if Stiki.user_name_via 
+        author.user.send( Stiki.user_name_via ) if author && author.user
+      end
     end
   end
 end

data/app/models/stiki/space.rb

@@ -6,7 +6,13 @@ module Stiki
     friendly_id :name, use: :slugged
     
     has_many :pages
-    has_many :authors, :as => :authorable
+    has_many :authors, :as => :authorable do
+      def <<(*authors)
+        # prevent duplicate authors
+        existing_users = proxy_association.owner.authors.map(&:user_id)
+        super( authors.select { |auth| !existing_users.include?( auth.user_id ) } )
+      end
+    end
     has_one :creator, :class_name => 'Author', :conditions => ["creator = ?", true], :as => :authorable
     
     attr_accessible :name

data/app/views/stiki/pages/edit.html.erb

@@ -1,5 +1,5 @@
 <div class="row-fluid">
-  <div class="span8">
+  <div class="span12">
     <div class="row-fluid well">
       <h2>Edit <%= @page.title %></h2>
     </div>

data/app/views/stiki/pages/new.html.erb

@@ -1,9 +1,8 @@
 <div class="row-fluid">
-  <div class="span8">
+  <div class="span12">
     <div class="row-fluid well">
       <h2>New Page in <%= @space.name %></h2>
     </div>
-          
     <div class="row-fluid well">
       <%= form_tag( stiki_routes.space_pages_path(@space), :class => 'form-horizontal' ) do |f| %>
         <%= render( :partial => 'stiki/pages/form', :locals => { :f => f, :page => @page  } ) %>

data/app/views/stiki/spaces/edit.html.erb

@@ -0,0 +1,39 @@
+<div class="stiki row-fluid">
+  <div class="span12">
+    <div class="row-fluid well">
+      <h2>Edit <%= @space.name %></h2>
+    </div>
+          
+    <div class="row-fluid well">
+      <%= form_tag( stiki_routes.space_path(@space), :class => 'form-horizontal', :method => :put) do |f| %>
+         <fieldset>
+    
+          <%- if @space.errors %>
+            <div class="control-group error">
+              <%- @space.errors.full_messages.each do |error| %>
+                <div class="error help-block">
+                  <%= error %>
+                </div>
+              <% end -%>
+            </div>
+          <% end -%>
+          
+          <div class="control-group">
+              <%= label_tag 'name', 'Name', :class => "control-label" %>
+              <div class="controls">
+                <input class="field input-xlarge span11" id="name" name="space[name]"  value="<%= @space.name %>" size="30" type="text">
+              </div>
+          </div>
+          <div class="form-actions">
+            <div class="span4">
+              <%= submit_tag "Save", :class => "btn btn-primary btn-large" %>
+            </div>
+            <div class="span2">
+                <%= link_to 'Cancel', stiki_routes.spaces_path(), :class => 'btn' %>
+            </div>
+          </div>
+        </fieldset>
+      <% end -%>
+    </div>
+  </div>
+</div>

data/app/views/stiki/spaces/index.html.erb

@@ -1,57 +1,62 @@
-<%- @spaces.each do |space| %>
-  <div class="row-fluid">
-    <div class="span8 well">
-      <div style="float:right">
-        <%- if has_access( :update, @page ) %>
-          <%= button_to "X", stiki_routes.space_path( space ), :method => :delete, 
-               :class => 'close', :confirm => 'Are you sure you want to delete this Wiki Space?' %>
-        <% end -%>
+<div class='stiki'>
+    <%- @spaces.each do |space| %>
+      <div class="row-fluid">
+        <div class="span8 well space">
+          <div class="action">
+            <%- if has_access( :update, @page ) %>
+              <%= link_to '<i class="icon-pencil"></i>'.html_safe, stiki_routes.edit_space_path( space ), :class => 'update close' %>
+            <% end %>
+            <%- if has_access( :delete, @page ) %>
+              <%= button_to 'x', stiki_routes.space_path( space ), :method => :delete, 
+                   :class => 'delete close', :confirm => 'Are you sure you want to delete this Wiki Space?' %>
+            <% end -%>
+          </div>
+          <div style="title">
+            <h2 ><%= link_to space.name, stiki_routes.space_pages_path(space) %></h2>
+            <% if space.creator %>
+              <h4 >Created by <%= user_name( space.creator ) %></h4>
+            <% end %>
+          </div>
+        </div>
       </div>
-      <div style="float:left">
-        <h2 ><%= link_to space.name, stiki_routes.space_pages_path(space) %></h2>
-        <% if space.creator %>
-          <h4 >Created by <%= user_name( space.creator ) %></h4>
-        <% end %>
+    <% end -%>
+    <%- if has_access( :create, Stiki::Space ) %>
+      <%- if javascript_enabled %>
+      <div class="row-fluid create-space">
+        <div class="span8 well">
+          <a href="#" class="create-space-trigger">Create New Space</a>
+        </div>
       </div>
-    </div>
-  </div>
-<% end -%>
-<%- if has_access( :create, Stiki::Space ) %>
-  <%- if javascript_enabled %>
-  <div class="row-fluid create-space">
-    <div class="span8 well">
-      <a href="#" class="create-space-trigger">Create New Space</a>
-    </div>
-  </div>
-  <% end -%>
-  <div class="row-fluid create-space" style="<%= 'display:none' if javascript_enabled %>">
-    <div class="span8">
-      <div class="row-fluid">
-        <%= form_tag( stiki_routes.spaces_path, :class => 'form-horizontal' ) do |f| %>
-          <fieldset class="well">
-            <h2>Create New Space</h2>
-            <div class="control-group">
-                <%= label_tag 'name', 'Name', :class => "control-label" %>
-                <div class="controls">
-                  <input class="input-xlarge" id="name" name="space[name]" size="30" type="text">
+      <% end -%>
+      <div class="row-fluid create-space" style="<%= 'display:none' if javascript_enabled %>">
+        <div class="span8">
+          <div class="row-fluid">
+            <%= form_tag( stiki_routes.spaces_path, :class => 'form-horizontal' ) do |f| %>
+              <fieldset class="well">
+                <h2>Create New Space</h2>
+                <div class="control-group">
+                    <%= label_tag 'name', 'Name', :class => "control-label" %>
+                    <div class="controls">
+                      <input class="input-xlarge" id="name" name="space[name]" size="30" type="text">
+                    </div>
+                </div>
+                <div class="form-actions">
+                  <%= submit_tag "Create", :class => "btn btn-primary btn-large" %>
+                  <a href="#" class="create-space-trigger btn">Cancel</a>
                 </div>
-            </div>
-            <div class="form-actions">
-              <%= submit_tag "Create", :class => "btn btn-primary btn-large" %>
-              <a href="#" class="create-space-trigger btn">Cancel</a>
-            </div>
-          </fieldset>
-          <% end -%>
+              </fieldset>
+              <% end -%>
+          </div>
+        </div>
       </div>
-    </div>
-  </div>
-  <%- if javascript_enabled %>
-    <script type="text/javascript">
-      $(function() {
-        $('.create-space-trigger').click( function() {
-          $('.create-space').slideToggle();
-        });
-      });
-    </script>
-  <% end -%>
-<% end -%>
+      <%- if javascript_enabled %>
+        <script type="text/javascript">
+          $(function() {
+            $('.create-space-trigger').click( function() {
+              $('.create-space').slideToggle();
+            });
+          });
+        </script>
+      <% end -%>
+    <% end -%>
+</div>

data/lib/stiki/authenticate/devise.rb

@@ -7,9 +7,9 @@ module Stiki::Authenticate::Devise
       auth_required = Stiki.auth_mapping[base.controller_name.to_sym]
       if auth_required
         if auth_required == :all
-          base.before_filter "authenticate_#{Stiki::Helper.user_model_name}!".to_sym
+          base.before_filter "authenticate_#{Stiki::Helper.user_model_name}!".to_sym, :if => lambda {|c| Stiki.authenticate_by == :devise }
         else
-          base.before_filter "authenticate_#{Stiki::Helper.user_model_name}!".to_sym, auth_required
+          base.before_filter "authenticate_#{Stiki::Helper.user_model_name}!".to_sym, auth_required.merge( :if => lambda {|c| Stiki.authenticate_by == :devise } )
         end
       end
     else

data/lib/stiki/authorize/cancan.rb

@@ -4,6 +4,6 @@ module Stiki::Authorize::Cancan
   def self.included(base)
     require 'cancan'
     require 'cancan/ability'
-    base.load_and_authorize_resource base.class.name
+    base.load_and_authorize_resource base.class.name, :if => lambda {|c| Stiki.authorize_by == :cancan }
   end 
 end

data/lib/stiki/version.rb

@@ -1,3 +1,3 @@
 module Stiki
-  VERSION = "0.1.3" 
+  VERSION = "0.1.4" 
 end

data/spec/controllers/stiki/pages_controller_spec.rb

@@ -6,6 +6,7 @@ describe Stiki::PagesController do
   before do
     Stiki.config do |stiki|
       stiki.user_class = 'Author'
+      stiki.authorize_by = false
     end
   end
   

data/spec/helpers/stiki/application_helper_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+require 'stiki/application_helper'
+require 'ostruct'
+
+describe Stiki::ApplicationHelper do
+  it "should expose Stiki routes" do
+    helper.stiki_routes.should eql Stiki::Engine.routes.url_helpers
+  end
+  
+  it "should expose Stiki#javascript_enabled as javascript_enabled" do
+    Stiki.javascript_enabled = false
+    helper.javascript_enabled.should be_false
+    
+    Stiki.javascript_enabled = true
+    helper.javascript_enabled.should be_true
+  end
+  
+  it "should get user_name for user" do
+    Stiki.user_name_via = :name
+    
+    author = OpenStruct.new
+    author.user = OpenStruct.new( :name => 'test' )
+    
+    helper.user_name( author ).should eql 'test'
+  end
+  
+  describe "#has_access" do 
+    before do 
+      view.stub!(:current_user).and_return( Author.new ) 
+    end 
+    
+    context "disabled" do
+      before do
+        Stiki.authorize_by = false
+      end
+      
+      it "should always be true" do
+        helper.has_access(:action, nil ).should be_true
+        helper.has_access(nil, Author.new ).should be_true
+      end
+    end
+    
+    context "enabled" do
+      before do
+        Stiki.authorize_by = :cancan
+      end
+      
+      it "should be authorized for index" do
+        helper.has_access(:index, Stiki::Author ).should be_true
+      end
+      
+      it "should not be authorized for create" do
+        helper.has_access(:create, Stiki::Author ).should be_false
+      end
+    end
+  end
+end

data/spec/lib/authenticate/devise_spec.rb

@@ -9,7 +9,7 @@ describe Stiki::Authenticate::Devise do
         stiki.authenticate_by = :devise
         stiki.user_class = 'Author'
         stiki.authenticate_pages = :all
-        stiki.authenticate_spaces = [:new, :create, :edit, :update]
+        stiki.authenticate_spaces = {:only => [:new, :create, :edit, :update]}
       end
     end
     

data/spec/lib/stiki_spec.rb

@@ -9,6 +9,7 @@ describe Stiki do
       Stiki.config do |stiki|
         stiki.authenticate_by = :devise
         stiki.user_class = 'Author'
+        stiki.user_name_via = :to_s
         stiki.authenticate_pages = {:only =>  [:blue, :green, :orange ] }
         stiki.authenticate_spaces = {:only => [:new, :create, :edit, :update] }
       end
@@ -18,7 +19,7 @@ describe Stiki do
       Stiki.authenticate_by.should eql :devise
     end
     
-    it "should set default user_name_via" do
+    it "should set user_name_via" do
       Stiki.user_name_via.should eql :to_s
     end
     

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require File.expand_path("../../test/dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'shoulda-matchers'
+require 'cancan'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -38,8 +39,7 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = "random"
-  
+  # config.order = "random"
   
   config.include FactoryGirl::Syntax::Methods
 end
@@ -49,6 +49,27 @@ class Author < ActiveRecord::Base
     self.table_name = "stiki_authors"
 end
 
+class Ability
+  include CanCan::Ability
+
+  def initialize(user)
+    # Define abilities for the passed in user here. For example:
+    #
+    author ||= Author.new # guest user (not logged in)
+  
+    can :manage, Stiki::Page
+    can :manage, Stiki::Space
+    can :index,  Stiki::Author
+    
+  end
+end
+
+class ActionView::TestCase::TestController    
+    def current_user
+      Author.new
+    end
+end
+
 
 # Shim the Stiki ApplicationController to get access to the filters
 # and stub the devise before_filter method
@@ -67,11 +88,15 @@ class Stiki::ApplicationController
   end
   
   def current_author
-    
+    Author.new
   end
   
   def authenticate_author!
     
   end
+  
+  def current_ability
+    @current_ability ||= Ability.new(current_author)
+  end
 
 end