modjs-architecture 0.1.6 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/modjs-architecture/{modjs.architecture → modjs.blueprint}

@@ -1,4 +1,4 @@
-framework: none
+blueprint: default
 src_dir: src
 build_dir: lib
 asset_root: ../

data/lib/modjs-architecture.rb

@@ -1,6 +1,14 @@
 module ModJS
-  BASE_DIR = File.expand_path("../..", __FILE__)
-  LIB_DIR = "#{BASE_DIR}/lib/modjs-architecture/lib"
+
+  def base_dir
+    File.expand_path("../..", __FILE__)
+  end
+
+  def lib_dir
+    "#{ModJS::base_dir}/lib/modjs-architecture/lib"
+  end
+
+  module_function :base_dir, :lib_dir
 
   class Blueprint < ArchitectureJS::Blueprint
     # this line adds the default framework to ArchitectureJS
@@ -15,8 +23,10 @@ module ModJS
         autoload: []
       }
       @config.merge! config unless config.nil?
-      # TODO add default template directory and templates
+
       super(@config, root)
+
+      add_templates "#{ModJS::base_dir}/templates"
       @directories = %w'application elements lib models modules plugins spec'
     end
 
@@ -34,26 +44,26 @@ module ModJS
 
     def create_application_file
       app_file = "#{@root}/#{@config[:build_dir]}/#{@config[:name]}.js"
-      FileUtils.cp "#{LIB_DIR}/mod.js", app_file
+      FileUtils.cp "#{ModJS::lib_dir}/mod.js", app_file
       File.open(app_file, 'a') { |f| f.write("\nvar #{@config[:name]} = new Mod.Application('#{@config[:name]}');") }
     end
 
     def copy_modjs_core_to_lib
-      FileUtils.cp "#{LIB_DIR}/mod.js", "#{@root}/lib/"
+      FileUtils.cp "#{ModJS::lib_dir}/mod.js", "#{@root}/lib/"
     end
 
     def copy_spec_files
       FileUtils.mkdir "#{@root}/spec/jasmine"
-      FileUtils.cp "#{ModJS::BASE_DIR}/spec/javascripts/application_spec.js", "#{@root}/spec/application_spec.js"
-      FileUtils.cp "#{ModJS::BASE_DIR}/spec/javascripts/dom_spec.js", "#{@root}/spec/dom_spec.js"
-      FileUtils.cp "#{ModJS::BASE_DIR}/spec/javascripts/existence_spec.js", "#{@root}/spec/existence_spec.js"
-      FileUtils.cp "#{ModJS::BASE_DIR}/spec/javascripts/module_spec.js", "#{@root}/spec/module_spec.js"
-      FileUtils.cp "#{ModJS::BASE_DIR}/lib/modjs-architecture/jasmine/jasmine-html.js", "#{@root}/spec/jasmine/"
-      FileUtils.cp "#{ModJS::BASE_DIR}/lib/modjs-architecture/jasmine/jasmine.css", "#{@root}/spec/jasmine/"
-      FileUtils.cp "#{ModJS::BASE_DIR}/lib/modjs-architecture/jasmine/jasmine.js", "#{@root}/spec/jasmine/"
-      FileUtils.cp "#{ModJS::BASE_DIR}/lib/modjs-architecture/jasmine/jasmine_favicon.png", "#{@root}/spec/jasmine/"
-      FileUtils.cp "#{ModJS::BASE_DIR}/lib/modjs-architecture/jasmine/MIT.LICENSE", "#{@root}/spec/jasmine/"
-      FileUtils.cp "#{ModJS::BASE_DIR}/lib/modjs-architecture/jasmine/index.html", "#{@root}/spec/jasmine/"
+      FileUtils.cp "#{ModJS::base_dir}/spec/javascripts/application_spec.js", "#{@root}/spec/application_spec.js"
+      FileUtils.cp "#{ModJS::base_dir}/spec/javascripts/dom_spec.js", "#{@root}/spec/dom_spec.js"
+      FileUtils.cp "#{ModJS::base_dir}/spec/javascripts/existence_spec.js", "#{@root}/spec/existence_spec.js"
+      FileUtils.cp "#{ModJS::base_dir}/spec/javascripts/module_spec.js", "#{@root}/spec/module_spec.js"
+      FileUtils.cp "#{ModJS::base_dir}/lib/modjs-architecture/jasmine/jasmine-html.js", "#{@root}/spec/jasmine/"
+      FileUtils.cp "#{ModJS::base_dir}/lib/modjs-architecture/jasmine/jasmine.css", "#{@root}/spec/jasmine/"
+      FileUtils.cp "#{ModJS::base_dir}/lib/modjs-architecture/jasmine/jasmine.js", "#{@root}/spec/jasmine/"
+      FileUtils.cp "#{ModJS::base_dir}/lib/modjs-architecture/jasmine/jasmine_favicon.png", "#{@root}/spec/jasmine/"
+      FileUtils.cp "#{ModJS::base_dir}/lib/modjs-architecture/jasmine/MIT.LICENSE", "#{@root}/spec/jasmine/"
+      FileUtils.cp "#{ModJS::base_dir}/lib/modjs-architecture/jasmine/index.html", "#{@root}/spec/jasmine/"
     end
 
     def update
@@ -103,7 +113,7 @@ module ModJS
 
     def compile_application_file(file)
       sprockets = Sprockets::Secretary.new(
-        root: ModJS::BASE_DIR,
+        root: ModJS::base_dir,
         asset_root: File.expand_path(@config[:asset_root], @root),
         load_path: ['repository'],
         source_files: [file],

data/modjs-architecture.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "modjs-architecture"
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
-  s.date = "2012-02-21"
+  s.date = "2012-02-27"
   s.description = "Mod.js is a modular javascript library that provides a base application strucure to build large javascript applications. Mod.js is designed to work with architecture.js."
   s.email = "daytonn@gmail.com"
   s.extra_rdoc_files = [
@@ -38,14 +38,18 @@ Gem::Specification.new do |s|
     "lib/modjs-architecture/jasmine/jasmine.js",
     "lib/modjs-architecture/jasmine/jasmine_favicon.png",
     "lib/modjs-architecture/lib/mod.js",
-    "lib/modjs-architecture/modjs.architecture",
+    "lib/modjs-architecture/modjs.blueprint",
     "lib/modjs-architecture/src/mod.js",
     "modjs-architecture.gemspec",
-    "spec/fixtures/myapp.architecture",
+    "spec/fixtures/foo.js",
+    "spec/fixtures/foo_all.js",
+    "spec/fixtures/foo_elements.js",
+    "spec/fixtures/foo_model.js",
+    "spec/fixtures/myapp.blueprint",
     "spec/fixtures/myapp.js",
     "spec/fixtures/test.js",
     "spec/fixtures/test.module.js",
-    "spec/fixtures/update.architecture",
+    "spec/fixtures/update.blueprint",
     "spec/fixtures/update.js",
     "spec/javascripts/application_spec.js",
     "spec/javascripts/dom_spec.js",
@@ -56,7 +60,10 @@ Gem::Specification.new do |s|
     "spec/javascripts/support/jasmine_config.rb",
     "spec/javascripts/support/jasmine_runner.rb",
     "spec/modjs-architecture_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/templates_spec.rb",
+    "templates/model.js",
+    "templates/module.js"
   ]
   s.homepage = "http://github.com/daytonn/modjs-architecture"
   s.licenses = ["MIT"]

data/spec/fixtures/foo.js

@@ -0,0 +1,9 @@
+(function(app) {
+    var m = app.add_module("foo");
+
+    m.actions = function() {
+        
+    }
+
+    m.run();
+})(myapp);

data/spec/fixtures/foo_all.js

@@ -0,0 +1,13 @@
+(function(app) {
+    var m = app.add_module("foo_all");
+
+    //= require "../elements/foo_all.elements"
+
+    //= require "../models/foo_all.model"
+
+    m.actions = function() {
+        
+    }
+
+    m.run();
+})(myapp);

data/spec/fixtures/foo_elements.js

@@ -0,0 +1,11 @@
+(function(app) {
+    var m = app.add_module("foo_elements");
+
+    //= require "../elements/foo_elements.elements"
+
+    m.actions = function() {
+        
+    }
+
+    m.run();
+})(myapp);

data/spec/fixtures/foo_model.js

@@ -0,0 +1,11 @@
+(function(app) {
+    var m = app.add_module("foo_model");
+
+    //= require "../models/foo_model.model"
+
+    m.actions = function() {
+        
+    }
+
+    m.run();
+})(myapp);

data/spec/fixtures/{myapp.architecture → myapp.blueprint}

@@ -1,4 +1,4 @@
-framework: modjs
+blueprint: modjs
 src_dir: modules
 build_dir: application
 asset_root: ../

data/spec/fixtures/{update.architecture → update.blueprint}

@@ -1,4 +1,4 @@
-framework: modjs
+blueprint: modjs
 src_dir: modules
 build_dir: application
 asset_root: ../

data/spec/modjs-architecture_spec.rb

@@ -1,15 +1,15 @@
 require "spec_helper.rb"
 
-describe ModJS::Project do
+describe ModJS::Blueprint do
 
   describe "defaults" do
 
     before :each do
-      suppress_output { @project = ModJS::Project.new( { name: 'myapp' }, TMP_DIR) }
+      suppress_output { @project = ModJS::Blueprint.new( { name: 'myapp' }, TMP_DIR) }
     end
 
-    it 'should have a BASE_DIR constant' do
-      ModJS::BASE_DIR = MODJS_ROOT
+    it 'should have a base_dir' do
+      ModJS::base_dir.should == MODJS_ROOT
     end
     
     it 'should have the correct directories' do
@@ -20,7 +20,7 @@ describe ModJS::Project do
   describe 'project creation' do
     before :each do
       suppress_output do
-        @project = ModJS::Project.new( { name: 'myapp' }, TMP_DIR)
+        @project = ModJS::Blueprint.new( { name: 'myapp' }, TMP_DIR)
         @project.create
       end
     end
@@ -39,9 +39,9 @@ describe ModJS::Project do
       File.exists?("#{TMP_DIR}/spec").should be_true
     end
 
-    it 'should create the architecture file' do
-      File.exists?("#{TMP_DIR}/myapp.architecture").should be_true
-      "#{TMP_DIR}/myapp.architecture".should be_same_file_as "#{FIXTURES}/myapp.architecture"
+    it 'should create the blueprint file' do
+      File.exists?("#{TMP_DIR}/myapp.blueprint").should be_true
+      "#{TMP_DIR}/myapp.blueprint".should be_same_file_as "#{FIXTURES}/myapp.blueprint"
     end
 
     it 'should create an application file in the build_dir' do
@@ -49,7 +49,7 @@ describe ModJS::Project do
     end
 
     it 'should copy the core library into the lib folder' do
-      "#{TMP_DIR}/lib/mod.js".should be_same_file_as "#{ModJS::LIB_DIR}/mod.js"
+      "#{TMP_DIR}/lib/mod.js".should be_same_file_as "#{ModJS::lib_dir}/mod.js"
     end
 
     it 'should copy the jasmine tests into the spec folder' do
@@ -72,12 +72,12 @@ describe ModJS::Project do
   
     before :each do
       suppress_output do
-        @project = ModJS::Project.new( { name: 'myapp' }, TMP_DIR)
+        @project = ModJS::Blueprint.new( { name: 'myapp' }, TMP_DIR)
         @project.create
       end
 
-      FileUtils.rm_rf "#{TMP_DIR}/myapp.architecture"
-      FileUtils.cp "#{FIXTURES}/update.architecture", "#{TMP_DIR}/myapp.architecture"
+      FileUtils.rm_rf "#{TMP_DIR}/myapp.blueprint"
+      FileUtils.cp "#{FIXTURES}/update.blueprint", "#{TMP_DIR}/myapp.blueprint"
       FileUtils.cp "#{FIXTURES}/test.module.js", "#{TMP_DIR}/modules/test.module.js"
 
       suppress_output do
@@ -97,4 +97,5 @@ describe ModJS::Project do
       "#{TMP_DIR}/application/test.js".should be_same_file_as "#{FIXTURES}/test.js"
     end
   end
+
 end

data/spec/templates_spec.rb

@@ -0,0 +1,70 @@
+require "spec_helper.rb"
+
+describe "ModJS templates" do
+
+  before :each do
+    suppress_output do
+      @project = ModJS::Blueprint.new( { name: 'myapp' }, TMP_DIR)
+      @project.create
+      FileUtils.cd("#{TMP_DIR}")
+    end
+  end
+
+  after :each do
+    FileUtils.rm_rf(TMP_DIR)
+    FileUtils.cd(SPEC_DIR)
+  end
+
+  it 'should generate a module file' do
+    config = {
+      arguments: ['module', 'foo'],
+      template: 'module',
+      filename: 'foo',
+      options: {}
+    }
+
+    @project.generator.generate(config)
+    File.exists?("#{TMP_DIR}/foo.js").should be_true
+    "#{TMP_DIR}/foo.js".should be_same_file_as "#{FIXTURES}/foo.js"
+  end
+
+  it 'should render a module with elements' do
+    config = {
+      arguments: ['module', 'foo_elements', '-e'],
+      template: 'module',
+      filename: 'foo_elements',
+      options: { e: true }
+    }
+
+    @project.generator.generate(config)
+    File.exists?("#{TMP_DIR}/foo_elements.js").should be_true
+    "#{TMP_DIR}/foo_elements.js".should be_same_file_as "#{FIXTURES}/foo_elements.js"
+  end
+
+  it 'should render a module with a model' do
+    config = {
+      arguments: ['module', 'foo_model', '-m'],
+      template: 'module',
+      filename: 'foo_model',
+      options: { m: true }
+    }
+
+    @project.generator.generate(config)
+    File.exists?("#{TMP_DIR}/foo_model.js").should be_true
+    "#{TMP_DIR}/foo_model.js".should be_same_file_as "#{FIXTURES}/foo_model.js"
+  end
+
+  it 'should render a module with both a model and elements' do
+    config = {
+      arguments: ['module', 'foo_all', '-e', '-m'],
+      template: 'module',
+      filename: 'foo_all',
+      options: { e: true, m: true }
+    }
+
+    @project.generator.generate(config)
+    File.exists?("#{TMP_DIR}/foo_all.js").should be_true
+    "#{TMP_DIR}/foo_all.js".should be_same_file_as "#{FIXTURES}/foo_all.js"
+  end
+
+end

data/templates/model.js

@@ -0,0 +1,3 @@
+    m.set_data({
+        
+    });

data/templates/module.js

@@ -0,0 +1,17 @@
+(function(app) {
+    var m = app.add_module("<%= arguments[1] %>");
+<% if options[:e] %>
+
+    //= require "../elements/<%= arguments[1] %>.elements"
+<% end %>
+<% if options[:m] %>
+
+    //= require "../models/<%= arguments[1] %>.model"
+<% end %>
+
+    m.actions = function() {
+        
+    }
+
+    m.run();
+})(<%= blueprint[:name] %>);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modjs-architecture
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: architecture-js
-  requirement: &70130159837360 !ruby/object:Gem::Requirement
+  requirement: &70121469700780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70130159837360
+  version_requirements: *70121469700780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70130159814540 !ruby/object:Gem::Requirement
+  requirement: &70121469699400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70130159814540
+  version_requirements: *70121469699400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70130159813940 !ruby/object:Gem::Requirement
+  requirement: &70121469698700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70130159813940
+  version_requirements: *70121469698700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70130159813400 !ruby/object:Gem::Requirement
+  requirement: &70121469697800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70130159813400
+  version_requirements: *70121469697800
 - !ruby/object:Gem::Dependency
   name: jasmine
-  requirement: &70130159812800 !ruby/object:Gem::Requirement
+  requirement: &70121469696700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.2
   type: :development
   prerelease: false
-  version_requirements: *70130159812800
+  version_requirements: *70121469696700
 - !ruby/object:Gem::Dependency
   name: architecture-js
-  requirement: &70130159812080 !ruby/object:Gem::Requirement
+  requirement: &70121469695860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70130159812080
+  version_requirements: *70121469695860
 description: Mod.js is a modular javascript library that provides a base application
   strucure to build large javascript applications. Mod.js is designed to work with
   architecture.js.
@@ -108,14 +108,18 @@ files:
 - lib/modjs-architecture/jasmine/jasmine.js
 - lib/modjs-architecture/jasmine/jasmine_favicon.png
 - lib/modjs-architecture/lib/mod.js
-- lib/modjs-architecture/modjs.architecture
+- lib/modjs-architecture/modjs.blueprint
 - lib/modjs-architecture/src/mod.js
 - modjs-architecture.gemspec
-- spec/fixtures/myapp.architecture
+- spec/fixtures/foo.js
+- spec/fixtures/foo_all.js
+- spec/fixtures/foo_elements.js
+- spec/fixtures/foo_model.js
+- spec/fixtures/myapp.blueprint
 - spec/fixtures/myapp.js
 - spec/fixtures/test.js
 - spec/fixtures/test.module.js
-- spec/fixtures/update.architecture
+- spec/fixtures/update.blueprint
 - spec/fixtures/update.js
 - spec/javascripts/application_spec.js
 - spec/javascripts/dom_spec.js
@@ -127,6 +131,9 @@ files:
 - spec/javascripts/support/jasmine_runner.rb
 - spec/modjs-architecture_spec.rb
 - spec/spec_helper.rb
+- spec/templates_spec.rb
+- templates/model.js
+- templates/module.js
 homepage: http://github.com/daytonn/modjs-architecture
 licenses:
 - MIT
@@ -142,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2379399736139929132
+      hash: 2975033321687838439
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: