brightcontent-core 2.0.33 → 2.1.0

data/spec/dummy/config/application.rb

@@ -43,15 +43,11 @@ module Dummy
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Enforce whitelist mode for mass assignment.
-    # This will create an empty whitelist of attributes available for mass-assignment for all models
-    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
-    # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = false
-
     # Enable the asset pipeline
     config.assets.enabled = true
 
+    # config.i18n.enforce_available_locales = true
+
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
   end

data/spec/dummy/config/environments/development.rb

@@ -1,4 +1,5 @@
 Dummy::Application.configure do
+  config.eager_load = false
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
@@ -6,9 +7,6 @@ Dummy::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -22,13 +20,6 @@ Dummy::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
-
   # Do not compress assets
   config.assets.compress = false
 

data/spec/dummy/config/environments/production.rb

@@ -60,8 +60,4 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
-
-  # Log the query plan for queries taking more than this (works
-  # with SQLite, MySQL, and PostgreSQL)
-  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

data/spec/dummy/config/environments/test.rb

@@ -1,4 +1,6 @@
 Dummy::Application.configure do
+  config.eager_load = false
+
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
@@ -11,9 +13,6 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -29,9 +28,6 @@ Dummy::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

data/spec/dummy/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Dummy::Application.config.secret_token = '1582af16879d84e4319aa02ea51964c7c27576e6468838ea1bcadf1286623d44e9117613a747386fde1bc2253a9a49c291a2c100fec64ae5c2cc5c75efa553ef'
+Dummy::Application.config.secret_key_base = '1582af16879d84e4319aa02ea51964c7c27576e6468838ea1bcadf1286623d44e9117613a747386fde1bc2253a9a49c291a2c100fec64ae5c2cc5c75efa553ef'

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

@@ -1,7 +1,6 @@
 class CreateComments < ActiveRecord::Migration
   def change
     create_table :comments do |t|
-      t.string :id
       t.text :text
       t.integer :blog_id
 

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

@@ -0,0 +1,5 @@
+class AddAuthorIdToBlogs < ActiveRecord::Migration
+  def change
+    add_reference :blogs, :author
+  end
+end

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

@@ -0,0 +1,9 @@
+class CreateAuthors < ActiveRecord::Migration
+  def change
+    create_table :authors do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -9,32 +9,39 @@
 # 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 to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130720211920) do
+ActiveRecord::Schema.define(version: 20140512090832) do
 
-  create_table "blogs", :force => true do |t|
+  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", :null => false
-    t.datetime "updated_at", :null => false
+    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|
+  create_table "brightcontent_admin_users", force: true do |t|
     t.string   "email"
     t.string   "password_digest"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "comments", :force => true do |t|
+  create_table "comments", force: true do |t|
     t.text     "text"
     t.integer  "blog_id"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "comments", ["blog_id"], :name => "index_comments_on_blog_id"
+  add_index "comments", ["blog_id"], name: "index_comments_on_blog_id"
 
 end

data/spec/factories.rb

@@ -13,5 +13,20 @@ FactoryGirl.define do
     name "Blogname"
     body "Inhoud"
     featured false
+
+    factory :featured_blog do
+      featured true
+    end
+  end
+
+  factory :author do
+    factory :author_with_blogs do
+      ignore do
+        blogs_count 5
+      end
+      after(:create) do |author, evaluator|
+        create_list(:blog, evaluator.blogs_count, author: author)
+      end
+    end
   end
 end

data/spec/features/login_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature "Login" do
-
   scenario "Login with invalid credentials" do
     sign_in_with_invalid_email
     page.should have_content "invalid"
@@ -9,7 +8,9 @@ feature "Login" do
 
   scenario "Login with valid credentials" do
     sign_in
-    page.should have_content "Admin users"
+    within "h1" do
+      page.should have_content "Blogs"
+    end
   end
 
   scenario "User logs out" do
@@ -25,5 +26,4 @@ feature "Login" do
     fill_in "Password", with: "wrongpass"
     click_button "Login"
   end
-
 end

data/spec/features/menu_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature "Menu" do
-
   scenario "Shows default menu" do
     sign_in
     menu_should_not_have_link "Sessions"
@@ -13,15 +12,14 @@ feature "Menu" do
   end
 
   def menu_should_have_link(link_name)
-    within "#menu" do
+    within ".js-menu" do
       page.should have_link link_name
     end
   end
 
   def menu_should_not_have_link(link_name)
-    within "#menu" do
+    within ".js-menu" do
       page.should have_no_link link_name
     end
   end
-
 end

data/spec/features/nested_resource_spec.rb

@@ -23,7 +23,7 @@ feature "Nested resource" do
 
   def create_comment(title)
     visit brightcontent.blog_comments_path(blog)
-    click_link "Create new Comment"
+    click_link "Create new comment"
     fill_in "Text", with: title
     click_button "Create Comment"
   end

data/spec/features/resources_form_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature "Resources form" do
-
   scenario "Adds a new item" do
     sign_in
     create_blog "Name for blogitem"
@@ -24,7 +23,7 @@ feature "Resources form" do
 
   def create_blog(title)
     visit brightcontent.blogs_url
-    click_link "Create new Blog"
+    click_link "Create new blog"
     fill_in "Name", with: title
     click_button "Create Blog"
   end
@@ -47,5 +46,4 @@ feature "Resources form" do
       yield
     end
   end
-
 end

data/spec/features/resources_index_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 feature "Resources index" do
-
   background do
     sign_in
   end
@@ -23,15 +22,31 @@ feature "Resources index" do
     given_10_per_page
     given_31_blog_items
     visit_blogs_page
-    page.should have_css("tbody tr", :count => 10)
+    page_should_have_n_rows 10
+  end
+
+  scenario "Filter by 'featured'" do
+    given_31_blog_items
+    visit_blogs_page
+    select "true", from: "Featured"
+    click_button "Search"
+    page_should_have_n_rows 6
+  end
+
+  scenario "Filter by author" do
+    given_20_blogs_from_two_authors
+    visit_blogs_page
+    select "Bob", from: "Author"
+    click_button "Search"
+    page_should_have_n_rows 9
   end
 
   def visit_blogs_page
-    click_link "Blog"
+    click_link "Blogs"
   end
 
   def page_should_have_valid_table
-    within "#overview" do
+    within ".panel" do
       page.should have_content "Blogs"
       page.should have_content "Name"
       page.should have_content "Body"
@@ -39,12 +54,21 @@ feature "Resources index" do
     end
   end
 
+  def page_should_have_n_rows(n)
+    page.should have_css("tbody tr", :count => n)
+  end
+
   def given_31_blog_items
-    31.times { create :blog }
+    25.times { create :blog }
+    6.times { create :featured_blog }
+  end
+
+  def given_20_blogs_from_two_authors
+    create(:author_with_blogs, blogs_count: 11, name: "Alice")
+    create(:author_with_blogs, blogs_count: 9, name: "Bob")
   end
 
   def given_10_per_page
     Brightcontent::BlogsController.class_eval { per_page 10 }
   end
-
 end

data/spec/helpers/brightcontent/translation_helper_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Brightcontent::TranslationHelper do
+  let(:string) { "thing" }
+  let(:model) { Brightcontent::AdminUser }
+
+  describe '#nominative_plural' do
+    it "pluralizes strings" do
+      expect(nominative_plural(string)).to eq("things")
+    end
+
+    it "pluralizes active record models" do
+      expect(nominative_plural(model)).to eq("Admins")
+    end
+  end
+
+  describe '#nominative_singular' do
+    it "returns a singular strings" do
+      expect(nominative_singular(string)).to eq("thing")
+    end
+
+    it "deals with active record models" do
+      expect(nominative_singular(model)).to eq("Admin")
+    end
+  end
+
+end

data/spec/lib/brightcontent/model_extensions_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Brightcontent
   describe ModelExtensions do
-    let(:columns) {  ["id", "name", "body", "created_at", "updated_at", "featured"] }
+    let(:columns) {  ["id", "name", "body", "created_at", "updated_at", "featured", "author_id"] }
     subject(:blog) { Blog }
     its(:brightcontent_columns) { should eq columns }
 

data/spec/lib/brightcontent/resource_spec.rb

@@ -0,0 +1,16 @@
+require 'brightcontent/resource'
+
+describe Brightcontent::Resource do
+  FakeBlog = Module.new
+  Brightcontent::FakeComment = Module.new
+
+  describe '.klass' do
+    it 'returns the class of the path' do
+      expect(described_class.new('fake_blog').klass).to eq FakeBlog
+    end
+
+    it 'returns the brightcontent namespaces path if not exist' do
+      expect(described_class.new('fake_comment').klass).to eq Brightcontent::FakeComment
+    end
+  end
+end

data/spec/lib/brightcontent/resources_spec.rb

@@ -0,0 +1,67 @@
+require 'brightcontent/resources'
+
+module Brightcontent
+  describe Resources do
+
+    let(:array) { [1, 2, 3, 4, 5] }
+    let(:resources) { Resources.new(array) }
+
+    it 'behaves like an array' do
+      expect(resources).to eq array
+    end
+
+    context 'main menu count of 4' do
+      before do
+        allow(Brightcontent).to receive(:main_menu_count) { 4 }
+      end
+
+      it 'gives the main menu items (with extra counting as an item)' do
+        expect(resources.main_menu).to eq [1, 2, 3]
+      end
+
+      it 'gives the extra menu items' do
+        expect(resources.extra_menu).to eq [4, 5]
+      end
+
+      it 'does have any exta menu items' do
+        expect(resources.extra_menu?).to be_true
+      end
+    end
+
+    context 'main menu count of 5' do
+      before do
+        allow(Brightcontent).to receive(:main_menu_count) { 5 }
+      end
+
+      it 'gives the main menu items' do
+        expect(resources.main_menu).to eq array
+      end
+
+      it 'gives the extra menu items' do
+        expect(resources.extra_menu).to eq []
+      end
+
+      it 'does not have any exta menu items' do
+        expect(resources.extra_menu?).to be_false
+      end
+    end
+
+    context 'main menu count of 6' do
+      before do
+        allow(Brightcontent).to receive(:main_menu_count) { 6 }
+      end
+
+      it 'gives the main menu items' do
+        expect(resources.main_menu).to eq array
+      end
+
+      it 'gives the extra menu items' do
+        expect(resources.extra_menu).to eq []
+      end
+
+      it 'does not have any exta menu items' do
+        expect(resources.extra_menu?).to be_false
+      end
+    end
+  end
+end

data/spec/lib/brightcontent/routes_parser_spec.rb

@@ -12,11 +12,11 @@ module Brightcontent
 
     subject(:parser) { RoutesParser.new(routes_hash, engine_resources) }
 
-    its(:resources) { should eq [resource("blogs")] }
+    its(:resources) { should eq [Resource.new("blogs")] }
 
     context "with extra resource" do
       before { routes_hash << {:action=>"index", :controller=>"brightcontent/articles", :path_spec => '/articles' } }
-      its(:resources) { should eq [resource("blogs"), resource("articles")] }
+      its(:resources) { should eq [Resource.new("blogs"), Resource.new("articles")] }
     end
 
     context "with engine resources" do
@@ -25,7 +25,7 @@ module Brightcontent
           routes_hash << {:action=>"index", :controller=>"brightcontent/#{resource_name}"}
         end
       end
-      its(:resources) { should eq [resource("blogs")] }
+      its(:resources) { should eq [Resource.new("blogs")] }
     end
 
     context "duplicate resources" do
@@ -33,12 +33,7 @@ module Brightcontent
         routes_hash << {action: "index", controller: "brightcontent/blogs" }
       end
 
-      its(:resources) { should eq [resource("blogs")] }
+      its(:resources) { should eq [Resource.new("blogs")] }
     end
-
-    def resource(path)
-      RoutesParser::Resource.new(path)
-    end
-
   end
 end

data/spec/lib/brightcontent/view_lookup/abstract_spec.rb

@@ -0,0 +1,40 @@
+require 'brightcontent/view_lookup/abstract'
+
+module Brightcontent::ViewLookup
+  describe Abstract do
+    class FakeFormField < Abstract
+      def field_type
+        :string
+      end
+    end
+
+    let(:view_context) { double(:view_context) }
+    let(:item) { double(:item, name: 'Item name') }
+    let(:fake_form_field) { FakeFormField.new(view_context, field: 'name', item: item) }
+
+    context 'with specific field partial' do
+      it 'renders the parial' do
+        expect(view_context).to receive(:render_if_exists)
+          .with("fake_form_field_name", {field: 'name', item: item}) { "Result" }
+        fake_form_field.call
+      end
+    end
+
+    context 'with specific field type partial' do
+      it 'renders the parial' do
+        expect(view_context).to receive(:render_if_exists).once
+        expect(view_context).to receive(:render_if_exists)
+          .with("brightcontent/base/fake_form_fields/string", {field: 'name', item: item}) { "Result" }
+        fake_form_field.call
+      end
+    end
+
+    context 'without partial' do
+      it 'renders the default value' do
+        expect(view_context).to receive(:render_if_exists).once
+        allow(fake_form_field).to receive(:field_type) { nil }
+        expect(fake_form_field.call).to eq 'Item name'
+      end
+    end
+  end
+end