quick_script 0.0.50 → 0.0.51

data/lib/quick_script/assets/js/framework.js.coffee

@@ -363,9 +363,16 @@ class @Model
 			else
 				obj[prop] = @[prop]()
 		obj
+	toJSON : (flds)=>
+		JSON.stringify(@toJS(flds))
 	absorb : (model) =>
 		@reset()
 		@handleData(model.toJS())
+Model.includeCollection = (self)->
+	self.Collection = class extends Collection
+		init : ->
+			@adapter = self.adapter
+			@model = self
 
 class @FileModel extends @Model
 	extend : ->
@@ -390,11 +397,10 @@ class @FileModel extends @Model
 
 class @Collection
 	init : ->
-	constructor: (opts, parent) ->
+	constructor: (opts) ->
 		@opts = opts || {}
 		@events = {}
 		@_reqid = 0
-		@parent = parent
 		@scope = ko.observable(@opts.scope || [])
 		@items = ko.observableArray([])
 		@views = ko.observableArray([])
@@ -404,8 +410,8 @@ class @Collection
 		@limit = ko.observable(@opts.limit || 4)
 		@title = ko.observable(@opts.title || 'Collection')
 		@extra_params = ko.observable(@opts.extra_params || {})
-		@model = @opts.model
-		@adapter = new ModelAdapter()
+		@model = @opts.model || Model
+		@adapter = @opts.adapter || new ModelAdapter()
 		@template = ko.observable(@opts.template)
 		@model_state = ko.observable(0)
 		@is_ready = ko.dependentObservable ->
@@ -492,7 +498,6 @@ class @Collection
 		if !op? || op == Collection.REPLACE
 			@items(models)
 			@views(views)
-			console.log("Items loaded")
 		else if op == Collection.INSERT
 			@items(models.concat(@items()))
 			@views(views.concat(@views()))
@@ -508,17 +513,26 @@ class @Collection
 		@update()
 	hasItems : ->
 		@items().length > 0
+	addItem : (item)->
+		cls = @view_model()
+		@items.push(item)
+		@views.push(new cls("view-#{item.id()}", @view_owner(), item))
 	getItemById : (id)->
 		list = @items().filter ((item)=> item.id() == id)
 		ret = if list.length > 0 then list[0] else null
 	removeDuplicates : ->
 		ids = []
-		@items().forEach (item, idx, array)->
+		@items().forEach (item, idx, array)=>
 			if ids.includes(item.id())
 				@items.splice(idx, 1)
 				@views.splice(idx, 1)
 			else
 				ids.push(item.id())
+	removeIf : (callback)->
+		@items().forEach (item, idx, array)=>
+			if callback(item, idx)
+				@items.splice(idx, 1)
+				@views.splice(idx, 1)
 	getTemplate : ->
 		@template()
 	reset : ->
@@ -689,6 +703,7 @@ class @AppView extends @View
 		@handlePath(path)
 	handlePath : (path) ->
 	setUser : (data)->
+		console.log(data)
 		@current_user.handleData(data) if data != null
 	redirectTo : (path) ->
 		$.history.load(path)

data/lib/quick_script/assets/js/quick_script.js

@@ -1,4 +1,4 @@
-// QS_VERSION = 0.0.50;
+// QS_VERSION = 0.0.51;
 //= require ./jquery.min
 //= require ./jquery-ui.min
 //= require ./jquery.iframe-transport

data/lib/quick_script/version.rb

@@ -1,3 +1,3 @@
 module QuickScript
-  VERSION = "0.0.50"
+  VERSION = "0.0.51"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quick_script
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 121
   prerelease: 
   segments: 
   - 0
   - 0
-  - 50
-  version: 0.0.50
+  - 51
+  version: 0.0.51
 platform: ruby
 authors: 
 - Alan Graham
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-24 00:00:00 Z
+date: 2012-03-25 00:00:00 Z
 dependencies: []
 
 description: Framework for single-page web applications