quick_script 0.11.1 → 0.11.4

data/lib/quick_script/helpers.rb

@@ -1,7 +1,7 @@
 module QuickScript
 	module Helpers
-		def jsify model
-			raw (model ? model.to_api.to_json : 'null')
+		def jsify(model, opt=:full)
+			raw (model ? model.to_api(opt).to_json : 'null')
 		end
 
 		def jqtpl(name, &block)
@@ -20,7 +20,7 @@ module QuickScript
 
 				$(function() {
 					initKO();
-					CURRENT_USER = (#{jsify current_user});
+					CURRENT_USER = (#{jsify current_user, :me});
 					appViewModel = new #{app_model}();
 					initApp();
 					console.log('Initialized...');

data/lib/quick_script/version.rb

@@ -1,3 +1,3 @@
 module QuickScript
-  VERSION = "0.11.1"
+  VERSION = "0.11.4"
 end

data/vendor/assets/javascripts/quick_script/framework.js.coffee

@@ -351,7 +351,7 @@
 		if self[field]?
 			self[field].reset()
 		else
-			self[field] = new model({}, self)
+			self[field] = new model({}, self, {is_submodel : true})
 		self.fields.pushOnce(field) if typeof(field) == "string"
 
 	ko.intercepter = (observable, write_fn, self) ->
@@ -437,7 +437,7 @@ jQuery.ajax_qs = (opts)->
 class @Model
 	init : ->
 	extend : ->
-	constructor: (data, collection) ->
+	constructor: (data, collection, opts) ->
 		@fields = []
 		ko.addFields(['id'], '', this)
 		@events = {}
@@ -447,6 +447,8 @@ class @Model
 		@errors = ko.observable([])
 		@model_state = ko.observable(0)
 		@saveProgress = ko.observable(0)
+		if opts?
+			@is_submodel = opts.is_submodel
 		@extend()
 		@init()
 		@is_ready = ko.dependentObservable ->
@@ -990,31 +992,31 @@ class @AccountAdapter
 			@[prop] = val
 	login : (username, password, opts)->
 		opts.data = {} unless opts.data?
-		opts.url = @host + @login_url
+		opts.url = @login_url
 		opts.data[@login_key] = username
 		opts.data[@password_key] = password
 		@send opts
 	logout : (opts)->
 		opts.data = {}
-		opts.url = @host + @logout_url
+		opts.url = @logout_url
 		@send opts
 	register : (data_opts, opts)->
 		opts.data = data_opts
-		opts.url = @host + @register_url
+		opts.url = @register_url
 		@send opts
 	sendInviteCode : (code, opts)->
 		opts.data = {code : code}
-		opts.url = @host + @enter_code_url
+		opts.url = @enter_code_url
 		@send opts
 	save : (data_opts, opts) ->
 		opts.data = data_opts
-		opts.url = @host + @save_url
+		opts.url = @save_url
 		@send opts
 	load : (opts) ->
 		opts ||= {}
 		$.ajax_qs
 			type : 'POST'
-			url : @host + @load_url
+			url : @load_url
 			data : opts.data
 			progress : opts.progress
 			success : opts.success
@@ -1022,11 +1024,11 @@ class @AccountAdapter
 	resetPassword : (login, opts)->
 		opts.data = {}
 		opts.data[@login_key] = login
-		opts.url = @host + @reset_url
+		opts.url = @reset_url
 		@send opts
 	activate: (token, opts)->
 		opts.data = {token : token}
-		opts.url = @host + @activate_url
+		opts.url = @activate_url
 		@send opts
 	send : (opts)->
 		ModelAdapter.send(@host, opts)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 11
-  - 1
-  version: 0.11.1
+  - 4
+  version: 0.11.4
 platform: ruby
 authors: 
 - Alan Graham
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-21 00:00:00 -04:00
+date: 2012-10-25 00:00:00 -04:00
 default_executable: 
 dependencies: []