[INTERNAL] Extract Core::Attributes to the 'attributes_dsl' gem

== Deleted

* QueryBuilder::Core::Attributes
* QueryBuilder::Core::AttributeError

CHANGELOG.md

@@ -1,3 +1,16 @@
+## v0.0.4 to be released
+
+### Internal
+
+* Extracted `Core::Attributes` to the external gem 'attributes_dsl' (nepalez)
+
+### Deleted
+
+* `Core::Attributes` (nepalez)
+* `Core::AttributesDSL` (nepalez)
+
+[Compare v0.0.3...HEAD](https://github.com/nepalez/query_builder/compare/v0.0.3...HEAD)
+
 ## v0.0.3 2015-08-21
 
 ### Added

lib/query_builder.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require "attributes_dsl"
 require "equalizer"
 require "ice_nine"
 require "transproc"

lib/query_builder/core.rb

@@ -8,8 +8,6 @@ module QueryBuilder
   #
   module Core
 
-    require_relative "core/attribute_error"
-    require_relative "core/attribute"
     require_relative "core/base"
     require_relative "core/clause"
     require_relative "core/statement"

lib/query_builder/core/base.rb

@@ -10,55 +10,15 @@ module QueryBuilder::Core
   #
   class Base
 
-    # @!method attributes
-    # The hash of default attributes of class' instances
-    #
-    # @return [Hash]
-    #
-    def self.attributes
-      @attributes ||= Set.new
-    end
-
-    # @!method attribute(name, options)
-    # Declares the attribute with optional default value
-    #
-    # @param [Symbol] name The name of the attribute
-    # @param [Hash] options
-    # @option options [Object] :default
-    #
-    # @return [undefined]
-    #
-    def self.attribute(name, options = {})
-      attributes << Attribute.new(name, options)
-      define_method(name) { attributes.fetch(name) }
-    end
-
-    # Makes default attributes inheritable
-    #
-    # @private
-    #
-    def self.inherited(subclass)
-      attributes.each do |item|
-        subclass.public_send(:attribute, *item.arguments)
-      end
-    end
-
-    # @!attribute [r] attributes
-    #
-    # @return [Hash] The hash of the initialized attributes
-    #
-    attr_reader :attributes
+    extend AttributesDSL
 
     # @!method initialize(attributes = {})
     # Initializes the instance
     #
     # @param [Hash] attributes The custom attributes of the instance
     #
-    def initialize(attributes = {})
-      validate_unknown attributes
-      validate_missing attributes
-
-      @attributes = default_attributes.merge(attributes)
+    def initialize(_attributes = {})
+      super
       IceNine.deep_freeze(self)
     end
 
@@ -73,30 +33,6 @@ def to_s
       ""
     end
 
-    private
-
-    def known_attributes
-      self.class.attributes
-    end
-
-    def required_attributes
-      known_attributes.select(&:required)
-    end
-
-    def default_attributes
-      known_attributes.each_with_object({}) { |e, a| a[e.name] = e.default }
-    end
-
-    def validate_unknown(hash)
-      unknown = hash.keys - known_attributes.map(&:name)
-      fail AttributeError.new(:unknown, unknown) if unknown.any?
-    end
-
-    def validate_missing(hash)
-      missed = required_attributes.map(&:name) - hash.keys
-      fail AttributeError.new(:missed, missed) if missed.any?
-    end
-
   end # class Base
 
 end # module CQLBuiler::Core

query_builder.gemspec

@@ -22,9 +22,10 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.9.3"
 
-  gem.add_runtime_dependency "transproc", "~> 0.3"
+  gem.add_runtime_dependency "attributes_dsl", "~> 0.0"
   gem.add_runtime_dependency "equalizer", "~> 0.0.11"
   gem.add_runtime_dependency "ice_nine", "~> 0.11"
+  gem.add_runtime_dependency "transproc", "~> 0.3"
 
   gem.add_development_dependency "hexx-rspec", "~> 0.5"