architecture-js 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/architecture-js.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "architecture-js"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = "2012-02-26"
+  s.date = "2012-02-27"
   s.description = "Architecture.js helps you generate scaffolding, manage third-party packages, compile, and compress your application."
   s.email = "daytonn@gmail.com"
   s.executables = ["architect"]
@@ -86,6 +86,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/compressed.blueprint",
     "spec/fixtures/compressed.js",
     "spec/fixtures/ejs.ejs",
+    "spec/fixtures/env-test.js",
     "spec/fixtures/existing.blueprint",
     "spec/fixtures/lib1.js",
     "spec/fixtures/lib1_compressed.js",
@@ -93,6 +94,7 @@ Gem::Specification.new do |s|
     "spec/fixtures/lib2_compressed.js",
     "spec/fixtures/myapp.blueprint",
     "spec/fixtures/src_file.js",
+    "spec/fixtures/templates/env_template.js",
     "spec/fixtures/templates/test_template_one.js",
     "spec/fixtures/templates/test_template_two.js",
     "spec/fixtures/test_blueprint.rb",

data/lib/architecture-js/architect.rb

@@ -76,11 +76,15 @@ module Architect
       end
 
       project = ArchitectureJS::create_project_from_config(project_path)
-      template = @args.first
-      filename = @args[1]
-      options = @template_options
-      arguments = @args
-      project.generator.generate(template, filename, options, arguments)
+
+      config = {
+        arguments: @args,
+        template: @args.first,
+        filename: @args[1],
+        options: @template_options
+      }
+
+      project.generator.generate config
     end
 
     def compile

data/lib/architecture-js/generator.rb

@@ -35,10 +35,15 @@ module ArchitectureJS
       ERB.new(File.read(file), nil, '<>')
     end
 
-    def generate(template, filename, options, arguments)
+    def generate(config)
+      template = config[:template]
       raise "There is no template named #{template} in the #{@blueprint[:name]} project" if @templates[template].nil?
-      filename = "#{filename}#{@templates[template][:ext]}"
-      generate_file(filename, render_template(template, options))
+
+      options = config[:options]
+      arguments = config[:arguments]
+      filename = "#{config[:filename]}#{@templates[template][:ext]}"
+
+      generate_file(filename, render_template(template, filename, arguments, options))
     end
 
     def generate_file(filename, template, path = nil)
@@ -46,7 +51,7 @@ module ArchitectureJS
       File.open("#{path}/#{filename}", "w+") { |f| f.write template }
     end
 
-    def render_template(template, options = nil)
+    def render_template(template, filename, arguments, options)
       blueprint = @blueprint
       project = @project
       @templates[template][:erb].result(binding)

data/spec/fixtures/env-test.js

@@ -0,0 +1,5 @@
+    module
+    foo
+    -f
+    --name
+    Something

data/spec/fixtures/templates/env_template.js

@@ -0,0 +1,3 @@
+<% arguments.each do |arg| %>
+    <%= arg %>
+<% end %>

data/spec/fixtures/templates/test_template_two.js

@@ -1,6 +1,6 @@
 var <%= blueprint[:name] %> = (function() {
   function <%= blueprint[:name] %>() {
-    <%= "var optional_variable = #{options[:optional_variable]};" if options %>
+    <%= "var optional_variable = #{options[:optional_variable]};" if options[:optional_variable] %>
   }
   return <%= blueprint[:name] %>;
 })();

data/spec/generator_spec.rb

@@ -7,6 +7,8 @@ describe ArchitectureJS::Generator do
     FileUtils.mkdir "#{TMP_DIR}/templates"
     FileUtils.cp "#{FIXTURES}/templates/test_template_one.js", "#{TMP_DIR}/test_template_one.js"
     FileUtils.cp "#{FIXTURES}/templates/test_template_two.js", "#{TMP_DIR}/test_template_two.js"
+    FileUtils.cp "#{FIXTURES}/templates/env_template.js", "#{TMP_DIR}/env_template.js"
+
     project = ArchitectureJS::Blueprint.new({ name: 'myapp' }, TMP_DIR)
     project.template_directories = ["#{FIXTURES}/templates"]
     @gen = ArchitectureJS::Generator.new(project)
@@ -34,17 +36,22 @@ describe ArchitectureJS::Generator do
   end
 
   it 'should render a template' do
-    @gen.render_template('test_template_one').should == File.open("#{FIXTURES}/templates/test_template_one.js").read
-    @gen.render_template('test_template_two').should == File.open("#{FIXTURES}/test_template_two.js").read
+    @gen.render_template('test_template_one', 'test', [], {}).should == File.open("#{FIXTURES}/templates/test_template_one.js").read
+    @gen.render_template('test_template_two', 'test', [], {}).should == File.open("#{FIXTURES}/test_template_two.js").read
   end
 
   it 'should render a template with options' do
-    @gen.render_template('test_template_two', optional_variable: 'true').should == File.open("#{FIXTURES}/test_template_options.js").read
+    @gen.render_template('test_template_two', 'test', [], { optional_variable: 'true' }).should == File.open("#{FIXTURES}/test_template_options.js").read
   end
 
   it 'should generate a file from a template' do
-    @gen.generate_file("test.js", @gen.render_template("test_template_two"), TMP_DIR)
+    @gen.generate_file("test.js", @gen.render_template("test_template_two", "test", [], {}), TMP_DIR)
     File.exists?("#{TMP_DIR}/test.js").should be_true
     File.open("#{TMP_DIR}/test.js").read.should == File.open("#{FIXTURES}/test_template_two.js").read
   end
+
+  it 'should pass the arguments to the template' do
+    @gen.generate_file("env-test.js", @gen.render_template("env_template", "env-test", ['module', 'foo', '-f', '--name', 'Something'], {}), TMP_DIR)
+    File.open("#{TMP_DIR}/env-test.js").read.should == File.open("#{FIXTURES}/env-test.js").read
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: architecture-js
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70099801634900 !ruby/object:Gem::Requirement
+  requirement: &70223810592840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70099801634900
+  version_requirements: *70223810592840
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &70099801634420 !ruby/object:Gem::Requirement
+  requirement: &70223810592360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70099801634420
+  version_requirements: *70223810592360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70099801633900 !ruby/object:Gem::Requirement
+  requirement: &70223810591820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70099801633900
+  version_requirements: *70223810591820
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70099801633400 !ruby/object:Gem::Requirement
+  requirement: &70223810591320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70099801633400
+  version_requirements: *70223810591320
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70099801632880 !ruby/object:Gem::Requirement
+  requirement: &70223810590840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70099801632880
+  version_requirements: *70223810590840
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70099801632320 !ruby/object:Gem::Requirement
+  requirement: &70223810590360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *70099801632320
+  version_requirements: *70223810590360
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70099801631800 !ruby/object:Gem::Requirement
+  requirement: &70223810589840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.2.16
   type: :development
   prerelease: false
-  version_requirements: *70099801631800
+  version_requirements: *70223810589840
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &70099801631220 !ruby/object:Gem::Requirement
+  requirement: &70223810589360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70099801631220
+  version_requirements: *70223810589360
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70099801630680 !ruby/object:Gem::Requirement
+  requirement: &70223810588880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70099801630680
+  version_requirements: *70223810588880
 description: Architecture.js helps you generate scaffolding, manage third-party packages,
   compile, and compress your application.
 email: daytonn@gmail.com
@@ -188,6 +188,7 @@ files:
 - spec/fixtures/compressed.blueprint
 - spec/fixtures/compressed.js
 - spec/fixtures/ejs.ejs
+- spec/fixtures/env-test.js
 - spec/fixtures/existing.blueprint
 - spec/fixtures/lib1.js
 - spec/fixtures/lib1_compressed.js
@@ -195,6 +196,7 @@ files:
 - spec/fixtures/lib2_compressed.js
 - spec/fixtures/myapp.blueprint
 - spec/fixtures/src_file.js
+- spec/fixtures/templates/env_template.js
 - spec/fixtures/templates/test_template_one.js
 - spec/fixtures/templates/test_template_two.js
 - spec/fixtures/test_blueprint.rb
@@ -223,7 +225,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 315668935587202633
+      hash: -132243405050259594
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: