cmtool 2.0.0 → 3.1.0

data/lib/cmtool/includes/pages_controller.rb

@@ -1,58 +1,68 @@
 module Cmtool
-   module Includes
-     module PagesController
-       extend ActiveSupport::Concern
-        def home
-          page_name = "home"
-          @page = find_page(page_name)
-          @sub_pages = @page.children.select{|child| child.in_menu.present? }
-          render :template => "pages/#{page_name}", :layout => @page.layout.presence || ::Page.layouts.first.to_s
-        end
+  module Includes
+    module PagesController
+      extend ActiveSupport::Concern
 
-        # General catcher for pages
-        def show
-          @page = ::Page.find_by_name_and_locale(params[:name], I18n.locale.to_s)
-          not_found and return unless @page
+      def home
+        page_name = 'home'
+        @page = find_page(page_name)
+        @sub_pages = @page.children.select{|child| child.in_menu.present? }
+        render template: "pages/#{page_name}", layout: @page.layout.presence || ::Page.layouts.first.to_s, formats: [:html]
+      end
 
-          @sub_pages = [@page] + @page.children.select{|child| child.in_menu.present? }
-          template = "pages/#{@page.name}"
-          if template_exists?(template)
-            render :template => template, :layout => @page.layout.presence || ::Page.layouts.first
-            return
-          else
-            render :layout => @page.layout.presence || ::Page.layouts.first
-          end
+      # General catcher for pages
+      def show
+        @page = ::Page.find_by_name_and_locale(params[:name], I18n.locale.to_s)
+        return not_found  unless @page
+
+        @sub_pages = [@page] + @page.children.select{|child| child.in_menu.present? }
+        template = "pages/#{@page.name}"
+        if template_exists?(template)
+          render template: template, formats: [:html], layout: @page.layout.presence || ::Page.layouts.first
+          return
+        else
+          render formats: [:html], layout: @page.layout.presence || ::Page.layouts.first
         end
+      end
 
-        def not_found
-          @page = ::Page.find_by_name_and_locale('404', I18n.locale.to_s) || ::Page.new(name: '404', body: "404 Page Not Found")
-          @sub_pages = []
-          render template: 'pages/404', layout: @page.layout.presence || ::Page.layouts.first.to_s, status: 404
+      def not_found
+        @page = ::Page.find_by_name_and_locale('404', I18n.locale.to_s) || ::Page.new(name: '404', body: "404 Page Not Found")
+        @sub_pages = []
+        page_name_extension = params[:name].to_s[/(?<=\.)\w{2,4}$/]
+        format = %w[html css js json].find{|f| f == request.format.symbol.to_s or f == page_name_extension }.try(:to_sym) || :html
+        case format
+        when :json
+          render json: {}, status: 404
+        when :html
+          render template: 'pages/404', formats: [:html], layout: @page.layout.presence || ::Page.layouts.first.to_s, status: 404
+        else
+          render nothing: true, status: 404
         end
+      end
 
-        def sitemap
-          respond_to do |format|
-            format.xml do
-              pages_xml = ::Page.for_sitemap.map do |page|
-                uri = page_url(page.name, locale: page.locale)
-                "<url><loc>#{uri}</loc><lastmod>#{page.updated_at.strftime('%Y-%m-%d')}</lastmod></url>"
-              end.join("\n")
-              result = <<-XML
+      def sitemap
+        respond_to do |format|
+          format.xml do
+            pages_xml = ::Page.for_sitemap.map do |page|
+              uri = page_url(page.name, locale: page.locale)
+              "<url><loc>#{uri}</loc><lastmod>#{page.updated_at.strftime('%Y-%m-%d')}</lastmod></url>"
+            end.join("\n")
+            result = <<-XML
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 #{pages_xml}
 </urlset>
-              XML
-              render xml: result
-            end
+            XML
+            render xml: result
           end
         end
+      end
 
-        private
+      private
 
-        def find_page(name)
-          ::Page.find_by_name_and_locale(name, I18n.locale.to_s) || ::Page.new(:name => name, locale: I18n.locale.to_s)
-        end
-     end
-   end
+      def find_page(name)
+        ::Page.find_by_name_and_locale(name, I18n.locale.to_s) || ::Page.new(name: name, locale: I18n.locale.to_s)
+      end
+    end
+  end
 end

data/lib/cmtool/menu.rb

@@ -141,18 +141,22 @@ module Cmtool
 
       def engine
         return @options[:engine] if @options[:engine].present?
-        base = @options[:scope].presence
-        base ||= @resource.name.split('::').first if @resource.name.index('::')
+        if @options[:scope].present?
+          base = options[:scope].to_s.camelize
+        else
+          base = @resource.name.split('::').first if @resource.name.index('::')
+        end
         return Rails.application unless base
-        return base if base.is_a?(Rails::Engine)
+        return base if base.is_a?(Rails::Engine) # WTF?
         if e = "#{base}::Engine".safe_constantize
           return e
         end
         return Rails.application
       end
+
       def nested_controller_name
         if @options[:scope].present?
-          "#{@options[:scope]}::#{@resource.name.split('::').last}".underscore.pluralize
+          "#{@options[:scope].to_s.camelize}::#{@resource.name.split('::').last}".underscore.pluralize
         else
           @resource.name.underscore.pluralize
         end

data/lib/cmtool/version.rb

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

data/lib/cmtool.rb

@@ -1,8 +1,17 @@
+require 'momentjs-rails'
+
 require "cmtool/engine"
 require 'cmtool/includes/user'
 require 'cmtool/includes/page'
 require 'cmtool/includes/pages_controller'
 require 'cmtool/menu'
+require 'email_validator'
+
+# Paperclip replacement — stores file metadata as CouchDB properties,
+# handles thumbnail generation via MiniMagick.
+# Replace `include Paperclip::Glue` + `has_attached_file` with
+# `include SimplyStored::HasAttachment` + `has_attachment`
+# has_attachment now in simply_stored gem
 
 module Cmtool
 end

data/spec/controllers/newsletter_subscriptions_controller_spec.rb

@@ -35,7 +35,7 @@ describe Cmtool::NewsletterSubscriptionsController, type: :controller do
   describe "GET show" do
     it "assigns the requested newsletter_subscription as @newsletter_subscription" do
       newsletter_subscription = create :newsletter_subscription
-      get :show, :id => newsletter_subscription.id
+      get :show, id: newsletter_subscription.id
       assigns(:newsletter_subscription).should eq(newsletter_subscription)
     end
   end
@@ -50,7 +50,7 @@ describe Cmtool::NewsletterSubscriptionsController, type: :controller do
   describe "GET edit" do
     it "assigns the requested newsletter_subscription as @newsletter_subscription" do
       newsletter_subscription = create :newsletter_subscription
-      get :edit, :id => newsletter_subscription.id
+      get :edit, id: newsletter_subscription.id
       assigns(:newsletter_subscription).should eq(newsletter_subscription)
     end
   end
@@ -59,18 +59,18 @@ describe Cmtool::NewsletterSubscriptionsController, type: :controller do
     describe "with valid params" do
       it "creates a new Cmtool::NewsletterSubscription" do
         expect {
-          post :create, :newsletter_subscription => build(:newsletter_subscription).attributes
+          post :create, newsletter_subscription: build(:newsletter_subscription).attributes
         }.to change(Cmtool::NewsletterSubscription, :count).by(1)
       end
 
       it "assigns a newly created newsletter_subscription as @newsletter_subscription" do
-        post :create, :newsletter_subscription => build(:newsletter_subscription).attributes
+        post :create, newsletter_subscription: build(:newsletter_subscription).attributes
         assigns(:newsletter_subscription).should be_a(Cmtool::NewsletterSubscription)
         assigns(:newsletter_subscription).should be_persisted
       end
 
       it "redirects to the newsletter_subscriptions newsletter_subscription" do
-        post :create, :newsletter_subscription => build(:newsletter_subscription).attributes
+        post :create, newsletter_subscription: build(:newsletter_subscription).attributes
         response.should redirect_to(Cmtool::NewsletterSubscription.last)
       end
     end
@@ -79,14 +79,14 @@ describe Cmtool::NewsletterSubscriptionsController, type: :controller do
       it "assigns a newly created but unsaved newsletter_subscription as @newsletter_subscription" do
         # Trigger the behavior that occurs when invalid params are submitted
         allow_any_instance_of( Cmtool::NewsletterSubscription ).to receive(:save).and_return(false)
-        post :create, :newsletter_subscription => {email: ''}
+        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
         allow_any_instance_of( Cmtool::NewsletterSubscription ).to receive(:save).and_return(false)
-        post :create, :newsletter_subscription => {email: ''}
+        post :create, newsletter_subscription: {email: ''}
         response.should render_template("new")
       end
     end
@@ -100,19 +100,19 @@ describe Cmtool::NewsletterSubscriptionsController, type: :controller 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({'email' => 'test44@cmtool.nl'})
-        put :update, :id => newsletter_subscription.id, :newsletter_subscription => {'email' => 'test44@cmtool.nl'}
+        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
         newsletter_subscription = create(:newsletter_subscription)
-        put :update, :id => newsletter_subscription.id, :newsletter_subscription => newsletter_subscription.attributes
-        assigns(:newsletter_subscription).should eq(newsletter_subscription)
+        put :update, id: newsletter_subscription.id, newsletter_subscription: newsletter_subscription.attributes
+        assigns(:newsletter_subscription).id.should eq newsletter_subscription.id
       end
 
       it "redirects to the newsletter_subscription" do
         newsletter_subscription = create(:newsletter_subscription)
-        put :update, :id => newsletter_subscription.id, :newsletter_subscription => newsletter_subscription.attributes
+        put :update, id: newsletter_subscription.id, newsletter_subscription: newsletter_subscription.attributes
         response.should redirect_to(newsletter_subscription)
       end
     end
@@ -122,7 +122,7 @@ describe Cmtool::NewsletterSubscriptionsController, type: :controller 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 => {email: ''}
+        put :update, id: newsletter_subscription.id, newsletter_subscription: {email: ''}
         assigns(:newsletter_subscription).should eq(newsletter_subscription)
       end
 
@@ -130,7 +130,7 @@ describe Cmtool::NewsletterSubscriptionsController, type: :controller 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 => {email: ''}
+        put :update, id: newsletter_subscription.id, newsletter_subscription: {email: ''}
         response.should render_template("edit")
       end
     end
@@ -141,20 +141,20 @@ describe Cmtool::NewsletterSubscriptionsController, type: :controller do
       @request.env['HTTP_REFERER'] = newsletter_subscriptions_path
       newsletter_subscription = create(:newsletter_subscription)
       expect {
-        delete :destroy, :id => newsletter_subscription.id
+        delete :destroy, id: newsletter_subscription.id
       }.to change(Cmtool::NewsletterSubscription, :count).by(-1)
     end
 
     it "redirects to the newsletter_subscriptions list" do
       @request.env['HTTP_REFERER'] = newsletter_subscriptions_path
       newsletter_subscription = create(:newsletter_subscription)
-      delete :destroy, :id => newsletter_subscription.id
+      delete :destroy, id: newsletter_subscription.id
       response.should redirect_to(newsletter_subscriptions_path)
     end
     it "redirects to the newsletter_subscriptions list when called from edit page" do
       newsletter_subscription = create(:newsletter_subscription)
       @request.env['HTTP_REFERER'] = edit_newsletter_subscription_path(newsletter_subscription)
-      delete :destroy, :id => newsletter_subscription.id
+      delete :destroy, id: newsletter_subscription.id
       response.should redirect_to(newsletter_subscriptions_path)
     end
   end

data/spec/models/cmtool/contact_form_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Cmtool::ContactForm do
+
+  it "is invalid with Funded.com in email or body" do
+    build(:contact_form).should be_valid
+    build(:contact_form, email: "fundingteam+url.com@getbusinessfunded.com").should_not be_valid
+    build(:contact_form, body: "fundingteam+url.com@getbusinessFunded.com").should_not be_valid
+  end
+end