alki-dsl 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3049970503a496913ddb6c325f05bb6e5638c21d
-  data.tar.gz: 7bff335255be597d9e219dad99789b1e604c80ec
+  metadata.gz: e1b8f9d06b3c6f0de4627b59fa94beead6482a7c
+  data.tar.gz: 92e044024e188fe0a75e7d3b7e541d4743a6c389
 SHA512:
-  metadata.gz: 91efd70a0d47d70481dd0db89c59a4d287710a84aeee5df9fb441e5823fb2083c4bd818376d25fe102b5b313918214d2dfe89c98b12c0606b0465586c2f33dac
-  data.tar.gz: 197bb68fa144226dccb6d9a6463570f5a37f64861702d484862f7c67ba561b39a96e6e5dd18e6a54849e1f6430a399e50874f65789f9b74c2ff5a17ddada82ae
+  metadata.gz: 92d22cccaab64a4432d63705cda0adb15dfacb322b869d3232e479c09a3300a306be90b7579942c70cada82106aadfa369ceb61be2287f0922ed19d08abbf8e7
+  data.tar.gz: 820e2ffe299fccaf70047e771bcedf993a4fb9dcefa39a92224d6c401b347f022e13e2bbb74552f4b7f9b1a9ec6c372dda9c2210c576853ee7c37311c914b26a

data/alki-dsl.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'alki-support', '~> 0.3'
+  spec.add_dependency 'alki-support', '~> 0.6'
   spec.add_development_dependency 'minitest', '~> 5.9', '>= 5.9.1'
 end

data/lib/alki/class_builder.rb

@@ -24,18 +24,36 @@ module Alki
         )
       end
 
+      klass = Alki::Support.constantize class_name, data[:parent_class] if class_name
+      must_create = !klass
+
       if data[:type] == :module
-        klass = Module.new
+        if klass
+          if klass.class != Module
+            raise "#{class_name} already exists as is a #{klass.class}"
+          end
+        else
+          klass = Module.new
+        end
       else
+        if klass && klass.class != Class
+          raise "#{class_name} already exists as is a #{klass.class}"
+        end
         super_class = if data[:super_class]
           Alki::Support.load_class data[:super_class]
         else
           Object
         end
-        klass = Class.new super_class
+        if klass
+          if 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
+      if class_name && must_create
         create_constant class_name, klass, data[:parent_class]
       end
       if data[:secondary_classes]
@@ -111,12 +129,11 @@ module Alki
 
     def self.add_initialize(klass,params)
       at_setters = ''
-      params.each do |(p,default)|
+      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 do
-            default
-          end
+          klass.send(:define_method, default_method, &default)
           klass.send :private, default_method
           at_setters << "@#{p} = #{p} || #{default_method}\n"
         else
@@ -125,8 +142,8 @@ module Alki
       end
 
       klass.class_eval "
-        def initialize(#{params.map{|p| p[1] ? "#{p[0]}=nil" : p[0]}.join(', ')})
+        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/class_helpers.rb

@@ -59,8 +59,10 @@ module Alki
         add_module mod, subclass: 'Helpers'
       end
 
-      def add_initialize_param(name,default=nil,opts={})
-        (class_builder(opts[:subclass])[:initialize_params]||=[]) << [name.to_sym,default]
+      def add_initialize_param(name,opts={},&default)
+        name = name.to_sym
+        param = default ? [name,default] : name
+        (class_builder(opts[:subclass])[:initialize_params]||=[]) << param
       end
 
       def add_instance_class_proxy(type, name,subclass: nil)
@@ -83,4 +85,4 @@ module Alki
       end
     end
   end
-end
+end

data/lib/alki/dsl/version.rb

@@ -1,5 +1,5 @@
 module Alki
   module Dsl
-    VERSION = '0.3.1'
+    VERSION = '0.3.3'
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki-dsl
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-03 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alki-support
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement