browsercms-artirix 4.0.2 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a57902749d033539ac45bb99f421e92e3f9daf29
-  data.tar.gz: 13dcbcd60d6db9caade2157947c28e95a5b4bd06
+  metadata.gz: 4a8519377c9ccb8b8a859b530a35f64c6b5b1ae7
+  data.tar.gz: 7b927f07488aface1218361eb8283d0fc3978ae9
 SHA512:
-  metadata.gz: 0eb504ff8c8d24e30270e068ef7782e6fc0b7f7ca9bd457663fe3573c8f709212bc2dd5e86c8dfa510c1744d2750c5b94a801c39aa50a9c2621a117006d3548d
-  data.tar.gz: acfd15b494b1e6d1ef6d7b3fa402724e8a14e4496ebc7b7eaca5cbd18baccf837a19bfaf8df522e661df0221e7e8c4a47862b688e9abcbf6837d56b8b3f5b107
+  metadata.gz: 646599f5f4ef3c5ea175ded8171175895ba98895e857fd4dd15fdfe54935e010536cc941da66f33591ee06f01ab7c827f65df0fa048f8ac18d0d09ee95d4fb48
+  data.tar.gz: 144bfe4a7340d108fc64c42cff99c5dcdee949a6b922732f62e411c036e9700d9b2f955b072686e3d5cd9c0cab3655c5e3cbebd122e3ab38266bc2b7cbbe9f4a

data/app/assets/stylesheets/cms/_nav.scss

@@ -178,14 +178,18 @@
 
 		.btn {
 			margin-bottom: 0;
-          box-shadow: none;
-			@include rem(height,3.75rem);
+			box-shadow: none;
+			@include rem(height, 3.75rem);
 
-			&:first-child {
+			&.btn-init {
 				@include border-radius(5px 0 0 0);
-              line-height: 60px;
 			}
-			&:nth-child(2) {
+
+			&.btn-alone {
+				@include border-radius(5px 5px 0 0);
+			}
+
+			&.btn-end {
 				@include border-radius(0 5px 0 0);
 			}
 		}

data/app/controllers/cms/content_block_controller.rb

@@ -68,10 +68,22 @@ module Cms
 
     def new
       build_block
+
+      if readonly?
+        url = [params[:_redirect_to], engine_aware_path(@block, nil)].map(&:presence).compact.first
+        if url
+          return redirect_to url, alert: 'Read only models cannot be created'
+        else
+          return render_not_implemented
+        end
+      end
+
       set_default_category
     end
 
     def create
+      return render_not_implemented if readonly?
+
       if create_block
         after_create_on_success
       else
@@ -84,9 +96,20 @@ module Cms
 
     def edit
       load_block_draft
+
+      if readonly?
+        url = [params[:_redirect_to], engine_aware_path(@block)].map(&:presence).compact.first
+        if url
+          return redirect_to url, alert: 'Read only models cannot be edited'
+        else
+          return render_not_implemented
+        end
+      end
     end
 
     def update
+      return render_not_implemented if readonly?
+
       if update_block
         after_update_on_success
       else
@@ -100,6 +123,8 @@ module Cms
     end
 
     def destroy
+      return render_not_implemented if readonly?
+
       do_command("deleted") { @block.destroy }
       respond_to do |format|
         format.html { redirect_to_first params[:_redirect_to], engine_aware_path(@block.class) }
@@ -111,11 +136,15 @@ module Cms
     # Additional CMS Action
 
     def publish
+      return render_not_implemented if readonly?
+
       do_command("published") { @block.publish! }
       redirect_to_first params[:_redirect_to], engine_aware_path(@block, nil)
     end
 
     def revert_to
+      return render_not_implemented if readonly?
+
       do_command("reverted to version #{params[:version]}") do
         revert_block(params[:version])
       end
@@ -123,6 +152,8 @@ module Cms
     end
 
     def version
+      return render_not_implemented unless versioned?
+
       load_block
       if params[:version]
         @block = @block.as_of_version(params[:version])
@@ -131,19 +162,29 @@ module Cms
     end
 
     def versions
-      if model_class.versioned?
-        load_block
-      else
-        render :text => "Not Implemented", :status => :not_implemented
-      end
+      return render_not_implemented unless versioned?
+
+      load_block
     end
 
     def new_button_path
-      new_engine_aware_path(content_type)
+      new_engine_aware_path(content_type) unless readonly?
     end
 
     protected
 
+    def render_not_implemented
+      render text: 'Not Implemented', status: :not_implemented
+    end
+
+    def versioned?
+      model_class.versioned?
+    end
+
+    def readonly?
+      model_class.readonly?
+    end
+
     def content_type_name
       self.class.name.sub(/Controller/, '').singularize
     end

data/app/helpers/cms/ui_elements_helper.rb

@@ -80,13 +80,15 @@ module Cms
     # @option options [Boolean] :enabled
     # @option options [Array<String>] :class An array of additional classes to apply
     def menu_button(label, path, options={})
+      return '' unless path.present?
+
       defaults = {
           enabled: true,
           pull: 'left'
       }
       options = defaults.merge!(options)
-      options[:class] = %w{btn btn-primary}
-      if (options[:pull] == 'left' || options[:pull]== 'right')
+      options[:class] = options[:class].presence || %w{btn btn-primary}
+      if options[:pull] == 'left' || options[:pull] == 'right'
         options[:class] << "pull-#{options.delete(:pull)}"
       end
 

data/app/models/cms/content_type.rb

@@ -13,6 +13,10 @@ module Cms
 
     DEFAULT_CONTENT_TYPE_NAME = 'Cms::HtmlBlock'
 
+    def readonly?
+      model_class.readonly?
+    end
+
     class << self
       def named(name)
         [Cms::ContentType.new(name: name)]

data/app/views/cms/content_block/_sidebar.html.erb

@@ -29,8 +29,10 @@
     <%= link_to("Preview", @block.path, id: "preview_button", target: "_blank", class: "btn btn-small") if @block.class.addressable? %>
     <%= link_to "Versions", engine(@block).polymorphic_path([:versions, @block]), class: "btn btn-small" if @block.class.versioned? %>
   </div>
-  <div class="btn-group">
-    <%= link_to "Delete", engine_aware_path(@block), class: "btn btn-small btn-danger confirm_with_title http_delete", title: "Are you sure you want to delete this content?" %>
-  </div>
+  <% unless @block.readonly? %>
+    <div class="btn-group">
+      <%= link_to "Delete", engine_aware_path(@block), class: "btn btn-small btn-danger confirm_with_title http_delete", title: "Are you sure you want to delete this content?" %>
+    </div>
+  <% end %>
 </div>
 <%= yield :sidebar_after if content_for(:sidebar_after)%>

data/app/views/cms/content_block/index.html.erb

@@ -44,7 +44,7 @@
                 <% end %>
               </th>
           <% end %>
-          <% if (content_type.model_class.respond_to?(:created_by)) %>
+          <% if content_type.model_class.respond_to?(:created_by) %>
               <th>Created By</th>
           <% end %>
           <% if content_type.model_class.connectable? %>
@@ -55,15 +55,16 @@
 
         <tbody>
         <% @blocks.each do |block| %>
+          <% pth = block.readonly? ? engine_aware_path(block) : edit_engine_aware_path(block)%>
             <tr>
               <td class="check-cell"><%= check_box_tag 'content_id[]', block.id %></td>
               <% content_type.columns_for_index.each_with_index do |column, i| %>
                   <td>
-                    <%= link_to_if(i == 0, block.send(column[:method]), edit_engine_aware_path(block)) %>
+                    <%= link_to_if(i == 0, block.send(column[:method]), pth) %>
                     <%= draft_icon_tag(block) if i == 0 %>
                   </td>
               <% end %>
-              <% if (content_type.model_class.respond_to?(:created_by)) %>
+              <% if content_type.model_class.respond_to?(:created_by) %>
                   <td><%= block.created_by.try(:full_name) %></td>
               <% end %>
               <% if content_type.model_class.connectable? %>

data/app/views/cms/content_block/show_in_isolation.html.erb

@@ -1,15 +1,17 @@
 <% use_page_title "View #{content_type.display_name}" %>
 <%= render layout: 'page_title' do %>
+  <% unless @block.readonly? %>
     <%= link_to 'Edit', edit_engine_aware_path(@block), class: 'btn btn-primary btn-small right' %>
+  <% end %>
 <% end %>
 <% content_for :sidebar, render('sidebar') %>
 <%= render layout: 'main_with_sidebar' do %>
-    <% if @block.respond_to?(:deleted) && @block.deleted %>
-        <p>This <%= @block.class.name %> has been deleted.</p>
-    <% end %>
-    <% if @block.class.renderable? %>
-        <%= render_connectable(@block) %>
-    <% end %>
+  <% if @block.respond_to?(:deleted) && @block.deleted %>
+    <p>This <%= @block.class.name %> has been deleted.</p>
+  <% end %>
+  <% if @block.class.renderable? %>
+    <%= render_connectable(@block) %>
+  <% end %>
 <% end %>
 
 

data/app/views/layouts/cms/_main_menu.html.erb

@@ -57,16 +57,20 @@
 
     <% if current_user.able_to?(:edit_content) %>
     <div class="btn-group">
-      <%= menu_button "New", new_button_path, id: 'new-content-button', class: 'btn btn-primary', tabindex: '-1' %>
-      <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" tabindex="-1">
+      <% pth = new_button_path %>
+      <%= menu_button 'New', pth, id: 'new-content-button', class: %w(btn btn-primary btn-init), tabindex: '-1' if pth.present? %>
+      <button class="btn btn-primary dropdown-toggle <%= pth.present? ? 'btn-end' : 'btn-alone' %>" data-toggle="dropdown" tabindex="-1">
         <span class="caret"></span>
       </button>
       <ul class="dropdown-menu pull-right">
         <%= render 'cms/toolbar/new_pages_menu' %>
         <% modules = Cms::ContentType.available_by_module
            modules.keys.sort.each_with_index do |module_name, i| %>
+            <% mods = modules[module_name].reject(&:readonly?) %>
+            <% next unless mods.present? %>
+
             <%= divider_tag(i) %>
-            <% modules[module_name].each do |type| %>
+            <% mods.each do |type| %>
                 <%= nav_link_to h(type.display_name), new_engine_aware_path(type), id: "create_new_#{type.param_key}" %>
             <% end -%>
         <% end %>

data/lib/cms/acts/content_block.rb

@@ -15,8 +15,9 @@ module Cms
         def acts_as_content_block(options={})
           defaults = {
               # Set default values here.
-              :allow_attachments => true,
-              :content_module => true
+              allow_attachments: true,
+              content_module: true,
+              readonly: false,
           }
           options = defaults.merge(options)
 
@@ -26,6 +27,7 @@ module Cms
 
           extend Cms::DefaultAccessible
           allow_attachments if options[:allow_attachments]
+          is_readonly if options[:readonly]
           is_archivable(options[:archiveable].is_a?(Hash) ? options[:archiveable] : {}) unless options[:archiveable] == false
           is_connectable(options[:connectable].is_a?(Hash) ? options[:connectable] : {}) unless options[:connectable] == false
           flush_cache_on_change(options[:flush_cache_on_change].is_a?(Hash) ? options[:flush_cache_on_change] : {}) unless options[:flush_cache_on_change] == false

data/lib/cms/behaviors/readonly.rb

@@ -0,0 +1,23 @@
+module Cms
+  module Behaviors
+    module Readonly
+      def self.included(model_class)
+        model_class.extend(MacroMethods)
+      end
+      module MacroMethods
+        def readonly?
+          !!@is_readonly
+        end
+        def is_readonly(_options={})
+          @is_readonly = true
+          include InstanceMethods
+        end
+      end
+      module InstanceMethods
+        def readonly?
+          true
+        end
+      end
+    end
+  end
+end

data/lib/cms/configuration/devise.rb

@@ -254,74 +254,3 @@ Devise.setup do |config|
   # so you need to do it manually. For the users scope, it would be:
   # config.omniauth_path_prefix = '/my_engine/users/auth'
 end
-
-# override DEVISE CAS
-module Devise
-  def self.cas_action_url(base_url, mapping, action)
-    cas_action_url_factory_class.new(base_url, mapping, action).call
-  end
-
-  def self.cas_action_url_factory_class
-    @cas_action_url_factory_class ||= CasActionUrlFactoryBase.prepare_class
-  end
-
-  class CasActionUrlFactoryBase
-    attr_reader :base_url, :mapping, :action
-
-    def self.prepare_class
-      Class.new(self) do
-        include Rails.application.routes.url_helpers
-        include Rails.application.routes.mounted_helpers if Rails.application.routes.try(:mounted_helpers)
-      end
-    end
-
-    def initialize(base_url, mapping, action)
-      @base_url = base_url
-      @mapping  = mapping
-      @action   = action
-    end
-
-    def call
-      uri = URI.parse(base_url).tap { |uri| uri.query = nil }
-      uri.path = load_base_path
-      uri.to_s
-    end
-
-    alias_method :build, :call
-
-    private
-    def load_base_path
-      load_routes_path || load_mapping_path
-    end
-
-    def load_routes_path
-      router_name = mapping.router_name || Devise.available_router_name
-      context = send(router_name)
-
-      route = "#{mapping.singular}_#{action}_path"
-      if context.respond_to? route
-        context.send route
-      else
-        nil
-      end
-    rescue NameError, NoMemoryError
-      nil
-    end
-
-    def load_mapping_path
-      path = mapping_fullpath || mapping_raw_path
-      path << "/" unless path =~ /\/$/
-      path << action
-      path
-    end
-
-    def mapping_fullpath
-      return nil unless mapping.respond_to?(:fullpath)
-      "#{ENV['RAILS_RELATIVE_URL_ROOT']}#{mapping.fullpath}"
-    end
-
-    def mapping_raw_path
-      "#{ENV['RAILS_RELATIVE_URL_ROOT']}#{mapping.raw_path}"
-    end
-  end
-end

data/lib/cms/route_extensions.rb

@@ -1,25 +1,56 @@
 module Cms::RouteExtensions
+  DEFAULT_RESOURCE_ACTIONS = [:index, :show, :new, :create, :edit, :update, :destroy]
 
+  DEFAULT_CONTENT_BLOCKS_OPTIONS = { bulk_update: true }
 
   # Adds all necessary routes to manage a new content type. Works very similar to the Rails _resources_ method, adding basic CRUD routes, as well as additional ones
   #   for CMS specific routes (like versioning)
   #
   # @param [Symbol] content_block_name - The plural name of a new Content Type. Should match the name of the model_class, like :dogs or :donation_statuses
-  def content_blocks(content_block_name, options={}, & block)
+  def content_blocks(content_block_name, options = {}, &block)
+    options     = DEFAULT_CONTENT_BLOCKS_OPTIONS.merge options
     model_class = guess_model_class(content_block_name)
 
-    resources content_block_name do
-      member do
-        put :publish if model_class.publishable?
-        if model_class.versioned?
-          get :versions
-          get 'version/:version', to: "#{content_block_name}#version", as: 'version'
-          put 'revert_to/:version', to: "#{content_block_name}#revert_to", as: 'revert'
+    # options to
+    bulk_update = options.delete :bulk_update
+
+    only = options.delete(:only) || DEFAULT_RESOURCE_ACTIONS.dup
+
+    if model_class.try :readonly?
+      only.delete :new
+      only.delete :create
+      only.delete :edit
+      only.delete :update
+      only.delete :destroy
+
+      bulk_update = false
+    end
+
+    options[:only] = only unless only == DEFAULT_RESOURCE_ACTIONS
+
+    # pass the options only if any present
+    resources_args = [content_block_name]
+    resources_args << options if options.present?
+
+    resources(*resources_args) do
+      if model_class.publishable? || model_class.versioned?
+        member do
+          put :publish if model_class.publishable?
+          if model_class.versioned?
+            get :versions
+            get 'version/:version', to: "#{content_block_name}#version", as: 'version'
+            put 'revert_to/:version', to: "#{content_block_name}#revert_to", as: 'revert'
+          end
         end
       end
-      collection do
-        put :update, to: "#{content_block_name}#bulk_update"
+
+      if bulk_update
+        collection do
+          put :update, to: "#{content_block_name}#bulk_update"
+        end
       end
+
+      yield if block_given?
     end
   end
 
@@ -40,11 +71,11 @@ module Cms::RouteExtensions
 
     # Add User management features
     devise_for :cms_user,
-               class_name: Cms.user_class_name,
-               path: '',
-               skip: :password,
-               path_names: {sign_in: 'login'},
-               controllers: {sessions: 'cms/sites/sessions'}
+               class_name:  Cms.user_class_name,
+               path:        '',
+               skip:        :password,
+               path_names:  { sign_in: 'login' },
+               controllers: { sessions: 'cms/sites/sessions' }
 
     devise_scope :cms_user do
       get '/forgot-password' => "cms/sites/passwords#new", :as => 'forgot_password'
@@ -70,10 +101,10 @@ module Cms::RouteExtensions
 
   def guess_model_class(content_block_name)
     content_name = content_block_name.to_s.classify
-    prefix = determine_model_prefix
+    prefix       = determine_model_prefix
     begin
       namespaced_model_name = "#{Cms::Module.current_namespace}::#{content_name}"
-      model_class = namespaced_model_name.constantize
+      model_class           = namespaced_model_name.constantize
     rescue NameError
       model_class = "#{prefix}#{content_name}".constantize
     end
@@ -102,8 +133,8 @@ module Cms::RouteExtensions
   # I.e. /cms/forms/:id/inline
   def add_inline_content_route(base_route_name, klass)
     denamespaced_controller = klass.name.demodulize.pluralize.underscore
-    module_name = klass.name.deconstantize.underscore
-    inline_route_name = "#{base_route_name}_inline"
+    module_name             = klass.name.deconstantize.underscore
+    inline_route_name       = "#{base_route_name}_inline"
     unless route_exists?(inline_route_name)
       klass.content_type.engine_class.routes.prepend do
         if klass.content_type.main_app_model?
@@ -129,9 +160,9 @@ module Cms::RouteExtensions
 
   # I.e. /forms/:slug
   def add_show_via_slug_route(base_route_name, klass)
-    slug_path = "#{klass.path}/:slug"
+    slug_path             = "#{klass.path}/:slug"
     namespaced_controller = klass.name.underscore.pluralize
-    slug_path_name = "#{base_route_name}_slug"
+    slug_path_name        = "#{base_route_name}_slug"
     # Add route to main application (By doing this here, we ensure all ContentBlock constants have already been load)
     # Engines don't process their routes until after the main routes are created.
     unless route_exists?(slug_path_name)

data/lib/cms/version.rb

@@ -2,7 +2,7 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = '4.0.2'
+  VERSION = '4.0.3'
 
   # Return the current version of the CMS.
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms-artirix
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 platform: ruby
 authors:
 - BrowserMedia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,16 +43,16 @@ dependencies:
   name: devise_cas_authenticatable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -943,6 +943,7 @@ files:
 - lib/cms/behaviors/namespacing.rb
 - lib/cms/behaviors/naming.rb
 - lib/cms/behaviors/publishing.rb
+- lib/cms/behaviors/readonly.rb
 - lib/cms/behaviors/rendering.rb
 - lib/cms/behaviors/searching.rb
 - lib/cms/behaviors/soft_deleting.rb
@@ -1061,7 +1062,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Web Content Management in Rails