sudojs-rails 0.3.6 → 0.3.8

data/lib/generators/sudojs/class/USAGE

@@ -51,3 +51,7 @@ Example:
 Note:
     If the `route` is application level (application#baz) the file will be placed
     in the application level directory and the manifests/application file will be modified
+
+    Also a custom path may be passed to allow Javascript files to be placed in arbitrary locations.
+    --js-dr=views/foo for example would force any newly created file into the '/foo' subdirectory of the 
+    views folder

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

@@ -9,6 +9,9 @@ module Sudojs
       # not really a route but passed in the form controller#name
       argument :route, :type =>:string, :default => 'foo#bar'
 
+      class_option :js_dir, :type => :string, :aliases => "--js-dir", :default => '',
+        :desc => 'Specify the application, models, views or a custom directory'
+
       def set_vars
         # recognized sudo.js class objects. unrecognized names will
         # be considered 'custom' classes
@@ -20,6 +23,20 @@ module Sudojs
           'View' => '_.View',
           'ViewController' => '_.ViewController'
         }
+
+        @js_app_path = 'app/assets/javascripts/application'
+        @css_app_path = 'app/assets/stylesheets/application'
+        @js_model_path = 'app/assets/javascripts/models'
+        @js_views_path = 'app/assets/javascripts/views'
+        @css_views_path = 'app/assets/stylesheets/views'
+
+        # was the js_dir option passed
+        if options[:js_dir] != ''
+          @js_dir = "app/assets/javascripts/#{options[:js_dir]}"
+        else 
+          @js_dir = nil
+        end
+
         ary = route.split('#')
         @c_name = ary[0]
         @c_camel = camelize(@c_name)
@@ -33,41 +50,54 @@ module Sudojs
         # either inherits from a sudo.js class or a custom one
         @parent = @class_names[name] || name
         # the arguments vary in the templates for class types
-        if @parent
-          if @parent == '_.Base' || @parent == '_.Model' || @parent == '_.Container'
+        # also we can make some assumptions about paths
+        case @parent
+          when '_.Base', '_.Container'
+            @args = 'data'
+            @js_path = @js_views_path
+            @js_req = 'views'
+          when '_.Model'
             @args = 'data'
-          else 
+            @js_path = @js_model_path
+            @js_req = 'models'
+          when '_.View', '_.ViewController', 'DataView'
             @args = 'el, data'
-          end
-        else
-          # cannot guess the args to a custom class
-          @args = '/* args */'
+            @js_path = @js_views_path
+            @js_req = 'views'
+          else
+            #default to unknown args and views path
+            @args = '/* args */'
+            @js_path = @js_views_path
+            @js_req = 'views'
         end
+
       end
 
       # expand the template to <destination>
       def copy_class_template
         if @is_application
-          path = 'app/assets/javascripts/application'
-          css_path = 'app/assets/stylesheets/application'
+          # a more definitive indicator
+          js_path = @js_app_path
+          css_path = @css_app_path
           @path_to_object = namespace
         else
-          path = "app/assets/javascripts/views/#{@c_name}"
-          css_path = "app/assets/stylesheets/views/#{@c_name}"
+          # 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(path, css_path)
+            ensure_cname_dir(js_path, css_path)
           else
-            ensure_cname_dir(path)
+            ensure_cname_dir(js_path)
           end
         end
 
         # js
         if js_extension == '.js.coffee'
-          template 'class.coffee.erb', "#{path}/#{@a_name}.js.coffee"
+          template 'class.coffee.erb', "#{js_path}/#{@a_name}.js.coffee"
         else
-          template 'class.js.erb', "#{path}/#{@a_name}#{js_extension}"
+          template 'class.js.erb', "#{js_path}/#{@a_name}#{js_extension}"
         end
 
         # css
@@ -80,17 +110,17 @@ module Sudojs
       def create_or_modify_manifest
         js_pre = '//= '
         css_pre = ' *= '
-        rest_app = "require application/#{@a_name}"
-        rest_view = "require views/#{@c_name}/#{@a_name}"
-        filename = "app/assets/javascripts/manifests/#{@c_name}.js"
-        css_filename = "app/assets/stylesheets/manifests/#{@c_name}.css"
         if @is_application
-          line = js_pre + rest_app
-          css_line = css_pre + rest_app + "\n"
+          req = "require application/#{@a_name}"
         else
-          line = js_pre + rest_view
-          css_line = css_pre + rest_view + "\n"
+          # user passed  option can take precedence
+          req = "require #{@js_dir || @js_path}/#{@c_name}/#{@a_name}"
         end
+        filename = "app/assets/javascripts/manifests/#{@c_name}.js"
+        css_filename = "app/assets/stylesheets/manifests/#{@c_name}.css"
+        
+        line = js_pre + req
+        css_line = css_pre + req + "\n"
 
         # js
         if File.exist? filename

data/lib/generators/sudojs/class/templates/class.js.erb

@@ -7,8 +7,7 @@ _.namespace('<%= @path_to_object %>');
   // remember `init` will also be called `post-super` if present
 };
 
-<%= @path_to_object %>.<%= @a_pascal %>.prototype = Object.create(<%= @parent %>.prototype);
-
-// optional init method for your new viewController, delete if unused
-<%= @path_to_object %>.<%= @a_pascal %>.prototype.init = function init() {};
-
+<%= @path_to_object %>.<%= @a_pascal %>.prototype = $.extend(Object.create(<%= @parent %>.prototype), {
+  // optional init method for your new viewController, delete if unused
+  init: function init() {};
+});

data/lib/generators/sudojs/install/USAGE

@@ -26,9 +26,10 @@ Example:
         javascripts/
           application/
             yourNamespace.js
-            model.js
           manifests/
             application.js
+          models/
+            base.js
           views/
     config/
       sudo_js.yml

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

@@ -21,14 +21,14 @@ module Sudojs
       end
 
       def create_dir_structure
-        %W{application manifests views}.each do |dir|
+        %W{application manifests models views}.each do |dir|
           directory = "app/assets/javascripts/#{dir}"
           css_directory = "app/assets/stylesheets/#{dir}"
           unless File.directory? directory
             empty_directory directory
           end
 
-          unless options[:skip_css]
+          unless options[:skip_css] || dir == 'models'
             unless File.directory? css_directory
               empty_directory css_directory
             end
@@ -45,11 +45,11 @@ module Sudojs
         # TODO templates for other javascript pre-processors 
         if js_extension_arg == '.js.coffee'
           template 'namespace.coffee.erb', "app/assets/javascripts/application/#{name}.js.coffee"
-          template 'model.coffee.erb', 'app/assets/javascripts/application/model.js.coffee'
+          template 'model.coffee.erb', 'app/assets/javascripts/models/base.js.coffee'
         else
           # for now any other js flavor gets the baseline .js 
           template 'namespace.js.erb', "app/assets/javascripts/application/#{name}#{js_extension_arg}"
-          template 'model.js.erb', "app/assets/javascripts/application/model#{js_extension_arg}"
+          template 'model.js.erb', "app/assets/javascripts/models/base#{js_extension_arg}"
         end
 
       end

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

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

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

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

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

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

data/lib/sudojs/version.rb

@@ -1,3 +1,3 @@
 module Sudojs
-  VERSION = '0.3.6'
+  VERSION = '0.3.8'
 end

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

@@ -423,6 +423,18 @@ sudo.Container.prototype.removeChild = function removeChild(arg) {
 	this._indexChildren_(i);
 	return this;
 };
+
+// ###removeChildren
+// Remove all children, removing the name references and index
+// This method calls removeFromParent on each child. If it's a DataView also removes the child's DOM.
+// `returns` {Object} `this`
+sudo.Container.prototype.removeChildren = function removeChildren(arg) {
+	while(this.children.length) {
+		this.children.shift().removeFromParent();
+	}
+	return this;
+};
+
 // ###removeFromParent
 // Remove this object from its parents list of children.
 // Does not alter the dom - do that yourself by overriding this method
@@ -1021,7 +1033,7 @@ sudo.Navigator.prototype.setData = function setData() {
 // Gather the necessary information about the current environment and 
 // bind to either (push|pop)state or hashchange.
 // Also, if given an imcorrect URL for the current environment (hashchange 
-// vs pushState) normalize it and set accordingly.
+// vs pushState) normalize it and set accordingly (or don't).
 //
 // `returns` {object} `this`
 sudo.Navigator.prototype.start = function start() {
@@ -1043,26 +1055,31 @@ sudo.Navigator.prototype.start = function start() {
 	} else if (this.isHashChange) {
 		$(window).on('hashchange', this.handleChange.bind(this));
 	} else return;
-	// Does the current URL need to changed? (hashchange vs popstate)
 	atRoot = window.location.pathname.replace(/[^\/]$/, '$&/') === this.data['root'];
-	// somehow a pushstate URL got here (and here is hashchange)
-	if(this.isHashChange && !atRoot) {
-		window.location.replace(this.data['root'] + window.location.search + '#' + 
-			this.data.fragment);
-		// return early as browser will redirect
-		return true;
-		// the converse of the above
-	} else if(this.isPushState && atRoot && window.location.hash) {
-		tmp = this.getHash().replace(this.leadingStripper, '');
-		window.history.replaceState({}, document.title, this.data['root'] + 
-			tmp + window.location.search);
+	// somehow a URL got here not in my 'format', unless explicitly told not too, correct this
+	if(!this.data.stay) {
+	 if(this.isHashChange && !atRoot) {
+			window.location.replace(this.data['root'] + window.location.search + '#' + 
+				this.data.fragment);
+			// return early as browser will redirect
+			return true;
+			// the converse of the above
+		} else if(this.isPushState && atRoot && window.location.hash) {
+			tmp = this.getHash().replace(this.leadingStripper, '');
+			window.history.replaceState({}, document.title, this.data['root'] + 
+				tmp + window.location.search);
+		} 
 	}
 	// TODO provide option to `go` from inital `start` state?
 	return this;
 };
-// Is a passed in fragment different from the currently set one?
+// ###urlChanged
+// Is a passed in fragment different from the one currently set at `this.get('fragment')`?
+// If so set the fragment to the passed fragment passed in (as well as any 'query' data), else
+// simply return false
 //
 // `param` {String} `fragment`
+// `returns` {bool} 
 sudo.Navigator.prototype.urlChanged = function urlChanged(fragment) {
 	var current = this.getFragment(fragment);
 	// nothing has changed
@@ -1569,7 +1586,7 @@ sudo.extensions.persistable = {
 	//
 	// `returns` {object} A normalized params object for the XHR call
 	_normalizeParams_: function _normalizeParams_(meth, opts, params) {
-		opts || (opts = this.data.ajax);
+		opts || (opts = $.extend({}, this.data.ajax));
 		opts.url || (opts.url = this.url(opts.baseUrl));
 		opts.type || (opts.type = meth);
 		opts.dataType || (opts.dataType = 'json');
@@ -1612,7 +1629,7 @@ sudo.extensions.persistable = {
 	//
 	// `returns` {object} jqXhr
 	_sendData_: function _sendData_(meth, params) {
-		opts = this.data.ajax;
+		opts = $.extend({}, this.data.ajax);
 		opts.contentType || (opts.contentType = 'application/json');
 		opts.data || (opts.data = this.data);
 		// non GET requests do not 'processData'
@@ -1672,9 +1689,9 @@ sudo.delegates.Change.prototype = Object.create(sudo.Model.prototype);
 // `param` {string} `val`
 // `returns` {object} this
 sudo.delegates.Change.prototype.addFilter = function addFilter(key, val) {
-	this.get('filters')[key] = val;
+	this.data.filters[key] = val;
 	return this;
-},
+};
 // ###filter
 // Change records are delivered here and filtered, calling any matching
 // methods specified in `this.get('filters').
@@ -1702,6 +1719,15 @@ sudo.delegates.Change.prototype.filter = function filter(change) {
 		return this.delegator[filters[name]].call(this.delegator, obj);
 	}
 };
+// ###removeFilter
+// Remove an entry from this object's hash of filters
+//
+// `param` {string} `key`
+// `returns` {object} this
+sudo.delegates.Change.prototype.removeFilter = function removeFilter(key) {
+	delete this.data.filters[key];
+	return this;
+};
 // `private`
 sudo.delegates.Change.prototype.role = 'change';
 //##Data Delegate
@@ -1719,6 +1745,16 @@ sudo.delegates.Data = function(data) {
 };
 // inherits from Model
 sudo.delegates.Data.prototype = Object.create(sudo.Model.prototype);
+// ###addFilter
+// Place an entry into this object's hash of filters
+//
+// `param` {string} `key`
+// `param` {string} `val`
+// `returns` {object} this
+sudo.delegates.Data.prototype.addFilter = function addFilter(key, val) {
+	this.data.filters[key] = val;
+	return this;
+};
 // ###filter
 // iterates over a given object literal and returns a value (if present)
 // located at a given key or path
@@ -1743,10 +1779,19 @@ sudo.delegates.Data.prototype.filter = function(obj) {
 		}
 	}
 };
+// ###removeFilter
+// Remove an entry from this object's hash of filters
+//
+// `param` {string} `key`
+// `returns` {object} this
+sudo.delegates.Data.prototype.removeFilter = function removeFilter(key) {
+	delete this.data.filters[key];
+	return this;
+};
 // `private`
 sudo.delegates.Data.prototype.role = 'data';
 
 sudo.version = "0.9.4";
 window.sudo = sudo;
 if(typeof window._ === "undefined") window._ = sudo;
-}).call(this, this);
+}).call(this, this);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sudojs-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -35,6 +35,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
 - Gemfile
 - LICENSE.txt
@@ -78,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -973221170454478308
+      hash: 67341650352489792
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -973221170454478308
+      hash: 67341650352489792
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25