lib/remarkable/controller/controller.rb in carlosbrando-remarkable-0.0.99 vs lib/remarkable/controller/controller.rb in carlosbrando-remarkable-2.2.1

@@ -1,15 +1,20 @@
 require 'remarkable/controller/helpers'
-Dir[File.join(File.dirname(__FILE__), "macros", '*')].each do |file|
+Dir[File.join(File.dirname(__FILE__), "macros", '*.rb')].each do |file|
   require file
 end
+require 'remarkable/controller/macros'
 
 module Spec
   module Rails
-    module Matchers
-      include Remarkable::Controller::Helpers
+    module Example
+      class ControllerExampleGroup
+        include Remarkable::Assertions
+        include Remarkable::Controller::Matchers
+        extend Remarkable::Controller::Macros
+
+        private
+        include Remarkable::Private
+      end
     end
   end
 end
-
-Spec::Rails::Matchers.send(:include, Remarkable::Syntax::RSpec)
-Spec::Example::ExampleGroupMethods.send(:include, Remarkable::Syntax::Shoulda)