brightcontent-core 2.0.33 → 2.1.0

data/app/controllers/brightcontent/application_controller.rb

@@ -1,9 +1,20 @@
 module Brightcontent
   class ApplicationController < ActionController::Base
+    add_flash_types :success, :info, :warning, :danger
     before_filter :authorize
+    before_filter :set_locale
+    helper TranslationHelper
+
+    def index
+      redirect_to root_path + user_resources.first.path
+    end
 
     private
 
+    def set_locale
+      I18n.locale = Brightcontent.locale
+    end
+
     def current_user
       @current_user ||= AdminUser.find(session[:brightcontent_user_id]) if session[:brightcontent_user_id]
     end
@@ -15,8 +26,7 @@ module Brightcontent
     helper_method :user_resources
 
     def authorize
-      redirect_to login_url if current_user.nil?
+      redirect_to login_url unless current_user
     end
-
   end
 end

data/app/controllers/brightcontent/base_controller.rb

@@ -4,32 +4,22 @@ require_dependency "brightcontent/application_controller"
 module Brightcontent
   class BaseController < ApplicationController
     inherit_resources
-    helper_method :scopes_configuration
     respond_to :all
 
-    include DefaultActions
-    include Pagination
+    include BaseControllerExt::DefaultActions
+    include BaseControllerExt::Pagination
+    include BaseControllerExt::Fields
+    include BaseControllerExt::Filtering
 
     def permitted_params
       params.permit!
     end
 
-    protected
-
-    def list_fields
-      default_fields - %w{attachments}
-    end
-    helper_method :list_fields
-
-    def form_fields
-      default_fields
+    def resource_params
+      [permitted_params[resource_instance_name]]
     end
-    helper_method :form_fields
 
-    def default_fields
-      resource_class.brightcontent_columns - %w{id created_at updated_at password_digest}
-    end
-    helper_method :default_fields
+    protected
 
     def parent
       super if parent?
@@ -45,6 +35,5 @@ module Brightcontent
       [parent, resource_class]
     end
     helper_method :resource_index_path
-
   end
 end

data/app/controllers/brightcontent/sessions_controller.rb

@@ -11,7 +11,7 @@ module Brightcontent
         session[:brightcontent_user_id] = user.id
         redirect_to root_url
       else
-        flash.now.alert = "Email or password is invalid"
+        flash.now[:danger] = "Email or password is invalid"
         render :new
       end
     end

data/app/helpers/brightcontent/application_helper.rb

@@ -1,4 +1,8 @@
 module Brightcontent
   module ApplicationHelper
+    def avatar_url(user)
+      gravatar_id = Digest::MD5.hexdigest(user.email.downcase)
+      "https://gravatar.com/avatar/#{gravatar_id}.png?s=30&d=mm"
+    end
   end
 end

data/app/helpers/brightcontent/base_helper.rb

@@ -1,33 +1,21 @@
 module Brightcontent
   module BaseHelper
     def render_list_field(item, field)
-      render_if_exists("list_field_#{field}", item: item) || item.send(field).to_s.truncate(50)
+      ViewLookup::ListField.new(self, item: item, field: field).call
     end
 
-    def render_form_field(form, field)
-      render_if_exists("form_field_#{field}", form: form, item: form.object) ||
-      render_if_exists("brightcontent/fields/#{field_type(form, field)}", form: form, item: form.object, field: field) ||
-      form.input(field.to_sym)
+    def render_filter_field(form, field)
+      ViewLookup::FilterField.new(self, field: field, form: form).call
     end
 
-    def link_for_scope(scope)
-      case scope[:type]
-      when :boolean
-        polymorphic_url(resource_index_path, scope[:as] => true)
-      end
+    def render_form_field(form, field)
+      ViewLookup::FormField.new(self, item: form.object, field: field, form: form).call
     end
 
-    private
-
     def render_if_exists(*args)
-      render *args
+      render(*args)
     rescue ActionView::MissingTemplate
       nil
     end
-
-    def field_type(form, field)
-      column = form.send(:find_attribute_column, field)
-      form.send(:default_input_type, field, column, {})
-    end
   end
 end

data/app/helpers/brightcontent/translation_helper.rb

@@ -0,0 +1,38 @@
+module Brightcontent
+  module TranslationHelper
+
+    # http://en.wiktionary.org/wiki/nominative_case
+    #
+    # This implementation works fine for Germanic languages and it will fail
+    # horribly at Slavic languages or Arabic. Support for true declensions
+    # could be added later though.
+    #
+    # This method exists because:
+    # - we don't want to abuse #human(count: 2) because that should return
+    #   something like "2 Users" and not just "Users". It's not meant to say
+    #   things like: "These are users"
+    # - we want to avoid feeding the current locale to #pluralize the whole time
+    #
+    # nominative_plural("thing") => "things"
+    # nominative_plural(User) => "users"
+    # or if I18n.locale == :nl
+    #   nominative_plural(User) => "gebruikers"
+    #   nominative_plural("thing") => "dingen"
+    def nominative_plural(thing)
+      if thing.respond_to? :model_name
+        nominative_plural(thing.model_name.human)
+      else
+        I18n.t "#{thing}.title", default: thing.to_s.pluralize(I18n.locale)
+      end
+    end
+
+    def nominative_singular(thing)
+      if thing.respond_to? :model_name
+        nominative_singular(thing.model_name.human)
+      else
+        I18n.t "#{thing}.title", default: thing.to_s.singularize(I18n.locale)
+      end
+    end
+
+  end
+end

data/app/views/brightcontent/application/_menu.html.erb

@@ -1,3 +1,10 @@
-<% user_resources.each do |resource| %>
-  <li><%= link_to resource.klass.model_name.human.pluralize, root_path + resource.path %></li>
+<%= render user_resources.main_menu %>
+
+<% if user_resources.extra_menu? %>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Extra <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <%= render user_resources.extra_menu %>
+    </ul>
+  </li>
 <% end %>

data/app/views/brightcontent/application/_resource.html.erb

@@ -0,0 +1,3 @@
+<li class="<%= 'active' if resource_class == resource.klass %>">
+  <%= link_to nominative_plural(resource.klass).capitalize, root_path + resource.path %>
+</li>

data/app/views/brightcontent/application/_show_flash_names.html.erb

@@ -1,5 +1,6 @@
 <% flash.each do |key,value| %>
-  <div class="alert alert-<%= key.to_s%>">
+  <div class="alert alert-info">
+    <a class="close" data-dismiss="alert" href="#" aria-hidden="true">&times;</a>
     <%= value %>
   </div>
 <% end %>

data/app/views/brightcontent/application/_user_menu.html.erb

@@ -0,0 +1,4 @@
+<li><%= link_to "Homepage", "/" %></li>
+<li><%= link_to Brightcontent::AdminUser.model_name.human.pluralize, admin_users_path %></li>
+<li class="divider"></li>
+<li><%= link_to t('brightcontent.logout'), logout_path %></li>

data/app/views/brightcontent/base/_form.html.erb

@@ -1,17 +1,22 @@
-<%= simple_form_for resource_item_path do |form| -%>
+<%= simple_form_for resource_item_path do |form| %>
   <%= form.error_notification %>
 
-  <div class="form-inputs">
-    <% form_fields.each do |form_field| -%>
-      <%= render_form_field(form, form_field) -%>
-    <% end -%>
+  <div class="page-header">
+    <h1><%= t('brightcontent.' + (resource.new_record? ? 'create_new' : 'edit_model'), model: resource_class.model_name.human).capitalize %></h1>
   </div>
 
-  <%= form.button :submit, class: "btn btn-primary" %>
-  <%= form.button :submit, "Save and continue", :name => "commit_and_continue" %>
+  <div class="panel-body form-fields">
+    <% form_fields.each do |form_field| %>
+      <%= render_form_field(form, form_field) %>
+    <% end %>
+  </div>
 
-  <% unless resource.new_record? -%>
-    <%= link_to "Delete", resource_item_path, :class => "btn btn-danger delete", :method => :delete, :data => { :confirm => 'Are you sure?' } %>
-  <% end -%>
+  <div class="panel-footer">
+    <%= form.button :submit, class: "btn btn-primary" %>
+    <%= form.button :submit, t('brightcontent.save_and_continue'), class: "btn btn-default", name: "commit_and_continue" %>
 
-<% end -%>
+    <% unless resource.new_record? %>
+      <%= link_to t('brightcontent.delete'), resource_item_path, class: "btn btn-danger pull-right", method: :delete, data: { confirm: 'Are you sure?' } %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/brightcontent/base/_list_actions.html.erb

@@ -1,2 +1,2 @@
-<%= link_to "Edit", [:edit, parent, item], class: "btn btn-mini btn-primary" %>
-<%= link_to "Delete", [parent, item], class: "btn btn-mini", confirm: 'Are you sure?', method: :delete %>
+<%= link_to t('brightcontent.edit'), [:edit, parent, item], class: "btn btn-xs btn-primary" %>
+<%= link_to t('brightcontent.delete'), [parent, item], class: "btn btn-xs btn-danger", data: {confirm: t('brightcontent.are_you_sure')}, method: :delete %>

data/app/views/brightcontent/base/_list_filters.html.erb

@@ -0,0 +1,12 @@
+<% if filter_fields.present? %>
+  <div class="panel-body">
+    <%= search_form_for ransack_search, class: "form-inline" do |form| %>
+      <% filter_fields.each do |field| %>
+        <div class="form-group">
+          <%= render_filter_field form, field %>
+        </div>
+      <% end %>
+      <%= form.submit class: "btn btn-default btn-sm" %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/brightcontent/base/_list_header.html.erb

@@ -0,0 +1,6 @@
+<div class="page-header">
+  <%= link_to "#{I18n.t('brightcontent.create_new', model: resource_class.model_name.human).capitalize}", polymorphic_url(resource_index_path, action: :new), class: "btn btn-primary pull-right" %>
+  <h1><%= nominative_plural(resource_class).capitalize %></h1>
+</div>
+
+<%= render_if_exists "index_top" %>

data/app/views/brightcontent/base/_list_item.html.erb

@@ -0,0 +1,6 @@
+<%= content_tag_for :tr, item do %>
+  <% list_fields.each do |field| %>
+    <td><%= render_list_field(item, field) %></td>
+  <% end %>
+  <td class="list-actions"><%= render "list_actions", item: item %></td>
+<% end %>

data/app/views/brightcontent/base/edit.html.erb

@@ -1,3 +1 @@
-<h1>Edit <%= resource_class.model_name.human %></h1>
-
 <%= render "form" %>

data/app/views/brightcontent/base/index.html.erb

@@ -1,25 +1,23 @@
-<div id="overview">
+<%= render "list_header" %>
 
-  <%= link_to "Create new #{resource_instance_name.to_s.humanize}", polymorphic_url(resource_index_path, action: :new), class: "btn btn-primary btn-right" %>
-  <h1><%= resource_class.model_name.human.pluralize %></h1>
+<%= render "list_filters" %>
 
-  <%= render "scope_filters" if scopes_configuration %>
-  <%= render "index_top" %>
-
-  <table class="table table-hover">
+<div class="table-responsive">
+  <table class="table table-hover <%= dom_class(resource_class, :table) %>">
     <thead>
       <tr>
         <% list_fields.each do |list_field| %>
-          <th><%= list_field.humanize %></th>
+          <th><%= resource_class.human_attribute_name(list_field) %></th>
         <% end %>
         <th></th>
       </tr>
     </thead>
     <tbody>
-      <%= render "list", collection: collection, list_fields: list_fields  %>
+      <%= render partial: 'list_item', collection: collection, as: :item %>
     </tbody>
   </table>
+</div>
 
-  <%= will_paginate collection %>
-
+<div class="panel-footer panel-footer-pagination">
+  <%= will_paginate collection, renderer: BootstrapPagination::Rails %>
 </div>

data/app/views/brightcontent/base/list_fields/_boolean.html.erb

@@ -0,0 +1,5 @@
+<% if item.send(field) %>
+  <span class="glyphicon glyphicon-ok"></span>
+<% else %>
+  <span class="list-false">&times;</span>
+<% end %>

data/app/views/brightcontent/base/new.html.erb

@@ -1,3 +1 @@
-<h1>Create new <%= resource_instance_name.to_s %></h1>
-
 <%= render "form" %>

data/app/views/brightcontent/sessions/new.html.erb

@@ -1,12 +1,6 @@
-<%= form_tag sessions_path, class: "form-signin" do %>
-  <h2>Please sign in</h2>
-  <div class="field">
-    <%= label_tag :email %>
-    <%= text_field_tag :email, params[:email] %>
-  </div>
-  <div class="field">
-    <%= label_tag :password %>
-    <%= password_field_tag :password %>
-  </div>
-  <%= submit_tag "Login", class: "btn btn-large btn-primary" %>
+<%= form_tag sessions_path, class: "form-signin", role: 'form' do %>
+  <h2 class="form-signin-heading"><%=t('brightcontent.sign_in')%></h2>
+  <%= text_field_tag :email, params[:email], class: 'form-control', placeholder: 'Email', autofocus: true %>
+  <%= password_field_tag :password, nil, class: 'form-control', placeholder: 'Password' %>
+  <%= submit_tag "Login", class: "btn btn-lg btn-primary btn-block" %>
 <% end %>

data/app/views/layouts/brightcontent/application.html.erb

@@ -3,52 +3,57 @@
 <head>
   <title>Brightcontent</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <%= stylesheet_link_tag    "brightcontent/brightcontent", :media => "all" %>
-  <%= javascript_include_tag "brightcontent/brightcontent" %>
+  <meta name="robots" content="noindex" />
+  <%= stylesheet_link_tag "brightcontent/brightcontent", :media => "all" %>
+  <%= yield :head %>
   <%= csrf_meta_tags %>
   <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
   <![endif]-->
 </head>
-<body>
-
 
+<body data-editor-locale="<%=t('brightcontent.editor_locale')%>">
   <% if current_user %>
-    <div class="navbar">
-      <div class="navbar-inner">
-        <div class="container">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+    <div class="navbar navbar-inverse navbar-bc navbar-static-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
-          </a>
-          <%= link_to Brightcontent.application_name, root_path, class: "brand" %>
-          <div class="nav-collapse collapse">
-            <ul class="nav" id="menu">
-              <%= render "menu" %>
-            </ul>
-            <ul class="nav pull-right">
-              <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= current_user.email %><b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  <li><%= link_to "Homepage", "/" %></li>
-                  <li><%= link_to "Admins", admin_users_path %></li>
-                  <li><%= link_to "Logout", logout_path %></li>
-                <ul>
-              </li>
+          </button>
+          <%= link_to Brightcontent.application_name, root_path, class: "navbar-brand" %>
+        </div>
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav js-menu">
+            <%= render "menu" %>
+          </ul>
+          <ul class="nav navbar-nav navbar-right">
+            <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+              <%= image_tag avatar_url(current_user), class: 'avatar' %>
+              <%= current_user.email %><b class="caret"></b>
+            </a>
+            <ul class="dropdown-menu">
+              <%= render "brightcontent/application/user_menu" %>
             </ul>
-          </div>
+            </li>
+          </ul>
         </div>
       </div>
     </div>
   <% end %>
 
-  <div class="container <%= "box" unless controller.controller_name == 'sessions' %>">
-    <%= render "brightcontent/application/show_flash_names" %>
-    <%= yield %>
+  <div class="container">
+    <div class="<%= "panel panel-default" unless controller.controller_name == 'sessions' %>">
+      <%= render "brightcontent/application/show_flash_names" %>
+      <%= yield %>
+    </div>
   </div>
-
 </div>
 
+<%= javascript_include_tag "brightcontent/brightcontent" %>
+<%= yield :bottom %>
 </body>
 </html>

data/bin/autospec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'autospec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'autospec')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/brightcontent-core.gemspec

@@ -15,17 +15,22 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 3.2.13"
+  s.add_dependency "rails", ">= 4.0.0"
+  s.add_dependency "bcrypt-ruby"
+  s.add_dependency "bootstrap-sass", "~> 3.1"
+  s.add_dependency "bootstrap-wysihtml5-rails"
+  s.add_dependency "coffee-rails"
+  s.add_dependency "inherited_resources", ">= 1.4.1"
   s.add_dependency "jquery-rails"
-  s.add_dependency "bcrypt-ruby", ">= 3.0.0"
-  s.add_dependency "inherited_resources"
-  s.add_dependency "has_scope"
+  s.add_dependency "sass-rails", ">= 4.0.2"
   s.add_dependency "simple_form"
   s.add_dependency "will_paginate"
-  s.add_dependency "bootstrap-wysihtml5-rails"
-  s.add_dependency "strong_parameters"
+  s.add_dependency "will_paginate-bootstrap"
+  s.add_dependency "ransack", "~> 1.1"
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency "rspec"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "capybara"
   s.add_development_dependency "launchy"

data/config/initializers/simple_form.rb

@@ -5,8 +5,8 @@ SimpleForm.setup do |config|
   # wrapper, change the order or even add your own to the
   # stack. The options given below are used to wrap the
   # whole input.
-  config.wrappers :default, :class => :input,
-    :hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
+  config.wrappers :default, class: :input,
+    hint_class: :field_with_hint, error_class: :field_with_errors do |b|
     ## Extensions enabled by default
     # Any of these extensions can be disabled for a
     # given input by passing: `f.input EXTENSION_NAME => false`.
@@ -18,7 +18,7 @@ SimpleForm.setup do |config|
     b.use :html5
 
     # Calculates placeholders automatically from I18n
-    # You can also pass a string as f.input :placeholder => "Placeholder"
+    # You can also pass a string as f.input placeholder: "Placeholder"
     b.use :placeholder
 
     ## Optional extensions
@@ -41,8 +41,8 @@ SimpleForm.setup do |config|
 
     ## Inputs
     b.use :label_input
-    b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
-    b.use :error, :wrap_with => { :tag => :span, :class => :error }
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
   end
 
   # The default wrapper to be used by the FormBuilder.
@@ -50,8 +50,8 @@ SimpleForm.setup do |config|
 
   # Define the way to render check boxes / radio buttons with labels.
   # Defaults to :nested for bootstrap config.
-  #   :inline => input + label
-  #   :nested => label > input
+  #   inline: input + label
+  #   nested: label > input
   config.boolean_style = :nested
 
   # Default class for buttons
@@ -66,7 +66,7 @@ SimpleForm.setup do |config|
   config.error_notification_tag = :div
 
   # CSS class to add for error notification helper.
-  config.error_notification_class = 'alert alert-error'
+  config.error_notification_class = 'alert alert-danger'
 
   # ID to add for error notification helper.
   # config.error_notification_id = nil
@@ -95,7 +95,7 @@ SimpleForm.setup do |config|
   # config.label_text = lambda { |label, required| "#{required} #{label}" }
 
   # You can define the class to use on all labels. Default is nil.
-  config.label_class = 'control-label'
+  config.label_class = 'control-label col-sm-2'
 
   # You can define the class to use on all forms. Default is simple_form.
   config.form_class = 'form-horizontal'
@@ -106,8 +106,11 @@ SimpleForm.setup do |config|
   # Whether attributes are required by default (or not). Default is true.
   # config.required_by_default = true
 
-  # Tell browsers whether to use default HTML5 validations (novalidate option).
-  # Default is enabled.
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
   config.browser_validations = false
 
   # Collection of methods to detect if a file type was given.
@@ -120,7 +123,7 @@ SimpleForm.setup do |config|
 
   # Custom wrappers for input types. This should be a hash containing an input
   # type as key and the wrapper that will be used for all inputs with specified type.
-  # config.wrapper_mappings = { :string => :prepend }
+  # config.wrapper_mappings = { string: :prepend }
 
   # Default priority for time_zone inputs.
   # config.time_zone_priority = nil
@@ -128,9 +131,6 @@ SimpleForm.setup do |config|
   # Default priority for country inputs.
   # config.country_priority = nil
 
-  # Default size for text inputs.
-  # config.default_input_size = 50
-
   # When false, do not use translations for labels.
   # config.translate_labels = true
 
@@ -139,4 +139,7 @@ SimpleForm.setup do |config|
 
   # Cache SimpleForm inputs discovery
   config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
 end