lib/lotus/configuration.rb in lotusrb-0.5.0 vs lib/lotus/configuration.rb in lotusrb-0.6.0

@@ -1,11 +1,10 @@
 require 'lotus/utils/kernel'
 require 'lotus/utils/deprecation'
 require 'lotus/environment'
 require 'lotus/config/framework_configuration'
 require 'lotus/config/load_paths'
-require 'lotus/config/assets'
 require 'lotus/config/routes'
 require 'lotus/config/mapping'
 require 'lotus/config/sessions'
 require 'lotus/config/configure'
 require 'lotus/config/security'
@@ -387,12 +386,10 @@
     #   Gets the value
     #   @return [Lotus::Config::Assets] assets root
     #
     # @since 0.1.0
     #
-    # @see Lotus::Configuration#serve_assets
-    #
     # @example Getting the value
     #   require 'lotus'
     #
     #   module Bookshelf
     #     class Application < Lotus::Application
@@ -406,73 +403,26 @@
     #   require 'lotus'
     #
     #   module Bookshelf
     #     class Application < Lotus::Application
     #       configure do
-    #         serve_assets true
-    #         assets << [
-    #           'vendor/assets'
-    #         ]
+    #         assets do
+    #           sources << [
+    #             'vendor/assets'
+    #           ]
+    #         end
     #       end
     #     end
     #   end
     #
     #   Bookshelf::Application.configuration.assets
     #     # => #<Lotus::Config::Assets @root=#<Pathname:/root/path/assets>, @paths=["public"]>
-    #
-    def assets
-      @assets ||= Config::Assets.new(root)
-    end
-
-    # Configure serving of assets
-    # Enable static assets (disabled by default).
-    #
-    # This is part of a DSL, for this reason when this method is called with
-    # an argument, it will set the corresponding instance variable. When
-    # called without, it will return the already set value, or the default.
-    #
-    # @since 0.2.0
-    #
-    # @overload serve_assets(value)
-    #   Sets the given value.
-    #   @param value [TrueClass, FalseClass]
-    #
-    # @overload serve_assets
-    #   Gets the value.
-    #   @return [TrueClass, FalseClass]
-    #
-    # @see Lotus::Configuration#assets
-    #
-    # @example Getting serve assets configuration by default
-    #   require 'lotus'
-    #
-    #   module Bookshelf
-    #     class Application < Lotus::Application
-    #     end
-    #   end
-    #
-    #   Bookshelf::Application.configuration.serve_assets
-    #     # => false
-    #
-    # @example Enabling static assets
-    #   require 'lotus'
-    #
-    #   module Bookshelf
-    #     class Application < Lotus::Application
-    #       configure do
-    #         serve_assets true
-    #       end
-    #     end
-    #   end
-    #
-    #   Bookshelf::Application.configuration.serve_assets
-    #     # => true
-    def serve_assets(value = nil)
-      if value.nil?
-        @serve_assets || false
+    def assets(&blk)
+      if @assets
+        @assets.__add(&blk)
       else
-        @serve_assets = value
+        @assets ||= Config::FrameworkConfiguration.new(&blk)
       end
     end
 
     # Configure cookies
     # Enable cookies (disabled by default).
@@ -1275,18 +1225,16 @@
     #           get '/', to: 'dashboard#index'
     #         end
     #       end
     #     end
     #
-    #     module Controllers
-    #       module Dashboard
-    #         include Bookshelf::Controller
+    #     module Controllers::Dashboard
+    #       class Index
+    #         include Bookshelf::Action
     #
-    #         action 'Index' do
-    #           def call(params)
-    #             # ...
-    #           end
+    #         def call(params)
+    #           # ...
     #         end
     #       end
     #     end
     #   end
     #
@@ -1310,13 +1258,13 @@
     #         end
     #       end
     #     end
     #
     #     module DashboardController
-    #       include Bookshelf::Controller
+    #       class Index
+    #         include Bookshelf::Action
     #
-    #       action 'Index' do
     #         def call(params)
     #         end
     #       end
     #     end
     #   end
@@ -1343,13 +1291,13 @@
     #       end
     #     end
     #   end
     #
     #   module DashboardController
-    #     include Bookshelf::Controller
+    #     class Index
+    #       incude Bookshelf::Action
     #
-    #     action 'Index' do
     #       def call(params)
     #       end
     #     end
     #   end
     #
@@ -1528,13 +1476,13 @@
     #
     #       load!
     #     end
     #
     #     module Controllers::Error
-    #       include Bookshelf::Controller
+    #       class Index
+    #         include Bookshelf::Action
     #
-    #       action 'Index' do
     #         def call(params)
     #           raise ArgumentError
     #         end
     #       end
     #     end
@@ -1557,13 +1505,13 @@
     #
     #       load!
     #     end
     #
     #     module Controllers::Error
-    #       include Bookshelf::Controller
+    #       class Index
+    #         include Bookshelf::Action
     #
-    #       action 'Index' do
     #         def call(params)
     #           raise ArgumentError
     #         end
     #       end
     #     end
@@ -1729,12 +1677,12 @@
     #       end
     #       load!
     #     end
     #
     #     module Controllers::Error
-    #       include Bookshelf::Controller
+    #       class Index
+    #         include Bookshelf::Action
     #
-    #       action 'Index' do
     #         def call(params)
     #           Bookshelf::Logger.info "Logging to STDOUT"
     #         end
     #       end
     #     end