brightcontent-core 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 785527dbe8ae6e79befb9e074d0ef98893551ba8
-  data.tar.gz: 1932114b9e4589e765adffc5d630c2a482332434
+  metadata.gz: 0ff81cd24827adff2301e1c27e43bae64cf99b5c
+  data.tar.gz: 7f28f10f9edb23e1f32a851c1e94b4cbcdb89c63
 SHA512:
-  metadata.gz: 75f2630d907c0303a7a72a9090d1d4306d446e4d2a33d757ecba8fc3d4947a51e755688f595d4d55d32b335ccc593d3606bcbf3f700aa0cf20a548614e3ab815
-  data.tar.gz: 85db810a1df5e53b924b41dc3141322d8c49b67d71e28258ff82532781c1c25ca9451776886b25d7986ae57445b5107db04ef63a40358eebb088f88b2368fadb
+  metadata.gz: d1a776c397011e888583f85ddfc12d2e77660b444e835bb10c42eec1ca096347be07a96b368f680f8358f5b9c15c5e079c6e46eccc5916c34e22367b69aafea3
+  data.tar.gz: 875faa02c872d739780d9ff09d14b874fa06a427826cfc4563ca1a4cf2a2f6a125f4dcac561da9d5ca10f6205be8f08099e8d6d915b4feeb36dd5defeb40743e

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

@@ -1,4 +1,4 @@
-#= require bootstrap-wysihtml5/b3
+#= require bootstrap-wysihtml5
 #= require brightcontent/wysithtml5-parser-rules
 #= require bootstrap-wysihtml5/locales/nl-NL
 

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

@@ -1,6 +1,6 @@
 /*
  *= require bootstrap
- *= require bootstrap-wysihtml5/b3
+ *= require bootstrap-wysihtml5
  *= require brightcontent/signin
  */
 

data/app/controllers/brightcontent/application_controller.rb

@@ -16,7 +16,7 @@ module Brightcontent
     end
 
     def current_user
-      @current_user ||= AdminUser.find(session[:brightcontent_user_id]) if session[:brightcontent_user_id]
+      @current_user ||= Brightcontent.user_model.find(session[:brightcontent_user_id]) if session[:brightcontent_user_id]
     end
     helper_method :current_user
 

data/app/controllers/brightcontent/sessions_controller.rb

@@ -6,7 +6,7 @@ module Brightcontent
     end
 
     def create
-      user = AdminUser.find_by_email(params[:email])
+      user = Brightcontent.user_model.find_by_email(params[:email])
       if user && user.authenticate(params[:password])
         session[:brightcontent_user_id] = user.id
         redirect_to root_url

data/app/models/brightcontent/admin_user.rb

@@ -2,5 +2,6 @@ module Brightcontent
   class AdminUser < ActiveRecord::Base
     has_secure_password
     validates_uniqueness_of :email
+    attr_accessible *column_names if defined? ProtectedAttributes
   end
 end

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

@@ -2,7 +2,7 @@
 
 <% if user_resources.extra_menu? %>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Extra <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t('brightcontent.extra_menu') %> <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <%= render user_resources.extra_menu %>
     </ul>

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

@@ -1,6 +1,8 @@
-<% if item.send(field).present? %>
-  <div class="controls file-preview">
-    <%= image_tag item.send(field).url(item.send(field).styles.keys.first) %>
+<%= form.input field %>
+<% if item.send(field).present? && item.send(field).content_type =~ /^image\// %>
+  <div class="form-group file-preview">
+    <div class="col-sm-offset-2 col-sm-10">
+      <%= image_tag item.send(field).url(item.send(field).styles.keys.first) %>
+    </div>
   </div>
 <% end %>
-<%= form.input field %>

data/brightcontent-core.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   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 "bootstrap-wysihtml5-rails", "~> 0.3.2"
   s.add_dependency "coffee-rails"
-  s.add_dependency "inherited_resources", ">= 1.4.1"
+  s.add_dependency "inherited_resources", "~> 1.4.1"
   s.add_dependency "jquery-rails"
   s.add_dependency "sass-rails", ">= 4.0.2"
   s.add_dependency "simple_form"
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake"
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", "~> 2.14.1"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "capybara"
   s.add_development_dependency "launchy"

data/config/locales/brightcontent_core.en.yml

@@ -20,6 +20,7 @@ en:
     hidden: Hidden
     sign_in: Please sign in
     editor_locale: ""
+    extra_menu: More
 
   activerecord:
     models:

data/config/locales/brightcontent_core.nl.yml

@@ -20,6 +20,7 @@ nl:
     hidden: Verborgen
     sign_in: Inloggen
     editor_locale: "nl-NL"
+    extra_menu: Meer
 
   activerecord:
     models:

data/lib/brightcontent/core.rb

@@ -12,10 +12,7 @@ require "brightcontent/rails/routes"
 require "brightcontent/engine"
 
 module Brightcontent
-  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'
@@ -37,6 +34,12 @@ module Brightcontent
   mattr_accessor :application_name
   @@application_name = "Brightcontent"
 
+  mattr_writer :user_model
+  def self.user_model
+    @@user_model.is_a?(String) ? @@user_model.constantize : @@user_model
+  end
+  @@user_model = "Brightcontent::AdminUser"
+
   mattr_accessor :main_menu_count
   @@main_menu_count = 6
 

data/lib/brightcontent/model_extensions.rb

@@ -4,11 +4,15 @@ module Brightcontent
 
     module ClassMethods
       def brightcontent_columns
-        @brightcontent_columns ||= column_names.dup
+        (column_names + added_brightcontent_columns).uniq
       end
 
       def add_brightcontent_column(column_name)
-        brightcontent_columns.append(column_name.to_s)
+        added_brightcontent_columns << column_name.to_s
+      end
+
+      def added_brightcontent_columns
+        @_added_brightcontent_columns ||= []
       end
     end
   end

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

@@ -10,11 +10,17 @@ Brightcontent.setup do |config|
   # 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 
+  # 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"]
+
+  # Brightcontent provides its own user model: AdminUser. This is used by
+  # default. You can specify a custom user model as string or class.
+  # It has to implement an authenticate method.
+  # config.user_model = "Brightcontent::AdminUser"
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,16 +56,16 @@ dependencies:
   name: bootstrap-wysihtml5-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
@@ -210,16 +210,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -391,7 +391,6 @@ files:
 - spec/dummy/db/migrate/20130720211920_create_comments.rb
 - spec/dummy/db/migrate/20140512085432_add_author_id_to_blogs.rb
 - spec/dummy/db/migrate/20140512090832_create_authors.rb
-- spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -480,7 +479,6 @@ test_files:
 - spec/dummy/db/migrate/20130720211920_create_comments.rb
 - spec/dummy/db/migrate/20140512085432_add_author_id_to_blogs.rb
 - spec/dummy/db/migrate/20140512090832_create_authors.rb
-- spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html

data/spec/dummy/db/schema.rb

@@ -1,47 +0,0 @@
-# encoding: UTF-8
-# 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: 20140512090832) do
-
-  create_table "authors", force: true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "blogs", force: true do |t|
-    t.string   "name"
-    t.text     "body"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "featured"
-    t.integer  "author_id"
-  end
-
-  create_table "brightcontent_admin_users", force: true do |t|
-    t.string   "email"
-    t.string   "password_digest"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "comments", force: true do |t|
-    t.text     "text"
-    t.integer  "blog_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "comments", ["blog_id"], name: "index_comments_on_blog_id"
-
-end