architecture-js 0.5.8 → 0.6.0

data/Gemfile

@@ -1,10 +1,13 @@
 source :rubygems
 
 gem "listen"
+gem "ejs"
 gem "jsmin", "~> 1.0.1"
 
 group :test do
   gem "simplecov", "~> 0.5.4", :require => false
+  gem 'rb-fsevent', :require => false if RUBY_PLATFORM =~ /darwin/i
+  gem 'guard-rspec'
 end
 
 group :development do

data/Gemfile.lock

@@ -2,16 +2,22 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
+    ejs (1.1.1)
     ffi (1.0.11)
     git (1.2.5)
-    jeweler (1.8.3)
+    guard (1.2.1)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-rspec (1.1.0)
+      guard (>= 1.1)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
     jsmin (1.0.1)
     json (1.7.3)
-    listen (0.4.2)
+    listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
@@ -36,14 +42,18 @@ GEM
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
+    thor (0.15.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
+  ejs
+  guard-rspec
   jeweler (~> 1.8.3)
   jsmin (~> 1.0.1)
   listen
+  rb-fsevent
   rspec (~> 2.8.0)
   simplecov (~> 0.5.4)

data/Guardfile

@@ -0,0 +1,24 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  
+  # Capybara request specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
+  
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.6.0

data/architecture-js.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "architecture-js"
-  s.version = "0.5.8"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = "2012-05-27"
+  s.date = "2012-07-01"
   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"]
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
     "AUTHORS",
     "Gemfile",
     "Gemfile.lock",
+    "Guardfile",
     "HELP",
     "LICENSE.txt",
     "README.md",
@@ -38,7 +39,6 @@ Gem::Specification.new do |s|
     "lib/architecture-js/architect.rb",
     "lib/architecture-js/blueprint.rb",
     "lib/architecture-js/dependencies.rb",
-    "lib/architecture-js/generator.rb",
     "lib/architecture-js/helpers.rb",
     "lib/architecture-js/notification.rb",
     "lib/architecture-js/watcher.rb",
@@ -97,27 +97,29 @@ Gem::Specification.new do |s|
     "spec/fixtures/lib1_compressed.js",
     "spec/fixtures/lib2.js",
     "spec/fixtures/lib2_compressed.js",
+    "spec/fixtures/multiple_templates.blueprint",
     "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",
+    "spec/fixtures/test_template.jst",
     "spec/fixtures/test_template_options.js",
     "spec/fixtures/test_template_two.js",
     "spec/fixtures/underscore_template.js",
     "spec/fixtures/update.blueprint",
     "spec/fixtures/update.js",
-    "spec/generator_spec.rb",
     "spec/helpers_spec.rb",
     "spec/notification_spec.rb",
     "spec/spec_helper.rb",
-    "templates/blank.js"
+    "spec/templates_spec.rb",
+    "templates/templates_file.erb"
   ]
   s.homepage = "https://github.com/daytonn/architecture-js"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.21"
+  s.rubygems_version = "1.8.24"
   s.summary = "architecture.js is a command line application to dynamically build and manage complex javascript applications."
 
   if s.respond_to? :specification_version then
@@ -125,6 +127,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<listen>, [">= 0"])
+      s.add_runtime_dependency(%q<ejs>, [">= 0"])
       s.add_runtime_dependency(%q<jsmin>, ["~> 1.0.1"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -133,6 +136,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<listen>, [">= 0"])
     else
       s.add_dependency(%q<listen>, [">= 0"])
+      s.add_dependency(%q<ejs>, [">= 0"])
       s.add_dependency(%q<jsmin>, ["~> 1.0.1"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -142,6 +146,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<listen>, [">= 0"])
+    s.add_dependency(%q<ejs>, [">= 0"])
     s.add_dependency(%q<jsmin>, ["~> 1.0.1"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/lib/architecture-js.rb

@@ -36,7 +36,8 @@ module ArchitectureJS
 end
 
 require "sprockets/lib/sprockets"
+require "ejs"
 
-%w(dependencies generator notification watcher blueprint architect).each do |lib|
+%w(dependencies notification watcher blueprint architect).each do |lib|
   require "architecture-js/#{lib}"
 end

data/lib/architecture-js/architect.rb

@@ -26,13 +26,8 @@ module Architect
 
     def run
       parse_command
-      if @command == :generate
-        parse_arguments
-        parse_generate_options
-      else
-        parse_options
-        parse_arguments
-      end
+      parse_options
+      parse_arguments
 
       if @command
           self.send @command unless @command =~ /^-/
@@ -62,22 +57,8 @@ module Architect
       puts ArchitectureJS::Notification.error e.message
     end
 
-    def generate
-      @project = ArchitectureJS::Blueprint.new_from_config(@root)
-      config = {
-        arguments: @args,
-        template: @args.first,
-        filename: @args[1],
-        options: @template_options
-      }
-      @project.generator.generate config
-    rescue Exception => e
-      puts ArchitectureJS::Notification.error e.message
-      templates if @project
-    end
-
     def compile
-      @project = ArchitectureJS::Blueprint.new_from_config(@root)
+      @project = ArchitectureJS::Blueprint.init_with_config(@root)
       compress = @options[:c] || @options[:compress]
       @project.update(compress)
     rescue Exception => e
@@ -85,7 +66,7 @@ module Architect
     end
 
     def watch
-      @project = ArchitectureJS::Blueprint.new_from_config(@root)
+      @project = ArchitectureJS::Blueprint.init_with_config(@root)
       @project.update
       @watcher = @project.watch("architect is watching for changes. Type 'quit' to stop.")
       start_interactive_session
@@ -93,16 +74,8 @@ module Architect
       puts ArchitectureJS::Notification.error e.message
     end
 
-    def templates
-      @project = ArchitectureJS::Blueprint.new_from_config(@root)
-      puts "Templates:"
-      @project.generator.templates.each { |k,v| puts "  - #{k}" }
-    rescue Exception => e
-      puts ArchitectureJS::Notification.error e.message
-    end
-
     def src_files
-      @project = ArchitectureJS::Blueprint.new_from_config(@root)
+      @project = ArchitectureJS::Blueprint.init_with_config(@root)
       puts "Source files:"
       @project.src_files.each { |f| puts "  - #{File.basename f}" }
     rescue Exception => e
@@ -125,20 +98,13 @@ module Architect
           when /help/
             puts 'Interactive commands:'
             puts '  compile - compile the application'
-            puts '  generate - generate a template'
-            puts '  templates - list available templates to generate'
             puts '  src_files - list source files to be compiled into the build_dir'
             puts '  help - show this menu'
             puts '  quit - stop watching for changes'
-          when /compile|generate|templates|src_files/
-            if @command == :generate
-              parse_arguments args
-              parse_generate_options
-            else
-              args = args.drop 1
-              parse_interactive_options args
-              parse_arguments args
-            end
+          when /compile|src_files/
+            args = args.drop 1
+            parse_interactive_options args
+            parse_arguments args
 
             self.send @command
           else
@@ -187,33 +153,6 @@ module Architect
         end.parse!
       end
 
-      def parse_generate_options
-        @options = {
-          help: false
-        }
-        @template_options = {}
-
-        @args.each_with_index do |arg, i|
-          # double dash options contain variables
-          if arg.match(/^--/)
-            option_key = arg.gsub(/^--/, '')
-            option_value = @args[i + 1]
-
-            if (option_value && option_value.match(/^-/) || option_value.nil?)
-              # no option value
-              @template_options[option_key.to_sym] = false
-            else
-              # option has a value
-              @template_options[option_key.to_sym] = option_value
-            end
-          # single dash options are flags
-          elsif arg.match(/^-/)
-            @template_options[arg.gsub(/^-/, '').to_sym] = true
-          end
-        end
-        # each_with_index
-      end
-
       def parse_arguments(args = Array.try_convert(ARGV))
         @args = args
         @args.shift # remove command

data/lib/architecture-js/blueprint.rb

@@ -7,11 +7,11 @@ module ArchitectureJS
                   :config_name,
                   :directories,
                   :template_directories,
-                  :generator,
+                  :templates,
                   :config,
                   :raise_errors
 
-    def self.new_from_config(path)
+    def self.init_with_config(path)
       config_file = Dir.entries(path).select {|f| f =~ /\.blueprint$/ }.first
 
       raise ".blueprint file was not found in #{path}/" if config_file.nil?
@@ -29,23 +29,20 @@ module ArchitectureJS
       @config_file = "#{config[:name].downcase}.blueprint"
       root ||= Dir.getwd
       @root = File.expand_path(root)
-      @template_directories = ["#{ArchitectureJS::base_directory}/templates", "#{@root}/templates"]
+      @template_directories = ["#{@root}/templates"]
       @directories = ['lib', 'src']
       @config = {
         blueprint: 'default',
         src_dir: 'src',
         build_dir: 'lib',
         asset_root: '../',
-        output: 'compressed'
+        output: 'compressed',
+        template_dir: 'templates',
+        template_namespace: 'templates'
       }
       @config.merge! config unless config.nil?
+      @template_directories = [*@config[:template_dir]].map { |dir| "#{@root}/#{dir}" }
       get_src_files
-      @generator = ArchitectureJS::Generator.new self
-    end
-
-    def add_templates(dir)
-      [*dir].each { |d| @template_directories << d }
-      @generator.load_templates
     end
 
     def read_config
@@ -94,6 +91,8 @@ module ArchitectureJS
     def update(compress = false)
       read_config
       get_src_files
+      get_templates
+      create_templates_file unless @templates.empty?
       compile_src_files
       compress_application if compress || @config[:output] == 'compressed'
       puts ArchitectureJS::Notification.log "application updated" unless @errors
@@ -107,6 +106,39 @@ module ArchitectureJS
       end      
     end
 
+    def get_templates
+      @templates = {}
+      @template_directories.each do |dir|
+        find_templates_in_directory dir
+      end
+    end
+
+    def find_templates_in_directory(dir)
+      dir_glob = File.join(dir, "**", "*.jst")
+      Dir.glob(dir_glob).each do |f|
+        name = get_template_name f, dir
+        @templates[name] = EJS.compile(File.read f)
+      end
+    end
+
+    def get_template_name(file, dir, ext = '.jst')
+      File.basename(file.gsub(/#{dir}\/?/, ''), ext)
+    end
+
+    def create_templates_file
+      templates_string = ''
+      app_name = @config[:name]
+      template_namespace = @config[:template_namespace]
+      formatted_templates = @templates.map do |name, function|
+        "\"#{name}\": #{function}"
+      end
+      template = ERB.new File.read("#{ArchitectureJS::base_directory}/templates/templates_file.erb")
+      @compiled_templates_file = template.result binding
+      File.open("#{@root}/#{@config[:build_dir]}/templates.js", "w+") do |f|
+        f << @compiled_templates_file
+      end
+    end
+
     def add_src_files_to_project(directory)
       Dir["#{directory}/*.js"].each do |file|
         src_filename = file.gsub(directory, '')

data/spec/architect_spec.rb

@@ -30,27 +30,13 @@ describe 'architect' do
       File.exists?("#{TMP_DIR}/sub/src/myapp.js").should be_true
       FileUtils.rm_rf "#{TMP_DIR}/sub"
     end
-
+    
     it 'should compile the application' do
       `cd #{TMP_DIR}; #{@bin} compile`
       File.exists?("#{TMP_DIR}/lib/myapp.js").should be_true
       "#{TMP_DIR}/lib/myapp.js".should be_same_file_as "#{FIXTURES}/compressed.js"
     end
 
-    it 'should generate a template' do
-      `cd #{TMP_DIR}; #{@bin} generate blank src/test`
-      File.exists?("#{TMP_DIR}/src/test.js").should be_true
-    end
-
-    it 'should generate a template with options' do
-      FileUtils.mkdir("#{TMP_DIR}/templates")
-      FileUtils.cp("#{FIXTURES}/templates/test_template_two.js", "#{TMP_DIR}/templates/test_template.js")
-      `cd #{TMP_DIR}; #{@bin} generate test_template src/foo --optional_variable true --is_good -g --bool`
-      
-      File.exists?("#{TMP_DIR}/src/foo.js").should be_true
-      "#{TMP_DIR}/src/foo.js".should be_same_file_as "#{FIXTURES}/test_template_options.js"
-    end
-
   end
 
 end

data/spec/architecture-js_spec.rb

@@ -27,7 +27,7 @@ describe ArchitectureJS do
    before :each do
      FileUtils.mkdir("#{TMP_DIR}")
      FileUtils.cp "#{FIXTURES}/existing.blueprint", "#{TMP_DIR}/myapp.blueprint"
-     suppress_output { @project = ArchitectureJS::Blueprint.new_from_config(TMP_DIR) }
+     suppress_output { @project = ArchitectureJS::Blueprint.init_with_config(TMP_DIR) }
    end
 
    after :each do
@@ -36,7 +36,7 @@ describe ArchitectureJS do
 
    it "should raise an error if there is no .blueprint file" do
      FileUtils.rm_rf "#{TMP_DIR}/myapp.blueprint"
-     lambda { ArchitectureJS::Blueprint.new_from_config TMP_DIR }.should raise_error
+     lambda { ArchitectureJS::Blueprint.init_with_config TMP_DIR }.should raise_error
    end
 
    it 'should set defaults from config file' do
@@ -46,7 +46,9 @@ describe ArchitectureJS do
        build_dir: 'dest',
        asset_root: '../',
        output: 'compressed',
-       name: 'test',
+       template_dir: 'templates',
+       template_namespace: 'templates',
+       name: 'test'
      }
    end
 

data/spec/blueprint_spec.rb

@@ -39,11 +39,7 @@ describe ArchitectureJS::Blueprint do
     end
 
     it "should have template_directories" do
-      @project.template_directories.should == ["#{ArchitectureJS::base_directory}/templates", "#{TMP_DIR}/templates"]
-    end
-
-    it "should have a generator" do
-      @project.generator.should_not be_nil
+      @project.template_directories.should == ["#{TMP_DIR}/templates"]
     end
 
     context "with existing project" do
@@ -52,7 +48,7 @@ describe ArchitectureJS::Blueprint do
       end
 
       it "should initialize with a config path" do
-        @existing = ArchitectureJS::Blueprint.new_from_config TMP_DIR
+        @existing = ArchitectureJS::Blueprint.init_with_config TMP_DIR
         @existing.config.should_not be_empty
         @existing.config[:name].should == 'myapp'
       end

data/spec/fixtures/multiple_templates.blueprint

@@ -0,0 +1,8 @@
+blueprint: default
+src_dir: src
+build_dir: lib
+asset_root: ../
+output: compressed
+template_dir: ['templates', 'more_templates']
+template_namespace: Foo
+name: myapp

data/spec/fixtures/myapp.blueprint

@@ -3,4 +3,6 @@ src_dir: src
 build_dir: lib
 asset_root: ../
 output: compressed
+template_dir: templates
+template_namespace: templates
 name: myapp

data/spec/fixtures/test_template.jst

@@ -0,0 +1 @@
+<p>Hello my name is <%= person.name %>, I am <%= person.age %></p>

data/spec/templates_spec.rb

@@ -0,0 +1,92 @@
+require "spec_helper.rb"
+
+describe 'Templates' do
+
+  describe 'without template files' do
+
+    before :each do
+      FileUtils.mkdir TMP_DIR
+      suppress_output do
+        @project = ArchitectureJS::Blueprint.new({ name: 'myapp' }, TMP_DIR)
+        @project.create
+      end
+      suppress_output { @project.update }
+    end
+
+    after :each do
+      FileUtils.rm_rf "#{TMP_DIR}" if File.exists? "#{TMP_DIR}"
+    end
+
+    it 'should not create a templates.js file in the build_dir' do
+      File.exists?("#{TMP_DIR}/lib/templates.js").should be_false
+    end
+
+  end
+
+  describe "with one template_dir and one template file" do
+    before :each do
+      FileUtils.mkdir TMP_DIR
+      suppress_output do
+        @project = ArchitectureJS::Blueprint.new({ name: 'myapp' }, TMP_DIR)
+        @project.create
+      end
+      FileUtils.mkdir "#{TMP_DIR}/templates"
+      FileUtils.cp "#{FIXTURES}/test_template.jst", "#{TMP_DIR}/templates/test_template.jst"
+      suppress_output { @project.update }
+    end
+
+    after :each do
+      FileUtils.rm_rf "#{TMP_DIR}" if File.exists? "#{TMP_DIR}"
+    end
+
+    it 'should have one template' do
+      @project.templates['test_template'].should_not be_nil
+    end
+
+    it 'should create a templates file in the build directory' do
+      File.exists?("#{TMP_DIR}/lib/templates.js").should be_true
+    end
+
+  end
+
+  describe 'with multiple template_dirs and multiple templates' do
+    before :each do
+      FileUtils.mkdir TMP_DIR
+      suppress_output do
+        project = ArchitectureJS::Blueprint.new({ name: 'myapp' }, TMP_DIR)
+        project.create
+        FileUtils.cp "#{FIXTURES}/multiple_templates.blueprint", "#{TMP_DIR}/myapp.blueprint"
+        FileUtils.mkdir "#{TMP_DIR}/templates"
+        FileUtils.mkdir "#{TMP_DIR}/more_templates"
+        FileUtils.cp "#{FIXTURES}/test_template.jst", "#{TMP_DIR}/templates/test_template.jst"
+        FileUtils.cp "#{FIXTURES}/test_template.jst", "#{TMP_DIR}/more_templates/another_template.jst"
+        @project = ArchitectureJS::Blueprint.init_with_config(TMP_DIR)
+      end
+      suppress_output { @project.update }
+    end
+
+    after :each do
+      FileUtils.rm_rf "#{TMP_DIR}" if File.exists? "#{TMP_DIR}"
+    end
+
+    it 'should use alternate namespace' do
+      File.read("#{TMP_DIR}/lib/templates.js").match(/^myapp\.Foo/).should be_true
+    end
+
+    it 'should have multiple template directories' do
+      puts @project.template_directories
+      @project.template_directories.length.should == 2
+    end
+
+    it 'should have two templates' do
+      @project.templates['test_template'].should_not be_nil
+      @project.templates['another_template'].should_not be_nil
+    end
+
+    it 'should create a templates file in the build directory' do
+      File.exists?("#{TMP_DIR}/lib/templates.js").should be_true
+    end
+
+  end
+
+end

data/templates/templates_file.erb

@@ -0,0 +1,3 @@
+<%= app_name %>.<%= template_namespace %> = {
+    <%= formatted_templates.join(",\n\t") %>
+};

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: architecture-js
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ejs
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jsmin
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +156,7 @@ files:
 - AUTHORS
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - HELP
 - LICENSE.txt
 - README.md
@@ -153,7 +170,6 @@ files:
 - lib/architecture-js/architect.rb
 - lib/architecture-js/blueprint.rb
 - lib/architecture-js/dependencies.rb
-- lib/architecture-js/generator.rb
 - lib/architecture-js/helpers.rb
 - lib/architecture-js/notification.rb
 - lib/architecture-js/watcher.rb
@@ -212,22 +228,24 @@ files:
 - spec/fixtures/lib1_compressed.js
 - spec/fixtures/lib2.js
 - spec/fixtures/lib2_compressed.js
+- spec/fixtures/multiple_templates.blueprint
 - 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
+- spec/fixtures/test_template.jst
 - spec/fixtures/test_template_options.js
 - spec/fixtures/test_template_two.js
 - spec/fixtures/underscore_template.js
 - spec/fixtures/update.blueprint
 - spec/fixtures/update.js
-- spec/generator_spec.rb
 - spec/helpers_spec.rb
 - spec/notification_spec.rb
 - spec/spec_helper.rb
-- templates/blank.js
+- spec/templates_spec.rb
+- templates/templates_file.erb
 homepage: https://github.com/daytonn/architecture-js
 licenses:
 - MIT
@@ -243,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3997393681716254954
+      hash: 278530094311869968
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -252,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: architecture.js is a command line application to dynamically build and manage

data/lib/architecture-js/generator.rb

@@ -1,66 +0,0 @@
-module ArchitectureJS
-  class Generator
-
-    attr_accessor :template_paths,
-                  :templates,
-                  :blueprint,
-                  :project
-
-    def initialize(blueprint)
-      @project = blueprint
-      @blueprint = @project.config
-      @template_paths = @project.template_directories
-      @templates = Hash.new
-      load_templates
-    end
-
-    def find_templates(paths)
-      [*paths].each do |path|
-        Dir["#{path}/*"].each do |file|
-          add_file_to_templates file
-        end
-      end
-    end
-
-    def load_templates
-      find_templates @template_paths
-    end
-
-    def add_file_to_templates(file)
-      ext = File.extname(file)
-      template_name = File.basename(file, ext)
-      @templates[template_name] = {
-        erb: read_template(file),
-        ext: ext
-      }
-    end
-
-    def read_template(file)
-      ERB.new(File.read(file), nil, '<>')
-    end
-
-    def generate(config)
-      raise "You must provide a template to generate:\n  - architect generate <template>" unless config[:template]
-      raise "There is no template named '#{template}' in the #{@blueprint[:name]} project" unless @templates[config[:template]]
-
-      template = config[:template]
-      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)
-      path ||= File.expand_path(Dir.getwd)
-      File.open("#{path}/#{filename}", "w+") { |f| f.write template }
-      puts ArchitectureJS::Notification.added "#{filename} generated" if File.exists?("#{path}/#{filename}")
-    end
-
-    def render_template(template, filename, arguments, options)
-      blueprint = @blueprint
-      project = @project
-      @templates[template][:erb].result(binding)
-    end
-  end
-end

data/spec/generator_spec.rb

@@ -1,58 +0,0 @@
-require 'spec_helper'
-
-describe ArchitectureJS::Generator do
-
-  before :each do
-    FileUtils.mkdir TMP_DIR
-    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.add_templates "#{FIXTURES}/templates"
-    @gen = project.generator
-  end
-
-  after :each do
-    FileUtils.rm_rf TMP_DIR if File.exists? TMP_DIR
-  end
-
-  it 'should have a project' do
-    @gen.project.class.should == ArchitectureJS::Blueprint
-  end
-
-  it 'should have a blueprint' do
-    @gen.blueprint.class.should_not be_nil
-  end
-
-  it 'should have template_paths' do
-    @gen.template_paths.should == ["#{ArchitectureJS::base_directory}/templates", "#{TMP_DIR}/templates", "#{FIXTURES}/templates"]
-  end
-
-  it 'should find all the templates' do
-    @gen.templates['test_template_one'].should_not be_nil
-    @gen.templates['test_template_two'].should_not be_nil
-  end
-
-  it 'should render a template' do
-    @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', 'test', [], { optional_variable: 'true' }).should == File.open("#{FIXTURES}/test_template_options.js").read
-  end
-
-  it 'should generate a file from a template' do
-    suppress_output { @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
-    suppress_output { @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