brightcontent-core 2.0.30 → 2.0.31

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b14c5e3e5868779efe399929d61b1c1b6370865d
+  data.tar.gz: 042f496e3c714b54896d95ee48a02a173d29fc63
+SHA512:
+  metadata.gz: 567b8186b474923724f93b6a681fe72bad14432bd9ec2f6f04d4c171a6585a4e20e5a42318a1aca3f1ecf00f7bce3aeea119d0bc6bd9f08fd624cde9d9e85be3
+  data.tar.gz: c55958d7cf3394301a00cf52c2d1866b838fcf1a31e88662f06516aa80baf36e38b16e696debf651a0d9a9d85fc756ed8e1406b3f8b31b0caa3ad369d5efd842

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    brightcontent-core (2.0.30)
-      bcrypt-ruby
+    brightcontent-core (2.0.31)
+      bcrypt-ruby (= 3.0.0)
       bootstrap-wysihtml5-rails
       has_scope
       inherited_resources
       jquery-rails
-      rails (~> 3.2.9)
+      rails (~> 3.2.13)
       simple_form
       strong_parameters
       will_paginate
@@ -15,124 +15,112 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionmailer (3.2.13)
+      actionpack (= 3.2.13)
+      mail (~> 2.5.3)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activeresource (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    addressable (2.3.2)
+    addressable (2.3.5)
     arel (3.0.2)
-    bcrypt-ruby (3.0.1)
-    bootstrap-wysihtml5-rails (0.3.1.19)
+    bcrypt-ruby (3.0.0)
+    bootstrap-wysihtml5-rails (0.3.1.20)
       railties (>= 3.0)
     builder (3.0.4)
-    capybara (2.0.1)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    diff-lcs (1.1.3)
+      xpath (~> 2.0)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
-    factory_girl (4.1.0)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
-    ffi (1.2.0)
     has_scope (0.5.1)
-    hike (1.2.1)
+    hike (1.2.3)
     i18n (0.6.1)
-    inherited_resources (1.3.1)
+    inherited_resources (1.4.0)
       has_scope (~> 0.5.0)
-      responders (~> 0.6)
+      responders (~> 0.9)
     journey (1.0.4)
-    jquery-rails (2.2.1)
+    jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.5)
-    launchy (2.1.2)
+    json (1.8.0)
+    launchy (2.3.0)
       addressable (~> 2.3)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
-    nokogiri (1.5.6)
+    mime-types (1.23)
+    mini_portile (0.5.1)
+    multi_json (1.7.7)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
+    rails (3.2.13)
+      actionmailer (= 3.2.13)
+      actionpack (= 3.2.13)
+      activerecord (= 3.2.13)
+      activeresource (= 3.2.13)
+      activesupport (= 3.2.13)
       bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12)
+    rake (10.1.0)
+    rdoc (3.12.2)
       json (~> 1.4)
     responders (0.9.3)
       railties (~> 3.1)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    rspec-rails (2.12.0)
+    rspec-core (2.14.3)
+    rspec-expectations (2.14.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.1)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.27.2)
-      childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
     simple_form (2.1.0)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
@@ -141,20 +129,19 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    strong_parameters (0.2.0)
+    sqlite3 (1.3.7)
+    strong_parameters (0.2.1)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
       railties (~> 3.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    treetop (1.4.12)
+    thor (0.18.1)
+    tilt (1.4.1)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    websocket (1.0.6)
     will_paginate (3.0.4)
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS

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

@@ -16,5 +16,4 @@
 //= require bootstrap-wysihtml5/locales/nl-NL
 //= require brightcontent/attachments
 //= require brightcontent/custom
-//= require pages
 //= require_tree .

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

@@ -1,8 +1,9 @@
 $(document).ready(function(){
-  $('textarea').each(function(i, elem) {
+  $('textarea[name*="content"], textarea[name*="body"], textarea[name*="editor"]').each(function(i, elem) {
     $(elem).wysihtml5({
       html: true,
       locale: "nl-NL",
+      parserRules:  wysihtml5ParserRules,
       "events": {
         "load": function() {
           editor = $('#insertable').data("wysihtml5").editor;
@@ -12,13 +13,13 @@ $(document).ready(function(){
     });
   });
 
-  $(".insert_image").live("click", function(e){
+  $("#attachments").on("click", ".insert_image", function(e){
     e.preventDefault();
     console.log($(this).data("insertImage"));
     editor.composer.commands.exec("insertImage", { src: $(this).data("insertImage") });
   });
 
-  $(".insert_link").live("click", function(e){
+  $("#attachments").on("click", ".insert_link", function(e){
     e.preventDefault();
     console.log($(this).data());
     editor.composer.commands.exec("createLink", { href: $(this).data("insertUrl"), target: "_blank", rel: "nofollow", text: $(this).data("insertName") });

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

@@ -1,4 +1,3 @@
-/*=require pages */
 body {
   background-color: #f5f5f5;
 }
@@ -9,6 +8,10 @@ body {
   max-width: 622px;
 }
 
+.form-inputs input[type=checkbox] {
+  width: auto;
+}
+
 .btn-right {
   float: right;
 }
@@ -78,3 +81,15 @@ td.list-actions {
   overflow: hidden;
   padding: 5px 10px;
 }
+
+.file-preview img {
+  border: 1px solid #ccc;
+}
+
+.delete {
+  float: right;
+}
+
+select.datetime {
+  width: 116px
+}

data/app/controllers/brightcontent/admin_users_controller.rb

@@ -2,5 +2,8 @@ require_dependency "brightcontent/application_controller"
 
 module Brightcontent
   class AdminUsersController < BaseController
+    def form_fields
+      %w( email password )
+    end
   end
 end

data/app/controllers/brightcontent/application_controller.rb

@@ -9,10 +9,10 @@ module Brightcontent
     end
     helper_method :current_user
 
-    def resource_paths
-      @resource_paths ||= RoutesParser.parse
+    def user_resources
+      @user_resources ||= RoutesParser.new.resources
     end
-    helper_method :resource_paths
+    helper_method :user_resources
 
     def authorize
       redirect_to login_url if current_user.nil?

data/app/controllers/brightcontent/base_controller.rb

@@ -10,10 +10,11 @@ module Brightcontent
     include DefaultActions
     include Pagination
 
-    # Temp until inherent resources supports strong params
-    include StrongParamsFix
+    def permitted_params
+      params.permit!
+    end
 
-    private
+    protected
 
     def list_fields
       default_fields - %w{attachments}
@@ -30,9 +31,10 @@ module Brightcontent
     end
     helper_method :default_fields
 
-    def resource_params
-      params.require(resource_instance_name).permit!
+    def parent
+      super if parent?
     end
+    helper_method :parent
 
   end
 end

data/app/helpers/brightcontent/base_helper.rb

@@ -5,13 +5,15 @@ module Brightcontent
     end
 
     def render_form_field(form, field)
-      render_if_exists("form_field_#{field}", form: form, item: form.object) || form.input(field.to_sym)
+      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)
     end
 
     def link_for_scope(scope)
       case scope[:type]
       when :boolean
-        polymorphic_url(resource_class, scope[:as] => true)
+        polymorphic_url([parent, resource_class], scope[:as] => true)
       end
     end
 
@@ -22,5 +24,10 @@ module Brightcontent
     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/views/brightcontent/application/_menu.html.erb

@@ -1,3 +1,3 @@
-<% resource_paths.each do |resource_path| %>
-  <li><%= link_to resource_path.titleize, root_path + resource_path %></li>
+<% user_resources.each do |resource| %>
+  <li><%= link_to resource.klass.model_name.human.pluralize, root_path + resource.path %></li>
 <% end %>

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

@@ -1,5 +1,5 @@
 <% flash.each do |key,value| %>
-  <div class="flash <%= key.to_s%>">
+  <div class="alert alert-<%= key.to_s%>">
     <%= value %>
   </div>
 <% end %>

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

@@ -1,10 +1,17 @@
-<%= simple_form_for resource do |form| %>
+<%= simple_form_for [parent, resource] do |form| -%>
   <%= form.error_notification %>
 
   <div class="form-inputs">
-    <% form_fields.each do |form_field| %>
-      <%= render_form_field(form, form_field) %>
-    <% end %>
+    <% form_fields.each do |form_field| -%>
+      <%= render_form_field(form, form_field) -%>
+    <% end -%>
   </div>
+
   <%= form.button :submit, class: "btn btn-primary" %>
-<% end %>
+  <%= form.button :submit, "Save and continue", :name => "commit_and_continue" %>
+
+  <% unless resource.new_record? -%>
+    <%= link_to "Delete", [parent, resource], :class => "btn btn-danger delete", :method => :delete, :data => { :confirm => 'Are you sure?' } %>
+  <% end -%>
+
+<% end -%>

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

@@ -1,2 +1,2 @@
-<%= link_to "Edit", polymorphic_url(item, action: :edit), class: "btn btn-mini btn-primary" %>
-<%= link_to "Delete", polymorphic_url(item), class: "btn btn-mini", confirm: 'Are you sure?', method: :delete %>
+<%= 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 %>

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

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

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

@@ -1,4 +1,4 @@
-<%= CSV.generate(:col_sep => ";") do |csv| %>
+<%== CSV.generate(:col_sep => ";", :quote_char => '"') do |csv| %>
   <% csv << default_fields %>
   <% collection.each do |item| %>
     <% csv << default_fields.map { |field| item.send(field) } %>

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

@@ -1,7 +1,7 @@
 <div id="overview">
 
-  <%= link_to "Create new #{resource_instance_name.to_s.humanize}", polymorphic_url(resource_class, action: :new), class: "btn btn-primary btn-right" %>
-  <h1><%= resource_collection_name.to_s.humanize %></h1>
+  <%= link_to "Create new #{resource_instance_name.to_s.humanize}", polymorphic_url([parent, resource_class], action: :new), class: "btn btn-primary btn-right" %>
+  <h1><%= resource_class.model_name.human.pluralize %></h1>
 
   <%= render "scope_filters" if scopes_configuration %>
   <%= render "index_top" %>

data/app/views/brightcontent/fields/_file.html.erb

@@ -0,0 +1,6 @@
+<% if item.send(field).present? %>
+  <div class="controls file-preview">
+    <%= image_tag item.send(field).url(item.send(field).styles.keys.first) %>
+  </div>
+<% end %>
+<%= form.input field %>

data/brightcontent-core.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", "~> 3.2.9"
+  s.add_dependency "rails", "~> 3.2.13"
   s.add_dependency "jquery-rails"
-  s.add_dependency "bcrypt-ruby"
+  s.add_dependency "bcrypt-ruby", "3.0.0"
   s.add_dependency "inherited_resources"
   s.add_dependency "has_scope"
   s.add_dependency "simple_form"

data/config/locales/brightcontent.en.yml

@@ -0,0 +1,10 @@
+en:
+  flash:
+    actions:
+      create:
+        notice: '%{resource_name} was successfully created.'
+      update:
+        notice: '%{resource_name} was successfully updated.'
+      destroy:
+        notice: '%{resource_name} was successfully destroyed.'
+        alert: '%{resource_name} could not be destroyed.'

data/config/locales/brightcontent.nl.yml

@@ -0,0 +1,10 @@
+nl:
+  flash:
+    actions:
+      create:
+        notice: '%{resource_name} was successfully created.'
+      update:
+        notice: '%{resource_name} was successfully updated.'
+      destroy:
+        notice: '%{resource_name} was successfully destroyed.'
+        alert: '%{resource_name} could not be destroyed.'

data/lib/brightcontent/default_actions.rb

@@ -5,15 +5,23 @@ module Brightcontent
     end
 
     def create
-      create! { polymorphic_url(resource_class) }
+      if params["commit_and_continue"].present?
+        create! { [parent, resource] }
+      else
+        create! { [parent, resource_class] }
+      end
     end
 
     def update
-      update! { polymorphic_url(resource_class) }
+      if params["commit_and_continue"].present?
+        update! { [parent, resource] }
+      else
+        update! { [parent, resource_class] }
+      end
     end
 
     def destroy
-      destroy! { polymorphic_url(resource_class) }
+      destroy! { [parent, resource_class] }
     end
   end
 end

data/lib/brightcontent/routes_parser.rb

@@ -3,31 +3,45 @@ require 'active_support/inflector'
 module Brightcontent
   class RoutesParser
 
-    def self.parse(routes_hash=nil, engine_resources=nil)
-      new(routes_hash, engine_resources).user_resource
-    end
-
     def initialize(routes_hash=nil, engine_resources=nil)
       @routes_hash = routes_hash
       @engine_resources = engine_resources
     end
 
-    def user_resource
-      resource_names - engine_resources
+    def resources
+      (resource_names - engine_resources).map do |name|
+        Resource.new(name)
+      end
+    end
+
+    class Resource < Struct.new(:path)
+      def klass
+        path.classify.constantize
+      rescue
+        "Brightcontent::#{path.classify}".constantize
+      end
     end
 
     private
 
     def resource_names
       routes_hash.map do |route|
-        if route && route[:action] == "index"
-          route[:controller].match(/brightcontent\/(.+)/)[1]
+        next unless route && route[:controller] && route[:path_spec]
+        name = route[:controller].match(/brightcontent\/(.+)/)[1]
+        if route[:action] == "index" && route[:path_spec].start_with?('/' + name)
+          name
         end
       end.compact.uniq
     end
 
     def routes_hash
-      @routes_hash ||= Engine.routes.routes.map(&:defaults)
+      @routes_hash ||= Engine.routes.routes.map do |r|
+        {
+          controller: r.defaults[:controller],
+          action: r.defaults[:action],
+          path_spec: r.path.spec.to_s
+        }
+      end
     end
 
     def engine_resources

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

@@ -0,0 +1,3 @@
+class Brightcontent::CommentsController < Brightcontent::BaseController
+  belongs_to :blog
+end

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

@@ -1,3 +1,4 @@
 class Blog < ActiveRecord::Base
   scope :featured, where(:featured => true)
+  has_many :comments
 end

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

@@ -0,0 +1,3 @@
+class Comment < ActiveRecord::Base
+  belongs_to :blog
+end

data/spec/dummy/config/routes.rb

@@ -2,6 +2,8 @@ Rails.application.routes.draw do
   resources :blogs
 
   brightcontent_resources do
-    resources :blogs
+    resources :blogs do
+      resources :comments
+    end
   end
 end

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

@@ -0,0 +1,12 @@
+class CreateComments < ActiveRecord::Migration
+  def change
+    create_table :comments do |t|
+      t.string :id
+      t.text :text
+      t.integer :blog_id
+
+      t.timestamps
+    end
+    add_index :comments, :blog_id
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121223131824) do
+ActiveRecord::Schema.define(:version => 20130720211920) do
 
   create_table "blogs", :force => true do |t|
     t.string   "name"
@@ -28,4 +28,13 @@ ActiveRecord::Schema.define(:version => 20121223131824) do
     t.datetime "updated_at",      :null => false
   end
 
+  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
+  end
+
+  add_index "comments", ["blog_id"], :name => "index_comments_on_blog_id"
+
 end

data/spec/dummy/test/fixtures/comments.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  id: MyString
+  text: MyText
+  blog_id: 1
+
+two:
+  id: MyString
+  text: MyText
+  blog_id: 1

data/spec/dummy/test/unit/comments_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CommentsTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/spec/factories.rb

@@ -2,7 +2,7 @@ FactoryGirl.define do
   sequence :email do |n|
     "person#{n}@example.com"
   end
- 
+
   factory :admin_user, class: Brightcontent::AdminUser do
     email
     password "password"

data/spec/features/nested_resource_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+feature "Nested resource" do
+  background { sign_in }
+  let!(:blog) { create(:blog) }
+
+  scenario "add new nested resource item" do
+    create_comment "Name for Commenty"
+    page.should have_content "Name for Commenty"
+  end
+
+  scenario "edit nested resource item" do
+    create_comment "Name for Commenty"
+    update_comment "Name for Commenty", "New Commentz name"
+    page.should have_content "New Commentz name"
+  end
+
+  scenario "Removes an nested resource item" do
+    create_comment "Name for Commenty"
+    remove_comment "Name for Commenty"
+    page.should_not have_content "Name for Commenty"
+  end
+
+  def create_comment(title)
+    visit brightcontent.blog_comments_path(blog)
+    click_link "Create new Comment"
+    fill_in "Text", with: title
+    click_button "Create Comment"
+  end
+
+  def update_comment(title, new_title)
+    within_comment_item(title) { click_link "Edit" }
+    fill_in "Text", with: new_title
+    click_button "Update Comment"
+  end
+
+  def remove_comment(title)
+    within_comment_item(title) do
+      click_link "Delete"
+    end
+  end
+
+  def within_comment_item(title)
+    comment = Comment.find_by_text!(title)
+    within "#comment_#{comment.id}" do
+      yield
+    end
+  end
+
+end

data/spec/features/resources_index_spec.rb

@@ -27,7 +27,7 @@ feature "Resources index" do
   end
 
   def visit_blogs_page
-    click_link "Blogs"
+    click_link "Blog"
   end
 
   def page_should_have_valid_table

data/spec/lib/brightcontent/routes_parser_spec.rb

@@ -5,17 +5,18 @@ module Brightcontent
     let(:engine_resources) { %w{sessions admin_users} }
     let(:routes_hash) do
       [ {}, nil, {:action=>"admin"},
-      {:action=>"index", :controller=>"brightcontent/blogs"},
-      {:action=>"create", :controller=>"brightcontent/blogs"} ]
+      {:action=>"index", :controller=>"brightcontent/blogs", :path_spec => '/blogs(.:format)'},
+      {:action=>"create", :controller=>"brightcontent/blogs", :path_spec => '/blogs(.:format)'},
+      {:controller=>"brightcontent/comments", :action=>"show", :path_spec=>"/blogs/:blog_id/comments/:id(.:format)"}]
     end
 
-    subject(:parser) { RoutesParser.parse(routes_hash, engine_resources) }
+    subject(:parser) { RoutesParser.new(routes_hash, engine_resources) }
 
-    it { should eq ["blogs"] }
+    its(:resources) { should eq [resource("blogs")] }
 
     context "with extra resource" do
-      before { routes_hash << {:action=>"index", :controller=>"brightcontent/articles"} }
-      it { should eq ["blogs", "articles"] }
+      before { routes_hash << {:action=>"index", :controller=>"brightcontent/articles", :path_spec => '/articles' } }
+      its(:resources) { should eq [resource("blogs"), resource("articles")] }
     end
 
     context "with engine resources" do
@@ -24,7 +25,7 @@ module Brightcontent
           routes_hash << {:action=>"index", :controller=>"brightcontent/#{resource_name}"}
         end
       end
-      it { should eq ["blogs"] }
+      its(:resources) { should eq [resource("blogs")] }
     end
 
     context "duplicate resources" do
@@ -32,7 +33,11 @@ module Brightcontent
         routes_hash << {action: "index", controller: "brightcontent/blogs" }
       end
 
-      it { should eq ["blogs"] }
+      its(:resources) { should eq [resource("blogs")] }
+    end
+
+    def resource(path)
+      RoutesParser::Resource.new(path)
     end
 
   end

metadata

@@ -1,238 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: brightcontent-core
 version: !ruby/object:Gem::Version
-  version: 2.0.30
-  prerelease: 
+  version: 2.0.31
 platform: ruby
 authors:
 - Developers at Brightin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-27 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-wysihtml5-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: strong_parameters
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Brightcontent core
@@ -276,12 +247,15 @@ files:
 - app/views/brightcontent/base/index.csv.erb
 - app/views/brightcontent/base/index.html.erb
 - app/views/brightcontent/base/new.html.erb
+- app/views/brightcontent/fields/_file.html.erb
 - app/views/brightcontent/sessions/new.html.erb
 - app/views/layouts/brightcontent/application.html.erb
 - brightcontent-core.gemspec
 - config/initializers/simple_form.rb
 - config/initializers/simple_form_bootstrap.rb
 - config/initializers/will_paginate.rb
+- config/locales/brightcontent.en.yml
+- config/locales/brightcontent.nl.yml
 - config/routes.rb
 - db/migrate/20121206121725_create_brightcontent_admin_users.rb
 - lib/brightcontent-core.rb
@@ -292,7 +266,6 @@ files:
 - lib/brightcontent/pagination.rb
 - lib/brightcontent/rails/routes.rb
 - lib/brightcontent/routes_parser.rb
-- lib/brightcontent/strong_params_fix.rb
 - lib/generators/brightcontent/install_generator.rb
 - lib/generators/brightcontent/resource_generator.rb
 - lib/generators/brightcontent/templates/brightcontent_controller.rb
@@ -306,11 +279,13 @@ files:
 - spec/dummy/app/assets/stylesheets/brightcontent/custom.css
 - 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/pages_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/blog.rb
+- spec/dummy/app/models/comment.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/pages/index.html.erb
 - spec/dummy/config.ru
@@ -333,6 +308,7 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121206225720_create_blogs.rb
 - spec/dummy/db/migrate/20121223131824_add_featured_to_blog.rb
+- spec/dummy/db/migrate/20130720211920_create_comments.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
@@ -340,10 +316,13 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/dummy/test/fixtures/comments.yml
+- spec/dummy/test/unit/comments_test.rb
 - spec/factories.rb
 - spec/features/export_spec.rb
 - spec/features/login_spec.rb
 - spec/features/menu_spec.rb
+- spec/features/nested_resource_spec.rb
 - spec/features/resources_form_spec.rb
 - spec/features/resources_index_spec.rb
 - spec/features/scope_spec.rb
@@ -353,33 +332,26 @@ files:
 - spec/support/acceptance_helper.rb
 homepage: http://brightin.nl
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1318734726726849324
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1318734726726849324
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Brightcontent core
 test_files:
 - spec/dummy/README.rdoc
@@ -390,11 +362,13 @@ test_files:
 - spec/dummy/app/assets/stylesheets/brightcontent/custom.css
 - 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/pages_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/.gitkeep
 - spec/dummy/app/models/blog.rb
+- spec/dummy/app/models/comment.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/pages/index.html.erb
 - spec/dummy/config.ru
@@ -417,6 +391,7 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121206225720_create_blogs.rb
 - spec/dummy/db/migrate/20121223131824_add_featured_to_blog.rb
+- spec/dummy/db/migrate/20130720211920_create_comments.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
@@ -424,10 +399,13 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/dummy/test/fixtures/comments.yml
+- spec/dummy/test/unit/comments_test.rb
 - spec/factories.rb
 - spec/features/export_spec.rb
 - spec/features/login_spec.rb
 - spec/features/menu_spec.rb
+- spec/features/nested_resource_spec.rb
 - spec/features/resources_form_spec.rb
 - spec/features/resources_index_spec.rb
 - spec/features/scope_spec.rb

data/lib/brightcontent/strong_params_fix.rb

@@ -1,16 +0,0 @@
-module Brightcontent
-  module StrongParamsFix
-
-    def build_resource
-      get_resource_ivar || set_resource_ivar(end_of_association_chain.send(method_for_build, params_for_build))
-    end
-
-    def params_for_build
-      request.get? ? {} : resource_params
-    end
-
-    def update_resource(object, attributes)
-      object.update_attributes(attributes)
-    end
-  end
-end