cmtool 0.4.0 → 2.0.0

data/lib/cmtool/includes/user.rb

@@ -3,25 +3,23 @@ module Cmtool
     module User
       def self.included(klass)
         klass.send :include, SimplyStored::Couch
-        klass.send :include, Devise::Orm::SimplyStored
+        #klass.send :include, Devise::Orm::SimplyStored
         klass.send :include, InstanceMethods
         klass.send :extend, ClassMethods
 
         klass.property :is_admin, type: :boolean
         klass.property :active, type: :boolean, default: true
 
-        klass.devise :database_authenticatable, :recoverable, :rememberable, :trackable
-
 
         #== VALIDATIONS
         klass.validates_presence_of :email
         klass.validates_uniqueness_of :email, if: lambda{ |u| u.email.present? }
         klass.validates_presence_of :encrypted_password, if: lambda{ |u| u.email.present? }
         klass.validates_confirmation_of :password, if: lambda{ |u| u.password.present? }
-    
 
         klass.view :by_email, key: :email
       end
+
       module InstanceMethods
         def google?
           false

data/lib/cmtool/menu.rb

@@ -48,6 +48,15 @@ module Cmtool
         return false if args.first.to_s.last == '?'
         @register.send(*args)
       end
+
+      def engine_link?
+        false
+      end
+
+      def resource_link?
+        false
+      end
+
     end
 
     ##
@@ -55,7 +64,7 @@ module Cmtool
     ##
     class Divider < ElementBase
     end
-    
+
     ##
     # A group element, works as a new kind of menu, but then within another one
     ##
@@ -65,8 +74,9 @@ module Cmtool
         @register = Register.new
         @options = options
         @block = block
-        @register.instance_eval &block
+        @register.instance_eval(&block)
       end
+
       def title
         @register.title.respond_to?(:call) ? @register.title.call : @register.title
       end
@@ -79,6 +89,33 @@ module Cmtool
       end
     end
 
+    ##
+    # Engine link, links to an engine. Root by default
+    ##
+    class EngineLink < ElementBase
+      attr_reader :engine
+      def initialize(engine, options = {})
+        @engine, @options = engine, options
+      end
+
+      def engine_link?
+        true
+      end
+
+
+      def title
+        options[:title] || engine.name.split('::').first
+      end
+
+      def path
+        case options[:path]
+        when Symbol then engine.routes.url_helpers.send(:"#{options[:path]}_path")
+        when String then options[:path]
+        else engine.routes.url_helpers.root_path
+        end
+      end
+    end
+
     ##
     # Resource link, indicates a link to standard resource. The first argument should
     ##
@@ -99,10 +136,11 @@ module Cmtool
         @resource.model_name.human_plural
       end
       def path
-        engine.routes.url_helpers.url_for(controller: nested_controller_name, action: 'index', only_path: true)
+        engine.routes.url_helpers.url_for({controller: nested_controller_name, action: 'index', only_path: true}.merge(@options[:path] || {}))
       end
 
       def engine
+        return @options[:engine] if @options[:engine].present?
         base = @options[:scope].presence
         base ||= @resource.name.split('::').first if @resource.name.index('::')
         return Rails.application unless base
@@ -114,7 +152,7 @@ module Cmtool
       end
       def nested_controller_name
         if @options[:scope].present?
-          "#{@options[:scope]}::#{@resource.name}".underscore.pluralize
+          "#{@options[:scope]}::#{@resource.name.split('::').last}".underscore.pluralize
         else
           @resource.name.underscore.pluralize
         end
@@ -126,25 +164,36 @@ module Cmtool
     ##
     class Register
       attr_reader :items
+
       def initialize
         @items = []
       end
+
       def t(*args)
         -> { I18n.t(*args) }
       end
+
       def group(options = {}, &block)
         @items << Group.new(options, &block)
       end
+
       def title(*args)
         return @title if args.empty?
         @title = args.first
       end
+
       def resource_link(resource, options = {})
         @items << ResourceLink.new(resource, options)
       end
+
+      def engine_link(engine, options = {})
+        @items << EngineLink.new(engine, options)
+      end
+
       def resource_links
         @items.select{|i| i.is_a?(ResourceLink)}
       end
+
       def method_missing(*args)
         @items.send(*args).to_a
       end
@@ -168,12 +217,12 @@ module Cmtool
         @items = @before + @items + @after
       end
 
-      def append_to(label, &block)
+      def append_to(label, options = {}, &block)
         item = items.find{|i| i.options[:label] == label}
         if item
           register = item.instance_variable_get('@register')
           if register
-            register.instance_variable_get('@items') << Cmtool::Menu::Divider.new
+            register.instance_variable_get('@items') << Cmtool::Menu::Divider.new unless options[:skip_divider].present?
             register.instance_eval(&block)
           end
         else

data/lib/cmtool/version.rb

@@ -1,3 +1,3 @@
 module Cmtool
-  VERSION = "0.4.0"
+  VERSION = "2.0.0"
 end

data/script/rails

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/cmtool/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'

data/spec/cmtool_menu/engine_link_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Cmtool::Menu::EngineLink do
+  let(:options) { Hash.new }
+  let(:link){ Cmtool::Menu::EngineLink.new(Cmtool::Engine, options)}
+  subject{ link }
+
+  its(:title) { should == 'Cmtool' }
+
+  it 'Should change title when given as option' do
+    options[:title] = 'Engine Title'
+    link.title.should == 'Engine Title'
+  end
+
+  it "should change the path to internal path when given as symbol option" do
+    options[:path] = :faqs
+    link.path.should == '/cmtool/faqs'
+  end
+
+  it "should directly return a path specified as a string in the options" do
+    options[:path] = 'http://www.google.com/'
+    link.path.should == 'http://www.google.com/'
+  end
+end

data/spec/cmtool_menu_spec.rb

@@ -13,21 +13,21 @@ describe Cmtool::Menu do
       base_element = Cmtool::Menu::ElementBase.new
       element_names = Cmtool::Menu::ElementBase.subclasses.map{|e| e.name.sub(/.*::/, '').underscore }
       for element_name in element_names
-        base_element.send("#{element_name}?").should be_false
+        base_element.send("#{element_name}?").should be false
       end
     end
   end
   describe Cmtool::Menu::Group do
     it "should identify itself as such" do
-      Cmtool::Menu::Group.new.group?.should be_true
+      Cmtool::Menu::Group.new.group?.should be true
     end
     it "should not identify as resource link" do
-      Cmtool::Menu::Group.new.resource_link?.should be_false
+      Cmtool::Menu::Group.new.resource_link?.should be false
     end
   end
   describe Cmtool::Menu::ResourceLink do
     it "should identify itself as such" do
-      Cmtool::Menu::ResourceLink.new(User).resource_link?.should be_true
+      Cmtool::Menu::ResourceLink.new(User).resource_link?.should be true
     end
   end
   describe :items do
@@ -38,6 +38,14 @@ describe Cmtool::Menu do
       Cmtool::Menu.items.size.should == 5
     end
 
+    it "should have publications as second item" do
+      Cmtool::Menu.items[1].options[:label].should == :publications
+    end
+
+    it "should have three publications item by default" do
+      Cmtool::Menu.items[1].items.size.should == 3
+    end
+
   end
 
   describe 'New register block' do
@@ -63,5 +71,51 @@ describe Cmtool::Menu do
       second_last.should be_a Cmtool::Menu::ResourceLink
       second_last.resource.should == Page
     end
+
+    it "should fall back to normal behaviour when no menu item specified is found" do
+      Cmtool::Menu.reset!
+      Cmtool::Menu.register do
+        append_to :publications do
+          resource_link Cmtool::Directory
+        end
+      end
+      Cmtool::Menu.items.size.should == 1
+    end
+
+    it "should have added a divider and a link to publications" do
+      Cmtool::Menu.items[1].items.size.should == 5
+    end
+
+    it "should not add a divider when skip_divider option is given" do
+      Cmtool::Menu.reset!
+      Cmtool::Menu.register &@base_block
+      Cmtool::Menu.register do
+        append_to :publications, skip_divider: true do
+          resource_link Cmtool::Directory
+        end
+      end
+      Cmtool::Menu.items[1].items.size.should == 4
+    end
+  end
+
+  describe 'Engine Link' do
+    before do
+      Cmtool::Menu.register do
+        engine_link Cmtool::Engine
+      end
+    end
+    it 'Should add a engine link' do
+      Cmtool::Menu.items.last.engine_link?.should be true
+    end
+    it 'Should not identify as a resource link' do
+      Cmtool::Menu.items.last.resource_link?.should be false
+    end
+
+    it 'should set the path when given as symbol' do
+      Cmtool::Menu.register do
+        engine_link Cmtool::Engine, path: :news_index
+      end
+      Cmtool::Menu.items.last.path.should == '/cmtool/news'
+    end
   end
 end

data/spec/controllers/contact_forms_controller_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
-describe Cmtool::ContactFormsController do
+describe Cmtool::ContactFormsController, type: :controller do
+  routes { Cmtool::Engine.routes }
   before :each do
     sign_in @user
   end
@@ -73,22 +74,6 @@ describe Cmtool::ContactFormsController do
         response.should redirect_to(Cmtool::ContactForm.last)
       end
     end
-
-    describe "with invalid params" do
-      it "assigns a newly created but unsaved contact_form as @contact_form" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        Cmtool::ContactForm.any_instance.stub(:save).and_return(false)
-        post :create, :contact_form => {}
-        assigns(:contact_form).should be_a_new(Cmtool::ContactForm)
-      end
-
-      it "re-renders the 'new' template" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        Cmtool::ContactForm.any_instance.stub(:save).and_return(false)
-        post :create, :contact_form => {}
-        response.should render_template("new")
-      end
-    end
   end
 
   describe "PUT update" do
@@ -99,8 +84,8 @@ describe Cmtool::ContactFormsController do
         # specifies that the Cmtool::ContactForm created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        Cmtool::ContactForm.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
-        put :update, :id => contact_form.id, :contact_form => {'these' => 'params'}
+        expect_any_instance_of( Cmtool::ContactForm ).to receive(:update_attributes).with({'name' => 'Zeikurt'})
+        put :update, :id => contact_form.id, :contact_form => {'name' => 'Zeikurt'}
       end
 
       it "assigns the requested contact_form as @contact_form" do
@@ -116,23 +101,6 @@ describe Cmtool::ContactFormsController do
       end
     end
 
-    describe "with invalid params" do
-      it "assigns the contact_form as @contact_form" do
-        contact_form = create(:contact_form)
-        # Trigger the behavior that occurs when invalid params are submitted
-        Cmtool::ContactForm.any_instance.stub(:save).and_return(false)
-        put :update, :id => contact_form.id, :contact_form => {}
-        assigns(:contact_form).should eq(contact_form)
-      end
-
-      it "re-renders the 'edit' template" do
-        contact_form = create(:contact_form)
-        # Trigger the behavior that occurs when invalid params are submitted
-        Cmtool::ContactForm.any_instance.stub(:save).and_return(false)
-        put :update, :id => contact_form.id, :contact_form => {}
-        response.should render_template("edit")
-      end
-    end
   end
 
   describe "DELETE destroy" do

data/spec/controllers/faqs_controller_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
-describe Cmtool::FaqsController do
+describe Cmtool::FaqsController, type: :controller do
+  routes { Cmtool::Engine.routes }
   before :each do
     sign_in @user
   end
@@ -67,21 +68,6 @@ describe Cmtool::FaqsController do
       end
     end
 
-    describe "with invalid params" do
-      it "assigns a newly created but unsaved faq as @faq" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        Cmtool::Faq.any_instance.stub(:save).and_return(false)
-        post :create, :faq => {}
-        assigns(:faq).should be_a_new(Cmtool::Faq)
-      end
-
-      it "re-renders the 'new' template" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        Cmtool::Faq.any_instance.stub(:save).and_return(false)
-        post :create, :faq => {}
-        response.should render_template("new")
-      end
-    end
   end
 
   describe "PUT update" do
@@ -92,8 +78,8 @@ describe Cmtool::FaqsController do
         # specifies that the Cmtool::Faq created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        Cmtool::Faq.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
-        put :update, :id => faq.id, :faq => {'these' => 'params'}
+        expect_any_instance_of( Cmtool::Faq ).to receive(:update_attributes).with({'question' => 'meaning of life'})
+        put :update, :id => faq.id, :faq => {'question' => 'meaning of life'}
       end
 
       it "assigns the requested faq as @faq" do
@@ -109,23 +95,6 @@ describe Cmtool::FaqsController do
       end
     end
 
-    describe "with invalid params" do
-      it "assigns the faq as @faq" do
-        faq = create(:faq)
-        # Trigger the behavior that occurs when invalid params are submitted
-        Cmtool::Faq.any_instance.stub(:save).and_return(false)
-        put :update, :id => faq.id, :faq => {}
-        assigns(:faq).should eq(faq)
-      end
-
-      it "re-renders the 'edit' template" do
-        faq = create(:faq)
-        # Trigger the behavior that occurs when invalid params are submitted
-        Cmtool::Faq.any_instance.stub(:save).and_return(false)
-        put :update, :id => faq.id, :faq => {}
-        response.should render_template("edit")
-      end
-    end
   end
 
   describe "DELETE destroy" do

data/spec/controllers/newsletter_subscriptions_controller_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
-describe Cmtool::NewsletterSubscriptionsController do
+describe Cmtool::NewsletterSubscriptionsController, type: :controller do
+  routes { Cmtool::Engine.routes }
   before :each do
     sign_in @user
   end
@@ -77,15 +78,15 @@ describe Cmtool::NewsletterSubscriptionsController do
     describe "with invalid params" do
       it "assigns a newly created but unsaved newsletter_subscription as @newsletter_subscription" do
         # Trigger the behavior that occurs when invalid params are submitted
-        Cmtool::NewsletterSubscription.any_instance.stub(:save).and_return(false)
-        post :create, :newsletter_subscription => {}
+        allow_any_instance_of( Cmtool::NewsletterSubscription ).to receive(:save).and_return(false)
+        post :create, :newsletter_subscription => {email: ''}
         assigns(:newsletter_subscription).should be_a_new(Cmtool::NewsletterSubscription)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
-        Cmtool::NewsletterSubscription.any_instance.stub(:save).and_return(false)
-        post :create, :newsletter_subscription => {}
+        allow_any_instance_of( Cmtool::NewsletterSubscription ).to receive(:save).and_return(false)
+        post :create, :newsletter_subscription => {email: ''}
         response.should render_template("new")
       end
     end
@@ -99,8 +100,8 @@ describe Cmtool::NewsletterSubscriptionsController do
         # specifies that the Cmtool::NewsletterSubscription created on the previous line
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
-        Cmtool::NewsletterSubscription.any_instance.should_receive(:update_attributes).with({'these' => 'params'})
-        put :update, :id => newsletter_subscription.id, :newsletter_subscription => {'these' => 'params'}
+        Cmtool::NewsletterSubscription.any_instance.should_receive(:update_attributes).with({'email' => 'test44@cmtool.nl'})
+        put :update, :id => newsletter_subscription.id, :newsletter_subscription => {'email' => 'test44@cmtool.nl'}
       end
 
       it "assigns the requested newsletter_subscription as @newsletter_subscription" do
@@ -121,7 +122,7 @@ describe Cmtool::NewsletterSubscriptionsController do
         newsletter_subscription = create(:newsletter_subscription)
         # Trigger the behavior that occurs when invalid params are submitted
         Cmtool::NewsletterSubscription.any_instance.stub(:save).and_return(false)
-        put :update, :id => newsletter_subscription.id, :newsletter_subscription => {}
+        put :update, :id => newsletter_subscription.id, :newsletter_subscription => {email: ''}
         assigns(:newsletter_subscription).should eq(newsletter_subscription)
       end
 
@@ -129,7 +130,7 @@ describe Cmtool::NewsletterSubscriptionsController do
         newsletter_subscription = create(:newsletter_subscription)
         # Trigger the behavior that occurs when invalid params are submitted
         Cmtool::NewsletterSubscription.any_instance.stub(:save).and_return(false)
-        put :update, :id => newsletter_subscription.id, :newsletter_subscription => {}
+        put :update, :id => newsletter_subscription.id, :newsletter_subscription => {email: ''}
         response.should render_template("edit")
       end
     end