webbynode-blueprint 0.0.2 → 0.0.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 0
-:patch: 2
+:patch: 3
 :major: 0

data/lib/blueprint/blueprint.rb

@@ -1,3 +1,4 @@
+require 'pp'
 require "blueprint/components"
 require "blueprint/utils"
 require "yaml"
@@ -22,15 +23,16 @@ class Blueprint
       @def.merge!(opts)
       
     else
-      @def[:name] ||= s
+      @def[:content] ||= s
       @def[:script] = "#{s}.sh"
-      @def[:email] = "#{s}.markdown"
+      @def[:email] = "#{s}.markdown" if @def["item_type"] == "readystack"
+      @def[:item_type] ||= "stack"
       
     end
     
     (errors ||= []) << "provides requires the blueprint name" if @def.empty?
-    (errors ||= []) << "no blueprint name found for #{@def[:content]}" unless @def.has_key?(:name)
-    (errors ||= []) << "no email template found for #{@def[:content]}" unless @def.has_key?(:email)
+    (errors ||= []) << "no blueprint name found" unless @def.has_key?(:content)
+    # (errors ||= []) << "no email template found for #{@def[:content]}" unless @def.has_key?(:email)
     (errors ||= []) << "no script found for #{@def[:content]}" unless @def.has_key?(:script)
     
     raise "Errors: #{errors * ", "}" if errors
@@ -40,7 +42,7 @@ class Blueprint
     if req.is_a?(Hash)
       requirement_def = { :group => req[:group], :contains => req[:with] }
     else
-      requirement_def = { :group => req, :contains => req }
+      requirement_def = { :group => req, :contains => [req] }
     end
     
     (@def[:dependencies] ||= []) << requirement_def

data/lib/blueprint/components.rb

@@ -1,6 +1,11 @@
 require "blueprint/utils"
 
 module BlueprintComponents
+  BLUEPRINT_TRANSLATIONS = {
+    :render_as => :control,
+    :type => :item_type
+  }
+  
   class Component
     class << self
       attr_accessor :item_type
@@ -16,22 +21,35 @@ module BlueprintComponents
 
     def attributes(*args)
       opts = args.last.is_a?(Hash) ? args.pop : {}
-      @def.merge!(opts)
+      @def.merge!(:attributes => opts)
     end
 
     def initialize(*args)
       opts = args.last.is_a?(Hash) ? args.pop : {}
+      
+      if opts
+        opts.clone.keys.each do |k|
+          if BLUEPRINT_TRANSLATIONS.key?(k)
+            opts[BLUEPRINT_TRANSLATIONS[k]] = opts.delete(k)
+          end
+        end
+      end
+      
       @def = { :item_type => self.class.item_type }.merge(opts)
       if self.class.block
-        @def.merge!(self.class.block.call(args, opts))
+        @def.merge!(self.class.block.call(self, args, opts))
       end
     end
+    
+    def remove_attribute(attr)
+      @def.delete(attr)
+    end
   end
 
   class Value < Component
     include BlueprintComponents
 
-    creates "value" do |args, opts|
+    creates "value" do |obj, args, opts|
       { :content => args.pop }.merge(opts)
     end
   end
@@ -47,15 +65,28 @@ module BlueprintComponents
       add_child val
     end  
 
-    creates "param" do |args, opts|
-      { :content => args.pop }.merge(opts)
+    creates "param" do |obj, args, opts|
+      content = args.pop
+
+      if opts.key?(:values)
+        opts.delete(:values)
+
+        values = obj.remove_attribute(:values)
+        unless values.is_a?(Array)
+          raise "values should be an array for Parameter #{content}"
+        end
+        
+        values.each { |v| obj.value(v) }
+      end
+      
+      { :content => content }.merge(opts)
     end
   end
 
   class Aggregate < Component
     include BlueprintComponents
 
-    creates "aggregate" do |args, opts|
+    creates "aggregate" do |obj, args, opts|
       { :label => args.pop }.merge(opts)
     end
   end
@@ -63,7 +94,7 @@ module BlueprintComponents
   class Dependency < Component
     include BlueprintComponents
 
-    creates "dependency" do |args, opts|
+    creates "dependency" do |obj, args, opts|
       { :content => args.pop }.merge(opts)
     end
   end

data/lib/blueprint.rb

@@ -4,16 +4,20 @@ require 'blueprint/utils'
 
 def blueprint(*args, &block)
   blueprint_def = args.last.is_a?(Hash) ? args.pop : {}
-  
+
   if blueprint_def.empty?
     blueprint_def[:label] = args.pop
   end
   
+  if blueprint_def[:type]
+    blueprint_def[:item_type] = blueprint_def.delete(:type)
+  end
+
   blueprint = Blueprint.new(blueprint_def)
-  
+
   if block_given?
     yield blueprint
   end
-  
+
   blueprint
 end

data/test/blueprint_test.rb

@@ -5,11 +5,8 @@ class BlueprintTest < Test::Unit::TestCase
     blueprint "Rails" do |f|
       f.provides "rails"
 
-      f.parameter "version", :label => "Rails Version", :render_as => "combobox" do |p|
-        p.value "2.3.2"
-        p.value "2.2.2"
-        p.value "2.1.2"
-      end
+      f.parameter "version", :label => "Rails Version", :render_as => "combobox",
+        :values => ["2.3.2", "2.2.2", "2.1.2"]
 
       f.parameter "doc_rdoc", :label => "Install rdoc", :render_as => "checkbox"
       f.parameter "doc_ri",   :label => "Install ri",   :render_as => "checkbox"
@@ -18,6 +15,7 @@ class BlueprintTest < Test::Unit::TestCase
         :label => "Create dummy app?", 
         :render_as => "checkbox",
         :attributes => {:default => "y"}
+        
       f.parameter "dummyapp-path", 
         :label => "Path for dummy app",
         :render_as => "text",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webbynode-blueprint
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Felipe Coury
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: []