topping 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d56837f3a227355acadb988324896023b04bb271
-  data.tar.gz: 6d78c71af47e6453e3ee5e0edf58ff6b97f5da2b
+  metadata.gz: a1147486fdb5ceb1e12f992681b5d6e86745d332
+  data.tar.gz: e622771370993c6881fd67b8b94a72685617cd54
 SHA512:
-  metadata.gz: fcf70b23f49fdba1509b6eb5a988d942a8ba8ffbc00956ef40a195a641b01d70766f8a67f929e9a35034907b8e3fa904de6c2f8e14718bdd244ade49b87061ec
-  data.tar.gz: 10533fe300383d34b1c37040d01ebb486a8d65654da5dac4466fbf7d6f5cbec17babe5eacd28fbe18fa19a6c6e3bf69ab32f7a2cc8bdaf62e80974327c07e8ca
+  metadata.gz: d5c089fa4a81fdfeee5e6dbef54c7006669c96941c999ee28e856a7002882b1db9275983501ac22983a3fae4761d610d417af19452a57dd79d31acfdbd37bb10
+  data.tar.gz: 342d2a23a9bdcb56c1a5d8ab092676616d7d69a7e6c2b9cfd823366e3ae138b007fb15be9b3002471185b381a2a3878039678bf9bce899cc4372d3916515db34

data/.rubocop.yml

@@ -1,6 +1,6 @@
 
 AllCops:
-  TargetRubyVersion: 2.3.4
+  TargetRubyVersion: 2.3
   Exclude:
      - 'vendor/**/*'
      - 'spec/fixtures/**/*'

data/README.md

@@ -1,5 +1,4 @@
-# Topping
-
+# Topping [![Gem Version](https://badge.fury.io/rb/topping.svg)](https://badge.fury.io/rb/topping) [![Build Status](https://travis-ci.org/rike422/topping.svg?branch=master)](https://travis-ci.org/rike422/topping) [![Code Climate](https://codeclimate.com/github/rike422/topping/badges/gpa.svg)](https://codeclimate.com/github/rike422/topping) [![Coverage Status](https://coveralls.io/repos/github/rike422/topping/badge.svg?branch=master)](https://coveralls.io/github/rike422/topping?branch=master)
 Configuration library for like a [Lita](https://github.com/litaio/lita) style application 
 
 ## Installation
@@ -17,8 +16,19 @@ gem 'topping'
 require 'topping'
 
 module MockApplication
-  class Application
-    include Topping::Configurable::HQ
+  class BaseApplication
+    extend Topping::Configurable::HQ
+    config :store, default: :memory
+    config :name, default: 'myapp'
+    config :dir, type: String
+  end
+end
+
+module MockApplication
+  class Application < MockApplication::BaseApplication
+  	config.store = :redis
+  	config.name = 'topping_app'
+  	config.dir = 'work'
   end
 end
 
@@ -40,7 +50,7 @@ module MockApplication
   end
 end
 
-MockApplication::Application.build
+Topping.build
 
 MockApplication::Application.configure do |c|
 	c.features.net.host = 'github.com'
@@ -51,13 +61,19 @@ MockApplication::Application.configure do |c|
 end
 
 net = MockApplication::Features::Net.new
-user = MockApplication::Features::User.new
+user = MockApplication::Features::User.new 
+
+p MockApplication::Application.config.name
+# => 'topping_app'
+p MockApplication::Application.config.store
+# => :redis
+p MockApplication::Application.config.dir
+# => 'work'
 
 p net.config.host 
 # => 'github.com'
 p net.config.port 
 # => 89
-
 p user.config.username
 # => 'akira takahashi'
 p user.config.password
@@ -68,11 +84,20 @@ p user.config.password
 or 
 
 ```ruby
+
 require 'topping'
 
 module MockApplication
-  class Application
-    include Topping::Configurable::HQ
+  class BaseApplication
+    extend Topping::Configurable::HQ
+    config :store, default: :memory
+    config :name, default: 'myapp'
+    config :dir, type: String
+  end
+end
+
+module MockApplication
+  class Application < MockApplication::BaseApplication
   end
 end
 
@@ -94,7 +119,7 @@ module MockApplication
   end
 end
 
-MockApplication::Application.build
+Topping.build
 
 MockApplication::Features::Net.configure do |c|
 	c.host = 'github.com'
@@ -106,6 +131,15 @@ MockApplication::Features::User.configure do |c|
 	c.password = 'password'	
 end
 
+p MockApplication::Application.config.name
+# => 'topping_app'
+
+p MockApplication::Application.config.store
+# => :redis
+
+p MockApplication::Application.config.dir
+# => 'work'
+
 p MockApplication::Application.config.features.net.host
 # => 'github.com'
 p MockApplication::Application.config.features.net.port

data/lib/topping/configurable/branch.rb

@@ -25,41 +25,8 @@ module Topping
       end
 
       module ChildClassMethods
-        # A block to be executed after configuration is finalized.
-        # @return [#call, nil] The block.
-        # @since 0.0.1
-        # @api private
-        attr_accessor :after_config_block
+        include Topping::Configurable
 
-        # The plugins's {ConfigurationBuilder} object.
-        # @return [ConfigurationBuilder] The configuration builder.
-        # @since 0.0.1
-        # @api public
-        attr_accessor :configuration_builder
-        # Registers a block to be executed after configuration is finalized.
-        # @yieldparam config [Configuration] The handler's configuration object.
-        # @return [void]
-        # @since 0.0.1
-        def after_config(&block)
-          self.after_config_block = block
-        end
-
-        # Sets a configuration attribute on the plugin.
-        # @return [void]
-        # @since 0.0.1
-        # @see ConfigurationBuilder#config
-        def config(*args, **kwargs, &block)
-          if block
-            configuration_builder.config(*args, **kwargs, &block)
-          else
-            configuration_builder.config(*args, **kwargs)
-          end
-        end
-
-        # Yields the configuration object
-        # @yieldparam [Configuration] config The configuration object.
-        # @since 0.0.1
-        # @see ConfigurationBuilder#config
         def configure(&block)
           configuration_builder.configure(&block)
         end

data/lib/topping/configurable/hq.rb

@@ -11,29 +11,29 @@ module Topping
       # @api private
       attr_accessor :name_space
 
-      # Yields the configuration object
-      # @yieldparam [Configuration] config The configuration object.
+      # Sets a configuration attribute on the application.
+      # @return [void]
       # @since 0.0.1
       # @see ConfigurationBuilder#config
-      def configure
-        yield root.configuration.send(name_space.first.to_sym)
+      def config(*args, **kwargs, &block)
+        if block
+          root.config(*args, **kwargs, &block)
+        else
+          root.config(*args, **kwargs)
+        end
+        build
       end
 
-      # User configuration store
-      # @return [Configuration] The root attribute.
+      # Sets a configuration attribute on the application.
+      # @return [void]
       # @since 0.0.1
-      def config
-        root.configuration.send(name_space.first.to_sym)
-      end
-
       def build
-        @root.build
+        root.build
       end
 
       # @api private
       def mapping(klass)
-        keys = Topping::Configurable::HQ.undersocre_namespace(klass)
-        keys.delete(name_space)
+        keys = Topping.underscore_namespace(klass) - name_space
         klass_name = keys.pop
 
         parent = keys.reduce(root) do |memo, key|
@@ -44,16 +44,17 @@ module Topping
         parent.combine(klass_name, klass.configuration_builder)
       end
 
+      def inherited(klass)
+        klass.extend(Topping::Configurable::HQ::ChildClassMethods)
+        klass.root = root
+      end
+
       class << self
         # The top-level Configurable Class
         # @api private
         # @return [Configuration] The root attribute.
         attr_accessor :hq_class
 
-        def included(klass)
-          klass.extend(Topping::Configurable::HQ)
-        end
-
         def mapping(klass)
           hq_class.mapping(klass)
         end
@@ -61,23 +62,31 @@ module Topping
         def extended(klass)
           super
           self.hq_class = klass
-          root_config = ConfigurationBuilder.new
-          klass.root = root_config
-          klass.name_space = Topping::Configurable::HQ.undersocre_namespace(klass)
+          klass.name_space = Topping.underscore_namespace(klass)
+
+          config = Topping.root.config(klass.name_space.first)
+          klass.root = config
         end
+      end
 
-        def undersocre_namespace(klass)
-          klass.name.split('::').map do |key|
-            Topping::Configurable::HQ.underscore(key)
-          end
+      module ChildClassMethods
+        # The top-level {ConfigurationBuilder} attribute.
+        # @return [Configuration] The root attribute.
+        attr_accessor :root
+
+        # Yields the configuration object
+        # @yieldparam [Configuration] config The configuration object.
+        # @since 0.0.1
+        # @see ConfigurationBuilder#config
+        def configure
+          yield root.configuration
         end
 
-        def underscore(str)
-          str.gsub(/::/, '/').
-            gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
-            gsub(/([a-z\d])([A-Z])/, '\1_\2').
-            tr('-', '_').
-            downcase
+        # User configuration store
+        # @return [Configuration] The root attribute.
+        # @since 0.0.1
+        def config
+          root.configuration
         end
       end
     end

data/lib/topping/configuration_builder.rb

@@ -59,6 +59,12 @@ module Topping
       @name = :root
     end
 
+    # Merges two configuration builders by making one an attribute on the other.
+    # @yield The configuration object
+    def configure
+      yield configuration
+    end
+
     # Builds a {Configuration} object from the attributes defined on the builder.
     # @param object [Configuration] The empty configuration object that will be extended to
     #   create the final form.
@@ -93,10 +99,6 @@ module Topping
       children << attribute
     end
 
-    def configure
-      yield configuration
-    end
-
     # rubocop:disable Metrics1/ParameterLists
     # Declares a configuration attribute.
     # @param name [String, Symbol] The attribute's name.

data/lib/topping/version.rb

@@ -1,3 +1,3 @@
 module Topping
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 end

data/lib/topping.rb

@@ -1,9 +1,35 @@
 require 'topping/version'
+require 'topping/configuration_builder'
+require 'topping/errors'
 
 module Topping
   # Your code goes here...
+  class << self
+    # rubocop:disable Style/ClassVars
+    @@root = ConfigurationBuilder.new
+
+    def root
+      @@root
+    end
+
+    def build
+      root.build
+    end
+
+    def underscore_namespace(klass)
+      klass.name.split('::').map do |key|
+        Topping.underscore(key)
+      end
+    end
+
+    def underscore(str)
+      str.gsub(/::/, '/').
+        gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
+        gsub(/([a-z\d])([A-Z])/, '\1_\2').
+        tr('-', '_').
+        downcase
+    end
+  end
 end
 
 require 'topping/configurable'
-require 'topping/configuration_builder'
-require 'topping/errors'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topping
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Akira Takahashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler