brightcontent-core 2.0.33 → 2.1.0

data/config/initializers/simple_form_bootstrap.rb

@@ -1,45 +1,61 @@
-# Use this setup block to configure all options available in SimpleForm.
-SimpleForm.setup do |config|
-  config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
-    b.use :html5
-    b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |ba|
-      ba.use :input
-      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
-      ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
+inputs = %w[
+  CollectionSelectInput
+  DateTimeInput
+  FileInput
+  GroupedCollectionSelectInput
+  NumericInput
+  PasswordInput
+  RangeInput
+  StringInput
+  TextInput
+]
+
+inputs.each do |input_type|
+  superclass = "SimpleForm::Inputs::#{input_type}".constantize
+
+  new_class = Class.new(superclass) do
+    def input_html_classes
+      super.push('form-control')
     end
   end
 
-  config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  Object.const_set(input_type, new_class)
+end
+
+SimpleForm.setup do |config|
+  config.boolean_style = :nested
+
+  config.wrappers :bootstrap, tag: 'div', class: 'form-group', error_class: 'has-error',
+      defaults: { input_html: { class: 'default_class' } } do |b|
+
     b.use :html5
+    b.use :min_max
+    b.use :maxlength
     b.use :placeholder
+
+    b.optional :pattern
+    b.optional :readonly
+
     b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend|
-        prepend.use :input
-      end
-      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+
+    b.wrapper tag: 'div', class: 'col-sm-10' do |ba|
+      ba.use :input
+      ba.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' }
     end
   end
 
-  config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :checkbox, tag: :div, class: "checkbox", error_class: "has-error" do |b|
     b.use :html5
-    b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-append' do |append|
-        append.use :input
-      end
-      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+
+    b.wrapper tag: :label do |ba|
+      ba.use :input
+      ba.use :label_text
     end
+
+    b.use :hint,  wrap_with: { tag: :p, class: "help-block" }
+    b.use :error, wrap_with: { tag: :span, class: "help-block text-danger" }
   end
 
-  # Wrappers for forms and inputs using the Twitter Bootstrap toolkit.
-  # Check the Bootstrap docs (http://twitter.github.com/bootstrap)
-  # to learn about the different styles for forms and inputs,
-  # buttons and other elements.
   config.default_wrapper = :bootstrap
 end

data/config/locales/brightcontent_core.en.yml

@@ -0,0 +1,30 @@
+en:
+  flash:
+    actions:
+      create:
+        notice: '%{resource_name} was successfully created.'
+      update:
+        notice: '%{resource_name} was successfully updated.'
+      destroy:
+        notice: '%{resource_name} was successfully destroyed.'
+        alert: '%{resource_name} could not be destroyed.'
+
+  brightcontent:
+    create_new: 'Create new %{model}'
+    edit: Edit
+    edit_model: 'Edit %{model}'
+    save_and_continue: Save and continue
+    delete: Delete
+    are_you_sure: Are you sure?
+    logout: Logout
+    hidden: Hidden
+    sign_in: Please sign in
+    editor_locale: ""
+
+  activerecord:
+    models:
+      brightcontent/admin_user: Admin
+    attributes:
+      brightcontent/admin_user:
+        password: Password
+        password_confirmation: Password confirmation

data/config/locales/brightcontent_core.nl.yml

@@ -0,0 +1,30 @@
+nl:
+  flash:
+    actions:
+      create:
+        notice: '%{resource_name} is succesvol aangemaakt.'
+      update:
+        notice: '%{resource_name} is succesvol geüpdatet.'
+      destroy:
+        notice: '%{resource_name} is succesvol verwijderd.'
+        alert: '%{resource_name} kon niet worden verwijderd.'
+
+  brightcontent:
+    create_new: '%{model} toevoegen'
+    edit: Wijzig
+    edit_model: '%{model} wijzigen'
+    save_and_continue: Opslaan en verder bewerken
+    delete: Verwijderen
+    are_you_sure: Zeker weten?
+    logout: Uitloggen
+    hidden: Verborgen
+    sign_in: Inloggen
+    editor_locale: "nl-NL"
+
+  activerecord:
+    models:
+      brightcontent/admin_user: Beheerder
+    attributes:
+      brightcontent/admin_user:
+        password: Wachtwoord
+        password_confirmation: Wachtwoord bevestiging

data/config/routes.rb

@@ -5,5 +5,5 @@ Brightcontent::Engine.routes.draw do
   resources :admin_users
   resources :sessions, only: [:new, :create, :destroy]
 
-  root to: "admin_users#index"
+  root to: "application#index"
 end

data/db/migrate/20121206121725_create_brightcontent_admin_users.rb

@@ -7,6 +7,6 @@ class CreateBrightcontentAdminUsers < ActiveRecord::Migration
       t.timestamps
     end
 
-    Brightcontent::AdminUser.create!(:email => 'admin@example.com', :password => 'password')
+    Brightcontent::AdminUser.create!(:email => 'admin@example.com', :password => 'password', :password_confirmation => 'password')
   end
 end

data/lib/brightcontent/base_controller_ext/default_actions.rb

@@ -0,0 +1,35 @@
+module Brightcontent
+  module BaseControllerExt
+    module DefaultActions
+      def show
+        if request.format == :html
+          redirect_to action: :edit
+        else
+          show!
+        end
+      end
+
+      def create
+        create! { resource_redirect_path }
+      end
+
+      def update
+        update! { resource_redirect_path }
+      end
+
+      def destroy
+        destroy! { resource_index_path }
+      end
+
+      private
+
+      def resource_redirect_path
+        if params["commit_and_continue"].present?
+          resource_item_path
+        else
+          resource_index_path
+        end
+      end
+    end
+  end
+end

data/lib/brightcontent/base_controller_ext/fields.rb

@@ -0,0 +1,36 @@
+module Brightcontent
+  module BaseControllerExt
+    module Fields
+      extend ActiveSupport::Concern
+
+      included do
+        %w[list_fields filter_fields form_fields default_fields].each do |name|
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
+            def self.#{name}(*fields)
+              define_method(:#{name}) { fields.flatten }
+            end
+            helper_method :#{name}
+          RUBY
+        end
+      end
+
+      protected
+
+      def list_fields
+        default_fields
+      end
+
+      def filter_fields
+        []
+      end
+
+      def form_fields
+        default_fields
+      end
+
+      def default_fields
+        resource_class.brightcontent_columns - %w{id created_at updated_at password_digest}
+      end
+    end
+  end
+end

data/lib/brightcontent/base_controller_ext/filtering.rb

@@ -0,0 +1,21 @@
+require 'active_support/concern'
+
+module Brightcontent
+  module BaseControllerExt
+    module Filtering
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :ransack_search
+      end
+
+      def ransack_search
+        @_ransack_search ||= end_of_association_chain.ransack(params[:q])
+      end
+
+      def collection
+        @_collection ||= ransack_search.result(distinct: true)
+      end
+    end
+  end
+end

data/lib/brightcontent/base_controller_ext/pagination.rb

@@ -0,0 +1,29 @@
+require 'active_support/concern'
+
+module Brightcontent
+  module BaseControllerExt
+    module Pagination
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def per_page_count
+          @per_page_count ||= 30
+        end
+
+        def per_page(number)
+          @per_page_count = number
+        end
+      end
+
+      private
+
+      def end_of_association_chain
+        if action_name == "index" && self.class.per_page_count > 0
+          super.paginate(page: params[:page], per_page: self.class.per_page_count)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/brightcontent/base_controller_ext.rb

@@ -0,0 +1,8 @@
+module Brightcontent
+  module BaseControllerExt
+    autoload :DefaultActions, 'brightcontent/base_controller_ext/default_actions'
+    autoload :Pagination, 'brightcontent/base_controller_ext/pagination'
+    autoload :Fields, 'brightcontent/base_controller_ext/fields'
+    autoload :Filtering, 'brightcontent/base_controller_ext/filtering'
+  end
+end

data/lib/brightcontent/core.rb

@@ -1,22 +1,32 @@
+require "coffee_script"
+require "bootstrap-sass"
+require "bootstrap-wysihtml5-rails"
 require "inherited_resources"
-require "simple_form"
+require "ransack"
 require "jquery-rails"
+require "simple_form"
 require "will_paginate"
-require "bootstrap-wysihtml5-rails"
-require "has_scope"
-require "strong_parameters"
+require "will_paginate-bootstrap"
 
 require "brightcontent/rails/routes"
 require "brightcontent/engine"
 
 module Brightcontent
-
-  autoload :Pagination, 'brightcontent/pagination'
+  autoload :DefaultActions, 'brightcontent/default_actions'
+  autoload :ModelExtensions, 'brightcontent/model_extensions'
   autoload :PageMethods, 'brightcontent/page_methods'
+  autoload :Pagination, 'brightcontent/pagination'
+  autoload :Resource, 'brightcontent/resource'
+  autoload :Resources, 'brightcontent/resources'
   autoload :RoutesParser, 'brightcontent/routes_parser'
-  autoload :DefaultActions, 'brightcontent/default_actions'
   autoload :StrongParamsFix, 'brightcontent/strong_params_fix'
-  autoload :ModelExtensions, 'brightcontent/model_extensions'
+  autoload :ViewLookup, 'brightcontent/view_lookup'
+  autoload :BaseControllerExt, 'brightcontent/base_controller_ext'
+
+  mattr_accessor :locale
+
+  mattr_reader :extensions
+  @@extensions = %w{core}
 
   mattr_accessor :engine_resources
   @@engine_resources = %w{sessions admin_users}
@@ -27,10 +37,14 @@ module Brightcontent
   mattr_accessor :application_name
   @@application_name = "Brightcontent"
 
-  # Default way to setup Brightcontent.
-  # Run rails g brightcontent:install to create initializer
+  mattr_accessor :main_menu_count
+  @@main_menu_count = 6
+
   def self.setup
     yield self
   end
 
+  def self.register_extension(name)
+    @@extensions << name
+  end
 end

data/lib/brightcontent/engine.rb

@@ -11,5 +11,11 @@ module Brightcontent
         include ModelExtensions
       end
     end
+
+    initializer "Set default locale from main app" do
+      ActiveSupport.on_load(:after_initialize) do
+        Brightcontent.locale ||= I18n.default_locale
+      end
+    end
   end
 end

data/lib/brightcontent/resource.rb

@@ -0,0 +1,15 @@
+require 'active_support/inflector'
+
+module Brightcontent
+  Resource = Struct.new(:path) do
+    def klass
+      path.classify.constantize
+    rescue
+      "Brightcontent::#{path.classify}".constantize
+    end
+
+    def to_partial_path
+      "application/resource"
+    end
+  end
+end

data/lib/brightcontent/resources.rb

@@ -0,0 +1,25 @@
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/object/blank'
+
+module Brightcontent
+  Resources = Struct.new(:resources) do
+    include Enumerable
+    delegate :each, :==, to: :resources
+
+    def main_menu
+      take main_menu_count
+    end
+
+    def extra_menu
+      drop main_menu_count
+    end
+
+    def extra_menu?
+      resources.length > Brightcontent.main_menu_count
+    end
+
+    def main_menu_count
+      Brightcontent.main_menu_count - (extra_menu? ? 1 : 0)
+    end
+  end
+end

data/lib/brightcontent/routes_parser.rb

@@ -2,28 +2,25 @@ require 'active_support/inflector'
 
 module Brightcontent
   class RoutesParser
-
-    def initialize(routes_hash=nil, engine_resources=nil)
+    def initialize(routes_hash = nil, engine_resources = Brightcontent.engine_resources)
       @routes_hash = routes_hash
       @engine_resources = engine_resources
     end
 
     def resources
-      (resource_names - engine_resources).map do |name|
-        Resource.new(name)
-      end
+      Resources.new(resources_array)
     end
 
-    class Resource < Struct.new(:path)
-      def klass
-        path.classify.constantize
-      rescue
-        "Brightcontent::#{path.classify}".constantize
+    private
+
+    attr_reader :engine_resources
+
+    def resources_array
+      (resource_names - engine_resources).map do |name|
+        Resource.new(name)
       end
     end
 
-    private
-
     def resource_names
       routes_hash.map do |route|
         next unless route && route[:controller] && route[:path_spec]
@@ -43,10 +40,5 @@ module Brightcontent
         }
       end
     end
-
-    def engine_resources
-      @engine_resources ||= Brightcontent.engine_resources
-    end
-
   end
 end

data/lib/brightcontent/view_lookup/abstract.rb

@@ -0,0 +1,49 @@
+require 'active_support/inflector'
+
+module Brightcontent
+  module ViewLookup
+    class Abstract
+      attr_reader :options, :view_context
+
+      def initialize(view_context, options)
+        @view_context = view_context
+        @options = options
+      end
+
+      def call
+        render_by_field_name || render_by_type || render_default
+      end
+
+      private
+
+      def render_by_field_name
+        render("#{name}_#{options[:field]}", options)
+      end
+
+      def render_by_type
+        return unless field_type
+        render("brightcontent/base/#{name.pluralize}/#{field_type}", options)
+      end
+
+      def render_default
+        field_value
+      end
+
+      def field_type
+        raise NotImplementedError
+      end
+
+      def name
+        self.class.name.demodulize.underscore
+      end
+
+      def field_value
+        options[:item].send(options[:field])
+      end
+
+      def render(*args)
+        view_context.render_if_exists(*args)
+      end
+    end
+  end
+end

data/lib/brightcontent/view_lookup/filter_field.rb

@@ -0,0 +1,57 @@
+module Brightcontent
+  module ViewLookup
+    class FilterField < Abstract
+      def render_default
+        raise "invalid filter field: #{options[:field]}" unless field_name
+        [
+          options[:form].label(:"#{field_name}_eq", options[:field].humanize),
+          options[:form].select(:"#{field_name}_eq", select_options, {include_blank: true}, class: "form-control input-sm")
+        ].join(" ").html_safe
+      end
+
+      def field_type
+        resource_class.columns_hash[options[:field]].try :type
+      end
+
+      private
+
+      def field?
+        resource_class.column_names.include? options[:field].to_s
+      end
+
+      def belongs_to_association?
+        association.try :belongs_to?
+      end
+
+      def field_name
+        if field?
+          options[:field]
+        elsif belongs_to_association?
+          association.foreign_key
+        end
+      end
+
+      def select_options
+        if field?
+          field_type == :boolean ? raw_options : raw_options.sort
+        elsif belongs_to_association?
+          association.klass.where(association.association_primary_key => raw_options).map do |record|
+            [record, record[association.association_primary_key]]
+          end
+        end
+      end
+
+      def raw_options
+        resource_class.uniq.pluck(field_name)
+      end
+
+      def association
+        resource_class.reflect_on_association options[:field].to_sym
+      end
+
+      def resource_class
+        view_context.send :resource_class
+      end
+    end
+  end
+end

data/lib/brightcontent/view_lookup/form_field.rb

@@ -0,0 +1,14 @@
+module Brightcontent
+  module ViewLookup
+    class FormField < Abstract
+      def render_default
+        options[:form].input(options[:field].to_sym)
+      end
+
+      def field_type
+        column = options[:form].send(:find_attribute_column, options[:field])
+        options[:form].send(:default_input_type, options[:field], column, {})
+      end
+    end
+  end
+end

data/lib/brightcontent/view_lookup/list_field.rb

@@ -0,0 +1,13 @@
+module Brightcontent
+  module ViewLookup
+    class ListField < Abstract
+      def render_default
+        view_context.strip_tags(field_value.to_s).truncate(50)
+      end
+
+      def field_type
+        options[:item].column_for_attribute(options[:field]).try(:type)
+      end
+    end
+  end
+end

data/lib/brightcontent/view_lookup.rb

@@ -0,0 +1,8 @@
+module Brightcontent
+  module ViewLookup
+    autoload :Abstract, 'brightcontent/view_lookup/abstract'
+    autoload :FormField, 'brightcontent/view_lookup/form_field'
+    autoload :ListField, 'brightcontent/view_lookup/list_field'
+    autoload :FilterField, 'brightcontent/view_lookup/filter_field'
+  end
+end

data/lib/generators/brightcontent/templates/brightcontent_controller.rb

@@ -1,2 +1,2 @@
-class Brightcontent::<%= name.capitalize.pluralize %>Controller < Brightcontent::BaseController
+class Brightcontent::<%= name.camelize.pluralize %>Controller < Brightcontent::BaseController
 end

data/lib/generators/brightcontent/templates/initializer.rb

@@ -2,7 +2,19 @@ Brightcontent.setup do |config|
   # The path where the admin interface should mount.
   config.path = "admin"
 
-  # Name of the application which is displayed in header
-  # Defaults to Rails application name
+  # Name of the application which is displayed in header.
+  # Defaults to Rails application name.
   # config.application_name = "Custom app name"
+
+  # Overwrite Brightcontent locale. Defaults to Rails locale.
+  # config.locale = "nl"
+
+  # Set the amount of menu items which are shown directly in the top bar.
+  # If there are more resources than this number, the remaining will be 
+  # accumulated in a drop down menu.
+  # config.main_menu_count = 6
+
+  # The attachments model only allows images and pdf documents by default.
+  # Set to empty array to disable.
+  # config.attachment_content_types = [/\Aimage/, "application/pdf"]
 end

data/spec/dummy/app/controllers/brightcontent/blogs_controller.rb

@@ -1,3 +1,3 @@
 class Brightcontent::BlogsController < Brightcontent::BaseController
-  has_scope :featured, :type => :boolean
+  filter_fields %w[featured author]
 end

data/spec/dummy/app/models/author.rb

@@ -0,0 +1,7 @@
+class Author < ActiveRecord::Base
+  has_many :blogs
+
+  def to_s
+    name
+  end
+end

data/spec/dummy/app/models/blog.rb

@@ -1,4 +1,5 @@
 class Blog < ActiveRecord::Base
-  scope :featured, where(:featured => true)
+  belongs_to :author
   has_many :comments
+  scope :featured, ->{ where(:featured => true) }
 end