alki-dsl 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4450c3089f0ffa33bd64349a3f6a06e3e2c93192
-  data.tar.gz: 81c39bf6c311568c9b1ab3e633209622bc8c2798
+  metadata.gz: 90429495e92b8775651aac719580cdac47e97e14
+  data.tar.gz: 3084f05b8ca664ad0e4df95a85ba7623d39a2952
 SHA512:
-  metadata.gz: 56fe3c9044b3e0f416b363615269344ec5150292a422964fed7c05002e614b4cd7feb7a6137738287d443cfc2f8d3ef8aae3c061f776b7019573131e5cbf5124
-  data.tar.gz: a5d8ce35078e0cf74a313dbfbb7da8ce5312955dac27b06ba3c92582b06dee58d917cc1e055ca64f5ad4c390bde769b01ccd2214291f71974afeee05af9856de
+  metadata.gz: 64c345261de3bebc73b2f1bc76528794e634ed569736480477f8892d728e1c9ec14859d4af249efa72187d5f07b63fe3f981b32e35469093eedf1de087f229a6
+  data.tar.gz: 8120abd9422fdc9bb658637dd0d0e9fa7d40a346562d6a4ad5bb3ebdb9388a13ce8cc4effad0b81c6be8ae900a30707fa987c51335e05528cf87b40b2bb11a59

data/Gemfile

@@ -1,3 +1,6 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem 'rake'
+gem 'alki-testing'

data/Rakefile

@@ -0,0 +1,3 @@
+require 'alki/testing/tasks'
+
+task default: [:test]

data/alki-dsl.gemspec

@@ -18,6 +18,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'alki-support', '~> 0.7'
-  spec.add_dependency 'alki-loader', '~> 0.2'
-  spec.add_development_dependency 'alki-testing', '~> 0.1'
+  spec.add_dependency 'alki-loader', '~> 0.2', '>= 0.2.2'
 end

data/bin/bundler

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("bundler", "bundler")

data/bin/rake

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rake", "rake")

data/lib/alki/class_builder.rb

@@ -2,146 +2,163 @@ require 'forwardable'
 require 'alki/support'
 
 module Alki
-  class ClassBuilder
-    def self.create_constant(name,value = Class.new, parent=nil)
-      parent ||= Object
-      *ans, ln = name.to_s.split('::')
-      ans.each do |a|
-        unless parent.const_defined? a
-          parent.const_set a, Module.new
+  module ClassBuilder
+    class << self
+      def create_constant(name,value = Class.new, parent=nil)
+        parent ||= Object
+        *ans, ln = name.to_s.split('::')
+        ans.each do |a|
+          unless parent.const_defined? a
+            parent.const_set a, Module.new
+          end
+          parent = parent.const_get a
         end
-        parent = parent.const_get a
+
+        parent.const_set ln, value
       end
 
-      parent.const_set ln, value
-    end
+      def build(data)
+        class_name = data[:constant_name]
+        if !class_name && data[:name]
+          class_name = Alki::Support.classify(data[:name])
+        end
 
-    def self.build(data)
-      class_name = data[:constant_name]
-      if !class_name && data[:name]
-        class_name = Alki::Support.classify(data[:name])
+        klass = find_or_create_class(class_name, data)
+
+        build_class data, klass
+
+        if data[:secondary_classes]
+          build_secondary_classes data[:secondary_classes], klass
+        end
+
+        klass
       end
 
-      klass = Alki::Support.constantize class_name, data[:parent_class] if class_name
-      must_create = !klass
+      private
+
+      def find_or_create_class(class_name, data)
+        type = data[:type] || :class
+        klass = Alki::Support.constantize class_name, data[:parent_class] if class_name
+        must_create_constant = !klass && class_name
+
+        super_class = data[:super_class] ? Alki.load(data[:super_class]) : Object
 
-      if data[:type] == :module
         if klass
-          if klass.class != Module
-            raise "#{class_name} already exists as is a #{klass.class}"
-          end
+          validate_existing_class(type, class_name, klass, super_class)
         else
-          klass = Module.new
-        end
-      else
-        if klass && klass.class != Class
-          raise "#{class_name} already exists as is a #{klass.class}"
+          klass = case type
+            when :module then Module.new
+            when :class then Class.new(super_class)
+          end
         end
-        super_class = if data[:super_class]
-          Alki.load data[:super_class]
-        else
-          Object
+
+        if must_create_constant
+          create_constant class_name, klass, data[:parent_class]
         end
-        if klass
-          if klass.superclass != super_class
+        klass
+      end
+
+      def validate_existing_class(type, class_name, klass, super_class)
+        if type == :module
+          if klass.class != Module
+            raise "#{class_name} already exists as a #{klass.class}"
+          end
+        elsif type == :class
+          if klass.class != Class
+            raise "#{class_name} already exists as a #{klass.class}"
+          elsif klass.superclass != super_class
             raise "#{class_name} already exists with different super class"
           end
-        else
-          klass = Class.new super_class
         end
       end
-      build_class data, klass
-      if class_name && must_create
-        create_constant class_name, klass, data[:parent_class]
-      end
-      if data[:secondary_classes]
-        data[:secondary_classes].each do |data|
+
+      def build_secondary_classes(secondary_classes, parent_class)
+        secondary_classes.each do |data|
           if data[:subclass]
-            data = data.merge(parent_class: klass,constant_name: data[:subclass])
+            data = data.merge(parent_class: parent_class,constant_name: data[:subclass])
           elsif !data[:constant_name] && !data[:name]
             raise ArgumentError.new("Secondary classes must have names")
           end
           build data
         end
       end
-      klass
-    end
 
-    def self.module_not_empty?(mod)
-      not mod.instance_methods.empty? &&
-        mod.private_instance_methods.empty?
-    end
+      def module_not_empty?(mod)
+        not mod.instance_methods.empty? &&
+          mod.private_instance_methods.empty?
+      end
 
-    def self.build_class(data,klass)
-      if data[:module]
-        if module_not_empty? data[:module]
-          klass.include data[:module]
-        end
-        if data[:module].const_defined?(:ClassMethods) &&
-          module_not_empty?(data[:module]::ClassMethods)
-          klass.extend data[:module]::ClassMethods
+      def build_class(data,klass)
+        if data[:module]
+          if module_not_empty? data[:module]
+            klass.include data[:module]
+          end
+          if data[:module].const_defined?(:ClassMethods) &&
+            module_not_empty?(data[:module]::ClassMethods)
+            klass.extend data[:module]::ClassMethods
+          end
         end
-      end
 
-      if data[:modules]
-        data[:modules].each do |mod|
-          klass.include Alki.load mod
+        if data[:modules]
+          data[:modules].each do |mod|
+            klass.include Alki.load mod
+          end
         end
-      end
-      if data[:class_modules]
-        data[:class_modules].each do |mod|
-          klass.extend Alki.load mod
+        if data[:class_modules]
+          data[:class_modules].each do |mod|
+            klass.extend Alki.load mod
+          end
         end
-      end
 
-      add_methods klass, data
-      add_initialize klass, data[:initialize_params] if data[:initialize_params]
-    end
+        add_methods klass, data
+        add_initialize klass, data[:initialize_params] if data[:initialize_params]
+      end
 
-    def self.add_methods(klass, data)
-      if data[:class_methods]
-        data[:class_methods].each do |name, method|
-          klass.define_singleton_method name, &method[:body]
-          klass.singleton_class.send :private, name if method[:private]
+      def add_methods(klass, data)
+        if data[:class_methods]
+          data[:class_methods].each do |name, method|
+            klass.define_singleton_method name, &method[:body]
+            klass.singleton_class.send :private, name if method[:private]
+          end
         end
-      end
 
-      if data[:instance_methods]
-        data[:instance_methods].each do |name, method|
-          klass.send :define_method, name, &method[:body]
-          klass.send :private, name if method[:private]
+        if data[:instance_methods]
+          data[:instance_methods].each do |name, method|
+            klass.send :define_method, name, &method[:body]
+            klass.send :private, name if method[:private]
+          end
         end
-      end
 
-      if data[:delegators]
-        klass.extend Forwardable
-        data[:delegators].each do |name,delegator|
-          klass.def_delegator delegator[:accessor], delegator[:method], name
+        if data[:delegators]
+          klass.extend Forwardable
+          data[:delegators].each do |name,delegator|
+            klass.def_delegator delegator[:accessor], delegator[:method], name
+          end
         end
-      end
 
-      klass.send :attr_reader, *data[:attr_readers] if data[:attr_readers]
-      klass.send :attr_writer, *data[:attr_writers] if data[:attr_writers]
-      klass.send :attr_accessor, *data[:attr_accessors] if data[:attr_accessors]
-    end
+        klass.send :attr_reader, *data[:attr_readers] if data[:attr_readers]
+        klass.send :attr_writer, *data[:attr_writers] if data[:attr_writers]
+        klass.send :attr_accessor, *data[:attr_accessors] if data[:attr_accessors]
+      end
 
-    def self.add_initialize(klass,params)
-      at_setters = ''
-      params.each do |p|
-        p,default = p.is_a?(Array) ? p : [p,nil]
-        if default
-          default_method = "_default_#{p}".to_sym
-          klass.send(:define_method, default_method, &default)
-          klass.send :private, default_method
-          at_setters << "@#{p} = #{p} || #{default_method}\n"
-        else
-          at_setters << "@#{p} = #{p}\n"
+      def add_initialize(klass,params)
+        at_setters = ''
+        params.each do |p|
+          p,default = p.is_a?(Array) ? p : [p,nil]
+          if default
+            default_method = "_default_#{p}".to_sym
+            klass.send(:define_method, default_method, &default)
+            klass.send :private, default_method
+            at_setters << "@#{p} = #{p} || #{default_method}\n"
+          else
+            at_setters << "@#{p} = #{p}\n"
+          end
         end
-      end
 
-      klass.class_eval "
+        klass.class_eval "
         def initialize(#{params.map{|p| p.is_a?(Array) ? "#{p[0]}=nil" : p.to_s}.join(', ')})
         #{at_setters}end"
+      end
     end
   end
 end

data/lib/alki/dsl/version.rb

@@ -1,5 +1,5 @@
 module Alki
   module Dsl
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki-dsl
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alki-support
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,20 +41,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: alki-testing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.2.2
 description: Library for defining and using DSLs
 email:
 - matt.edlefsen@gmail.com
@@ -62,7 +54,10 @@ files:
 - ".gitignore"
 - Gemfile
 - README.adoc
+- Rakefile
 - alki-dsl.gemspec
+- bin/bundler
+- bin/rake
 - lib/alki/class_builder.rb
 - lib/alki/dsl.rb
 - lib/alki/dsl/base.rb