modjs-architecture 0.3.3 → 0.3.5

data/Gemfile

@@ -12,8 +12,8 @@ group :test do
 end
 
 group :development do
-  gem "rspec", "~> 2.8.0"
-  gem "bundler", "~> 1.0.0"
+  gem "rspec"
+  gem "bundler"
   gem "jeweler", "~> 1.8.3"
-  gem "jasmine", "~> 1.1.2"
+  gem "jasmine"
 end

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.5

data/lib/modjs-architecture.rb

@@ -4,7 +4,7 @@ module ArchitectureJS
       path ||= File.expand_path(Dir.getwd)
       filename = filename.gsub(/\.js$/, '.module.js')
       File.open("#{path}/#{filename}", "w+") { |f| f.write template }
-      puts ArchitectureJS::Notification.added "#{filename} #{template} added" if File.exists?("#{path}/#{filename}")
+      puts ArchitectureJS::Notification.added "#{filename} added" if File.exists?("#{path}/#{filename}")
     end
   end
 end

data/modjs-architecture.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "modjs-architecture"
-  s.version = "0.3.3"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dayton Nolan"]
@@ -69,28 +69,6 @@ Gem::Specification.new do |s|
     "spec/modjs-architecture_spec.rb",
     "spec/spec_helper.rb",
     "spec/templates_spec.rb",
-    "spec/tmp/application/myapp.js",
-    "spec/tmp/application/test.js",
-    "spec/tmp/application/test.module.js",
-    "spec/tmp/foo-elements.js",
-    "spec/tmp/foo.js",
-    "spec/tmp/foo_all.js",
-    "spec/tmp/foo_elements.js",
-    "spec/tmp/foo_model.js",
-    "spec/tmp/lib/mod.js",
-    "spec/tmp/modules/test.module.js",
-    "spec/tmp/myapp.architecture",
-    "spec/tmp/myapp.blueprint",
-    "spec/tmp/spec/application_spec.js",
-    "spec/tmp/spec/dom_spec.js",
-    "spec/tmp/spec/existence_spec.js",
-    "spec/tmp/spec/jasmine/MIT.LICENSE",
-    "spec/tmp/spec/jasmine/index.html",
-    "spec/tmp/spec/jasmine/jasmine-html.js",
-    "spec/tmp/spec/jasmine/jasmine.css",
-    "spec/tmp/spec/jasmine/jasmine.js",
-    "spec/tmp/spec/jasmine/jasmine_favicon.png",
-    "spec/tmp/spec/module_spec.js",
     "templates/model.js",
     "templates/module.js"
   ]
@@ -105,25 +83,25 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<architecture-js>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<jasmine>, ["~> 1.1.2"])
+      s.add_development_dependency(%q<jasmine>, [">= 0"])
       s.add_runtime_dependency(%q<architecture-js>, [">= 0"])
     else
       s.add_dependency(%q<architecture-js>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<jasmine>, ["~> 1.1.2"])
+      s.add_dependency(%q<jasmine>, [">= 0"])
       s.add_dependency(%q<architecture-js>, [">= 0"])
     end
   else
     s.add_dependency(%q<architecture-js>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<jasmine>, ["~> 1.1.2"])
+    s.add_dependency(%q<jasmine>, [">= 0"])
     s.add_dependency(%q<architecture-js>, [">= 0"])
   end
 end

data/spec/templates_spec.rb

@@ -22,12 +22,12 @@ describe "ModJS templates" do
       filename: 'foo',
       options: {}
     }
-
-    @project.generator.generate(config)
-    File.exists?("#{TMP_DIR}/foo.js").should be_true
+  
+    suppress_output { @project.generator.generate(config) }
+    File.exists?("#{TMP_DIR}/foo.module.js").should be_true
     "#{TMP_DIR}/foo.module.js".should be_same_file_as "#{FIXTURES}/foo.js"
   end
-
+  
   it 'should render a module with elements' do
     config = {
       arguments: ['module', 'foo_elements', '-e'],
@@ -35,12 +35,12 @@ describe "ModJS templates" do
       filename: 'foo_elements',
       options: { e: true }
     }
-
-    @project.generator.generate(config)
+  
+    suppress_output { @project.generator.generate(config) }
     File.exists?("#{TMP_DIR}/foo_elements.module.js").should be_true
     "#{TMP_DIR}/foo_elements.module.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'],
@@ -48,12 +48,12 @@ describe "ModJS templates" do
       filename: 'foo_model',
       options: { m: true }
     }
-
-    @project.generator.generate(config)
+  
+    suppress_output { @project.generator.generate(config) }
     File.exists?("#{TMP_DIR}/foo_model.module.js").should be_true
     "#{TMP_DIR}/foo_model.module.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'],
@@ -61,10 +61,22 @@ describe "ModJS templates" do
       filename: 'foo_all',
       options: { e: true, m: true }
     }
-
-    @project.generator.generate(config)
+  
+    suppress_output { @project.generator.generate(config) }
     File.exists?("#{TMP_DIR}/foo_all.module.js").should be_true
     "#{TMP_DIR}/foo_all.module.js".should be_same_file_as "#{FIXTURES}/foo_all.js"
   end
 
+  it 'should render a module partial with the correct module name' do
+    config = {
+      arguments: ['module', '_foo'],
+      template: 'module',
+      filename: '_foo',
+      options: {}
+    }
+  
+    suppress_output { @project.generator.generate(config) }
+    File.exists?("#{TMP_DIR}/_foo.module.js").should be_true
+    "#{TMP_DIR}/_foo.module.js".should be_same_file_as "#{FIXTURES}/foo.js"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modjs-architecture
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -32,33 +32,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: architecture-js
   requirement: !ruby/object:Gem::Requirement
@@ -169,28 +169,6 @@ files:
 - spec/modjs-architecture_spec.rb
 - spec/spec_helper.rb
 - spec/templates_spec.rb
-- spec/tmp/application/myapp.js
-- spec/tmp/application/test.js
-- spec/tmp/application/test.module.js
-- spec/tmp/foo-elements.js
-- spec/tmp/foo.js
-- spec/tmp/foo_all.js
-- spec/tmp/foo_elements.js
-- spec/tmp/foo_model.js
-- spec/tmp/lib/mod.js
-- spec/tmp/modules/test.module.js
-- spec/tmp/myapp.architecture
-- spec/tmp/myapp.blueprint
-- spec/tmp/spec/application_spec.js
-- spec/tmp/spec/dom_spec.js
-- spec/tmp/spec/existence_spec.js
-- spec/tmp/spec/jasmine/MIT.LICENSE
-- spec/tmp/spec/jasmine/index.html
-- spec/tmp/spec/jasmine/jasmine-html.js
-- spec/tmp/spec/jasmine/jasmine.css
-- spec/tmp/spec/jasmine/jasmine.js
-- spec/tmp/spec/jasmine/jasmine_favicon.png
-- spec/tmp/spec/module_spec.js
 - templates/model.js
 - templates/module.js
 homepage: http://github.com/daytonn/modjs-architecture
@@ -208,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3541363974514670302
+      hash: -4571541150195370455
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/spec/tmp/application/myapp.js

@@ -1,322 +0,0 @@
-is_defined = function(suspect) {
-  return typeof suspect == "undefined" ? false : true;
-};
-
-is_undefined = function(suspect) {
-  return typeof suspect == "undefined" ? true : false;
-};
-
-is_typeof = function(type, suspect) {
-  if (is_undefined(type)) {
-    throw new Error("is_typeof(Type, suspect): type is undefined");
-  }
-
-  if (is_undefined(suspect)) {
-    throw new Error("is_typeof(Type, suspect): suspect is undefined");
-  }
-
-  return suspect.constructor == type ? true : false;
-};
-
-is_numeric = function(suspect) {
-  if (isNaN(suspect)) {
-    return false;
-  }
-  return !isNaN(parseFloat(suspect)) && isFinite(suspect);
-};
-
-is_string = function(suspect) {
-  return is_typeof(String, suspect);
-};
-
-is_array = function(suspect) {
-  return is_typeof(Array, suspect);
-};
-
-is_number = function(suspect) {
-  return is_typeof(Number, suspect);
-};
-
-is_date = function(suspect) {
-  return is_typeof(Date, suspect);
-};
-
-is_bool = function(suspect) {
-  return is_typeof(Boolean, suspect);
-};
-
-is_regex = function(suspect) {
-  return is_typeof(RegExp, suspect);
-};
-
-is_empty = function(suspect) {
-  if (is_undefined(suspect)) {
-    return true;
-  }
-
-  return suspect.length === 0;
-};
-
-is_not_empty = function(suspect) {
-  return suspect.length >= 1;
-};
-if (!Element.prototype.addEventListener) {
-    var oListeners = {};
-
-    function runListeners(oEvent) {
-        if (!oEvent) {
-            oEvent = window.event;
-        }
-
-        for (var iLstId = 0, iElId = 0, oEvtListeners = oListeners[oEvent.type]; iElId < oEvtListeners.aEls.length; iElId++) {
-            if (oEvtListeners.aEls[iElId] === this) {
-                for (iLstId; iLstId < oEvtListeners.aEvts[iElId].length; iLstId++) {
-                    oEvtListeners.aEvts[iElId][iLstId].call(this, oEvent);
-                }
-
-                break;
-            }
-        }
-    }
-
-    Element.prototype.addEventListener = function (sEventType, fListener) {
-        if (oListeners.hasOwnProperty(sEventType)) {
-            var oEvtListeners = oListeners[sEventType];
-
-            for (var nElIdx = -1, iElId = 0; iElId < oEvtListeners.aEls.length; iElId++) {
-                if (oEvtListeners.aEls[iElId] === this) {
-                    nElIdx = iElId; break;
-                }
-            }
-
-            if (nElIdx === -1) {
-                oEvtListeners.aEls.push(this);
-                oEvtListeners.aEvts.push([fListener]);
-                this["on" + sEventType] = runListeners;
-            }
-            else {
-                var aElListeners = oEvtListeners.aEvts[nElIdx];
-
-                if (this["on" + sEventType] !== runListeners) {
-                    aElListeners.splice(0);
-                    this["on" + sEventType] = runListeners;
-                }
-
-                for (var iLstId = 0; iLstId < aElListeners.length; iLstId++) {
-                    if (aElListeners[iLstId] === fListener) {
-                        return;
-                    }
-                }
-
-                aElListeners.push(fListener);
-            }
-        }
-        else {
-            oListeners[sEventType] = {
-                aEls: [this],
-                aEvts: [[fListener]]
-            };
-
-            this["on" + sEventType] = runListeners;
-        }
-    };
-
-    Element.prototype.removeEventListener = function (sEventType) {
-        if (!oListeners.hasOwnProperty(sEventType)) {
-            return;
-        }
-
-        var oEvtListeners = oListeners[sEventType];
-
-        for (var nElIdx = -1, iElId = 0; iElId < oEvtListeners.aEls.length; iElId++) {
-            if (oEvtListeners.aEls[iElId] === this) {
-                nElIdx = iElId;
-                break;
-            }
-        }
-
-        if (nElIdx === -1) {
-            return;
-        }
-
-        for (var iLstId = 0, aElListeners = oEvtListeners.aEvts[nElIdx]; iLstId < aElListeners.length; iLstId++) {
-            aElListeners.splice(iLstId, 1);
-        }
-    };
-}
-
-var Mod = {};
-
-Mod.DOM = (function() {
-
-    var timer,
-        queue = [];
-
-    function DOM() {
-        this.cache = {};
-        this.is_ready = false;
-    }
-
-    DOM.prototype.add_event = function(element, type, fn, capture) {
-        if (is_undefined(capture)) {
-            capture = false;
-        }
-
-        if (is_string(element)) {
-            element = this.cache[element];
-        }
-
-        element.addEventListener(type, fn, capture);
-    };
-
-    DOM.prototype.remove_event = function(element, type, fn, capture) {
-        if (is_undefined(capture)) {
-            capture = false;
-        }
-
-        if (is_string(element)) {
-            element = this.cache[element];
-        }
-
-        element.removeEventListener(type, fn, capture);
-    };
-
-    DOM.prototype.call_when_ready = function(func) {
-        if (this.is_ready) {
-            return func();
-        }
-
-        if (timer) {
-            queue.push(func);
-        }
-        else {
-            this.add_event(window, 'load', this.execute_ready_queue);
-            queue.push(func);
-            timer = setInterval(this.execute_ready_queue, 13);
-        }
-    };
-
-    DOM.prototype.execute_ready_queue = function() {
-        if (this.is_ready) {
-            return false;
-        }
-
-        if (document && document.getElementsByTagName && document.getElementById && document.body) {
-            clearInterval(timer);
-            timer = null;
-            for(var i = 0, j = queue.length; i < j; i++) {
-                queue[i]();
-            }
-
-            queue = [];
-            this.is_ready = true;
-        }
-    };
-
-    DOM.prototype.add_elements = function(elements) {
-        for(var key in elements) {
-            if (elements.hasOwnProperty(key)) {
-                this.add_element(key, elements[key]);
-            }
-        }
-    };
-
-    DOM.prototype.add_element = function(key, element) {
-        this.cache[key] = element;
-    };
-
-    return DOM;
-})();
-Mod.Module = (function() {
-
-    function Module(name) {
-        if (is_undefined(name)) {
-            throw new Error("Mod.Module(name): name is undefined");
-        }
-
-        this.dom = new Mod.DOM;
-        this.data = {};
-        this.name = name;
-    }
-
-    Module.prototype.actions = function() {};
-
-    Module.prototype.run = function() {
-        var mod = this;
-        this.dom.call_when_ready(function() {
-            mod.execute();
-        });
-    };
-
-    Module.prototype.execute = function() {
-        this.actions();
-    };
-
-    Module.prototype.elements = function(elements) {
-        if (is_undefined(elements)) {
-            return this.dom.cache;
-        }
-
-        if (is_string(elements)) {
-            var name = elements;
-            return this.dom.cache[name];
-        }
-        else {
-            this.dom.add_elements(elements);
-        }
-    };
-
-    Module.prototype.set_data = function(key, value) {
-        if (is_undefined(key)) {
-            throw new Error(this.name + '.set_data(key, value): key is undefined');
-        }
-
-        if (is_typeof(String, key) && is_undefined(value)) {
-            throw new SyntaxError(this.name + 'Module.set_data(key, value): value is undefined');
-        }
-
-        if (is_typeof(String, key)) {
-            this.data[key] = value;
-        }
-        else if (is_typeof(Object, key)) {
-            var data = key;
-            for(var property in data) {
-                this.data[property] = data[property];
-            }
-        }
-
-        return this;
-    };
-
-    return Module;
-})();
-Mod.Application = (function() {
-
-    function Application(name) {
-        if (is_undefined(name)) {
-            throw new Error("new Mod.Application(name): name is undefined");
-        }
-
-        this.name = name
-    };
-
-    Application.prototype.add_module = function(name) {
-        if (is_undefined(name)) {
-            throw new Error("Mod.Application.add_module(name): name is undefined");
-        }
-
-        if (is_defined(this[name])) {
-            throw new Error("Mod.Application.add_module('" + name + "'): '" + name + "' already declared");
-        }
-
-        if (this.name === name) {
-            throw new Error("Mod.Application.add_module('" + name + "'): a module cannot have the same name as the application. It's bad idea. Do you really want to write " + name + "." + name + "? It's confusing.'");
-        }
-
-        return this[name] = new Mod.Module(name);
-    };
-
-    return Application;
-})();
-
-var myapp = new Mod.Application('myapp');