Merge pull request #45 from tguo/move-configuration-out-of-model

[WIP] Move lotus model adapter into Configuration

lib/lotus/model.rb

@@ -52,37 +52,7 @@ class NonPersistedEntityError < ::StandardError
     #     adapter :sql, 'postgres://localhost/database', default: true
     #   end
     def self.configure(&block)
-      instance_eval(&block)
-    end
-
-    # Register adapter
-    #
-    # If `default` params is set to `true`, the adapter will be used as default one
-    #
-    # @param name    [Symbol] Derive adapter class name
-    # @param uri     [String] The adapter uri
-    # @param default [TrueClass,FalseClass] Decide if adapter is used by default
-    #
-    # @since 0.2.0
-    #
-    # @see Lotus::Model#adapter
-    # @see Lotus::Model#configure
-    #
-    # @example Register SQL Adapter as default adapter
-    #   require 'lotus/model'
-    #
-    #   Lotus::Model.adapters # => {}
-    #
-    # @example Register an adapter
-    #   require 'lotus/model'
-    #
-    #   Lotus::Model.configure do
-    #     adapter :sql, 'postgres://localhost/database', default: true
-    #   end
-    def self.adapter(name, uri, default: false)
-      adapter = Lotus::Model::Config::Adapter.new(name, uri)
-      configuration.adapters[name] = adapter
-      configuration.adapters[:default] = adapter if default
+      configuration.instance_eval(&block)
     end
   end
 end

lib/lotus/model/configuration.rb

@@ -8,12 +8,12 @@ module Model
     # @since 0.2.0
     class Configuration
 
-      # @attr_accessor adapters [Hash] a hash of Lotus::Model::Config::Adapter
+      # @attr_reader adapters [Hash] a hash of Lotus::Model::Config::Adapter
       #
       # @since 0.2.0
       #
-      # @see Lotus::Controller::Configuration#adapters
-      attr_accessor :adapters
+      # @see Lotus::Model::Configuration#adapters
+      attr_reader :adapters
 
       # Initialize a configuration instance
       #
@@ -22,7 +22,7 @@ class Configuration
       #
       # @since 0.2.0
       def initialize
-        @adapters = {}
+        reset!
       end
 
       # Reset all the values to the defaults
@@ -32,6 +32,42 @@ def initialize
       def reset!
         @adapters = {}
       end
+
+      # Register adapter
+      #
+      # If `default` params is set to `true`, the adapter will be used as default one
+      #
+      # @param name    [Symbol] Derive adapter class name
+      # @param uri     [String] The adapter uri
+      # @param default [TrueClass, FalseClass] Decide if adapter is used by default
+      #
+      # @since x.x.x
+      #
+      # @see Lotus::Model#configure
+      #
+      # @example Register SQL Adapter as default adapter
+      #   require 'lotus/model'
+      #
+      #   Lotus::Model.configure do
+      #     adapter :sql, 'postgres://localhost/database', default: true
+      #   end
+      #
+      #   Lotus::Model.adapters.fetch(:default)
+      #   Lotus::Model.adapters.fetch(:sql)
+      #
+      # @example Register an adapter
+      #   require 'lotus/model'
+      #
+      #   Lotus::Model.configure do
+      #     adapter :sql, 'postgres://localhost/database'
+      #   end
+      #
+      #   Lotus::Model.adapters.fetch(:sql)
+      def adapter(name, uri, default: false)
+        adapter = Lotus::Model::Config::Adapter.new(name, uri)
+        @adapters[name] = adapter
+        @adapters[:default] = adapter if default
+      end
     end
   end
 end

test/model/configuration_test.rb

@@ -0,0 +1,37 @@
+require 'test_helper'
+
+describe Lotus::Model::Configuration do
+  before do
+    @configuration = Lotus::Model::Configuration.new
+  end
+
+  describe '#adapter' do
+    it 'defaults to an empty set' do
+      @configuration.adapters.must_be_empty
+    end
+
+    it 'allows to register adapter' do
+      @configuration.adapter(:sql, 'postgres://localhost/database')
+
+      adapter = @configuration.adapters.fetch(:sql)
+      adapter.must_be_kind_of Lotus::Model::Config::Adapter
+      adapter.uri.must_equal 'postgres://localhost/database'
+    end
+
+    it 'allows to register default adapter' do
+      @configuration.adapter(:sql, 'postgres://localhost/database', default: true)
+
+      default_adapter = @configuration.adapters.fetch(:default)
+      default_adapter.must_be_kind_of Lotus::Model::Config::Adapter
+      default_adapter.uri.must_equal 'postgres://localhost/database'
+    end
+
+    it 'eliminates duplications' do
+      @configuration.adapter(:sql, 'postgres://localhost/database')
+      @configuration.adapter(:sql, 'postgres://localhost/database')
+
+      @configuration.adapters.size.must_equal(1)
+    end
+  end
+
+end

test/model_test.rb

@@ -1,6 +1,12 @@
 require 'test_helper'
 
 describe Lotus::Model do
+  describe '.configuration' do
+    it 'exposes class configuration' do
+      Lotus::Model.configuration.must_be_kind_of(Lotus::Model::Configuration)
+    end
+  end
+
   describe '.configure' do
     describe '.adapter' do
       before do