RubyGems - brightcontent-core - Versions diffs - 2.4.6 → 2.5.0 - Mend

brightcontent-core 2.4.6 → 2.5.0

Files changed (24) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c53289cd30fd901707edf389707dd97744ab8aed
-  data.tar.gz: 788c93a2d4276f1548eb4ce250a897d0f86210fa
+SHA256:
+  metadata.gz: 64042327f76b07e28af6149a59ea8227b24c9f509b872f48fa2432d3983761af
+  data.tar.gz: 7a3c3459ef1dbebe87f2da33d83d7ff465f595d2a332f56c3bbd3d0247799c18
 SHA512:
-  metadata.gz: 7afb009f1d98a1a444485d87132cf6e21eda2ee0f6a8fa7b8b15d0af5c6d7533c885bf2769f28e7ff860995adf0b1ba7efe784fbda1b21c60b4ad9a9d119f76a
-  data.tar.gz: 9e850c5f47d5906c78863802e6dbfb65bad5c2d43eb430700a3ae84705affeb6871b9188e0a1027683ec82cbe708b9e51f5d9ba147f672d40c105877602fdb97
+  metadata.gz: '0417833d970787c91c85c958404c0f806fcf42b6c34867184454e363fb47b8d545180a2c95aba05765df3a71b0707f4abbdc5bed82117e4c5afe90db75cd835c'
+  data.tar.gz: a5281483e8c1ded0e7e79c2ba6c608614cbded7a7380029199afe2fc991348eacce55154aafd23e36af75790e24dfad940e3db774000e86deb1c9693590addfe

data/app/controllers/brightcontent/application_controller.rb CHANGED Viewed

@@ -23,7 +23,7 @@ module Brightcontent
     def current_user
       @current_user ||= begin
         Brightcontent.user_model.find(session[:brightcontent_user_id]) if session[:brightcontent_user_id]
-      end
+      end.tap { |u| logger.info "Current Brightcontent user: #{u&.to_gid}" }
     end
     helper_method :current_user

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

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

data/app/views/layouts/brightcontent/_content.html.erb ADDED Viewed

@@ -0,0 +1,4 @@
+<div class="<%= "panel panel-default" unless controller.controller_name == 'sessions' %>">
+  <%= render "brightcontent/application/show_flash_names" %>
+  <%= yield %>
+</div>

data/app/views/layouts/brightcontent/_navbar.html.erb ADDED Viewed

@@ -0,0 +1,31 @@
+<% if current_user %>
+  <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>
+        </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>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+<% end %>

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

@@ -10,43 +10,10 @@
 </head>
 <body data-editor-locale="<%=t('brightcontent.editor_locale')%>">
-  <% if current_user %>
-    <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>
-          </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>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  <% end %>
+  <%= render 'layouts/brightcontent/navbar' %>
   <div class="container">
-    <div class="<%= "panel panel-default" unless controller.controller_name == 'sessions' %>">
-      <%= render "brightcontent/application/show_flash_names" %>
-      <%= yield %>
-    </div>
+    <%= render 'layouts/brightcontent/content' %>
   </div>
 </div>

data/app/views/layouts/brightcontent/wide.html.erb ADDED Viewed

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= Brightcontent.application_name %></title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="robots" content="noindex" />
+  <%= stylesheet_link_tag "brightcontent/brightcontent", :media => "all" %>
+  <%= yield :head %>
+  <%= csrf_meta_tags %>
+</head>
+<body data-editor-locale="<%=t('brightcontent.editor_locale')%>">
+  <%= render 'layouts/brightcontent/navbar' %>
+  <div class="container-wide">
+    <%= render 'layouts/brightcontent/content' %>
+  </div>
+</div>
+<%= javascript_include_tag "brightcontent/brightcontent" %>
+<%= yield :bottom %>
+</body>
+</html>

data/brightcontent-core.gemspec CHANGED Viewed

@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
   s.add_dependency "sass-rails", ">= 4.0.2"
   s.add_dependency "simple_form"
   s.add_dependency "will_paginate"
-  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", "~> 2.14.1"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec-its"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "capybara"
   s.add_development_dependency "launchy"

data/db/migrate/20121206121725_create_brightcontent_admin_users.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-class CreateBrightcontentAdminUsers < ActiveRecord::Migration
+class CreateBrightcontentAdminUsers < ActiveRecord::Migration[4.2]
   def up
     create_table :brightcontent_admin_users do |t|
       t.string :email

data/lib/brightcontent/core.rb CHANGED Viewed

@@ -11,7 +11,6 @@ require "ransack"
 require "jquery-rails"
 require "simple_form"
 require "will_paginate"
-require "will_paginate-bootstrap"
 require "brightcontent/rails/routes"
 require "brightcontent/engine"
@@ -24,6 +23,7 @@ module Brightcontent
   autoload :StrongParamsFix, 'brightcontent/strong_params_fix'
   autoload :ViewLookup, 'brightcontent/view_lookup'
   autoload :BaseControllerExt, 'brightcontent/base_controller_ext'
+  autoload :PaginationRenderer, 'brightcontent/pagination_renderer'
   mattr_accessor :locale

data/lib/brightcontent/pagination_renderer.rb ADDED Viewed

@@ -0,0 +1,64 @@
+# Adapted from: https://github.com/bootstrap-ruby/will_paginate-bootstrap/blob/master/lib/bootstrap_pagination/bootstrap_renderer.rb
+# Licensed under the MIT License, copyright (c) 2012 Nicholas Dainty
+module Brightcontent
+  class PaginationRenderer < WillPaginate::ActionView::LinkRenderer
+    ELLIPSIS = "&hellip;"
+    def to_html
+      list_items = pagination.map do |item|
+        case item
+          when Integer
+            page_number(item)
+          else
+            send(item)
+        end
+      end.join(@options[:link_separator])
+      tag("ul", list_items, container_attributes.merge(class: ul_class))
+    end
+    def container_attributes
+      super.except(*[:link_options])
+    end
+    protected
+    def page_number(page)
+      link_options = @options[:link_options] || {}
+      if page == current_page
+        tag("li", tag("span", page), class: "active")
+      else
+        tag("li", link(page, page, link_options.merge(rel: rel_value(page))))
+      end
+    end
+    def previous_or_next_page(page, text, classname)
+      link_options = @options[:link_options] || {}
+      if page
+        tag("li", link(text, page, link_options), class: classname)
+      else
+        tag("li", tag("span", text), class: "%s disabled" % classname)
+      end
+    end
+    def gap
+      tag("li", tag("span", ELLIPSIS), class: "disabled")
+    end
+    def previous_page
+      num = @collection.current_page > 1 && @collection.current_page - 1
+      previous_or_next_page(num, @options[:previous_label], "prev")
+    end
+    def next_page
+      num = @collection.current_page < @collection.total_pages && @collection.current_page + 1
+      previous_or_next_page(num, @options[:next_label], "next")
+    end
+    def ul_class
+      ["pagination", @options[:class]].compact.join(" ")
+    end
+  end
+end

data/spec/dummy/config/application.rb CHANGED Viewed

@@ -20,6 +20,7 @@ module Dummy
     # Activate observers that should always be running.
     # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
+    config.active_record.sqlite3&.represent_boolean_as_integer = true
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
@@ -47,7 +48,7 @@ module Dummy
     config.assets.enabled = true
     # config.i18n.enforce_available_locales = true
-    config.active_record.raise_in_transactional_callbacks = true
+    # config.active_record.raise_in_transactional_callbacks = true
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'

data/spec/dummy/db/migrate/20121206225720_create_blogs.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-class CreateBlogs < ActiveRecord::Migration
+class CreateBlogs < ActiveRecord::Migration[4.2]
   def change
     create_table :blogs do |t|
       t.string :name

data/spec/dummy/db/migrate/20121223131824_add_featured_to_blog.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-class AddFeaturedToBlog < ActiveRecord::Migration
+class AddFeaturedToBlog < ActiveRecord::Migration[4.2]
   def change
     add_column :blogs, :featured, :boolean
   end

data/spec/dummy/db/migrate/20130720211920_create_comments.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-class CreateComments < ActiveRecord::Migration
+class CreateComments < ActiveRecord::Migration[4.2]
   def change
     create_table :comments do |t|
       t.text :text

data/spec/dummy/db/migrate/20140512085432_add_author_id_to_blogs.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-class AddAuthorIdToBlogs < ActiveRecord::Migration
+class AddAuthorIdToBlogs < ActiveRecord::Migration[4.2]
   def change
     add_reference :blogs, :author
   end

data/spec/dummy/db/migrate/20140512090832_create_authors.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-class CreateAuthors < ActiveRecord::Migration
+class CreateAuthors < ActiveRecord::Migration[4.2]
   def change
     create_table :authors do |t|
       t.string :name

data/spec/dummy/db/migrate/20150219130156_add_active_to_blogs.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-class AddActiveToBlogs < ActiveRecord::Migration
+class AddActiveToBlogs < ActiveRecord::Migration[4.2]
   def change
     add_column :blogs, :active, :boolean, default: true
   end

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

@@ -1,4 +1,4 @@
-class CreateGroupedBlogs < ActiveRecord::Migration
+class CreateGroupedBlogs < ActiveRecord::Migration[4.2]
   def change
     create_table :grouped_blogs do |t|
       t.string :name

data/spec/dummy/db/schema.rb ADDED Viewed

@@ -0,0 +1,55 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+ActiveRecord::Schema.define(version: 2016_06_23_142310) do
+  create_table "authors", force: :cascade do |t|
+    t.string "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+  create_table "blogs", force: :cascade do |t|
+    t.string "name"
+    t.text "body"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.boolean "featured"
+    t.integer "author_id"
+    t.boolean "active", default: true
+  end
+  create_table "brightcontent_admin_users", force: :cascade do |t|
+    t.string "email"
+    t.string "password_digest"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+  create_table "comments", force: :cascade do |t|
+    t.text "text"
+    t.integer "blog_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.index ["blog_id"], name: "index_comments_on_blog_id"
+  end
+  create_table "grouped_blogs", force: :cascade do |t|
+    t.string "name"
+    t.text "body"
+    t.boolean "active", default: true
+    t.integer "author_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+end

data/spec/helpers/brightcontent/translation_helper_spec.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 require 'spec_helper'
+include Brightcontent::TranslationHelper
 describe Brightcontent::TranslationHelper do
   let(:string) { "thing" }

data/spec/lib/brightcontent/resources_spec.rb CHANGED Viewed

@@ -24,7 +24,7 @@ module Brightcontent
       end
       it 'does have any exta menu items' do
-        expect(resources.extra_menu?).to be_true
+        expect(resources.extra_menu?).to eq true
       end
     end
@@ -42,7 +42,7 @@ module Brightcontent
       end
       it 'does not have any exta menu items' do
-        expect(resources.extra_menu?).to be_false
+        expect(resources.extra_menu?).to eq false
       end
     end
@@ -60,7 +60,7 @@ module Brightcontent
       end
       it 'does not have any exta menu items' do
-        expect(resources.extra_menu?).to be_false
+        expect(resources.extra_menu?).to eq false
       end
     end
   end

data/spec/spec_helper.rb CHANGED Viewed

@@ -2,6 +2,7 @@ ENV["RAILS_ENV"] = "test"
 ENGINE_RAILS_ROOT = File.join(File.dirname(__FILE__), '../')
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require 'rspec/its'
 require 'rspec/rails'
 require 'capybara/rspec'
 require 'factory_girl_rails'

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.5.0
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2018-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -151,35 +151,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: will_paginate-bootstrap
+  name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: ransack
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,19 +207,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -324,7 +324,10 @@ files:
 - app/views/brightcontent/base/list_fields/_has_many.html.erb
 - app/views/brightcontent/base/new.html.erb
 - app/views/brightcontent/sessions/new.html.erb
+- app/views/layouts/brightcontent/_content.html.erb
+- app/views/layouts/brightcontent/_navbar.html.erb
 - app/views/layouts/brightcontent/application.html.erb
+- app/views/layouts/brightcontent/wide.html.erb
 - bin/autospec
 - bin/rspec
 - brightcontent-core.gemspec
@@ -343,6 +346,7 @@ files:
 - lib/brightcontent/core.rb
 - lib/brightcontent/engine.rb
 - lib/brightcontent/model_extensions.rb
+- lib/brightcontent/pagination_renderer.rb
 - lib/brightcontent/rails/routes.rb
 - lib/brightcontent/resource.rb
 - lib/brightcontent/resources.rb
@@ -402,6 +406,7 @@ files:
 - 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/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -445,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.6
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: Brightcontent core
@@ -495,6 +500,7 @@ test_files:
 - 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/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html