jazz-jss 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,19 +1,51 @@
-= jazz
+jazz jss
+=======
 
-Description goes here.
+It's a simple rapid prototyping JSS framework
 
-== Contributing to jazz
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
 
-== Copyright
+Install
+-------
 
-Copyright (c) 2011 Florian Schade. See LICENSE.txt for
-further details.
 
+Usage
+-----
+
+in shell
+    jazz new todo
+    cd todo
+    jazz generate scaffold item title state
+
+add route to config/routes.js
+    Jazz.Route.draw(
+      {
+        '':       'items_controller#index',
+        '/items': 'items_controller#index'
+      }
+    );
+
+open app/controllers/items_controller.js and add this to index action
+    milk = new Item({title: 'milk', state: false});
+    milk.save();
+
+    bread = new Item({title: 'bread', state: false});
+    bread.save();
+
+    open_cart = Item.findBy({state: false});
+    console.log(open_cart);
+
+    bread.set({state: true});
+    bread.save();
+    open_cart = Item.findBy({state: false});
+    console.log(open_cart);
+
+Todo
+----
+
+Coming soon
+
+
+Credits
+-------
+
+Copyright (c) 2011 Florian Schade. All rights reserved.

data/bin/jazz

@@ -4,6 +4,7 @@ require 'jazz'
 
 if(ARGV.include?('generate'))
   Jazz::CLI.start
-else
+elsif(ARGV.include?('new'))
+  ARGV.delete('new')
   Jazz::AppGenerator.start
 end

data/dist/jazz/lib/db.js

@@ -16,7 +16,7 @@ _.extend(
     add:function (model) {
       obj = jQuery.extend(true, {}, model);
       obj._config.persist = true;
-      this.models[obj.uid()] = obj;
+      this.models[obj.uid] = obj;
     },
 
     all:function () {

data/dist/jazz/lib/helper.js

@@ -1,23 +1,14 @@
 _.extend(
   Jazz.Helper,
   {
-	  loadView: function (name) {
-	    return $.ajax({
-	      url:'./app/assets/templates/' + name + '.html',
-	      type:'GET',
-	      cache:false,
-	      async:false
-	    }).responseText;
-	  },
 	  extend: function (protoProps, classProps) {
 	    var child = Jazz.Helper.inherits(this, protoProps, classProps);
-	    //var child = jQuery.extend(true, this, protoProps, classProps);
 	    child.extend = this.extend;
 	    return child;
 	  },
-	
+
 	  ctor: function(){},
-	
+
 	  inherits: function(parent, protoProps, staticProps) {
 	    var child;
 	    if (protoProps && protoProps.hasOwnProperty('constructor')) {
@@ -25,31 +16,22 @@ _.extend(
 	    } else {
 	      child = function(){ return parent.apply(this, arguments); };
 	    }
-	  
+
 	    _.extend(child, parent);
-	
+
 	    Jazz.Helper.ctor.prototype = parent.prototype;
 	    child.prototype = new Jazz.Helper.ctor();
-	  
+
 	    if (protoProps) _.extend(child.prototype, protoProps);
-	
+
 	    if (staticProps) _.extend(child, staticProps);
-	  
+
 	    child.prototype.constructor = child;
-	
+
 	    child.__super__ = parent.prototype;
-	
+
 	    return child;
-	  },
-	  
-	  showError: function (message) {
-	    alert(message);
-	  },
-	  
-	  getApp: function(){
-	    return eval(Jazz.Config.appName);
 	  }
-	  
   }
 );
 

data/dist/jazz/lib/model.js

@@ -1,122 +1,88 @@
-Jazz.Model = function(attributes, options){
-
-  this._prepare(attributes);
-  this.initialize();
+Jazz.Model = function (attributes, options) {
+  this.initialize(attributes);
 };
 
-Jazz.Model.extend = Jazz.Model.create = Jazz.Helper.extend;
-
-_.extend(
-  Jazz.Model.prototype,
-  {
-    //initialize function
-    initialize: function(){},
-    
-    //
-    _prepare: function(attributes){
-
-    	//Resets the attributes per OBJ
-      this.attributes = {};
-      
-      //Resets the _config and combine per OBJ
-      _config = {
-        uid: _.uniqueId(),
-      	persist: false
-      }
-      this._config = _.extend({}, this._config, _config);
-      
-      //Prepopulate OBJ
-      defaults = {};
-      
-      for(var attr in window[this._config.table].columns){
-        defaults[attr] = window[this._config.table].columns[attr].value;
-      }
-      
-      _.extend(defaults, attributes);
-      
-      this.set(defaults);
-      
-    },
-    
-    //
-    toJson : function() {
-      return _.clone(this.attributes);
-    },
-    
-    //
-    has : function(attr) {
-      return this.attributes[attr] != null;
-    },
-    
-    //
-    hasPropertiesWithValues : function(query) {
-      
-      size = _.size(query);
-      i = 0;
-
-      for (var key in query) {
-        if (!this.has(key)) continue;
-        if (this.get(key) != query[key]) continue;
-        i++;
-      }
-      
-      return i == size ? true : false;
-      
-    },
-    
-    //
-    set: function(attrs){
-      if (!attrs) return this;
-      
-			var now = this.attributes;
-			var can = _.keys(window[this._config.table].columns);
-
-      for (var attr in attrs) {
-        if (_.contains(can, attr) ) {
-          now[attr] = attrs[attr];
-        } else {
-          Jazz.Helper.showError('Cannot add ' + attr);
-        }
+
+Jazz.Model._config = {}
+
+Jazz.Model.create = function (settings, model, object) {
+  _.extend(this._config, settings);
+  _.extend(this, model);
+  
+  obj = {};
+  obj._config = {}
+  _.extend(obj._config, settings);
+  _.extend(obj, object);
+  
+
+  
+  var child = Jazz.Helper.inherits(this, obj);
+  child.extend = this.extend;
+  return child;
+}
+
+Jazz.Model.findBy = function (attributes) {
+  var objs = [];
+  _.each(
+    this._config.table.models,
+    function (model) {
+
+      var add = false;
+
+      for (var attribute in attributes) {
+        if (!model.has(attribute)) continue;
+        if (model.get(attribute) != attributes[attribute]) continue;
+        add = true;
       }
-      
-      return this;
-    },
-    
-    //
-    get: function(key){
-      if (!this.attributes) return this;
-      if (!key) return this.attributes;
-      return this.attributes[key];
-    },
-    
-    uid: function(){
-      return this._config.uid;
-    },
-    
-    //
-    remove: function(key){
-      if (!key) return this;
-      delete this.attributes[key];
-      return this;
-    },
-    
-    //
-    create: function(attributes){
-      this.validate.atCreate();
-      this.set(attributes);
-      window[this._config.table].add(this);
-    },
-    
-    update: function(attributes){
-      this.validate.atUpdate();
-      this.set(attributes);
-      window[this._config.table].add(this);
-    },
-    
-    validate: {
-      atCreate: function(){},
-      atUpdate: function(){},
+
+      if (add) objs.push(model);
+
     }
+  );
+  return objs
+}
+
+Jazz.Model.prototype.initialize = function (attributes) {
+  this.attributes = {};
+  this.uid = _.uniqueId();
+
 
+
+
+  //Prepopulate OBJ
+  defaults = {};
+
+  for (var attribute in this._config.table.columns) {
+    defaults[attribute] = this._config.table.columns[attribute].value;
+  }
+
+  _.extend(defaults, attributes);
+
+  this.set(defaults);
+
+}
+
+Jazz.Model.prototype.set = function (attributes) {
+  var can = _.keys(this._config.table.columns);
+
+  for (var attribute in attributes) {
+
+    if (_.contains(can, attribute)) {
+      this.attributes[attribute] = attributes[attribute];
+    }
   }
-);
+}
+
+Jazz.Model.prototype.get = function (key) {
+  if (!this.attributes) return this;
+  if (!key) return this.attributes;
+  return this.attributes[key];
+}
+
+Jazz.Model.prototype.has = function (attribute) {
+  return this.attributes[attribute] != null;
+}
+
+Jazz.Model.prototype.save = function () {
+  this._config.table.add(this);
+}

data/dist/jazz/lib/route.js

@@ -1,5 +1,6 @@
 Jazz.Route = { 
   routes: {},
+  
   initialize: function(){
     Jazz.Route.navigate();
     $(window).hashchange(

data/dist/jazz/main.js

@@ -1,6 +1,7 @@
 var Jazz = {
   _:{
-    requires:[
+    _app: "",
+    _files: [
       'vendor/jquery/jquery.js',
       'vendor/hashchange/jquery.ba-hashchange.js',
       'vendor/mustache/mustache.js',
@@ -12,65 +13,53 @@ var Jazz = {
       'lib/jazz/lib/view.js',
       'lib/jazz/lib/controller.js',
       'config/application.js',
-      'config/routes.js',
-      'config/glue.js'
+      'config/glue.js',
+      'config/routes.js'
     ]
   },
-  Helper:{
-    addOrderToRequires:function (collection, path) {
-      path = path ? path : '';
-      //Load order is importent so add it by default
-      for (file in collection) {
-        collection[file] = collection[file] != "" ? 'vendor/require/order!' + path + collection[file] : "";
+  
+  Helper: function(){},
+  Now: {},
+  initialize: function(){
+    this.load(
+      glue,
+      function(){
+        window[Jazz._._app].initialize();
+        Jazz.Route.initialize();
       }
-      return collection;
+    );
+  },
+  
+  load: function(path, callback){
+    
+    if (!path) return this;
+    
+    files = [];
+    
+    if (typeof path == "string")
+      files.push(path);
+    else
+      files = path;
+    
+    for (file in files) {
+      files[file] = 'vendor/require/order!' + files[file];
     }
+    
+    require(
+      {
+        baseUrl:""
+      },
+      files,
+      callback
+    );    
   },
-  Now:{},
-  Config:{}
+  
+  setup: function(name){
+    //Set Appname
+    this._._app = name;
+  }
 }
 
-
-require(
-  {
-    baseUrl:""
-  },
-  Jazz.Helper.addOrderToRequires(Jazz._.requires),
-  function () {
-    _.extend(
-      Jazz.Helper.getApp(),
-      {
-        _:{
-          requires:[]
-        }
-      }
-    );
-
-    _.each(
-      Glue,
-      function (val, key) {
-        var path;
-        switch (key) {
-          case "Db":
-            path = "db/"
-            break;
-          default:
-            path = "app/" + key + '/'
-            break;
-        }
-
-        Jazz.Helper.getApp()._.requires.push(Jazz.Helper.addOrderToRequires(val, path));
-      }
-    );
-
-    Jazz.Helper.getApp()._.requires = _.flatten(Jazz.Helper.getApp()._.requires);
-
-    require(
-      Jazz.Helper.getApp()._.requires,
-      function () {
-        eval(Jazz.Config.appName + '.initialize()');
-        Jazz.Route.initialize();
-      }
-    );
-  }
-);
+Jazz.load(Jazz._._files, function(){
+  Jazz.initialize();
+});

data/lib/jazz/app_detector.rb

@@ -36,6 +36,32 @@ module Jazz
       File.exists?('public')
     end
     
+    def generate_controller
+      template "templates/controller.js", "#{app_path}/app/controllers/#{name.downcase.pluralize}_controller.js"
+    end
+    
+    def generate_model
+      template "templates/model.js", "#{app_path}/app/models/#{name.downcase}.js"
+    end
+    
+    def generate_db
+      template "templates/db.js", "#{app_path}/db/create_#{name.downcase.pluralize}.js"
+    end
+    
+    def generate_views
+      empty_directory "#{app_path}/app/views/#{name.downcase.pluralize}"
+      template "templates/view_create.html", "#{app_path}/app/views/#{name.downcase.pluralize}/create.html"
+      template "templates/view_index.html", "#{app_path}/app/views/#{name.downcase.pluralize}/index.html"
+      template "templates/view_show.html", "#{app_path}/app/views/#{name.downcase.pluralize}/show.html"
+      template "templates/view_update.html", "#{app_path}/app/views/#{name.downcase.pluralize}/update.html"
+    end
+    
+    def generate_glue
+      @files = Dir.glob('db/*') + Dir.glob('app/models/*') + Dir.glob('app/controllers/*')
+		  puts @files
+      template "templates/glue.js", "#{app_path}/config/glue.js", {:force => true}
+    end
+    
   end
   
 end

data/lib/jazz/app_generator.rb

@@ -23,7 +23,7 @@ module Jazz
       directory 'dist/mustache', "#{new_app_path}/vendor/mustache"
       directory 'dist/require', "#{new_app_path}/vendor/require"
       directory 'dist/underscore', "#{new_app_path}/vendor/underscore"
-      
+
       template "templates/application.js", "#{new_app_path}/config/application.js"
       template "templates/index.html", "#{new_app_path}/index.html"
       

data/lib/jazz/cli.rb

@@ -1,6 +1,6 @@
 module Jazz
   class CLI < Thor
-    
+
     desc "Jazz generate [generator] [name]", "call a generator"
     def generate(requested_generator, name, *args)
       ARGV.delete('generate')

data/lib/jazz/controller_generator.rb

@@ -16,8 +16,15 @@ module Jazz
     end
   
     def build_the_controller
-      template "templates/controller.js", "#{app_path}/app/controllers/#{name.downcase}_controller.js"
-      empty_directory "#{app_path}/app/views/#{name.downcase}"
+      generate_controller
+    end
+    
+    def build_the_views
+      generate_views
+    end
+    
+    def build_the_glue
+      generate_glue
     end
   
     def farewell

data/lib/jazz/model_generator.rb

@@ -16,8 +16,8 @@ module Jazz
     end
   
     def build_the_model
-      template "templates/model.js", "#{app_path}/app/models/#{name.downcase}.js"
-      template "templates/db.js", "#{app_path}/db/create_#{name.downcase.pluralize}.js"
+      generate_model
+      generate_db
     end
   
     def farewell

data/lib/jazz/scaffold_generator.rb

@@ -21,19 +21,21 @@ module Jazz
     end
   
     def build_the_model
-      template "templates/model.js", "#{app_path}/app/models/#{name.downcase}.js"
-      template "templates/db.js", "#{app_path}/db/create_#{name.downcase.pluralize}.js"
+      generate_model
+      generate_db
     end
     
     def build_the_controller
-      template "templates/scaffold_controller.js", "#{app_path}/app/controllers/#{name.downcase.pluralize}_controller.js"
+      generate_controller
     end
     
-#    def build_the_views
-#      template "templates/scaffold_index.html", "#{public_path}/#{name.downcase.pluralize}.html"
-#      template "templates/scaffold_partial.html.mustache", "#{app_path}/app/views/#{name.downcase.pluralize}/_#{name.downcase}.html.mustache"
-#      template "templates/scaffold_edit.html.mustache", "#{app_path}/app/views/#{name.downcase.pluralize}/edit.html.mustache"
-#    end
+    def build_the_views
+      generate_views
+    end
+    
+    def build_the_glue
+      generate_glue
+    end
   
     def farewell
       $stdout.puts "Your scaffold is ready to rumble!"

data/lib/jazz.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'json'
 require 'thor'
 require 'thor/group'
 require 'active_support/inflector'

data/templates/application.js

@@ -1,4 +1,6 @@
-Jazz.Config.appName = '<%= name %>';
+Jazz.setup('<%= name %>');
+
 <%= name %> = {
-  initialize: function(){}
+  initialize: function(){
+  }
 }

data/templates/controller.js

@@ -1,4 +1,4 @@
-var <%= name.capitalize %>Controller = Jazz.Controller.create(
+var <%= name.capitalize.pluralize %>Controller = Jazz.Controller.create(
   {
   
     initialize: function(){},
@@ -16,4 +16,4 @@ var <%= name.capitalize %>Controller = Jazz.Controller.create(
   }
 );
 
-<%= name %>_controller = new <%= name.capitalize %>Controller;
+<%= name.downcase.pluralize -%>_controller = new <%= name.capitalize.pluralize -%>Controller;

data/templates/db.js

@@ -11,4 +11,4 @@ var Create<%= name.capitalize.pluralize %> = Jazz.Db.create(
   }
 );
 
-<%= name.pluralize %> = new Create<%= name.capitalize.pluralize %>;
+create_<%= name.downcase.pluralize %> = new Create<%= name.capitalize.pluralize %>;

data/templates/glue.js

@@ -0,0 +1,4 @@
+var glue = [
+  <% @files.each_with_index do |file, index| %>'<%= file %>'<% unless @files.length == index + 1 %>,
+  <% end %><% end %>
+]

data/templates/model.js

@@ -1,9 +1,16 @@
-var <%= name.capitalize %>Model = Jazz.Model.create(
-  {
-    _config: {
-      
-      table: '<%= name.pluralize %>'
-      
-    }
-  }
+var <%= name.singularize.capitalize %> = Jazz.Model.create(
+
+    //configuration
+    {
+      table: create_<%= name.downcase.pluralize %>
+    },
+
+    //modelActions
+   	{
+   	},
+
+   	//objectActions
+   	{
+   	}
+
 );

data/templates/scaffold_controller.js

@@ -1,5 +1,6 @@
-var <%= name.capitalize.pluralize -%>Controller = Jazz.Controller.create(
+var <%= name.capitalize.pluralize %>Controller = Jazz.Controller.create(
   {
+  
     initialize: function(){},
     
     index: function(){},
@@ -8,11 +9,11 @@ var <%= name.capitalize.pluralize -%>Controller = Jazz.Controller.create(
     
     create: function(){},
     
-    edit: function(){},
+    update: function(){},
     
-    destroy: function(){},
+    destroy: function(){}
     
   }
 );
 
-<%= name.pluralize -%>_controller = new <%= name.capitalize.pluralize -%>Controller;
+<%= name.downcase.pluralize -%>_controller = new <%= name.capitalize.pluralize -%>Controller;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jazz-jss
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Florian Schade
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 Z
+date: 2011-12-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -138,14 +138,18 @@ files:
 - lib/jazz/scaffold_generator.rb
 - templates/app_root/app/assets/javascripts/application.js
 - templates/app_root/app/assets/stylesheets/application.css
-- templates/app_root/config/glue.js
 - templates/app_root/config/routes.js
 - templates/application.js
 - templates/controller.js
 - templates/db.js
+- templates/glue.js
 - templates/index.html
 - templates/model.js
 - templates/scaffold_controller.js
+- templates/view_create.html
+- templates/view_index.html
+- templates/view_show.html
+- templates/view_update.html
 - LICENSE.txt
 - README.rdoc
 homepage: https://github.com/purpled/jazz

data/templates/app_root/config/glue.js

@@ -1,7 +0,0 @@
-var Glue = {
-  Db: [],
-  Helpers: [],
-  Models: [],
-  Views: [],
-  Controllers: []
-};