sudojs-rails 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd1f53f3cbe93a5268b1931531c6ae22010c5e1f
-  data.tar.gz: f364419e8c9ead7b7d3e456b2e8c701d8b84b190
+  metadata.gz: dbb644c09ab21d3500df93cbede3023bacfacfba
+  data.tar.gz: 6e0fe9702b729f16025cd3b23be6e580271a86d6
 SHA512:
-  metadata.gz: eeb81d3cccac9e2b1979b9e851a1701fc77cf937114f5f411444b9dcffde1be3d6a93e2f486390f4c7874d50e676a0930978a24a640edfbf2f433cd71ed12f63
-  data.tar.gz: 05a9e8187fdf283fa3348e086c1ffa80348d18ed4f74f727afff104b9772b1278236cb0eb449f43a26e86ebd9f5658a9d54d1a06b4ad5764ca6f84318dce2f02
+  metadata.gz: 48ac70d1f915348c625b572da7eab797407dbc1bddbf6c497c534c9c8c626411e6baf40008ea14a625ec9180c390b1ea64a755b3ae015744585864650e871858
+  data.tar.gz: 500391e74e1dead14ba65d771c311c8e1bbfcdbc399f01b0235614327564e2e40dead59ace1547619f26794fb0a6fbe2f563f8025394eb35b628fde53341c8dd

data/README.md

@@ -79,17 +79,16 @@ Description:
     Install sudo.js along with it's particular directory hierarchy.
 
 Example:
-    rails g sudojs:install namespace [which_sudo] [html_extension] [js_extension] [css_extension] [--skip-css=true/false]
+    rails g sudojs:install [html_extension] [js_extension] [css_extension] [--skip-css=true/false]
 
-    The only mandatory argument is the initial `namespace`.
+    Two namespaces, 'page' and 'lib', will be automagically created. The 'models' and 'templates'
+    Containers will be appended to the page namespace, and 'lib' is used to house Class definitions 
+    by convention.
 
-    The install generator uses these optional arguments to expand the values in the sudo_js.yml file:
-      1. `which_sudo` => which version of sudo.js are you loading? As sudo.js can be rebuilt into any number
-         of custom configurations, indicate here what name should be placed into the application manifest.
-         Defaults to 'sudo-x' if omitted.
-      2. `html_extension` => Use the full extension, i.e. `.haml`. defaults to `.erb`.
-      3. `js_extension` => defaults to `.js` pass `.js.coffee` if you are of the coffee persuasion.
-      4. `css_extension` => defaults to `.css`. Sass for example would need `.css.scss`
+    The install generator uses these options to expand the values in the sudo_js.yml file:
+      1. `--html_extension` => Use the full extension, i.e. `.haml`. defaults to `.erb`.
+      2. `--js_extension` => defaults to `.js` pass `.coffee` if you are of the coffee persuasion.
+      3. `--css_extension` => defaults to `.css`. Sass for example would need `.scss`
 
     NOTE: to skip any and all generating of css files pass the option `--skip-css=true` when invoking the install generator.
     Obviously, you could then leave the `css_extension` argument out. The option defaults to false.
@@ -99,14 +98,15 @@ Example:
       assets/
         stylesheets/
           manifests/
-            application.css
+            application.*
         javascripts/
-          application/
-            yourNamespace.js
-            model.js
           manifests/
-            application.js
+            application.*
+          models/
+            base.*
           views/
+            application/
+              page.*
     config/
       sudo_js.yml
 

data/lib/generators/sudojs/class/class_generator.rb

@@ -52,41 +52,50 @@ module Sudojs
         # the arguments vary in the templates for class types
         # also we can make some assumptions about paths
         case @parent
-          when '_.Base', '_.Container'
+          when '_.Base'
             @args = 'data'
             @js_path = @js_views_path
             @js_req = 'views'
             skip_css = true
+            namespace = 'lib'
+          when '_.Container'
+            @args = 'data'
+            @js_path = @js_views_path
+            @js_req = 'containers'
+            skip_css = true
+            namespace = 'lib.containers'
           when '_.Model'
             @args = 'data'
             @js_path = @js_model_path
             @js_req = 'models'
             skip_css = true
+            namespace = 'lib.models'
           when '_.View', '_.ViewController', 'DataView'
             @args = 'el, data'
             @js_path = @js_views_path
             @js_req = 'views'
+            namespace = 'lib.views'
           else
             #default to unknown args and views path with css
             @args = '/* args */'
             @js_path = @js_views_path
             @js_req = 'views'
+            namespace = 'lib'
         end
 
       end
 
       # expand the template to <destination>
       def copy_class_template
+        @path_to_object = namespace
         if @is_application
           # a more definitive indicator
           js_path = @js_app_path
           css_path = @css_app_path
-          @path_to_object = namespace
         else
           # the user passed option takes precedence
           js_path = "#{@js_dir || @js_path}/#{@c_name}"
           css_path = "#{@css_views_path}/#{@c_name}"
-          @path_to_object = [namespace, '.', @c_camel].join('')
           # make sure the directory is present (create if not)
           unless skip_css?
             ensure_cname_dir(js_path, css_path)
@@ -147,7 +156,7 @@ module Sudojs
       end
 
       def modify_view_if_exists
-        filename = "app/views/#{@c_name}/#{@a_name}.html#{html_extension}"
+        filename = "app/views/#{@c_name}/#{@a_name}#{html_extension}"
         if File.exist? filename
           # TODO other pre-processors may need entries here
           if js_extension == '.js.coffee'

data/lib/generators/sudojs/helpers.rb

@@ -6,14 +6,6 @@ module Sudojs
 
       CFG = YAML.load_file('config/sudo_js.yml') unless defined? CFG
 
-      def namespace
-        CFG['js_namespace']
-      end
-      
-      def which_sudo
-        CFG['which_sudo']
-      end
-
       def html_extension
         CFG['html_extension']
       end

data/lib/generators/sudojs/install/USAGE

@@ -2,17 +2,16 @@ Description:
     Install sudo.js along with it's particular directory hierarchy.
 
 Example:
-    rails g sudojs:install namespace [which_sudo] [html_extension] [js_extension] [css_extension] [--skip-css=true/false]
+    rails g sudojs:install [html_extension] [js_extension] [css_extension] [--skip-css=true/false]
 
-    The only mandatory argument is the initial `namespace`.
+    Two namespaces, 'page' and 'lib', will be automagically created. The 'models' and 'templates'
+    Containers will be appended to the page namespace, and 'lib' is used to house Class definitions 
+    by convention.
 
-    The install generator uses these optional arguments to expand the values in the sudo_js.yml file:
-      1. `which_sudo` => which version of sudo.js are you loading? As sudo.js can be rebuilt into any number
-         of custom configurations, indicate here what name should be placed into the application manifest.
-         Defaults to 'sudo-x' if omitted.
-      2. `html_extension` => Use the full extension, i.e. `.haml`. defaults to `.erb`.
-      3. `js_extension` => defaults to `.js` pass `.js.coffee` if you are of the coffee persuasion.
-      4. `css_extension` => defaults to `.css`. Sass for example would need `.css.scss`
+    The install generator uses these options to expand the values in the sudo_js.yml file:
+      1. `--html_extension` => Use the full extension, i.e. `--html_extension=.haml`. Defaults to `.erb`.
+      2. `--js_extension` => Defaults to `.js` pass `--js_extension=.coffee` if you are of the coffee persuasion.
+      3. `--css_extension` => Defaults to `.css`. For Sass you would pass `-css_extension=.scss`
 
     NOTE: to skip any and all generating of css files pass the option `--skip-css=true` when invoking the install generator.
     Obviously, you could then leave the `css_extension` argument out. The option defaults to false.
@@ -30,6 +29,6 @@ Example:
             base.*
           views/
             application/
-              yourNamespace.*
+              page.*
     config/
       sudo_js.yml

data/lib/generators/sudojs/install/install_generator.rb

@@ -1,14 +1,17 @@
 module Sudojs
   module Generators
-    class InstallGenerator < Rails::Generators::NamedBase
+    class InstallGenerator < Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
 
-      argument :which_sudo_arg, :type => :string, :default => 'sudo-x'
-      argument :html_extension_arg, :type => :string, :default => '.erb'
-      argument :js_extension_arg, :type => :string, :default => '.js'
-      argument :css_extension_arg, :type => :string, :default => '.css'
+      class_option :html_extension, :type => :string, :aliases => '--html_extension', :default => '.erb',
+        :desc => 'Which html extension to use'
 
-      class_option :skip_css_opt, :type => :boolean, :aliases => "--skip-css", :default => false,
+      class_option :js_extension, :type => :string, :default => '.js', :aliases => '--js_extension',
+        :desc => 'Which js extension to use'
+
+      class_option :css_extension, :type => :string, :default => '.css', :aliases => '--css_extension',
+        :desc => 'Which css extension to use'
+      class_option :skip_css, :type => :boolean, :aliases => '--skip-css', :default => false,
         :desc => 'Skip the generation of any css files along with js'
 
       def create_yaml
@@ -40,19 +43,17 @@ module Sudojs
       end
 
       def place_install_files
-        template 'app_manifest.js.erb', 'app/assets/javascripts/manifests/application.js'
+        copy_file 'app_manifest.js', 'app/assets/javascripts/manifests/application.js'
         unless options[:skip_css]
-          template 'app_manifest.css.erb', 'app/assets/stylesheets/manifests/application.css'
+          copy_file 'app_manifest.css', 'app/assets/stylesheets/manifests/application.css'
         end
 
         # TODO templates for other javascript pre-processors 
-        if js_extension_arg == '.js.coffee'
-          template 'namespace.coffee.erb', "app/assets/javascripts/views/application/#{name}.js.coffee"
-          template 'model.coffee.erb', 'app/assets/javascripts/models/base.js.coffee'
+        if options[:js_extension] == '.coffee'
+          copy_file 'namespace.coffee', "app/assets/javascripts/views/application/page.js.coffee"
         else
           # for now any other js flavor gets the baseline .js 
-          template 'namespace.js.erb', "app/assets/javascripts/views/application/#{name}#{js_extension_arg}"
-          template 'model.js.erb', "app/assets/javascripts/models/base#{js_extension_arg}"
+          copy_file 'namespace.js', "app/assets/javascripts/views/application/page.js#{options[:js_extension] if options[:js_extension] != '.js'}"
         end
 
       end

data/lib/generators/sudojs/install/templates/{app_manifest.js.erb → app_manifest.js}

@@ -1,6 +1,6 @@
 // This is a manifest file that'll be compiled into application.js, which will include all the files
 // listed below.
 //
-//= require sudojs/<%= which_sudo_arg %>
-//= require views/application/<%= name %>
-//= require models/base
+//= require sudojs/zepto
+//= require sudojs/sudo
+//= require views/application/page

data/lib/generators/sudojs/install/templates/namespace.coffee

@@ -0,0 +1,8 @@
+# Define the 2 top-level app namespaces.
+window.lib = {}
+
+window.page =
+  descriptors: [],
+  models: new _.Container(),
+  templates: new _.Container()
+

data/lib/generators/sudojs/install/templates/namespace.js

@@ -0,0 +1,8 @@
+// Define the 2 top-level app namespaces.
+window.lib = {};
+
+window.page = {
+  descriptors: [],
+  models: new _.Container(),
+  templates: new _.Container()
+};

data/lib/generators/sudojs/install/templates/sudo_js.erb.yml

@@ -1,17 +1,11 @@
-# What is the applications top level namespace?
-js_namespace: <%= name %>
-
-# sudo.js with templating or without?
-which_sudo: <%= which_sudo_arg %>
-
 # erb or haml or ...?
-html_extension: <%= html_extension_arg %>
+html_extension: .html<%= options[:html_extension] if options[:html_extension] != '.html' %>
 
-# coffee?
-js_extension: <%= js_extension_arg %>
+# coffee/...?
+js_extension: .js<%= options[:js_extension] if options[:js_extension] != '.js'%>
 
 # create (S)css files too?
 skip_css: <%= @skip_css %>
 
-# sass?
-css_extension: <%= css_extension_arg %>
+# sass/less/...?
+css_extension: .css<%= options[:css_extension] if options[:css_extension] != '.css'%>

data/lib/sudojs/version.rb

@@ -1,3 +1,3 @@
 module Sudojs
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

data/sudojs-rails.gemspec

@@ -17,6 +17,4 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-
-  gem.add_development_dependency "rspec", "~> 2.6"
 end

data/vendor/assets/javascripts/sudojs/sudo.js

@@ -339,13 +339,18 @@ sudo.Model.prototype.unsets = function unsets(ary) {
 // ##Container Class Object
 //
 // A container is any object that can both contain other objects and
-// itself be contained
+// itself be contained.
+//
+// `param` {Array|Object} 'arg'. Optional array or hash
+// of child objects which the Container will add as child objects
+// via `addChildren`
 //
 // `constructor`
-sudo.Container = function() {
+sudo.Container = function(arg) {
   sudo.Base.call(this);
   this.children = [];
   this.childNames = {};
+  if(arg) this.addChildren(arg);
 };
 // Container is a subclass of sudo.Base
 sudo.inherit(sudo.Base, sudo.Container);
@@ -369,6 +374,30 @@ sudo.Container.prototype.addChild = function addChild(child, name) {
   if('addedToParent' in child) child.addedToParent(this);
   return this;
 };
+// ###addChildren
+// Allows for multiple children to be added to this Container by passing
+// either an Array or an Object literal.
+//
+// see `addChild`
+//
+// `param` {Array|Object} `arg`. An array of children to add or an
+// Object literal in the form {name: child}
+// `returns` {Object} `this` 
+sudo.Container.prototype.addChildren = function addChildren(arg) {
+  var i, keys;
+  // Array?
+  if(Array.isArray(arg)) {
+    for (i = 0; i < arg.length; i++) {
+      this.addChild(arg[i]);
+    }
+  } else {
+    keys = Object.keys(arg);
+    for (i = 0; i < keys.length; i++) {
+      this.addChild(arg[keys[i]] , keys[i]);
+    }
+  }
+  return this;
+};
 // ###bubble
 // By default, `bubble` returns the current view's parent (if it has one)
 //
@@ -428,6 +457,8 @@ sudo.Container.prototype.removeChild = function removeChild(arg) {
 // Remove all children, name references and adjust indexes accordingly.
 // This method calls removeFromParent as each child may have overridden logic there.
 //
+// see `removeChild`
+//
 // `returns` {object} `this`
 sudo.Container.prototype.removeChildren = function removeChildren() {
   while(this.children.length) {

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sudojs-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - robrobbins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-05 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.6'
+date: 2013-07-23 00:00:00.000000000 Z
+dependencies: []
 description: Install the latest versions of sudo.js and provide generators for fast
   and easy use.
 email:
@@ -47,12 +33,10 @@ files:
 - lib/generators/sudojs/helpers.rb
 - lib/generators/sudojs/install/USAGE
 - lib/generators/sudojs/install/install_generator.rb
-- lib/generators/sudojs/install/templates/app_manifest.css.erb
-- lib/generators/sudojs/install/templates/app_manifest.js.erb
-- lib/generators/sudojs/install/templates/model.coffee.erb
-- lib/generators/sudojs/install/templates/model.js.erb
-- lib/generators/sudojs/install/templates/namespace.coffee.erb
-- lib/generators/sudojs/install/templates/namespace.js.erb
+- lib/generators/sudojs/install/templates/app_manifest.css
+- lib/generators/sudojs/install/templates/app_manifest.js
+- lib/generators/sudojs/install/templates/namespace.coffee
+- lib/generators/sudojs/install/templates/namespace.js
 - lib/generators/sudojs/install/templates/sudo_js.erb.yml
 - lib/sudojs-rails.rb
 - lib/sudojs/engine.rb

data/lib/generators/sudojs/install/templates/model.coffee.erb

@@ -1,5 +0,0 @@
-# Global model is a sudo.Observable
-class <%= name %>.Base extends _.Model
-  constructor: (data) ->
-    super data
-    $.extend @, _.extensions.observable

data/lib/generators/sudojs/install/templates/model.js.erb

@@ -1,7 +0,0 @@
-// Global model is a sudo.Observable
-<%= name %>.Base = function(data) {
-  this.construct(data);
-  $.extend(this, _.extensions.observable);
-};
-// `private`
-<%= name %>.Base.prototype = Object.create(_.Model.prototype);

data/lib/generators/sudojs/install/templates/namespace.coffee.erb

@@ -1,8 +0,0 @@
-# Define the top-level app namespace as defined in the sudo_js yaml file.
-
-# The `descriptors` array is a global necessity that solves the issue of
-# child objects being parsed on a _partial before their parent ViewControllers
-# (who are declared on a containing view file)
-window.<%= name %> = 
-  descriptors: []
-

data/lib/generators/sudojs/install/templates/namespace.js.erb

@@ -1,8 +0,0 @@
-// Define the top-level app namespace as defined in the sudo_js yaml file.
-
-// The `descriptors` array is a global necessity that solves the issue of
-// child objects being parsed on a _partial before their parent ViewControllers
-// (who are declared on a containing view file)
-window.<%= name %> = {
-  descriptors: []
-};