brightcontent-core 2.3.4 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a42674026bfb9c90c0e782375d93a9698c65f23
-  data.tar.gz: a64e099fc087cd05afd971f0aea67cf30d073478
+  metadata.gz: a59c7387cca9c17d2cdd1a2172f14732fac39181
+  data.tar.gz: b35f502da97a126b6f1dd2d5553564bbcec67149
 SHA512:
-  metadata.gz: e3a974a15c9753555c1c582e163324d0ed478980b7a6b015ed55bf570b34a57b1b49179a4d6111e0ccf2cbf1702aeca6f5979d384bafb13aaf3a7bf14ccb68e5
-  data.tar.gz: 4a875f9257a6f88c8239318b57407d1cb52b8b6e9970f1690836bc89e6da7d6050514b27361d224cd8d48cc1a68c55406f0c5c093d421b8e0e058805382c3e96
+  metadata.gz: e51652e0b7c53f62e023f2c01fda8ddddf55d30e43feaa8ae2d29d710c703e3696deac162132dc18c7377762df3e6bcc46402d214a59edef3ec3698a054f7ca3
+  data.tar.gz: b4fa46b6fc1c9331ad112831e0ed4c2a00182c537b940fc5df6de05f4f1b56dc5fb5f04293913a953d67bb0df61a28f673a01fca08dafc30c79dc3f467c90cc5

data/app/assets/javascripts/brightcontent/brightcontent.js.erb

@@ -1,6 +1,10 @@
 //= require jquery
 //= require jquery_ujs
 //= require bootstrap
+//= require moment
+//= require bootstrap-datetimepicker
+//= require moment/nl
+//= require locales/bootstrap-datetimepicker.nl.js
 
 <% (Brightcontent.extensions + ['custom']).each do |name|
   require_asset("brightcontent/#{name}")

data/app/assets/javascripts/brightcontent/core.js

@@ -16,4 +16,7 @@ $(function() {
       }
     }
   });
+
+  $('[data-behaviour~=datepicker]').datetimepicker(pickTime: false, language: 'nl')
+  $('[data-behaviour~=datetimepicker]').datetimepicker(language: 'nl')
 });

data/app/assets/stylesheets/brightcontent/brightcontent.css.erb

@@ -1,4 +1,5 @@
 /*
+ *= require bootstrap-datetimepicker
  *= require bootstrap-wysihtml5
  *= require brightcontent/signin
  */

data/app/controllers/brightcontent/application_controller.rb

@@ -10,10 +10,14 @@ module Brightcontent
       redirect_to polymorphic_url(user_resources.first.klass)
     end
 
+    def default_url_options(options = {})
+      { locale: I18n.locale }.merge options
+    end
+
     private
 
     def set_locale
-      I18n.locale = Brightcontent.locale
+      I18n.locale = params[:locale] || Brightcontent.locale
     end
 
     def current_user
@@ -24,7 +28,7 @@ module Brightcontent
     helper_method :current_user
 
     def user_resources
-      @user_resources ||= RoutesParser.new.resources
+      @user_resources ||= @current_user.resources
     end
     helper_method :user_resources
 

data/app/controllers/brightcontent/base_controller.rb

@@ -3,37 +3,14 @@ require_dependency "brightcontent/application_controller"
 
 module Brightcontent
   class BaseController < ApplicationController
-    inherit_resources
-    respond_to :all
-
     include BaseControllerExt::DefaultActions
+    include BaseControllerExt::Filtering
     include BaseControllerExt::Pagination
     include BaseControllerExt::Fields
-    include BaseControllerExt::Filtering
-
-    def permitted_params
-      params.permit!
-    end
-
-    def resource_params
-      [permitted_params[resource_instance_name]]
-    end
-
-    protected
-
-    def parent
-      super if parent?
-    end
-    helper_method :parent
-
-    def resource_item_path
-      [parent, resource]
-    end
-    helper_method :resource_item_path
 
-    def resource_index_path
-      [parent, resource_class]
+    # deprecated; included for compatibility with inherited_resources
+    def end_of_association_chain
+      base_collection
     end
-    helper_method :resource_index_path
   end
 end

data/app/models/brightcontent/admin_user.rb

@@ -7,5 +7,9 @@ module Brightcontent
     def self.authenticate(email, password)
       find_by_email(email).try :authenticate, password
     end
+
+    def resources
+      Brightcontent::RoutesParser.new.resources
+    end
   end
 end

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

@@ -1,4 +1,4 @@
 <li><%= link_to "Homepage", "/" %></li>
-<li><%= link_to Brightcontent::AdminUser.model_name.human.pluralize, admin_users_path %></li>
+<li><%= link_to nominative_plural(Brightcontent.user_model), 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,4 +1,4 @@
-<%= simple_form_for resource_item_path do |form| %>
+<%= simple_form_for resource_path do |form| %>
   <%= form.error_notification %>
 
   <div class="page-header">
@@ -16,7 +16,7 @@
     <%= form.button :submit, t('brightcontent.save_and_continue'), class: "btn btn-default", name: "commit_and_continue" %>
 
     <% 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?' } %>
+      <%= link_to t('brightcontent.delete'), resource_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 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 %>
+<%= link_to t('brightcontent.edit'), resource_edit_path(item), class: "btn btn-xs btn-primary" %>
+<%= link_to t('brightcontent.delete'), resource_path(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

@@ -1,6 +1,7 @@
 <% if filter_fields.present? %>
   <div class="panel-body">
     <%= search_form_for ransack_search, class: "form-inline" do |form| %>
+      <%= hidden_field_tag :per_page, items_per_page %>
       <% normalized_filter_fields.each do |field, options| %>
         <%= render_filter_field form, field, options %>
       <% end %>

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

@@ -1,5 +1,5 @@
 <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" %>
+  <%= link_to "#{I18n.t('brightcontent.create_new', model: resource_class.model_name.human).capitalize}", url_for(action: :new), class: "btn btn-primary pull-right" %>
   <h1><%= nominative_plural(resource_class).capitalize %></h1>
 </div>
 

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

@@ -1,4 +1,4 @@
-<%= content_tag_for :tr, item do %>
+<%= content_tag :tr, id: dom_id(item), class: dom_class(item) do %>
   <% list_fields.each do |field| %>
     <td><%= render_list_field(item, field) %></td>
   <% end %>

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

@@ -0,0 +1,9 @@
+<% if page_sizes_visible?(collection) %>
+  <ul class="pagination page-sizes pull-left">
+    <% page_sizes.each do |size| %>
+      <li class="<%= :active if size == items_per_page %>">
+        <%= link_to size, params.permit!.merge({ per_page: size, page: corrected_page(size) }) %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>

data/app/views/brightcontent/base/form_fields/_date.html.erb

@@ -0,0 +1,10 @@
+<div class="form-group">
+  <%= form.label field %>
+  <div class="col-sm-10">
+    <%= form.text_field field, class: 'form-control', data: {behaviour: 'datepicker', format: "dd/MM/yyyy"} %>
+    <span class="add-on">
+      <i data-date-icon="icon-calendar">
+      </i>
+    </span>
+  </div>
+</div>

data/app/views/brightcontent/base/form_fields/_datetime.html.erb

@@ -0,0 +1,10 @@
+<div class="form-group">
+  <%= form.label field %>
+  <div class="col-sm-10">
+    <%= form.text_field field, class: 'form-control', data: {behaviour: 'datetimepicker', format: "dd/MM/yyyy HH:mm"} %>
+    <span class="add-on">
+      <i data-time-icon="icon-clock" data-date-icon="icon-calendar">
+      </i>
+    </span>
+  </div>
+</div>

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

@@ -19,5 +19,6 @@
 </div>
 
 <div class="panel-footer panel-footer-pagination">
-  <%= will_paginate collection, renderer: BootstrapPagination::Rails %>
+  <%= render partial: "page_sizes" %>
+  <%= will_paginate collection, class: :pages, renderer: BootstrapPagination::Rails %>
 </div>

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

@@ -7,9 +7,6 @@
   <%= stylesheet_link_tag "brightcontent/brightcontent", :media => "all" %>
   <%= yield :head %>
   <%= csrf_meta_tags %>
-  <!--[if lt IE 9]>
-    <script src="https://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
 </head>
 
 <body data-editor-locale="<%=t('brightcontent.editor_locale')%>">

data/brightcontent-core.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.add_dependency "bcrypt"
   s.add_dependency "bootstrap-sass", ">= 3.1"
   s.add_dependency "bootstrap-wysihtml5-rails", ">= 0.3.2"
-  s.add_dependency "inherited_resources", ">= 1.6.0"
+  s.add_dependency "momentjs-rails", "~> 2.5.0"
+  s.add_dependency "bootstrap3-datetimepicker-rails", "~> 3.0.0"
   s.add_dependency "jquery-rails"
   s.add_dependency "sass-rails", ">= 4.0.2"
   s.add_dependency "simple_form"

data/lib/brightcontent/base_controller_ext/default_actions.rb

@@ -1,35 +1,120 @@
+require 'active_support/concern'
+
 module Brightcontent
   module BaseControllerExt
     module DefaultActions
+      extend ActiveSupport::Concern
+
+      included do
+        before_action :set_collection
+        before_action :set_resource, only: [:show, :edit, :update, :destroy]
+        helper_method :resource, :resource_class, :resource_index_path, :resource_path, :collection, :resource_edit_path
+      end
+
+      def base_collection
+        instance_variable_get :"@#{resource_name.pluralize}"
+      end
+
+      def collection
+        base_collection
+      end
+
+      def collection=(val)
+        instance_variable_set :"@#{resource_name.pluralize}", val
+      end
+
+      def resource
+        instance_variable_get :"@#{resource_instance_name}"
+      end
+
+      def resource=(val)
+        instance_variable_set :"@#{resource_instance_name}", val
+      end
+
+      def resource_class
+        controller_name.classify.constantize
+      end
+
+      def resource_name
+        controller_name
+      end
+
+      def resource_instance_name
+        resource_name.singularize
+      end
+
+      def index
+      end
+
       def show
-        if request.format == :html
-          redirect_to action: :edit
-        else
-          show!
-        end
+        redirect_to action: :edit
+      end
+
+      def new
+        self.resource = base_collection.new
+      end
+
+      def edit
       end
 
       def create
-        create! { resource_redirect_path }
+        self.resource = base_collection.new(resource_params)
+        if resource.save
+          redirect_to resource_redirect_path, notice: t("flash.actions.create.notice", resource_name: resource_instance_name.capitalize)
+        else
+          render :new
+        end
       end
 
       def update
-        update! { resource_redirect_path }
+        if resource.update(resource_params)
+          redirect_to resource_redirect_path, notice: t("flash.actions.update.notice", resource_name: resource_instance_name.capitalize)
+        else
+          render :edit
+        end
       end
 
       def destroy
-        destroy! { resource_index_path }
+        if resource.destroy
+          redirect_to resource_index_path, notice: t("flash.actions.destroy.notice", resource_name: resource_instance_name.capitalize)
+        else
+          redirect_to resource_index_path, alert: t("flash.actions.destroy.alert", resource_name: resource_instance_name.capitalize)
+        end
       end
 
       private
 
+      def set_collection
+        self.collection = resource_class.all
+      end
+
+      def set_resource
+        self.resource = base_collection.find(params[:id])
+      end
+
+      def resource_params
+        params.require(resource_instance_name).permit!
+      end
+
+      def resource_index_path
+        [brightcontent, resource_class]
+      end
+
+      def resource_edit_path(res = resource)
+        [brightcontent, :edit, res]
+      end
+
       def resource_redirect_path
-        if params["commit_and_continue"].present?
-          resource_item_path
+        if params[:commit_and_continue].present?
+          resource_edit_path
         else
           resource_index_path
         end
       end
+
+      def resource_path(res = resource)
+        [brightcontent, res]
+      end
     end
   end
 end

data/lib/brightcontent/base_controller_ext/filtering.rb

@@ -10,11 +10,11 @@ module Brightcontent
       end
 
       def ransack_search
-        @_ransack_search ||= end_of_association_chain.ransack(params[:q])
+        @_ransack_search ||= base_collection.ransack(params[:q])
       end
 
       def collection
-        @_collection ||= ransack_search.result(distinct: true)
+        @_collection ||= ransack_search.result
       end
     end
   end

data/lib/brightcontent/base_controller_ext/pagination.rb

@@ -5,21 +5,70 @@ module Brightcontent
     module Pagination
       extend ActiveSupport::Concern
 
+      included do
+        helper_method :items_per_page
+        helper_method :current_page
+        helper_method :page_sizes
+        helper_method :corrected_page
+        helper_method :page_sizes_visible?
+      end
+
       module ClassMethods
         def per_page_count
-          @per_page_count ||= 30
+          @page_size = page_sizes.min
         end
 
         def per_page(number)
-          @per_page_count = number
+          @page_sizes = [number]
+        end
+
+        def page_size_options(sizes)
+          return unless sizes.is_a? Array
+          @page_sizes = sizes
+        end
+
+        def page_sizes
+          @page_sizes ||= [30]
         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)
+      def items_per_page
+        per_page = params[:per_page].try(:to_i)
+        @items_per_page =
+          if per_page && page_sizes.include?(per_page)
+            per_page.to_i
+          else
+            self.class.per_page_count
+          end
+      end
+
+      def page_sizes_visible?(collection)
+        total_entries = collection.count
+
+        if total_entries.respond_to?(:size) && !total_entries.is_a?(Integer)
+          total_entries = total_entries.size
+        end
+
+        page_sizes.length > 1 && total_entries > page_sizes.min
+      end
+
+      def current_page
+        params[:page].try(:to_i) || 1
+      end
+
+      def corrected_page(size)
+        (current_page - 1) * items_per_page / size + 1
+      end
+
+      def page_sizes
+        self.class.page_sizes
+      end
+
+      def collection
+        if action_name == "index" && items_per_page > 0
+          super.paginate(page: params[:page], per_page: items_per_page)
         else
           super
         end

data/lib/brightcontent/core.rb

@@ -5,7 +5,8 @@ ENV['RANSACK_FORM_BUILDER'] ||= '::SimpleForm::FormBuilder'
 
 require "bootstrap-sass"
 require "bootstrap-wysihtml5-rails"
-require "inherited_resources"
+require "momentjs-rails"
+require "bootstrap3-datetimepicker-rails"
 require "ransack"
 require "jquery-rails"
 require "simple_form"

data/lib/brightcontent/view_lookup/filter_field.rb

@@ -106,7 +106,7 @@ module Brightcontent
       end
 
       def raw_collection
-        resource_class.uniq.pluck(field_name)
+        resource_class.distinct.pluck(field_name)
       end
     end
   end

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

@@ -1,3 +1,21 @@
 class Brightcontent::CommentsController < Brightcontent::BaseController
-  belongs_to :blog
+  def blog
+    Blog.find(params[:blog_id])
+  end
+
+  def base_collection
+    blog.comments
+  end
+
+  def resource_path(res = resource)
+    [brightcontent, blog, res]
+  end
+
+  def resource_index_path
+    [brightcontent, blog, resource_class]
+  end
+
+  def resource_edit_path(res = resource)
+    [brightcontent, :edit, blog, res]
+  end
 end

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

@@ -0,0 +1,5 @@
+class Brightcontent::GroupedBlogsController < Brightcontent::BaseController
+  def collection
+    super.group(:author_id)
+  end
+end

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

@@ -0,0 +1,9 @@
+class GroupedBlog < ActiveRecord::Base
+  belongs_to :author
+
+  scope :exclude_inactive, ->{ where(active: true) }
+
+  def self.ransackable_scopes(auth = nil)
+    [:exclude_inactive]
+  end
+end

data/spec/dummy/config/routes.rb

@@ -5,5 +5,7 @@ Rails.application.routes.draw do
     resources :blogs do
       resources :comments
     end
+
+    resources :grouped_blogs
   end
 end

data/spec/dummy/db/migrate/20160623142310_create_grouped_blogs.rb

@@ -0,0 +1,12 @@
+class CreateGroupedBlogs < ActiveRecord::Migration
+  def change
+    create_table :grouped_blogs do |t|
+      t.string :name
+      t.text :body
+      t.boolean :active, default: true
+      t.column :author_id, :integer
+
+      t.timestamps
+    end
+  end
+end

data/spec/factories.rb

@@ -19,6 +19,11 @@ FactoryGirl.define do
     end
   end
 
+  factory :grouped_blog do
+    name "Blogname"
+    body "Inhoud"
+  end
+
   factory :author do
     factory :author_with_blogs do
       transient do
@@ -27,6 +32,15 @@ FactoryGirl.define do
       after(:create) do |author, evaluator|
         create_list(:blog, evaluator.blogs_count, author: author)
       end
+
+    end
+    factory :author_with_grouped_blogs do
+      transient do
+        blogs_count 5
+      end
+      after(:create) do |author, evaluator|
+        create_list(:grouped_blog, evaluator.blogs_count, author: author)
+      end
     end
   end
 

data/spec/features/grouped_resources_index_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+feature "Grouped resources index" do
+  background do
+    sign_in
+  end
+
+  scenario "Visit the index view of resource" do
+    given_authors_with_blogs(authors: 3, blogs: 2)
+    given_page_sizes [2, 3]
+
+    visit_grouped_blogs_page
+
+    page_should_have_n_rows 2
+
+    # 2 numbered links and previous/next links
+    page.should have_css(".pagination.pages li", count: 4)
+  end
+
+  def visit_grouped_blogs_page
+    click_link "Grouped blogs"
+  end
+
+  def given_authors_with_blogs(authors: 2, blogs: 5)
+    authors.times do |num|
+      create(:author_with_grouped_blogs, blogs_count: blogs, name: "Blogger #{num}")
+    end
+  end
+
+  def given_page_sizes(sizes = [2, 6, 10])
+    Brightcontent::GroupedBlogsController.class_eval { page_size_options sizes }
+  end
+
+  def page_should_have_n_rows(n)
+    page.should have_css("tbody tr", :count => n)
+  end
+end

data/spec/features/resources_index_spec.rb

@@ -66,6 +66,103 @@ feature "Resources index" do
     page_should_have_n_rows 1
   end
 
+  scenario "shows no page size options" do
+    given_blog_items
+    visit_blogs_page
+    page.should_not have_css(".pagination.page-sizes")
+  end
+
+  context "with adjustable pagination page size" do
+    scenario "shows pagination size options" do
+      given_page_sizes
+      given_blog_items
+      visit_blogs_page
+
+      page.should have_css(".pagination.page-sizes li", count: 3)
+      within ".pagination.page-sizes .active" do
+        page.should have_content "2"
+      end
+    end
+
+    scenario "shows 2 items" do
+      given_page_sizes
+      given_blog_items
+      visit_blogs_page
+      page_should_have_n_rows 2
+    end
+
+    scenario "can switch to different page size" do
+      given_page_sizes [3, 6, 9]
+      given_blog_items
+      visit_blogs_page
+      within ".pagination.page-sizes" do
+        click_link "6"
+      end
+
+      page_should_have_n_rows 6
+    end
+
+    scenario "adjusts active page to page size" do
+      given_page_sizes [2, 4, 8]
+      given_blog_items 16
+      visit_blogs_page
+
+      within ".pagination.pages" do
+        click_link "4"
+      end
+
+      within ".pagination.page-sizes" do
+        click_link "4"
+      end
+
+      within ".pagination.pages .active" do
+        page.should have_content "2"
+      end
+    end
+
+    scenario "retains page size after applying filter" do
+      given_page_sizes [2, 4, 8]
+      given_blog_items 9
+      visit_blogs_page
+      within ".pagination.page-sizes" do
+        click_link "4"
+      end
+
+      fill_in "Name", with: "Blog"
+      click_button "Search"
+
+      within ".pagination.page-sizes .active" do
+        page.should have_content "4"
+      end
+    end
+
+    scenario "retains filter after applying page size" do
+      given_page_sizes [2, 4, 8]
+      given_blog_items 14
+      visit_blogs_page
+      fill_in "Name", with: "Blog 1"
+      click_button "Search"
+
+      # 3 numbered links and previous/next links
+      page.should have_css(".pagination.pages li", count: 5)
+
+      within ".pagination.page-sizes" do
+        click_link "4"
+      end
+
+      # 2 numbered links and previous/next links
+      page.should have_css(".pagination.pages li", count: 4)
+    end
+
+    scenario "hides page size options when there is only a single page" do
+      given_page_sizes [5, 6, 7]
+      given_blog_items 4
+      visit_blogs_page
+
+      page.should_not have_css(".pagination.page-sizes")
+    end
+  end
+
   def visit_blogs_page
     click_link "Blogs"
   end
@@ -112,4 +209,12 @@ feature "Resources index" do
     create :blog, name: "Foo", active: false
     create :blog, name: "Bar", active: true
   end
+
+  def given_page_sizes(sizes = [2, 6, 10])
+    Brightcontent::BlogsController.class_eval { page_size_options sizes }
+  end
+
+  def given_blog_items(num = 10)
+    num.times { |num| create [:blog, :featured_blog].sample, name: "Blog #{num}" }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.4.0
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,19 +67,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
-  name: inherited_resources
+  name: momentjs-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+- !ruby/object:Gem::Dependency
+  name: bootstrap3-datetimepicker-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -269,7 +283,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- Gemfile
 - Rakefile
 - app/assets/javascripts/brightcontent/brightcontent.js.erb
 - app/assets/javascripts/brightcontent/core.js
@@ -296,8 +309,11 @@ files:
 - app/views/brightcontent/base/_list_filters.html.erb
 - app/views/brightcontent/base/_list_header.html.erb
 - app/views/brightcontent/base/_list_item.html.erb
+- app/views/brightcontent/base/_page_sizes.html.erb
 - app/views/brightcontent/base/edit.html.erb
 - app/views/brightcontent/base/form_fields/_belongs_to.html.erb
+- app/views/brightcontent/base/form_fields/_date.html.erb
+- app/views/brightcontent/base/form_fields/_datetime.html.erb
 - app/views/brightcontent/base/form_fields/_file.html.erb
 - app/views/brightcontent/base/form_fields/_has_and_belongs_to_many.html.erb
 - app/views/brightcontent/base/form_fields/_has_many.html.erb
@@ -350,6 +366,7 @@ files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/brightcontent/blogs_controller.rb
 - spec/dummy/app/controllers/brightcontent/comments_controller.rb
+- spec/dummy/app/controllers/brightcontent/grouped_blogs_controller.rb
 - spec/dummy/app/controllers/pages_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
@@ -357,6 +374,7 @@ files:
 - spec/dummy/app/models/author.rb
 - spec/dummy/app/models/blog.rb
 - spec/dummy/app/models/comment.rb
+- spec/dummy/app/models/grouped_blog.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/pages/index.html.erb
 - spec/dummy/config.ru
@@ -383,6 +401,7 @@ files:
 - spec/dummy/db/migrate/20140512085432_add_author_id_to_blogs.rb
 - spec/dummy/db/migrate/20140512090832_create_authors.rb
 - spec/dummy/db/migrate/20150219130156_add_active_to_blogs.rb
+- spec/dummy/db/migrate/20160623142310_create_grouped_blogs.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -393,6 +412,7 @@ files:
 - spec/dummy/test/unit/comments_test.rb
 - spec/factories.rb
 - spec/features/export_spec.rb
+- spec/features/grouped_resources_index_spec.rb
 - spec/features/login_spec.rb
 - spec/features/menu_spec.rb
 - spec/features/nested_resource_spec.rb
@@ -425,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Brightcontent core
@@ -439,6 +459,7 @@ test_files:
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/brightcontent/blogs_controller.rb
 - spec/dummy/app/controllers/brightcontent/comments_controller.rb
+- spec/dummy/app/controllers/brightcontent/grouped_blogs_controller.rb
 - spec/dummy/app/controllers/pages_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
@@ -446,6 +467,7 @@ test_files:
 - spec/dummy/app/models/author.rb
 - spec/dummy/app/models/blog.rb
 - spec/dummy/app/models/comment.rb
+- spec/dummy/app/models/grouped_blog.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/pages/index.html.erb
 - spec/dummy/config.ru
@@ -472,6 +494,7 @@ test_files:
 - spec/dummy/db/migrate/20140512085432_add_author_id_to_blogs.rb
 - spec/dummy/db/migrate/20140512090832_create_authors.rb
 - spec/dummy/db/migrate/20150219130156_add_active_to_blogs.rb
+- spec/dummy/db/migrate/20160623142310_create_grouped_blogs.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -482,6 +505,7 @@ test_files:
 - spec/dummy/test/unit/comments_test.rb
 - spec/factories.rb
 - spec/features/export_spec.rb
+- spec/features/grouped_resources_index_spec.rb
 - spec/features/login_spec.rb
 - spec/features/menu_spec.rb
 - spec/features/nested_resource_spec.rb

data/Gemfile

@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gemspec