Merge branch 'master' into interface_tweaks

releaf-content/lib/releaf-content.rb

@@ -1,3 +1,4 @@
 require 'releaf/content/engine'
 require 'releaf/content/acts_as_node'
 require 'releaf/content/node'
+require 'releaf/content/route'

releaf-content/app/models/releaf/content/route.rb → releaf-content/lib/releaf/content/route.rb

@@ -12,7 +12,7 @@ def self.node_class
     # @param controller_action [String] optional string with action and controller for route (Ex. home#index)
     # @param args [Hash] options to merge with internally built params. Passed params overrides route params.
     # @return [Hash] route options. Will return at least node "node_id" and "locale" keys.
-    def params controller_action, args = {}
+    def params(controller_action, args = {})
       route_params = {
         node_id: node_id.to_s,
         locale: locale
@@ -37,36 +37,27 @@ def params controller_action, args = {}
 
     # Return routes for given class that implement ActsAsNode
     #
-    # @param class_name [Class] class name to load related nodes
+    # @param content_type [Class] content type to load related nodes
     # @return [Array] array of Content::Route objects
-    def self.for class_name
-      return [] unless nodes_available?
-      routes = []
-
-      node_class.where(content_type: class_name).each do|node|
-        if node.available?
-          routes << build_route_object(node)
+    def self.for(content_type)
+      begin
+        node_class.where(content_type: content_type).each.inject([]) do |routes, node|
+          routes << build_route_object(node) if node.available?
+          routes
         end
+      rescue ActiveRecord::NoDatabaseError, ActiveRecord::StatementInvalid
+        []
       end
-
-      routes
     end
 
-    private
-
     # Build Content::Route from Node object
     def self.build_route_object node
       route = new
       route.node_id = node.id.to_s
       route.path = node.url
       route.locale = node.root.locale
-
       route
     end
 
-    # Check for nodes table availability
-    def self.nodes_available?
-      ActiveRecord::Base.connection.table_exists? node_class.table_name
-    end
   end
 end

releaf-content/spec/builders/content/nodes/content_form_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Content::Nodes::ContentFormBuilder, type: :class do
   class FormBuilderTestHelper < ActionView::Base

releaf-content/spec/builders/content/nodes/form_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Content::Nodes::FormBuilder, type: :class do
   class FormBuilderTestHelper < ActionView::Base

releaf-content/spec/controllers/releaf/content/nodes_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Releaf::Content::NodesController do
   describe "#builder_scopes" do

releaf-content/spec/features/nodes_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 describe "Nodes", js: true, with_tree: true, with_root: true do
   before do
     Rails.cache.clear

releaf-content/spec/lib/acts_as_node_spec.rb → releaf-content/spec/lib/releaf/content/acts_as_node_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 class ContactFormController < ActionController::Base
   acts_as_node

releaf-content/spec/models/node_spec.rb → releaf-content/spec/lib/releaf/content/node_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Node do
   class PlainNode < ActiveRecord::Base
@@ -15,7 +15,7 @@ class PlainNode < ActiveRecord::Base
     expect( Node.included_modules ).to include Releaf::Content::Node
   end
 
-  describe 'validations' do
+  describe "validations" do
     it { is_expected.to validate_presence_of(:name) }
     it { is_expected.to validate_presence_of(:slug) }
     it { is_expected.to validate_presence_of(:content_type) }

releaf-content/spec/models/content_route_spec.rb → releaf-content/spec/lib/releaf/content/route_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Content::Route do
   let(:node_route) { FactoryGirl.build(:node_route, node_id: 12, locale: "en", path: "/en") }
@@ -10,24 +10,33 @@
   end
 
   describe ".for" do
+    before do
+      create(:home_page_node)
+    end
+
     it "returns an array" do
       expect(described_class.for(HomePage).class).to eq(Array)
     end
 
-    context "when no releaf_nodes table defined" do
+    context "when databse doesn't exists" do
       it "returns an empty array" do
-        allow(described_class).to receive(:nodes_available?).and_return(false)
+        allow(described_class.node_class).to receive(:where).and_raise(ActiveRecord::NoDatabaseError.new("xxx"))
         expect(described_class.for(HomePage)).to eq([])
       end
     end
 
-    context "when releaf_nodes table defined and content nodes exist" do
-      before do
-        create(:home_page_node)
+    context "when releaf_nodes table doesn't exists" do
+      it "returns an empty array" do
+        allow(described_class.node_class).to receive(:where).and_raise(ActiveRecord::StatementInvalid.new("xxx"))
+        expect(described_class.for(HomePage)).to eq([])
       end
+    end
 
+    context "when releaf_nodes table exists" do
       it "returns an array of Node::Route objects" do
-        expect(described_class.for(HomePage).first.class).to eq(described_class)
+        result = described_class.for(HomePage)
+        expect(result.count).to eq(1)
+        expect(result.first.class).to eq(described_class)
       end
 
       context "when node is not available" do
@@ -40,7 +49,6 @@
   end
 
   describe '#params' do
-
     it "returns a hash with node_id" do
       expect(node_route.params("home#index")[:node_id]).to eq('12')
     end
@@ -70,7 +78,6 @@
     end
 
     context "when :as given in args" do
-
       context "when node has a locale" do
         it "prepends locale to :as" do
           expect(node_route.params("home#index", as: "home")[:as]).to eq("en_home")

releaf-content/spec/middleware/routes_reloader_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Content::RoutesReloader do
   let(:app) { ->(env) { [200, env, "app"] } }

releaf-content/spec/validators/content/node/parent_validator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Releaf::Content::Node::ParentValidator do
   let!(:root_node) { FactoryGirl.create(:node, content_type: 'HomePage') }

releaf-content/spec/validators/content/node/root_validator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Releaf::Content::Node::RootValidator do
 

releaf-content/spec/validators/content/node/singleness_validator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Releaf::Content::Node::SinglenessValidator do
 

releaf-core/app/builders/releaf/builders.rb

@@ -20,7 +20,7 @@ def self.constant_defined_at_scope?(mapping, at)
     constant_defined = false
 
     begin
-      constant_defined = at.const_get(mapping).present?
+      constant_defined = at.const_get(mapping).present? && mapping.constantize == at.const_get(mapping)
     rescue NameError => error
       raise unless constant_name_error?(error.message, mapping)
     end

releaf-core/app/builders/releaf/builders/table_builder.rb

@@ -12,7 +12,7 @@ def initialize(collection, resource_class, template, options)
   end
 
   def column_names
-    Releaf::Core::ResourceFields.new(resource_class).values(include_associations: false)
+    Releaf::Core::ResourceTableFields.new(resource_class).values(include_associations: false)
   end
 
   def columns

releaf-core/app/lib/releaf/core/resource_table_fields.rb

@@ -0,0 +1,10 @@
+class Releaf::Core::ResourceTableFields < Releaf::Core::ResourceFields
+
+  def excluded_attributes
+    super + table_excluded_attributes
+  end
+
+  def table_excluded_attributes
+    resource_class.column_names.select{|c| c.match(/.*_html$/) }
+  end
+end

releaf-core/spec/builders/builders/association_reflector_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Releaf::Builders::AssociationReflector, type: :class do
   let(:reflection){ Book.reflect_on_association("chapters") }

releaf-core/spec/builders/builders/base_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::Base, type: :module do
   class FormBuilderTestHelper < ActionView::Base

releaf-core/spec/builders/builders/collection_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::Collection, type: :module do
   class CollectionIncluder

releaf-core/spec/builders/builders/confirm_destroy_dialog_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::ConfirmDestroyDialogBuilder, type: :class do
   class ConfirmDestroyDialogTestHelper < ActionView::Base

releaf-core/spec/builders/builders/confirm_dialog_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::ConfirmDialogBuilder, type: :class do
   class ConfirmDestroyDialogTestHelper < ActionView::Base

releaf-core/spec/builders/builders/edit_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::EditBuilder, type: :class do
   class EditBuilderTestHelper < ActionView::Base

releaf-core/spec/builders/builders/form_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::FormBuilder, type: :class do
   class FormBuilderTestHelper < ActionView::Base

releaf-core/spec/builders/builders/index_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::IndexBuilder, type: :class do
   class IndexBuilderTestHelper < ActionView::Base

releaf-core/spec/builders/builders/orderer_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::Orderer, type: :module do
   class OrdererIncluder

releaf-core/spec/builders/builders/page/layout_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::Page::LayoutBuilder, type: :class do
   class PageHeaderBuilderTestHelper < ActionView::Base

releaf-core/spec/builders/builders/page/page_header_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::Page::HeaderBuilder, type: :class do
   class PageHeaderBuilderTestHelper < ActionView::Base

releaf-core/spec/builders/builders/resource_dialog_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::ResourceDialog, type: :class do
   class DialogTestHelper < ActionView::Base

releaf-core/spec/builders/builders/resource_view_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::ResourceView, type: :class do
   class ResourceViewIncluder

releaf-core/spec/builders/builders/show_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::ShowBuilder, type: :class do
   it "includes `Releaf::Builders::ResourceView`" do

releaf-core/spec/builders/builders/table_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::TableBuilder, type: :class do
   class TableBuilderTestHelper < ActionView::Base
@@ -66,8 +66,8 @@ def custom_title(resource); end
 
   describe "#column_names" do
     it "returns column names for resource_class" do
-      allow(Releaf::Core::ResourceFields).to receive(:new).with(subject.resource_class).and_call_original
-      allow_any_instance_of(Releaf::Core::ResourceFields).to receive(:values)
+      allow(Releaf::Core::ResourceTableFields).to receive(:new).with(subject.resource_class).and_call_original
+      allow_any_instance_of(Releaf::Core::ResourceTableFields).to receive(:values)
         .with(include_associations: false).and_return(["a", "b"])
       expect(subject.column_names).to eq(["a", "b"])
     end

releaf-core/spec/builders/builders/template_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::Template, type: :module do
   class TemplateClassIncluder

releaf-core/spec/builders/builders/toolbox_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::ToolboxBuilder, type: :class do
   class ToolboxBuilderTestHelper < ActionView::Base

releaf-core/spec/builders/builders/toolbox_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::Toolbox, type: :class do
   class ToolboxTestTemplate < ActionView::Base

releaf-core/spec/builders/builders/view_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Builders::View, type: :class do
   class ViewTestHelper < ActionView::Base

releaf-core/spec/builders/builders_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Releaf::Builders, type: :class do
   module Admin::Advanced
@@ -84,6 +84,11 @@ class Admin::Advanced::Builders < Releaf::Builders; end
       it "returns true" do
         expect(described_class.constant_defined_at_scope?("Releaf::Builders::FormBuilder", Releaf)).to be true
       end
+
+      it "compare constant with constant at given namespace and check whether it exists" do
+        allow(Admin).to receive(:const_get).with("Admin:xx").and_return(true)
+        expect(described_class.constant_defined_at_scope?("Admin:xx", Admin)).to be false
+      end
     end
 
     context "when NameError raised" do

releaf-core/spec/builders/core/settings/form_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Core::Settings::FormBuilder, type: :class do
   class FormBuilderTestHelper < ActionView::Base; end

releaf-core/spec/builders/core/settings/table_builder_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Releaf::Core::Settings::TableBuilder, type: :class do
   class TableBuilderTestHelper < ActionView::Base; end

releaf-core/spec/controllers/base_application_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Admin::BooksController do
   describe "#current_params" do

releaf-core/spec/controllers/concerns/releaf/richtext_attachments_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Releaf::Content::NodesController, type: :controller do
   before do

releaf-core/spec/controllers/releaf/base_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Releaf::BaseController do
   let(:new_resource){ Author.new }

releaf-core/spec/controllers/releaf/core/settings_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Releaf::Core::SettingsController do
   login_as_user :user