Added clone command

Rodrigo Alvarez committed Jan 25, 2013

commit e87208a666f4987bb16035f39b244311d20c9c9f

Showing 10 changed files with 417 additions and 350 deletions

Rakefile +6 -2

@@	@@ -8,12 +8,16 @@ namespace :development do
	c.cassette_library_dir = File.expand_path(File.dirname(__FILE__) + '/spec/integration/cassettes')
	c.hook_into :webmock # or :fakeweb
	c.allow_http_connections_when_no_cassette = true
+	# c.ignore_request do \|request\|
+	# URI(request.uri).path =~ /translations/
+	# end
	end

+	FileUtils.rm_rf(File.join(File.dirname(__FILE__), 'site'))
	VCR.use_cassette('pull') do
-	Locomotive::Builder.pull("site", "http://locomotive.engine.dev:3000", "admin@locomotivecms.com", "locomotive")
+	exit unless Locomotive::Builder.clone("site", {"host" => "http://locomotive.engine.dev:3000"}, "email" => "admin@locomotivecms.com", "password" => "locomotive")
	end

-	Locomotive::Builder.push("site", {"host" => "http://locomotive.engine.dev:3000"}, "email" => "admin@locomotivecms.com", "password" => "locomotive", "force" => true)
+	Locomotive::Builder.push("site", {"host" => "http://locomotive.engine.dev:3000"}, "email" => "admin@locomotivecms.com", "password" => "locomotive", "force" => true, "data" => true)
	end
	end

locomotive/builder.rb b/lib/locomotive/builder.rb +21 -0

@@	@@ -99,6 +99,27 @@ module Locomotive
	rescue Exception => e
	puts e.backtrace
	end
+
+	def self.clone(path, connection_info, options = {})
+	if File.exists?(path)
+	puts "Path already exists. If it's an existing site, you might want to pull instead of clone."
+	return false
+	end
+	require 'locomotive/mounter'
+
+	connection_info['uri'] = "#{connection_info.delete('host')}/locomotive/api"
+
+	_options = options.dup
+	_options[:only] = _options.delete(:resources)
+
+	reader = Locomotive::Mounter::Reader::Api.instance
+	reader.run!(_options.merge(connection_info))
+
+	writer = Locomotive::Mounter::Writer::FileSystem.instance
+	writer.run!(mounting_point: reader.mounting_point, target_path: path)
+	# rescue Exception => e
+	# puts e.backtrace
+	end

	# Destroy a remote site
	#

locomotive/builder/liquid.rb b/lib/locomotive/builder/liquid.rb +3 -1

@@	@@ -1,3 +1,4 @@
+	require "locomotive/mounter"
	require 'liquid'
	require 'locomotive/builder/liquid/drops/base'

@@	@@ -5,6 +6,7 @@ require 'locomotive/builder/liquid/drops/base'
	Dir[File.join(File.dirname(__FILE__), 'liquid', dir, '*.rb')].each { \|lib\| require lib }
	end

+
	# add to_liquid methods to main models from the mounter
	%w{site page content_entry}.each do \|name\|
	klass = "Locomotive::Mounter::Models::#{name.classify}".constantize
@@	@@ -14,4 +16,4 @@ end
	::Locomotive::Builder::Liquid::Drops::#{name.classify}.new(self)
	end
	EOV
-	end
	\ No newline at end of file
+	end

locomotive/builder/liquid/filters/translate.rb b/lib/locomotive/builder/liquid/filters/translate.rb +18 -0

@@	@@ -0,0 +1,18 @@
+	module Locomotive
+	module Builder
+	module Liquid
+	module Filters
+	module Translate
+	def translate(key)
+	require 'pp'
+	pp @context[:mounting_point].translations.inspect.force_encoding('UTF-8')
+	"test"
+	end
+	end
+
+	::Liquid::Template.register_filter(Translate)
+
+	end
+	end
+	end
+	end
	\ No newline at end of file

spec/integration/cassettes/pull.yml +144 -137

@@	@@ -19,32 +19,32 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"95752f9e2614ece1b15c07f3d8620bfe"'
+	- ! '"e29ee4caaed0880055c032e8a8586878"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- af1c1dab0e78d0f30bc76fb257ee9df6
+	- 59f2d2115fdeb2d7c49b02418d27eae4
	X-Runtime:
-	- '0.010678'
+	- '0.013383'
	Content-Length:
	- '32'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:03 GMT
+	- Thu, 24 Jan 2013 10:44:23 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTBlMTk1Mjk0ZGRhZWJhYTFkZWE4OTg0ZjIxNmFkNTlhBjsAVEkiCmZsYXNoBjsARm86JUFjdGlvbkRpc3BhdGNoOjpGbGFzaDo6Rmxhc2hIYXNoCToKQHVzZWRvOghTZXQGOgpAaGFzaHsAOgxAY2xvc2VkRjoNQGZsYXNoZXN7BjoLbm90aWNlSUM6HkFjdGl2ZVN1cHBvcnQ6OlNhZmVCdWZmZXIiI0hhc2ggd2FzIHN1Y2Nlc3NmdWxseSBjcmVhdGVkLgc7AFQ6D0BodG1sX3NhZmVUOglAbm93MA%3D%3D--790e90c18ed5db346ed310dec48231f4b2e2f3ad;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWNmNzczNTRhZjYzNWI0YjI4MDE0NjM0YTYzOTEzMTg1BjsAVEkiCmZsYXNoBjsARm86JUFjdGlvbkRpc3BhdGNoOjpGbGFzaDo6Rmxhc2hIYXNoCToKQHVzZWRvOghTZXQGOgpAaGFzaHsAOgxAY2xvc2VkRjoNQGZsYXNoZXN7BjoLbm90aWNlSUM6HkFjdGl2ZVN1cHBvcnQ6OlNhZmVCdWZmZXIiI0hhc2ggd2FzIHN1Y2Nlc3NmdWxseSBjcmVhdGVkLgc7AFQ6D0BodG1sX3NhZmVUOglAbm93MA%3D%3D--caf0dc8a7bcb6597e57a691cd94ffb4436ac1388;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"token":"syqtyQLXyex7st35PNUM"}'
+	string: ! '{"token":"jKkxPorzWo8uNYUxiiQC"}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:03 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:23 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/current_site.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/current_site.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -59,32 +59,32 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"03ea30ec3425b98d8fb719986ccd1258"'
+	- ! '"116f03a67f2d85f59d9496bc0fd26224"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- ff3c8c0041dcb1be99002ac5f34ac3d8
+	- faf1e65df83529834e55bf98fa2bb4f5
	X-Runtime:
-	- '0.011627'
+	- '0.018925'
	Content-Length:
-	- '678'
+	- '562'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:03 GMT
+	- Thu, 24 Jan 2013 10:44:23 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTBlMTU5YjlmNDIxY2E1NmViNjNkNDBhYjM4YWZiZGM0BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--6210b43d6fc08e313bf44098482b87b2aeaf25f4;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTk4ZjhhYThkMjI1M2Q1YTg4YjFjZWUwM2JmODEwYWU1BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--7d724604c6d9d346bc05f19ae86b8aee2c0cd574;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fd84c82cd14f39000005","_id":"50f3fd84c82cd14f39000005","created_at":"2013-01-14T13:43:48+01:00","updated_at":"2013-01-14T13:44:58+01:00","name":"locomotive","locales":["en","es"],"domain_name":"engine.dev","subdomain":"locomotive","domains":["locomotive.engine.dev"],"robots_txt":null,"seo_title":null,"meta_keywords":null,"meta_description":null,"domains_without_subdomain":[],"memberships":[{"id":"50f3fd84c82cd14f39000006","_id":"50f3fd84c82cd14f39000006","created_at":null,"updated_at":null,"account_id":"50f3fd7dc82cd14f39000003","name":"Admin","email":"admin@locomotivecms.com","role":"admin","role_name":"Administrator","can_update":false,"grant_admin":true}]}'
+	string: ! '{"id":"51010fd2c82cd17179000001","_id":"51010fd2c82cd17179000001","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T11:43:08+01:00","name":"locomotive","locales":["en","es"],"subdomain":"locomotive","domains":["locomotive.engine.dev"],"domains_without_subdomain":[],"domain_name":"engine.dev","memberships":[{"id":"51010fd2c82cd17179000005","_id":"51010fd2c82cd17179000005","role":"admin","role_name":"Administrator","can_update":false,"grant_admin":true,"account_id":"51010fd2c82cd17179000004","name":"Admin","email":"admin@locomotivecms.com"}]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:03 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:23 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/current_site.json?auth_token=syqtyQLXyex7st35PNUM&locale=es
+	uri: http://locomotive.engine.dev:3000/locomotive/api/current_site.json?auth_token=jKkxPorzWo8uNYUxiiQC&locale=es
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -99,32 +99,32 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"555f421ce670f7af13d0f716a66bd624"'
+	- ! '"290f92414519318b73a02cf9bd36344d"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 1dbfa2002a085570b72a24ae4d708a40
+	- 08614ed46539674ed8c2016ea4fdcf0c
	X-Runtime:
-	- '0.011192'
+	- '0.017585'
	Content-Length:
-	- '678'
+	- '562'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:23 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTFmYjlhYTIxOTRkNjljOTVkZWM0NmIzZWVhMDY0NjAyBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--36a8faef291541e80ffd65ac1db1a16946012e5d;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTBlNzZhZjYzZjFjMTk3MzcwNzQ2MDFmMmVlZWY2OWQ1BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--9bf1249cfa3e46432f1c7dd3e8a2594b03bdaf9a;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fd84c82cd14f39000005","_id":"50f3fd84c82cd14f39000005","created_at":"2013-01-14T13:43:48+01:00","updated_at":"2013-01-14T13:44:58+01:00","name":"locomotive","locales":["en","es"],"domain_name":"engine.dev","subdomain":"locomotive","domains":["locomotive.engine.dev"],"robots_txt":null,"seo_title":null,"meta_keywords":null,"meta_description":null,"domains_without_subdomain":[],"memberships":[{"id":"50f3fd84c82cd14f39000006","_id":"50f3fd84c82cd14f39000006","created_at":null,"updated_at":null,"account_id":"50f3fd7dc82cd14f39000003","name":"Admin","email":"admin@locomotivecms.com","role":"admin","role_name":"Administrador","can_update":false,"grant_admin":true}]}'
+	string: ! '{"id":"51010fd2c82cd17179000001","_id":"51010fd2c82cd17179000001","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T11:43:08+01:00","name":"locomotive","locales":["en","es"],"subdomain":"locomotive","domains":["locomotive.engine.dev"],"domains_without_subdomain":[],"domain_name":"engine.dev","memberships":[{"id":"51010fd2c82cd17179000005","_id":"51010fd2c82cd17179000005","role":"admin","role_name":"Administrador","can_update":false,"grant_admin":true,"account_id":"51010fd2c82cd17179000004","name":"Admin","email":"admin@locomotivecms.com"}]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:23 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/snippets.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/content_assets.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -143,28 +143,28 @@ http_interactions:
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 8c87e6f26ddcb60af7c4c3c3c669ddd7
+	- a50fd6835cceb48a63a17a91bad6a420
	X-Runtime:
-	- '0.015114'
+	- '0.021747'
	Content-Length:
	- '2'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:23 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTczMGMyODliYzdmMDBkZmEwZGQ0NGZiMzQ4Zjk2MDNhBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--cec7bc37bb49ed291b6f6f7d7ba6045d13633fc9;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTllNGJlZWRkZjc5YTVlNjE0OWJlZTBiOGEyYzQ1YmJlBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--f810b26e5dc1a0555d604fa40848d116eddab440;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
	string: ! '[]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:23 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/snippets.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -179,33 +179,32 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"1f58e2a5247c307cd0466f755ea2540a"'
+	- ! '"d751713988987e9331980363e24189ce"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 28eb4723a41d5d13eee33c0509b6af60
+	- 4852e41984215bb29e898dd321ddeea8
	X-Runtime:
-	- '0.018117'
+	- '0.020064'
	Content-Length:
-	- '1056'
+	- '2'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:23 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWI1MDBmNDU0MjU1NmU5NGRlODgwZmEwN2E0MTgyNTI0BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--37b6dcbebb1f69dd0a644703150cb8af0cc70383;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTI4OWY1ZTBmMjc2NGZiZTc5NDNiYzQ3MDM2MjFlMWM3BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--25fd219d6f35dda262d9a3201096a073b1f1cd8d;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '[{"id":"50f40738c82cd14f39000019","_id":"50f40738c82cd14f39000019","created_at":"2013-01-14T14:25:12+01:00","updated_at":"2013-01-15T09:41:12+01:00","name":"Products","description":"My
-	products collection","slug":"products","order_by":"created_at","order_direction":"asc","label_field_name":"name","group_by_field_id":null,"public_submission_accounts":null,"entries_custom_fields":[{"_id":"50f40738c82cd14f3900001a","class_name":null,"created_at":null,"hint":null,"inverse_of":null,"label":"name","localized":true,"name":"name","order_by":null,"position":0,"required":true,"text_formatting":"html","type":"string","ui_enabled":true,"updated_at":null,"id":"50f40738c82cd14f3900001a"},{"_id":"50f40738c82cd14f3900001b","class_name":null,"created_at":null,"hint":null,"inverse_of":null,"label":"available","localized":false,"name":"available","order_by":null,"position":1,"required":false,"text_formatting":"html","type":"boolean","ui_enabled":true,"updated_at":null,"id":"50f40738c82cd14f3900001b"}],"klass_name":"Locomotive::Entry50f40738c82cd14f39000019"}]'
+	string: ! '[]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:23 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types/products/entries.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -220,33 +219,33 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"f1104a72d68f473b940476311a5b7695"'
+	- ! '"821b57c9b4131678fd1b597e87252e96"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- aa442e0d501fcc914fac786305b37697
+	- d4a9e750a0aed593d6e7478176d873b5
	X-Runtime:
-	- '0.014677'
+	- '0.120591'
	Content-Length:
-	- '522'
+	- '761'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:23 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWE4ZWNhODYyZDUxNGEzMDhjZjdlNTdkN2Y4ZmVhODM1BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--d43317540464854fbe65c3e247f6aa7597d427c3;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTMwMGIzZjY3YmU3ZTZjMDAwZDM2MjU2N2ExOGVmMmM0BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--5875fe0fbbabbfdfcc6ae1da4cb0bf05e8d1f645;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '[{"id":"50f511fac82cd14f39000025","_id":"50f511fac82cd14f39000025","created_at":"2013-01-15T09:23:22+01:00","updated_at":"2013-01-15T09:23:22+01:00","name":"Useless
-	stuff","available":true,"_label":"Useless stuff","_slug":"useless-stuff","_position":1,"content_type_slug":"products","select_custom_fields":[],"file_custom_fields":[],"has_many_custom_fields":[],"many_to_many_custom_fields":[],"translated_in":["en"],"safe_attributes":["name","available","_slug","seo_title","meta_keywords","meta_description","_destroy"]}]'
+	string: ! '[{"id":"5101101bc82cd12530000013","_id":"5101101bc82cd12530000013","created_at":"2013-01-24T11:42:35+01:00","updated_at":"2013-01-24T11:42:35+01:00","name":"Products","slug":"products","entries_custom_fields":[{"id":"5101101bc82cd12530000014","_id":"5101101bc82cd12530000014","name":"name","label":"name","type":"string","required":true,"localized":true,"position":0},{"id":"5101101bc82cd12530000015","_id":"5101101bc82cd12530000015","name":"available","label":"available","type":"boolean","required":false,"localized":false,"position":1}],"description":"My
+	products collection","label_field_name":"name","order_by":"created_at","order_direction":"asc","order_by_field_name":"created_at","public_submission_enabled":false,"public_submission_account_emails":[]}]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:23 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types/products/entries/50f511fac82cd14f39000025.json?auth_token=syqtyQLXyex7st35PNUM&locale=en
+	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types/products/entries.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -257,37 +256,38 @@ http_interactions:
	message: ! 'OK '
	headers:
	Content-Type:
-	- application/json; charset=utf-8
+	- text/html; charset=utf-8
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"81d5c739a1b20bb5a80fccda8805c9e3"'
+	- ! '"75b1ac8a95d518ac69b5f02f6dc4d132"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 43591838398b0c47e471085ea877dd15
+	- 9d6ff0a86f4b780eb26dc19d3d95b86c
	X-Runtime:
-	- '0.014013'
+	- '0.027776'
	Content-Length:
-	- '520'
+	- '307'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:23 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWRlOWY0MzZmMGYwZmNiYjE5MDUyMzJjNjgzYjM2YTYyBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--64c92093b4f2a83f1753dd308862d4f35a9abdd6;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWI5OWVkZTkwNmQzNzgzZTc2OThjYzZhOThlZmM2ZTg4BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--7ff0b67b71c9435b72a4699277635b6206e7c16a;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f511fac82cd14f39000025","_id":"50f511fac82cd14f39000025","created_at":"2013-01-15T09:23:22+01:00","updated_at":"2013-01-15T09:23:22+01:00","name":"Useless
-	stuff","available":true,"_label":"Useless stuff","_slug":"useless-stuff","_position":1,"content_type_slug":"products","select_custom_fields":[],"file_custom_fields":[],"has_many_custom_fields":[],"many_to_many_custom_fields":[],"translated_in":["en"],"safe_attributes":["name","available","_slug","seo_title","meta_keywords","meta_description","_destroy"]}'
+	string: ! '[{"id":"5101101bc82cd12530000016","_id":"5101101bc82cd12530000016","created_at":"2013-01-24T11:42:35+01:00","updated_at":"2013-01-24T11:43:08+01:00","_label":"Useless
+	stuff","_slug":"useless-stuff","_position":0,"content_type_slug":"products","translated_in":["en"],"name":"Useless
+	stuff","available":true}]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:23 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/content_assets.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types/products/entries/5101101bc82cd12530000016.json?auth_token=jKkxPorzWo8uNYUxiiQC&locale=en
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -298,36 +298,38 @@ http_interactions:
	message: ! 'OK '
	headers:
	Content-Type:
-	- application/json; charset=utf-8
+	- text/html; charset=utf-8
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"d751713988987e9331980363e24189ce"'
+	- ! '"f2a0d516ed3a703c2e3e670fefef2216"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- cced956b911ac901b6c75e73fd068673
+	- 8cf2616e66c2a234c63c2f4de3cc7928
	X-Runtime:
-	- '0.014399'
+	- '0.029427'
	Content-Length:
-	- '2'
+	- '305'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:24 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTE3ZjU2NTdkN2QyNDA4NGYwNzE0NmM0ZmJiYjRkOWIxBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--9e7122583b1ab0f7fbf59d01449b5fe2bda537a5;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWMwZWQxZWIzNDZkZDQ1N2I5YTkyMmRkODNmZWU5OTJjBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--9dba89ed5da9cdae1e6de95b0afcd39e18b8479f;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '[]'
+	string: ! '{"id":"5101101bc82cd12530000016","_id":"5101101bc82cd12530000016","created_at":"2013-01-24T11:42:35+01:00","updated_at":"2013-01-24T11:43:08+01:00","_label":"Useless
+	stuff","_slug":"useless-stuff","_position":0,"content_type_slug":"products","translated_in":["en"],"name":"Useless
+	stuff","available":true}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:24 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -342,40 +344,44 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"ef568388ca833405fa7f1285fbafa848"'
+	- ! '"a92c6f0783ec1d04ebed1da8c968c8da"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- af0cd0aab5ee31531dc062adad15459a
+	- 2f74ac0edd40d5b3fedab213731db59e
	X-Runtime:
-	- '0.019224'
+	- '0.026828'
	Content-Length:
-	- '3185'
+	- '3338'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:24 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTc5YWNjYTJiYzA3MmE2YjVmZGRkNjI3MDFjNDZmMmMzBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--cf259043e934a361c18e4df343e8adda3e62b024;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWI1ZTllZjNmMjIzMzg4OGI2OWUyZWYzN2EzMjQzOWE0BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--e5aaa1fa9fa5db7b16428b3f23aa6bab71c24295;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '[{"id":"50f3fd84c82cd14f39000007","_id":"50f3fd84c82cd14f39000007","created_at":"2013-01-14T13:43:49+01:00","updated_at":"2013-01-15T09:42:16+01:00","title":"Home
-	page","slug":"index","fullpath":"index","handle":null,"position":0,"raw_template":"{%
-	block content %}\r\n Content of the home page\r\n{% endblock %}\r\n\r\n","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"","es":"es"},"translated_in":["en","es"]},{"id":"50f3fdc4c82cd14f39000012","_id":"50f3fdc4c82cd14f39000012","created_at":"2013-01-14T13:44:52+01:00","updated_at":"2013-01-15T09:41:13+01:00","title":"translated","slug":"translated","fullpath":"translated","handle":null,"position":0,"raw_template":"{{
-	''hello_world'' \| translate}}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"translated","es":"es/translated"},"translated_in":["en","es"]},{"id":"50f51298c82cd14f39000033","_id":"50f51298c82cd14f39000033","created_at":"2013-01-15T09:26:00+01:00","updated_at":"2013-01-15T09:44:43+01:00","title":"Latest","slug":"latest","fullpath":"products/latest","handle":null,"position":0,"raw_template":"{%
+	string: ! '[{"id":"51010fd2c82cd17179000002","_id":"51010fd2c82cd17179000002","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T11:43:08+01:00","title":"Home
+	page","slug":"index","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"index","localized_fullpaths":{"en":"","es":"es"},"depth":0,"translated_in":["en","es"],"raw_template":"{%
+	block content %}\r\n Content of the home page\r\n{% endblock %}\r\n\r\n","escaped_raw_template":"{%
+	block content %}\r\n Content of the home page\r\n{% endblock %}\r\n\r\n","editable_elements":[]},{"id":"5101101cc82cd12530000017","_id":"5101101cc82cd12530000017","created_at":"2013-01-24T11:42:36+01:00","updated_at":"2013-01-24T11:43:08+01:00","title":"translated","slug":"translated","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"translated","localized_fullpaths":{"en":"translated","es":"es/translated"},"depth":1,"translated_in":["en"],"raw_template":"{{
+	''hello_world'' \| translate}}","escaped_raw_template":"{{ 'hello_world'
+	\| translate}}","editable_elements":[]},{"id":"5101101cc82cd12530000019","_id":"5101101cc82cd12530000019","created_at":"2013-01-24T11:42:36+01:00","updated_at":"2013-01-24T11:43:08+01:00","title":"Latest","slug":"latest","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"products/latest","localized_fullpaths":{"en":"products/latest","es":"es/products/latest"},"depth":2,"translated_in":["en"],"raw_template":"{%
	extends parent %}\r\n{% block content %}\r\n The name of the latest product
-	is: {{ contents.products.last.name }}\r\n{% endblock %}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"products/latest","es":"es/products/latest"},"translated_in":["en"]},{"id":"50f3fd85c82cd14f39000008","_id":"50f3fd85c82cd14f39000008","created_at":"2013-01-14T13:43:49+01:00","updated_at":"2013-01-15T09:41:12+01:00","title":"Page
-	not found","slug":"404","fullpath":"404","handle":null,"position":1,"raw_template":"Content
-	of the 404 page","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"404","es":"es/404"},"translated_in":["en","es"]},{"id":"50f51224c82cd14f3900002d","_id":"50f51224c82cd14f3900002d","created_at":"2013-01-15T09:24:04+01:00","updated_at":"2013-01-15T09:42:16+01:00","title":"Products","slug":"products","fullpath":"products","handle":null,"position":1,"raw_template":"{%
-	extends parent %}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"products","es":"es/products"},"translated_in":["en"]}]'
+	is: {{ contents.products.last.name }}\r\n{% endblock %}","escaped_raw_template":"{%
+	extends parent %}\r\n{% block content %}\r\n The name of the latest product
+	is: {{ contents.products.last.name }}\r\n{% endblock %}","editable_elements":[]},{"id":"51010fd2c82cd17179000003","_id":"51010fd2c82cd17179000003","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T11:43:08+01:00","title":"Page
+	not found","slug":"404","position":1,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"404","localized_fullpaths":{"en":"404","es":"es/404"},"depth":0,"translated_in":["en","es"],"raw_template":"Content
+	of the 404 page","escaped_raw_template":"Content of the 404 page","editable_elements":[]},{"id":"5101101cc82cd12530000018","_id":"5101101cc82cd12530000018","created_at":"2013-01-24T11:42:36+01:00","updated_at":"2013-01-24T11:43:08+01:00","title":"Products","slug":"products","position":1,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"products","localized_fullpaths":{"en":"products","es":"es/products"},"depth":1,"translated_in":["en"],"raw_template":"{%
+	extends parent %}","escaped_raw_template":"{% extends parent %}","editable_elements":[]}]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:24 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f3fd84c82cd14f39000007.json?auth_token=syqtyQLXyex7st35PNUM&locale=es
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/51010fd2c82cd17179000002.json?auth_token=jKkxPorzWo8uNYUxiiQC&locale=es
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -390,34 +396,35 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"248b4e13f13df0d8cb0ba9e505bab68d"'
+	- ! '"6ddd24909444a1ff7d0e9b9da8b6cff3"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- b19b86d610ad344c89809a06d2457156
+	- 365c77e4a1f178cac260a68e5a8937bb
	X-Runtime:
-	- '0.015275'
+	- '0.017366'
	Content-Length:
-	- '605'
+	- '610'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:24 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWEzMzM2MzEzMjE1NmEyNjk2OGJlNDRjNTI4NzRlMzBmBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--e9e5ddada586dc07c59afc7f496c09f80df666b9;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWYwNTU5OTllYmQ4ZDY1ODBiMGIxN2FkZWU4ZTg4YWJhBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--1c3c7c2a9738456face697b3aa05b50b4eb4cefd;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fd84c82cd14f39000007","_id":"50f3fd84c82cd14f39000007","created_at":"2013-01-14T13:43:49+01:00","updated_at":"2013-01-15T09:42:16+01:00","title":"P\u00e1gina
-	de inicio","slug":"index","fullpath":"index","handle":null,"position":0,"raw_template":"New
-	content of the home page\r\n","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"","es":"es"},"translated_in":["en","es"]}'
+	string: ! '{"id":"51010fd2c82cd17179000002","_id":"51010fd2c82cd17179000002","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T11:43:08+01:00","title":"P\u00e1gina
+	de inicio","slug":"index","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"index","localized_fullpaths":{"en":"","es":"es"},"depth":0,"translated_in":["en","es"],"raw_template":"New
+	content of the home page\r\n","escaped_raw_template":"New content of the home
+	page\r\n","editable_elements":[]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:24 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f3fdc4c82cd14f39000012.json?auth_token=syqtyQLXyex7st35PNUM&locale=es
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/51010fd2c82cd17179000003.json?auth_token=jKkxPorzWo8uNYUxiiQC&locale=es
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -432,33 +439,34 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"6ba41ad216ef3019402b6d39604d0937"'
+	- ! '"e772ebb150342a9c4fce4582b1664b9c"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- ea43fdf430ea81e04f13108e736ab6f5
+	- 3ab28f6a798829f5fa0f31f25dcc72e3
	X-Runtime:
-	- '0.014532'
+	- '0.013809'
	Content-Length:
-	- '645'
+	- '599'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:24 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWUyYzM1NmNmMGVmN2RhMTYwNzBmNTA1ODI1YjhmMmYwBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--4d126d46b6550ed2f22c63a8ab12ba8499c75315;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTJlYjM0NGE0YzM2ODVjZDdiMThlYzJiNDBlNTM3ZDQwBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--cb43e5b364719ff1586edceaafc3f6322923508b;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fdc4c82cd14f39000012","_id":"50f3fdc4c82cd14f39000012","created_at":"2013-01-14T13:44:52+01:00","updated_at":"2013-01-15T09:41:13+01:00","title":"translated","slug":"translated","fullpath":"translated","handle":null,"position":0,"raw_template":"{{
-	''hello_world'' \| translate}} {% locale_switcher %}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"translated","es":"es/translated"},"translated_in":["en","es"]}'
+	string: ! '{"id":"51010fd2c82cd17179000003","_id":"51010fd2c82cd17179000003","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T11:43:08+01:00","title":"P\u00e1gina
+	no encontrada","slug":"404","position":1,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"404","localized_fullpaths":{"en":"404","es":"es/404"},"depth":0,"translated_in":["en","es"],"raw_template":"Content
+	of the 404 page","escaped_raw_template":"Content of the 404 page","editable_elements":[]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:24 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f3fd85c82cd14f39000008.json?auth_token=syqtyQLXyex7st35PNUM&locale=es
+	uri: http://locomotive.engine.dev:3000/locomotive/api/theme_assets.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -473,34 +481,32 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"581a8e3c5b24d0e13012f9de3f8831ad"'
+	- ! '"d751713988987e9331980363e24189ce"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 7baa30ecabae48081621799ce552836f
+	- 90979a04c25ef0950a376b4cd7915b42
	X-Runtime:
-	- '0.014888'
+	- '0.013095'
	Content-Length:
-	- '603'
+	- '2'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:24 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWNlYmM0MTYyY2RlZDI2NTAyYWMwYjE1NDI3ZjUyYzc4BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--3964bdc155f7e1b00fe72bc787d7c1d49b5d456c;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTRmNTYyNDIyMWUzMDQ0OTg1Zjc5Y2IxZDQ5NjljMTAxBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--e3a529fa27bc63f05973cbe983ac2b5d4ca32166;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fd85c82cd14f39000008","_id":"50f3fd85c82cd14f39000008","created_at":"2013-01-14T13:43:49+01:00","updated_at":"2013-01-15T09:41:12+01:00","title":"P\u00e1gina
-	no encontrada","slug":"404","fullpath":"404","handle":null,"position":1,"raw_template":"Content
-	of the 404 page","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"404","es":"es/404"},"translated_in":["en","es"]}'
+	string: ! '[]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:24 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/theme_assets.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/translations.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -515,32 +521,33 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"d751713988987e9331980363e24189ce"'
+	- ! '"af6cd1eda244013c9eb7c76fbc7b662b"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- c765e7c95e85f8691a7044b7a0aa6574
+	- 826844351d15ef7891c7861567f8fa06
	X-Runtime:
-	- '0.014081'
+	- '0.013776'
	Content-Length:
-	- '2'
+	- '227'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:04 GMT
+	- Thu, 24 Jan 2013 10:44:24 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTRiNmJiNGM4NDhmY2M5Yzk0OTIyODljZTJlMmNlYTVjBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--c90fdc2ed009a248814c16b02c2c7d271fb03942;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTFkOGQ2OTBlMDYyZWZhMGMzYmQxNWIzNDFjZTY4ZThkBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--c7706b477d3fd1807a43add5b3aa6c5001c3de0f;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '[]'
+	string: ! '[{"id":"51011077c82cd1253000001d","_id":"51011077c82cd1253000001d","created_at":"2013-01-24T11:44:07+01:00","updated_at":"2013-01-24T11:44:07+01:00","key":"hello_world","values":{"en":"Hello
+	world!","es":"\u00a1Hola, Mundo!"}}]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:04 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:24 GMT
	- request:
	method: post
-	uri: http://locomotive.engine.dev:3000/locomotive/api/tokens.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/tokens.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: email=admin%40locomotivecms.com&password=locomotive
@@	@@ -557,27 +564,27 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"95752f9e2614ece1b15c07f3d8620bfe"'
+	- ! '"e29ee4caaed0880055c032e8a8586878"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- ba79ded161505417ee73b6bde818acba
+	- b0e8a4050aabd192afbd5e7be627b8e9
	X-Runtime:
-	- '0.011182'
+	- '0.018633'
	Content-Length:
	- '32'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:45:08 GMT
+	- Thu, 24 Jan 2013 10:44:51 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJWI0ZWVmNzRiMjkyN2Y4ZWJhMGRkY2ZmMmM3YjQ2OTFhBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFRJIgpmbGFzaAY7AEZvOiVBY3Rpb25EaXNwYXRjaDo6Rmxhc2g6OkZsYXNoSGFzaAk6CkB1c2VkbzoIU2V0BjoKQGhhc2h7ADoMQGNsb3NlZEY6DUBmbGFzaGVzewY6C25vdGljZUlDOh5BY3RpdmVTdXBwb3J0OjpTYWZlQnVmZmVyIiNIYXNoIHdhcyBzdWNjZXNzZnVsbHkgY3JlYXRlZC4HOwBUOg9AaHRtbF9zYWZlVDoJQG5vdzA%3D--8782481ebd3d2427311732eb1e326519d611ea75;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJTQyZGMxZjM0ODIxM2Y3ZTc5ZjRlMjMxNTYzOTlhOTFlBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewA6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOgtub3RpY2VJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIjSGFzaCB3YXMgc3VjY2Vzc2Z1bGx5IGNyZWF0ZWQuBzsAVDoPQGh0bWxfc2FmZVQ6CUBub3cw--d5f7c07d1148ccf7ce2c2970faa3c0fb737697b3;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"token":"syqtyQLXyex7st35PNUM"}'
+	string: ! '{"token":"jKkxPorzWo8uNYUxiiQC"}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:45:08 GMT
+	recorded_at: Thu, 24 Jan 2013 10:44:51 GMT
	recorded_with: VCR 2.3.0

spec/integration/cassettes/push.yml +216 -199

@@	@@ -2,7 +2,7 @@
	http_interactions:
	- request:
	method: post
-	uri: http://locomotive.engine.dev:3000/locomotive/api/tokens.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/tokens.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: email=admin%40locomotivecms.com&password=locomotive
@@	@@ -19,32 +19,32 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"95752f9e2614ece1b15c07f3d8620bfe"'
+	- ! '"e29ee4caaed0880055c032e8a8586878"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 836bab67c3981ef30de5d5e873e837c6
+	- 94bdd007e8f2d545d1691c6998bfd66e
	X-Runtime:
-	- '0.011073'
+	- '0.017952'
	Content-Length:
	- '32'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJWQ4OWQ5ZDczNzVhM2YyMTJmOTY4ZTcyYjQ0ZmRkZGM3BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFRJIgpmbGFzaAY7AEZvOiVBY3Rpb25EaXNwYXRjaDo6Rmxhc2g6OkZsYXNoSGFzaAk6CkB1c2VkbzoIU2V0BjoKQGhhc2h7ADoMQGNsb3NlZEY6DUBmbGFzaGVzewY6C25vdGljZUlDOh5BY3RpdmVTdXBwb3J0OjpTYWZlQnVmZmVyIiNIYXNoIHdhcyBzdWNjZXNzZnVsbHkgY3JlYXRlZC4HOwBUOg9AaHRtbF9zYWZlVDoJQG5vdzA%3D--1d7e19c2f9df200fb5f44164af376c21b9790e15;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJWNmNTM0YTk1MTkyMTNiOGM2OTcwM2E4MmRkNWRlOGI2BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewA6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOgtub3RpY2VJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIjSGFzaCB3YXMgc3VjY2Vzc2Z1bGx5IGNyZWF0ZWQuBzsAVDoPQGh0bWxfc2FmZVQ6CUBub3cw--a468905760759377911ee4e2069adea01b0eded2;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"token":"syqtyQLXyex7st35PNUM"}'
+	string: ! '{"token":"jKkxPorzWo8uNYUxiiQC"}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/current_site.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/current_site.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -59,160 +59,164 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"03ea30ec3425b98d8fb719986ccd1258"'
+	- ! '"8deb2650b85b6b92dd0dec38083f73ba"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- b9d6fb60b9569682f6f6021a936504cf
+	- 7bca96b91ef4cbd71e687e0de0632779
	X-Runtime:
-	- '0.011281'
+	- '0.018549'
	Content-Length:
-	- '678'
+	- '562'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWNjM2MxOWQyNjc3MmRiZmFlNmU0YjYyM2Q1OWJkODU2BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--7237f5d92e28cde25f11e44e5b29e97b5377ae28;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTVjODE1NDA0NTMwZWMxNmY1NTQxMDFkNjQxNDc4MmQzBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--bca497959b4411cf0b6a0d79a4df5bbc2f205bcc;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fd84c82cd14f39000005","_id":"50f3fd84c82cd14f39000005","created_at":"2013-01-14T13:43:48+01:00","updated_at":"2013-01-14T13:44:58+01:00","name":"locomotive","locales":["en","es"],"domain_name":"engine.dev","subdomain":"locomotive","domains":["locomotive.engine.dev"],"robots_txt":null,"seo_title":null,"meta_keywords":null,"meta_description":null,"domains_without_subdomain":[],"memberships":[{"id":"50f3fd84c82cd14f39000006","_id":"50f3fd84c82cd14f39000006","created_at":null,"updated_at":null,"account_id":"50f3fd7dc82cd14f39000003","name":"Admin","email":"admin@locomotivecms.com","role":"admin","role_name":"Administrator","can_update":false,"grant_admin":true}]}'
+	string: ! '{"id":"51010fd2c82cd17179000001","_id":"51010fd2c82cd17179000001","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T12:09:43+01:00","name":"locomotive","locales":["en","es"],"subdomain":"locomotive","domains":["locomotive.engine.dev"],"domains_without_subdomain":[],"domain_name":"engine.dev","memberships":[{"id":"51010fd2c82cd17179000005","_id":"51010fd2c82cd17179000005","role":"admin","role_name":"Administrator","can_update":false,"grant_admin":true,"account_id":"51010fd2c82cd17179000004","name":"Admin","email":"admin@locomotivecms.com"}]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
-	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/snippets.json?auth_token=syqtyQLXyex7st35PNUM
+	method: put
+	uri: http://locomotive.engine.dev:3000/locomotive/api/sites/51010fd2c82cd17179000001.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
-	string: ''
+	string: site[name]=locomotive&site[locales][]=en&site[locales][]=es&site[subdomain]=locomotive&site[domains][]=locomotive.engine.dev&locale=en
	headers: {}
	response:
	status:
	code: 200
	message: ! 'OK '
	headers:
+	X-Message:
+	- ! '"Site was successfully updated."'
+	X-Message-Type:
+	- notice
+	Location:
+	- http://locomotive.engine.dev:3000/locomotive/sites/51010fd2c82cd17179000001
	Content-Type:
	- application/json; charset=utf-8
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"d751713988987e9331980363e24189ce"'
+	- ! '"e95953c2f43b60d77e276848c51e95fb"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- eb74d2c7e727690706fc6fa8df85ffdf
+	- a0c7148084354b2129b6221178d1c069
	X-Runtime:
-	- '0.014392'
+	- '0.021375'
	Content-Length:
-	- '2'
+	- '562'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTE2NmZkYjBmOWI2YTQ0MDUwMTg1MDAyMGMzYTA3MTVhBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--f514392e93baeb72f94f39790c963f4fd749ed6a;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJWNhZjAxYjg5MjJkZjcwY2I0ZmI4MWY2ZGQyZmVhZWU0BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewY6C25vdGljZVQ6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOwxJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIjU2l0ZSB3YXMgc3VjY2Vzc2Z1bGx5IHVwZGF0ZWQuBzsAVDoPQGh0bWxfc2FmZVQ6CUBub3cw--fe3ff0729a7a3447e4b95b2ea50965bdd25c0454;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '[]'
+	string: ! '{"id":"51010fd2c82cd17179000001","_id":"51010fd2c82cd17179000001","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T12:09:53+01:00","name":"locomotive","locales":["en","es"],"subdomain":"locomotive","domains":["locomotive.engine.dev"],"domains_without_subdomain":[],"domain_name":"engine.dev","memberships":[{"id":"51010fd2c82cd17179000005","_id":"51010fd2c82cd17179000005","role":"admin","role_name":"Administrator","can_update":false,"grant_admin":true,"account_id":"51010fd2c82cd17179000004","name":"Admin","email":"admin@locomotivecms.com"}]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
-	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types.json?auth_token=syqtyQLXyex7st35PNUM
+	method: put
+	uri: http://locomotive.engine.dev:3000/locomotive/api/sites/51010fd2c82cd17179000001.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
-	string: ''
+	string: site[name]=locomotive&site[locales][]=en&site[locales][]=es&site[subdomain]=locomotive&site[domains][]=locomotive.engine.dev&locale=es
	headers: {}
	response:
	status:
	code: 200
	message: ! 'OK '
	headers:
+	X-Message:
+	- ! '"Site was successfully updated."'
+	X-Message-Type:
+	- notice
+	Location:
+	- http://locomotive.engine.dev:3000/locomotive/sites/51010fd2c82cd17179000001
	Content-Type:
	- application/json; charset=utf-8
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"1f58e2a5247c307cd0466f755ea2540a"'
+	- ! '"e95953c2f43b60d77e276848c51e95fb"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- b23d0254a1f479bc0a8f6c53a5c593f6
+	- 683a778218fcfef73a2b56a98e3be43a
	X-Runtime:
-	- '0.017569'
+	- '0.022218'
	Content-Length:
-	- '1056'
+	- '562'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWE4ZjE3OGNmMGIzNzgwMDU3YzI4ZWMyNzcwODJiYWY3BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--bf0f47d708200643d53132b8a132b942cb5d004e;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJTQ3ZTZlODAwOGRhNzA2ZTg3YzgyOTgzMTA5YTg0MDgzBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewY6C25vdGljZVQ6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOwxJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIjU2l0ZSB3YXMgc3VjY2Vzc2Z1bGx5IHVwZGF0ZWQuBzsAVDoPQGh0bWxfc2FmZVQ6CUBub3cw--1eae4a455cb5aadbd73006d098a78b0bc2f73f77;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '[{"id":"50f40738c82cd14f39000019","_id":"50f40738c82cd14f39000019","created_at":"2013-01-14T14:25:12+01:00","updated_at":"2013-01-15T09:41:12+01:00","name":"Products","description":"My
-	products collection","slug":"products","order_by":"created_at","order_direction":"asc","label_field_name":"name","group_by_field_id":null,"public_submission_accounts":null,"entries_custom_fields":[{"_id":"50f40738c82cd14f3900001a","class_name":null,"created_at":null,"hint":null,"inverse_of":null,"label":"name","localized":true,"name":"name","order_by":null,"position":0,"required":true,"text_formatting":"html","type":"string","ui_enabled":true,"updated_at":null,"id":"50f40738c82cd14f3900001a"},{"_id":"50f40738c82cd14f3900001b","class_name":null,"created_at":null,"hint":null,"inverse_of":null,"label":"available","localized":false,"name":"available","order_by":null,"position":1,"required":false,"text_formatting":"html","type":"boolean","ui_enabled":true,"updated_at":null,"id":"50f40738c82cd14f3900001b"}],"klass_name":"Locomotive::Entry50f40738c82cd14f39000019"}]'
+	string: ! '{"id":"51010fd2c82cd17179000001","_id":"51010fd2c82cd17179000001","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T12:09:53+01:00","name":"locomotive","locales":["en","es"],"subdomain":"locomotive","domains":["locomotive.engine.dev"],"domains_without_subdomain":[],"domain_name":"engine.dev","memberships":[{"id":"51010fd2c82cd17179000005","_id":"51010fd2c82cd17179000005","role":"admin","role_name":"Administrator","can_update":false,"grant_admin":true,"account_id":"51010fd2c82cd17179000004","name":"Admin","email":"admin@locomotivecms.com"}]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
-	method: put
-	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types/50f40738c82cd14f39000019.json?auth_token=syqtyQLXyex7st35PNUM
+	method: get
+	uri: http://locomotive.engine.dev:3000/locomotive/api/snippets.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
-	string: content_type[name]=Products&content_type[description]=My%20products%20collection&content_type[slug]=products&content_type[label_field_name]=name&content_type[order_by]=created_at&content_type[entries_custom_fields][][label]=name&content_type[entries_custom_fields][][name]=name&content_type[entries_custom_fields][][type]=string&content_type[entries_custom_fields][][position]=0&content_type[entries_custom_fields][][required]=true&content_type[entries_custom_fields][][localized]=true&content_type[entries_custom_fields][][_id]=50f40738c82cd14f3900001a&content_type[entries_custom_fields][][label]=available&content_type[entries_custom_fields][][name]=available&content_type[entries_custom_fields][][type]=boolean&content_type[entries_custom_fields][][position]=1&content_type[entries_custom_fields][][_id]=50f40738c82cd14f3900001b
+	string: ''
	headers: {}
	response:
	status:
	code: 200
	message: ! 'OK '
	headers:
-	X-Message:
-	- ! '"Content type was successfully updated."'
-	X-Message-Type:
-	- notice
-	Location:
-	- http://locomotive.engine.dev:3000/locomotive/api/content_types
	Content-Type:
	- application/json; charset=utf-8
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"80f0b0e45dec8453aa35e2666ba91549"'
+	- ! '"d751713988987e9331980363e24189ce"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 111a217d57efafba5414fdd28e897d09
+	- 689114e6cdad3904ef1f53375c770076
	X-Runtime:
-	- '0.089495'
+	- '0.021023'
	Content-Length:
-	- '1054'
+	- '2'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJTlhNGM1ZjU1MzljNThjNGQ1Yjk0MWIwMDllNGI3ZGRkBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFRJIgpmbGFzaAY7AEZvOiVBY3Rpb25EaXNwYXRjaDo6Rmxhc2g6OkZsYXNoSGFzaAk6CkB1c2VkbzoIU2V0BjoKQGhhc2h7BjoLbm90aWNlVDoMQGNsb3NlZEY6DUBmbGFzaGVzewY7DElDOh5BY3RpdmVTdXBwb3J0OjpTYWZlQnVmZmVyIitDb250ZW50IHR5cGUgd2FzIHN1Y2Nlc3NmdWxseSB1cGRhdGVkLgc7AFQ6D0BodG1sX3NhZmVUOglAbm93MA%3D%3D--55c0bc28d50ddfb8927ef0405efbdfc74da57863;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTNkZjc4MjY2MGM1OWVkZThiMGY5Nzg5OTA4NTI0YmNhBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--5d70ac1517a9bc33fd1d2b41da7be3595549c9cc;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f40738c82cd14f39000019","_id":"50f40738c82cd14f39000019","created_at":"2013-01-14T14:25:12+01:00","updated_at":"2013-01-15T09:46:09+01:00","name":"Products","description":"My
-	products collection","slug":"products","order_by":"created_at","order_direction":"asc","label_field_name":"name","group_by_field_id":null,"public_submission_accounts":null,"entries_custom_fields":[{"_id":"50f40738c82cd14f3900001a","class_name":null,"created_at":null,"hint":null,"inverse_of":null,"label":"name","localized":true,"name":"name","order_by":null,"position":0,"required":true,"text_formatting":"html","type":"string","ui_enabled":true,"updated_at":null,"id":"50f40738c82cd14f3900001a"},{"_id":"50f40738c82cd14f3900001b","class_name":null,"created_at":null,"hint":null,"inverse_of":null,"label":"available","localized":false,"name":"available","order_by":null,"position":1,"required":false,"text_formatting":"html","type":"boolean","ui_enabled":true,"updated_at":null,"id":"50f40738c82cd14f3900001b"}],"klass_name":"Locomotive::Entry50f40738c82cd14f39000019"}'
+	string: ! '[]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types/products/entries.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -227,36 +231,36 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"f1104a72d68f473b940476311a5b7695"'
+	- ! '"821b57c9b4131678fd1b597e87252e96"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 197faf7d232bf61f6af27df48bfef2ed
+	- f94d3e391e8395c041ecc036a00b3529
	X-Runtime:
-	- '0.015724'
+	- '0.026653'
	Content-Length:
-	- '522'
+	- '761'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTZmYTRlNTQ0YTQ4N2RiOTdlODY2MjcwOWY3MWE3ZTc0BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--a53864745e77c0dc48be6c6423387555063b67bb;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWZhNzFmZjRjNzM4MGE1YWQyMWVkZmQ4YmY4YmI5YjQ3BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--2273141885cec2dbcda53e8620e2907e3ed80c64;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '[{"id":"50f511fac82cd14f39000025","_id":"50f511fac82cd14f39000025","created_at":"2013-01-15T09:23:22+01:00","updated_at":"2013-01-15T09:23:22+01:00","name":"Useless
-	stuff","available":true,"_label":"Useless stuff","_slug":"useless-stuff","_position":1,"content_type_slug":"products","select_custom_fields":[],"file_custom_fields":[],"has_many_custom_fields":[],"many_to_many_custom_fields":[],"translated_in":["en"],"safe_attributes":["name","available","_slug","seo_title","meta_keywords","meta_description","_destroy"]}]'
+	string: ! '[{"id":"5101101bc82cd12530000013","_id":"5101101bc82cd12530000013","created_at":"2013-01-24T11:42:35+01:00","updated_at":"2013-01-24T11:42:35+01:00","name":"Products","slug":"products","entries_custom_fields":[{"id":"5101101bc82cd12530000014","_id":"5101101bc82cd12530000014","name":"name","label":"name","type":"string","required":true,"localized":true,"position":0},{"id":"5101101bc82cd12530000015","_id":"5101101bc82cd12530000015","name":"available","label":"available","type":"boolean","required":false,"localized":false,"position":1}],"description":"My
+	products collection","label_field_name":"name","order_by":"created_at","order_direction":"asc","order_by_field_name":"created_at","public_submission_enabled":false,"public_submission_account_emails":[]}]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: put
-	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types/products/entries/50f511fac82cd14f39000025.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/content_types/5101101bc82cd12530000013.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
-	string: entry[_slug]=useless-stuff&entry[_position]=0&entry[_visible]=true&entry[available]=true&entry[name]=Useless%20stuff&locale=en
+	string: content_type[name]=Products&content_type[description]=My%20products%20collection&content_type[slug]=products&content_type[label_field_name]=name&content_type[order_by]=created_at&content_type[entries_custom_fields][][label]=name&content_type[entries_custom_fields][][name]=name&content_type[entries_custom_fields][][type]=string&content_type[entries_custom_fields][][position]=0&content_type[entries_custom_fields][][required]=true&content_type[entries_custom_fields][][localized]=true&content_type[entries_custom_fields][][_id]=5101101bc82cd12530000014&content_type[entries_custom_fields][][label]=available&content_type[entries_custom_fields][][name]=available&content_type[entries_custom_fields][][type]=boolean&content_type[entries_custom_fields][][position]=1&content_type[entries_custom_fields][][_id]=5101101bc82cd12530000015
	headers: {}
	response:
	status:
@@	@@ -264,43 +268,43 @@ http_interactions:
	message: ! 'OK '
	headers:
	X-Message:
-	- ! '"Entry50f40738c82cd14f39000019 was successfully updated."'
+	- ! '"Content type was successfully updated."'
	X-Message-Type:
	- notice
	Location:
-	- http://locomotive.engine.dev:3000/locomotive/api/content_types/products/entries
+	- http://locomotive.engine.dev:3000/locomotive/api/content_types
	Content-Type:
	- application/json; charset=utf-8
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"81d5c739a1b20bb5a80fccda8805c9e3"'
+	- ! '"76c828ea47f6bd951793d35d9e1fc622"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 0e2c5080e13d32af1d65dc51f4cd77ec
+	- 5174df22125dde370396cdcee2c6980b
	X-Runtime:
-	- '0.020437'
+	- '0.043230'
	Content-Length:
-	- '520'
+	- '759'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJWU0NTY0YzEzZDQxZDY2OGFlOTdlMWU4N2NhYjgwN2M4BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFRJIgpmbGFzaAY7AEZvOiVBY3Rpb25EaXNwYXRjaDo6Rmxhc2g6OkZsYXNoSGFzaAk6CkB1c2VkbzoIU2V0BjoKQGhhc2h7BjoLbm90aWNlVDoMQGNsb3NlZEY6DUBmbGFzaGVzewY7DElDOh5BY3RpdmVTdXBwb3J0OjpTYWZlQnVmZmVyIjxFbnRyeTUwZjQwNzM4YzgyY2QxNGYzOTAwMDAxOSB3YXMgc3VjY2Vzc2Z1bGx5IHVwZGF0ZWQuBzsAVDoPQGh0bWxfc2FmZVQ6CUBub3cw--6f3c8dec0ede877d14936fcdc99a251022779abf;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJThmMzg4MGI0ODVhYzJlYmEyMGUxZjgwNzUxYTgyYWQzBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewY6C25vdGljZVQ6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOwxJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIrQ29udGVudCB0eXBlIHdhcyBzdWNjZXNzZnVsbHkgdXBkYXRlZC4HOwBUOg9AaHRtbF9zYWZlVDoJQG5vdzA%3D--6898efcba089cec1336089992b5419bc296daa7d;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f511fac82cd14f39000025","_id":"50f511fac82cd14f39000025","created_at":"2013-01-15T09:23:22+01:00","updated_at":"2013-01-15T09:23:22+01:00","name":"Useless
-	stuff","available":true,"_label":"Useless stuff","_slug":"useless-stuff","_position":1,"content_type_slug":"products","select_custom_fields":[],"file_custom_fields":[],"has_many_custom_fields":[],"many_to_many_custom_fields":[],"translated_in":["en"],"safe_attributes":["name","available","_slug","seo_title","meta_keywords","meta_description","_destroy"]}'
+	string: ! '{"id":"5101101bc82cd12530000013","_id":"5101101bc82cd12530000013","created_at":"2013-01-24T11:42:35+01:00","updated_at":"2013-01-24T11:42:35+01:00","name":"Products","slug":"products","entries_custom_fields":[{"id":"5101101bc82cd12530000014","_id":"5101101bc82cd12530000014","name":"name","label":"name","type":"string","required":true,"localized":true,"position":0},{"id":"5101101bc82cd12530000015","_id":"5101101bc82cd12530000015","name":"available","label":"available","type":"boolean","required":false,"localized":false,"position":1}],"description":"My
+	products collection","label_field_name":"name","order_by":"created_at","order_direction":"asc","order_by_field_name":"created_at","public_submission_enabled":false,"public_submission_account_emails":[]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: ''
@@	@@ -315,40 +319,44 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"ef568388ca833405fa7f1285fbafa848"'
+	- ! '"b2419b60bc5a99c7f9aec8e74a5b8557"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- fe345776408cfda871ce3b5aa23e8c63
+	- be2b82f36e9172fa2bfce35ac525e34a
	X-Runtime:
-	- '0.020706'
+	- '0.116639'
	Content-Length:
-	- '3185'
+	- '3338'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTI3ZTE2MDJkNGMyNGNlZjhhZDM0MmEzYTlkY2Y1ZTgxBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--5ff67907487c3f83b6d08029aef57d1ef8500066;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWRiMmYyNzg1M2FhZTBlNDQ2OTkwNjczOThkOGMxMzZkBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--694e910d25258c8fa7fcb38c1e400456ac9e2eba;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '[{"id":"50f3fd84c82cd14f39000007","_id":"50f3fd84c82cd14f39000007","created_at":"2013-01-14T13:43:49+01:00","updated_at":"2013-01-15T09:42:16+01:00","title":"Home
-	page","slug":"index","fullpath":"index","handle":null,"position":0,"raw_template":"{%
-	block content %}\r\n Content of the home page\r\n{% endblock %}\r\n\r\n","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"","es":"es"},"translated_in":["en","es"]},{"id":"50f3fdc4c82cd14f39000012","_id":"50f3fdc4c82cd14f39000012","created_at":"2013-01-14T13:44:52+01:00","updated_at":"2013-01-15T09:41:13+01:00","title":"translated","slug":"translated","fullpath":"translated","handle":null,"position":0,"raw_template":"{{
-	''hello_world'' \| translate}}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"translated","es":"es/translated"},"translated_in":["en","es"]},{"id":"50f51298c82cd14f39000033","_id":"50f51298c82cd14f39000033","created_at":"2013-01-15T09:26:00+01:00","updated_at":"2013-01-15T09:44:43+01:00","title":"Latest","slug":"latest","fullpath":"products/latest","handle":null,"position":0,"raw_template":"{%
+	string: ! '[{"id":"51010fd2c82cd17179000002","_id":"51010fd2c82cd17179000002","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T12:09:44+01:00","title":"Home
+	page","slug":"index","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"index","localized_fullpaths":{"en":"","es":"es"},"depth":0,"translated_in":["en","es"],"raw_template":"{%
+	block content %}\r\n Content of the home page\r\n{% endblock %}\r\n\r\n","escaped_raw_template":"{%
+	block content %}\r\n Content of the home page\r\n{% endblock %}\r\n\r\n","editable_elements":[]},{"id":"5101101cc82cd12530000017","_id":"5101101cc82cd12530000017","created_at":"2013-01-24T11:42:36+01:00","updated_at":"2013-01-24T12:09:43+01:00","title":"translated","slug":"translated","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"translated","localized_fullpaths":{"en":"translated","es":"es/translated"},"depth":1,"translated_in":["en"],"raw_template":"{{
+	''hello_world'' \| translate}}","escaped_raw_template":"{{ 'hello_world'
+	\| translate}}","editable_elements":[]},{"id":"5101101cc82cd12530000019","_id":"5101101cc82cd12530000019","created_at":"2013-01-24T11:42:36+01:00","updated_at":"2013-01-24T12:09:44+01:00","title":"Latest","slug":"latest","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"products/latest","localized_fullpaths":{"en":"products/latest","es":"es/products/latest"},"depth":2,"translated_in":["en"],"raw_template":"{%
+	extends parent %}\r\n{% block content %}\r\n The name of the latest product
+	is: {{ contents.products.last.name }}\r\n{% endblock %}","escaped_raw_template":"{%
	extends parent %}\r\n{% block content %}\r\n The name of the latest product
-	is: {{ contents.products.last.name }}\r\n{% endblock %}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"products/latest","es":"es/products/latest"},"translated_in":["en"]},{"id":"50f3fd85c82cd14f39000008","_id":"50f3fd85c82cd14f39000008","created_at":"2013-01-14T13:43:49+01:00","updated_at":"2013-01-15T09:41:12+01:00","title":"Page
-	not found","slug":"404","fullpath":"404","handle":null,"position":1,"raw_template":"Content
-	of the 404 page","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"404","es":"es/404"},"translated_in":["en","es"]},{"id":"50f51224c82cd14f3900002d","_id":"50f51224c82cd14f3900002d","created_at":"2013-01-15T09:24:04+01:00","updated_at":"2013-01-15T09:42:16+01:00","title":"Products","slug":"products","fullpath":"products","handle":null,"position":1,"raw_template":"{%
-	extends parent %}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"products","es":"es/products"},"translated_in":["en"]}]'
+	is: {{ contents.products.last.name }}\r\n{% endblock %}","editable_elements":[]},{"id":"51010fd2c82cd17179000003","_id":"51010fd2c82cd17179000003","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T12:09:44+01:00","title":"Page
+	not found","slug":"404","position":1,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"404","localized_fullpaths":{"en":"404","es":"es/404"},"depth":0,"translated_in":["en","es"],"raw_template":"Content
+	of the 404 page","escaped_raw_template":"Content of the 404 page","editable_elements":[]},{"id":"5101101cc82cd12530000018","_id":"5101101cc82cd12530000018","created_at":"2013-01-24T11:42:36+01:00","updated_at":"2013-01-24T12:09:43+01:00","title":"Products","slug":"products","position":1,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"products","localized_fullpaths":{"en":"products","es":"es/products"},"depth":1,"translated_in":["en"],"raw_template":"{%
+	extends parent %}","escaped_raw_template":"{% extends parent %}","editable_elements":[]}]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: put
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f3fd85c82cd14f39000008.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/51010fd2c82cd17179000003.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: page[title]=Page%20not%20found&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=1&page[raw_template]=Content%20of%20the%20404%20page&locale=en
@@	@@ -369,34 +377,34 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"f91fb3bd12aeb46f55f5a2a01fb1aeb9"'
+	- ! '"16f96cdd47a777fd12ec6ba26f289ab0"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 6f41856ea678ee62a64e7e4d993b68d5
+	- fba3203f0223c5ed8721cc6bd7fedb61
	X-Runtime:
-	- '0.019263'
+	- '0.029923'
	Content-Length:
-	- '592'
+	- '588'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJWNlMzQ2MDkxMzJlY2QxNzM5MGRiNWU2MzI4MmZjMDE3BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFRJIgpmbGFzaAY7AEZvOiVBY3Rpb25EaXNwYXRjaDo6Rmxhc2g6OkZsYXNoSGFzaAk6CkB1c2VkbzoIU2V0BjoKQGhhc2h7BjoLbm90aWNlVDoMQGNsb3NlZEY6DUBmbGFzaGVzewY7DElDOh5BY3RpdmVTdXBwb3J0OjpTYWZlQnVmZmVyIiNQYWdlIHdhcyBzdWNjZXNzZnVsbHkgdXBkYXRlZC4HOwBUOg9AaHRtbF9zYWZlVDoJQG5vdzA%3D--4884ca7e9540cdd51653cf5c7005f15d2ac94895;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJTlmMGQ3M2UxYWYyOGZlNTg4YzA3YmNmZThhYWQ2M2FlBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewY6C25vdGljZVQ6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOwxJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIjUGFnZSB3YXMgc3VjY2Vzc2Z1bGx5IHVwZGF0ZWQuBzsAVDoPQGh0bWxfc2FmZVQ6CUBub3cw--3fa46b31d6e09601065e2e8893eeaddbb6ffa058;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fd85c82cd14f39000008","_id":"50f3fd85c82cd14f39000008","created_at":"2013-01-14T13:43:49+01:00","updated_at":"2013-01-15T09:46:09+01:00","title":"Page
-	not found","slug":"404","fullpath":"404","handle":null,"position":1,"raw_template":"Content
-	of the 404 page","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"404","es":"es/404"},"translated_in":["en","es"]}'
+	string: ! '{"id":"51010fd2c82cd17179000003","_id":"51010fd2c82cd17179000003","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T12:09:53+01:00","title":"Page
+	not found","slug":"404","position":1,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"404","localized_fullpaths":{"en":"404","es":"es/404"},"depth":0,"translated_in":["en","es"],"raw_template":"Content
+	of the 404 page","escaped_raw_template":"Content of the 404 page","editable_elements":[]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: put
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f3fd84c82cd14f39000007.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/51010fd2c82cd17179000002.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: page[title]=Home%20page&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=0&page[raw_template]=%7B%25%20block%20content%20%25%7D%0D%0A%20%20New%20content%20of%20the%20home%20page%0D%0A%7B%25%20endblock%20%25%7D%0D%0A%0D%0A&locale=en
@@	@@ -417,37 +425,38 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"66ed6aee5bdd40c1367b1b73afd4fdf6"'
+	- ! '"1de26ec00bd63890814409b152c775b7"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 320507c0a7e31890df088fc058c7c803
+	- 07459a6156f408a162ef62ce68fcbc12
	X-Runtime:
-	- '0.027004'
+	- '0.038297'
	Content-Length:
-	- '640'
+	- '716'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJTBjMTllYjlhNjYwYTA4OGUxMDI4NDk5N2ZiN2M4YTVkBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFRJIgpmbGFzaAY7AEZvOiVBY3Rpb25EaXNwYXRjaDo6Rmxhc2g6OkZsYXNoSGFzaAk6CkB1c2VkbzoIU2V0BjoKQGhhc2h7BjoLbm90aWNlVDoMQGNsb3NlZEY6DUBmbGFzaGVzewY7DElDOh5BY3RpdmVTdXBwb3J0OjpTYWZlQnVmZmVyIiNQYWdlIHdhcyBzdWNjZXNzZnVsbHkgdXBkYXRlZC4HOwBUOg9AaHRtbF9zYWZlVDoJQG5vdzA%3D--5a327b735008a7f4fcd197382022d09d00c3344d;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJTBhNjdhYzlhMDNkMTNkOWRjZmMxOTZiODY3NjhjZmE2BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewY6C25vdGljZVQ6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOwxJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIjUGFnZSB3YXMgc3VjY2Vzc2Z1bGx5IHVwZGF0ZWQuBzsAVDoPQGh0bWxfc2FmZVQ6CUBub3cw--d8a0739421260a47ccf05e257aa8b7af4ff9f59f;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fd84c82cd14f39000007","_id":"50f3fd84c82cd14f39000007","created_at":"2013-01-14T13:43:49+01:00","updated_at":"2013-01-15T09:46:09+01:00","title":"Home
-	page","slug":"index","fullpath":"index","handle":null,"position":0,"raw_template":"{%
-	block content %}\r\n New content of the home page\r\n{% endblock %}\r\n\r\n","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":true,"editable_elements":[],"localized_fullpaths":{"en":"","es":"es"},"translated_in":["en","es"]}'
+	string: ! '{"id":"51010fd2c82cd17179000002","_id":"51010fd2c82cd17179000002","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T12:09:53+01:00","title":"Home
+	page","slug":"index","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"index","localized_fullpaths":{"en":"","es":"es"},"depth":0,"template_changed":true,"translated_in":["en","es"],"raw_template":"{%
+	block content %}\r\n New content of the home page\r\n{% endblock %}\r\n\r\n","escaped_raw_template":"{%
+	block content %}\r\n New content of the home page\r\n{% endblock %}\r\n\r\n","editable_elements":[]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: put
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f3fdc4c82cd14f39000012.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/5101101cc82cd12530000017.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
-	string: page[title]=translated&page[slug]=translated&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=0&page[parent_id]=50f3fd84c82cd14f39000007&page[raw_template]=%7B%7B%20'hello_world'%20%7C%20translate%7D%7D&locale=en
+	string: page[title]=translated&page[slug]=translated&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=0&page[parent_id]=51010fd2c82cd17179000002&page[raw_template]=%7B%7B%20'hello_world'%20%7C%20translate%7D%7D&locale=en
	headers: {}
	response:
	status:
@@	@@ -465,36 +474,37 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"975dee900e1750f0475d17b674cb7691"'
+	- ! '"5392cab514700e58e6bfa958071bcbea"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- c2eddb360523acbe51ea3584c293e3d0
+	- a7ff4949766692bf8b8c8812e55a5b76
	X-Runtime:
-	- '0.022702'
+	- '0.035398'
	Content-Length:
-	- '623'
+	- '631'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJTVjYzRhZTU4MWZkY2ExZDYwNmRkZjk5Y2I2MDk1NDE0BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFRJIgpmbGFzaAY7AEZvOiVBY3Rpb25EaXNwYXRjaDo6Rmxhc2g6OkZsYXNoSGFzaAk6CkB1c2VkbzoIU2V0BjoKQGhhc2h7BjoLbm90aWNlVDoMQGNsb3NlZEY6DUBmbGFzaGVzewY7DElDOh5BY3RpdmVTdXBwb3J0OjpTYWZlQnVmZmVyIiNQYWdlIHdhcyBzdWNjZXNzZnVsbHkgdXBkYXRlZC4HOwBUOg9AaHRtbF9zYWZlVDoJQG5vdzA%3D--145c67f2484490e0de6e9bfc9842fb3aa4409b73;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJTcyZjg5YzEzNTk5NWZmMjJlNTUzZTZiMzVkZDg2MGQ5BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewY6C25vdGljZVQ6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOwxJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIjUGFnZSB3YXMgc3VjY2Vzc2Z1bGx5IHVwZGF0ZWQuBzsAVDoPQGh0bWxfc2FmZVQ6CUBub3cw--5b52db67c25fc353b1b766b68b0446424e3a1681;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fdc4c82cd14f39000012","_id":"50f3fdc4c82cd14f39000012","created_at":"2013-01-14T13:44:52+01:00","updated_at":"2013-01-15T09:46:09+01:00","title":"translated","slug":"translated","fullpath":"translated","handle":null,"position":0,"raw_template":"{{
-	''hello_world'' \| translate}}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"translated","es":"es/translated"},"translated_in":["en","es"]}'
+	string: ! '{"id":"5101101cc82cd12530000017","_id":"5101101cc82cd12530000017","created_at":"2013-01-24T11:42:36+01:00","updated_at":"2013-01-24T12:09:53+01:00","title":"translated","slug":"translated","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"translated","localized_fullpaths":{"en":"translated","es":"es/translated"},"depth":1,"translated_in":["en"],"raw_template":"{{
+	''hello_world'' \| translate}}","escaped_raw_template":"{{ 'hello_world'
+	\| translate}}","editable_elements":[]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: put
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f51224c82cd14f3900002d.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/5101101cc82cd12530000018.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
-	string: page[title]=Products&page[slug]=products&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=1&page[parent_id]=50f3fd84c82cd14f39000007&page[raw_template]=%7B%25%20extends%20parent%20%25%7D&locale=en
+	string: page[title]=Products&page[slug]=products&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=1&page[parent_id]=51010fd2c82cd17179000002&page[raw_template]=%7B%25%20extends%20parent%20%25%7D&locale=en
	headers: {}
	response:
	status:
@@	@@ -512,36 +522,36 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"14710977c06fccaa6d8f68cefdc44cbf"'
+	- ! '"0af95957118d905c67d53444527e9f3d"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- f48552e62d65430f8dcbba2e90179f02
+	- 20de2880ca3feb7511852a5b9b06c623
	X-Runtime:
-	- '0.022073'
+	- '0.030157'
	Content-Length:
-	- '598'
+	- '591'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJWY0ODgyOGUyMWExNjI0ZWY1MjQ0MzJhMGM3YTIxYmQ3BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFRJIgpmbGFzaAY7AEZvOiVBY3Rpb25EaXNwYXRjaDo6Rmxhc2g6OkZsYXNoSGFzaAk6CkB1c2VkbzoIU2V0BjoKQGhhc2h7BjoLbm90aWNlVDoMQGNsb3NlZEY6DUBmbGFzaGVzewY7DElDOh5BY3RpdmVTdXBwb3J0OjpTYWZlQnVmZmVyIiNQYWdlIHdhcyBzdWNjZXNzZnVsbHkgdXBkYXRlZC4HOwBUOg9AaHRtbF9zYWZlVDoJQG5vdzA%3D--f534903cf099cbd9201017e64abed02d5f60cf3a;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJWZmMWMwZjIzOGZjMGEzZjc1NGIzYjhiMzUwOGNmMGUwBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewY6C25vdGljZVQ6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOwxJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIjUGFnZSB3YXMgc3VjY2Vzc2Z1bGx5IHVwZGF0ZWQuBzsAVDoPQGh0bWxfc2FmZVQ6CUBub3cw--35061b0c17d702a2e83b68e8b78f228a82292284;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f51224c82cd14f3900002d","_id":"50f51224c82cd14f3900002d","created_at":"2013-01-15T09:24:04+01:00","updated_at":"2013-01-15T09:46:09+01:00","title":"Products","slug":"products","fullpath":"products","handle":null,"position":1,"raw_template":"{%
-	extends parent %}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"products","es":"es/products"},"translated_in":["en"]}'
+	string: ! '{"id":"5101101cc82cd12530000018","_id":"5101101cc82cd12530000018","created_at":"2013-01-24T11:42:36+01:00","updated_at":"2013-01-24T12:09:53+01:00","title":"Products","slug":"products","position":1,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"products","localized_fullpaths":{"en":"products","es":"es/products"},"depth":1,"translated_in":["en"],"raw_template":"{%
+	extends parent %}","escaped_raw_template":"{% extends parent %}","editable_elements":[]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: put
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f51298c82cd14f39000033.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/5101101cc82cd12530000019.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
-	string: page[title]=Latest&page[slug]=latest&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=0&page[parent_id]=50f51224c82cd14f3900002d&page[raw_template]=%7B%25%20extends%20parent%20%25%7D%0D%0A%7B%25%20block%20content%20%25%7D%0D%0A%20%20The%20name%20of%20the%20latest%20product%20is%3A%20%7B%7B%20contents.products.last.name%20%7D%7D%0D%0A%7B%25%20endblock%20%25%7D&locale=en
+	string: page[title]=Latest&page[slug]=latest&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=0&page[parent_id]=5101101cc82cd12530000018&page[raw_template]=%7B%25%20extends%20parent%20%25%7D%0D%0A%7B%25%20block%20content%20%25%7D%0D%0A%20%20The%20name%20of%20the%20latest%20product%20is%3A%20%7B%7B%20contents.products.last.name%20%7D%7D%0D%0A%7B%25%20endblock%20%25%7D&locale=en
	headers: {}
	response:
	status:
@@	@@ -559,34 +569,36 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"9a9243668d170e6677373a2e6edce1f6"'
+	- ! '"6c3d9262a6ecffaa7f713553db1e488f"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 364631fb066dbcf6cf6d5abdd69c35b9
+	- 5232c78ed35b2f80d731ea7ea804bf90
	X-Runtime:
-	- '0.020455'
+	- '0.025472'
	Content-Length:
-	- '730'
+	- '838'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJWJjZmQ5NGJlYjMxZDg4MjYyZGZkMjZhMmJjNWM0YzA0BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFRJIgpmbGFzaAY7AEZvOiVBY3Rpb25EaXNwYXRjaDo6Rmxhc2g6OkZsYXNoSGFzaAk6CkB1c2VkbzoIU2V0BjoKQGhhc2h7BjoLbm90aWNlVDoMQGNsb3NlZEY6DUBmbGFzaGVzewY7DElDOh5BY3RpdmVTdXBwb3J0OjpTYWZlQnVmZmVyIiNQYWdlIHdhcyBzdWNjZXNzZnVsbHkgdXBkYXRlZC4HOwBUOg9AaHRtbF9zYWZlVDoJQG5vdzA%3D--4179306ba148893eaa65cf900c69df66790ae09e;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJThmZmMyZWFhYTA1YzAyOWRiZjQwNmNjZGE1NzFkMDhjBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewY6C25vdGljZVQ6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOwxJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIjUGFnZSB3YXMgc3VjY2Vzc2Z1bGx5IHVwZGF0ZWQuBzsAVDoPQGh0bWxfc2FmZVQ6CUBub3cw--6b31caa6d7d7d8b7561ef5faa1770d310302e1eb;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f51298c82cd14f39000033","_id":"50f51298c82cd14f39000033","created_at":"2013-01-15T09:26:00+01:00","updated_at":"2013-01-15T09:46:09+01:00","title":"Latest","slug":"latest","fullpath":"products/latest","handle":null,"position":0,"raw_template":"{%
+	string: ! '{"id":"5101101cc82cd12530000019","_id":"5101101cc82cd12530000019","created_at":"2013-01-24T11:42:36+01:00","updated_at":"2013-01-24T12:09:53+01:00","title":"Latest","slug":"latest","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"products/latest","localized_fullpaths":{"en":"products/latest","es":"es/products/latest"},"depth":2,"translated_in":["en"],"raw_template":"{%
+	extends parent %}\r\n{% block content %}\r\n The name of the latest product
+	is: {{ contents.products.last.name }}\r\n{% endblock %}","escaped_raw_template":"{%
	extends parent %}\r\n{% block content %}\r\n The name of the latest product
-	is: {{ contents.products.last.name }}\r\n{% endblock %}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"products/latest","es":"es/products/latest"},"translated_in":["en"]}'
+	is: {{ contents.products.last.name }}\r\n{% endblock %}","editable_elements":[]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: put
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f3fd85c82cd14f39000008.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/51010fd2c82cd17179000003.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: page[title]=P%C3%A1gina%20no%20encontrada&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=1&page[raw_template]=Content%20of%20the%20404%20page&locale=es
@@	@@ -603,34 +615,34 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"7ff9a72069c042e91643bc6ee648bd21"'
+	- ! '"90ebac8309acd3965a0b67d0f661245b"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- a2b6c0a35185e978969d115cf00d7bd9
+	- 21d004581aad123717e3c246863388d8
	X-Runtime:
-	- '0.018152'
+	- '0.026326'
	Content-Length:
-	- '603'
+	- '599'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTBhZmFjZTU0OGQ3NmJlNTAxYjEyZDNiNTkwOWNmOWY2BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--93c836197c96b241599a2b415d7cc9264b2da4e4;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTY5ZjU2NTg5YTM4NzQ1ZWJlOGFjNWFkOWNlMjczNWIwBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--6bc8d42dbc0e6e0cba9e6fd992a0fefe582157da;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fd85c82cd14f39000008","_id":"50f3fd85c82cd14f39000008","created_at":"2013-01-14T13:43:49+01:00","updated_at":"2013-01-15T09:46:09+01:00","title":"P\u00e1gina
-	no encontrada","slug":"404","fullpath":"404","handle":null,"position":1,"raw_template":"Content
-	of the 404 page","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"404","es":"es/404"},"translated_in":["en","es"]}'
+	string: ! '{"id":"51010fd2c82cd17179000003","_id":"51010fd2c82cd17179000003","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T12:09:53+01:00","title":"P\u00e1gina
+	no encontrada","slug":"404","position":1,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"404","localized_fullpaths":{"en":"404","es":"es/404"},"depth":0,"translated_in":["en","es"],"raw_template":"Content
+	of the 404 page","escaped_raw_template":"Content of the 404 page","editable_elements":[]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
	method: put
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f3fd84c82cd14f39000007.json?auth_token=syqtyQLXyex7st35PNUM
+	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/51010fd2c82cd17179000002.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
	string: page[title]=P%C3%A1gina%20de%20inicio&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=0&page[raw_template]=New%20content%20of%20the%20home%20page%0D%0A&locale=es
@@	@@ -647,112 +659,117 @@ http_interactions:
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"969208d9d164432167362fc9e1fd0f7e"'
+	- ! '"ffdb69f5f7838791bd1106459c62c389"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 6dabfc6d1d9317c96896144317176080
+	- ba3258ca62dbbfe068121e4ddf72c7ba
	X-Runtime:
-	- '0.018563'
+	- '0.025239'
	Content-Length:
-	- '605'
+	- '610'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJWFkNzg2NDU2NTYwMWQ1NjNhM2Q1ZTA2YTI5MTQ1YWJlBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--a83603e3786d101b3ab963ad1b579d06f2c494dc;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTJhM2RhMGIyMjg0NTYyN2FjMDdhMDBhYzBlYzdiZTYxBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--e4e7f807fbebda56e8ce56dbcec8885d5d3e1d82;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fd84c82cd14f39000007","_id":"50f3fd84c82cd14f39000007","created_at":"2013-01-14T13:43:49+01:00","updated_at":"2013-01-15T09:46:09+01:00","title":"P\u00e1gina
-	de inicio","slug":"index","fullpath":"index","handle":null,"position":0,"raw_template":"New
-	content of the home page\r\n","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"","es":"es"},"translated_in":["en","es"]}'
+	string: ! '{"id":"51010fd2c82cd17179000002","_id":"51010fd2c82cd17179000002","created_at":"2013-01-24T11:41:22+01:00","updated_at":"2013-01-24T12:09:53+01:00","title":"P\u00e1gina
+	de inicio","slug":"index","position":0,"response_type":"text/html","cache_strategy":"none","redirect":false,"redirect_type":301,"listed":true,"published":true,"templatized":false,"templatized_from_parent":false,"fullpath":"index","localized_fullpaths":{"en":"","es":"es"},"depth":0,"translated_in":["en","es"],"raw_template":"New
+	content of the home page\r\n","escaped_raw_template":"New content of the home
+	page\r\n","editable_elements":[]}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
-	method: put
-	uri: http://locomotive.engine.dev:3000/locomotive/api/pages/50f3fdc4c82cd14f39000012.json?auth_token=syqtyQLXyex7st35PNUM
+	method: get
+	uri: http://locomotive.engine.dev:3000/locomotive/api/theme_assets.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
-	string: page[title]=translated&page[slug]=translated&page[redirect_type]=301&page[listed]=true&page[published]=true&page[cache_strategy]=none&page[response_type]=text%2Fhtml&page[position]=0&page[parent_id]=50f3fd84c82cd14f39000007&page[raw_template]=%7B%7B%20'hello_world'%20%7C%20translate%7D%7D%20%7B%25%20locale_switcher%20%25%7D&locale=es
+	string: ''
	headers: {}
	response:
	status:
	code: 200
	message: ! 'OK '
	headers:
-	Location:
-	- http://locomotive.engine.dev:3000/locomotive/api/pages
	Content-Type:
	- application/json; charset=utf-8
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"d637fe069643c439cf12430dccd7ba70"'
+	- ! '"d751713988987e9331980363e24189ce"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 18a6075cf700fdc5eac796494d5ace8a
+	- 80dda9dceb6907d16c568ad1c28d4106
	X-Runtime:
-	- '0.019796'
+	- '0.020839'
	Content-Length:
-	- '645'
+	- '2'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:53 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTgxODc0YTMzMzcwNGFlNTZhNWNiZjZmYzBhMzhkZDI2BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--0c740fb880b723e430c5bc82137922e82cd5930e;
+	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTZhMzdkZDQ4MWZjMTIzODZkYTE1ZDhjOWY4Njc1ZGI1BjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBU--3f203659a59a96685fc7f3e6d285c31453418c07;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '{"id":"50f3fdc4c82cd14f39000012","_id":"50f3fdc4c82cd14f39000012","created_at":"2013-01-14T13:44:52+01:00","updated_at":"2013-01-15T09:46:09+01:00","title":"translated","slug":"translated","fullpath":"translated","handle":null,"position":0,"raw_template":"{{
-	''hello_world'' \| translate}} {% locale_switcher %}","published":true,"listed":true,"templatized":false,"templatized_from_parent":false,"target_klass_slug":null,"redirect":false,"redirect_url":null,"cache_strategy":"none","response_type":"text/html","template_changed":null,"editable_elements":[],"localized_fullpaths":{"en":"translated","es":"es/translated"},"translated_in":["en","es"]}'
+	string: ! '[]'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:53 GMT
	- request:
-	method: get
-	uri: http://locomotive.engine.dev:3000/locomotive/api/theme_assets.json?auth_token=syqtyQLXyex7st35PNUM
+	method: put
+	uri: http://locomotive.engine.dev:3000/locomotive/api/translations/51011077c82cd1253000001d.json?auth_token=jKkxPorzWo8uNYUxiiQC
	body:
	encoding: US-ASCII
-	string: ''
+	string: translation[_id]=51011077c82cd1253000001d&translation[key]=hello_world&translation[values][en]=Hello%20world!&translation[values][es]=%C2%A1Hola%2C%20Mundo!
	headers: {}
	response:
	status:
	code: 200
	message: ! 'OK '
	headers:
+	X-Message:
+	- ! '"Translation was successfully updated."'
+	X-Message-Type:
+	- notice
+	Location:
+	- http://locomotive.engine.dev:3000/locomotive/api/translations/51011077c82cd1253000001d
	Content-Type:
	- application/json; charset=utf-8
	X-Ua-Compatible:
	- IE=Edge
	Etag:
-	- ! '"d751713988987e9331980363e24189ce"'
+	- ! '"b567d63bf604a10c2ef8177f45a0f9ea"'
	Cache-Control:
	- max-age=0, private, must-revalidate
	X-Request-Id:
-	- 519508bc63d31034685b56be85b6f7ad
+	- 9a76a90add3f47535deadb3ec9674488
	X-Runtime:
-	- '0.014636'
+	- '0.023540'
	Content-Length:
-	- '2'
+	- '225'
	Server:
	- WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10)
	Date:
-	- Tue, 15 Jan 2013 08:46:09 GMT
+	- Thu, 24 Jan 2013 11:09:54 GMT
	Connection:
	- Keep-Alive
	Set-Cookie:
-	- _dummy_session=BAh7B0kiD3Nlc3Npb25faWQGOgZFRkkiJTc4NTg4YmM0NzJjOWU5YzY0NGViNjYxYTQ0MDI2ZWFmBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVVpAfNpAf1pAX1pAchpMWkB0WlUaT5pAGkAaQhJIhlGcjdCbTVnYThNTXFBV3Q1aFFYcAY7AFQ%3D--e3e4e645649c2f64224236496c9f74423521ad91;
+	- _dummy_session=BAh7CEkiD3Nlc3Npb25faWQGOgZFRkkiJWEwNzhkNTZhMzViMTY2NTI4ODZiZGRjMmViNjFkM2YwBjsAVEkiJ3dhcmRlbi51c2VyLmxvY29tb3RpdmVfYWNjb3VudC5rZXkGOwBUWwhJIhhMb2NvbW90aXZlOjpBY2NvdW50BjsARlsGbzoTQlNPTjo6T2JqZWN0SWQGOgpAZGF0YVsRaVZpBmkUaQHSaQHIaTFpAdFpdml%2BaQBpAGkJSSIZM1E2OFRtN0c4MUV4RkhiWjc3R3gGOwBUSSIKZmxhc2gGOwBGbzolQWN0aW9uRGlzcGF0Y2g6OkZsYXNoOjpGbGFzaEhhc2gJOgpAdXNlZG86CFNldAY6CkBoYXNoewY6C25vdGljZVQ6DEBjbG9zZWRGOg1AZmxhc2hlc3sGOwxJQzoeQWN0aXZlU3VwcG9ydDo6U2FmZUJ1ZmZlciIqVHJhbnNsYXRpb24gd2FzIHN1Y2Nlc3NmdWxseSB1cGRhdGVkLgc7AFQ6D0BodG1sX3NhZmVUOglAbm93MA%3D%3D--3d4f38819c6dde016ce119aaaf587de232857499;
	domain=.engine.dev; path=/; HttpOnly
	body:
	encoding: US-ASCII
-	string: ! '[]'
+	string: ! '{"id":"51011077c82cd1253000001d","_id":"51011077c82cd1253000001d","created_at":"2013-01-24T11:44:07+01:00","updated_at":"2013-01-24T11:44:07+01:00","key":"hello_world","values":{"en":"Hello
+	world!","es":"\u00a1Hola, Mundo!"}}'
	http_version:
-	recorded_at: Tue, 15 Jan 2013 08:46:09 GMT
+	recorded_at: Thu, 24 Jan 2013 11:09:54 GMT
	recorded_with: VCR 2.3.0

spec/integration/integration_helper.rb +1 -0

@@	@@ -1,6 +1,7 @@
	require File.dirname(__FILE__) + '/../spec_helper'
	require 'vcr'
	require 'webmock/rspec'
+	require 'active_support/core_ext'

	VCR.configure do \|c\|
	c.ignore_localhost = false

spec/integration/server_spec.rb +2 -2

@@	@@ -1,4 +1,4 @@
-	#encoding: utf-8
+	# encoding: utf-8
	require File.dirname(__FILE__) + "/integration_helper"
	require "locomotive/builder/server"
	require "rack/test"
@@	@@ -7,7 +7,7 @@ describe Locomotive::Builder::Server do
	include Rack::Test::Methods

	def app
-	pull_site
+	clone_site
	reader = Locomotive::Mounter::Reader::FileSystem.instance
	reader.run!(path: "site")
	Locomotive::Builder::Server.new(reader)

spec/integration/sites_spec.rb +4 -7

@@	@@ -3,26 +3,23 @@ require File.dirname(__FILE__) + "/integration_helper"
	describe Locomotive::Builder do
	it "imports" do
	File.exists?("site/config/site.yml").should be_false
-	pull_site
+	clone_site
	YAML.load_file("site/config/site.yml").should == {
	"name"=>"locomotive",
	"locales"=>["en", "es"],
	"subdomain"=>"locomotive",
-	"domains"=>["locomotive.engine.dev"],
-	"seo_title"=>{"en"=>nil, "es"=>nil},
-	"meta_keywords"=>{"en"=>nil, "es"=>nil},
-	"meta_description"=>{"en"=>nil, "es"=>nil}
+	"domains"=>["locomotive.engine.dev"]
	}
	end

	it "pushes" do
-	pull_site
+	clone_site
	file_name = File.dirname(__FILE__) + '/../../site/app/views/pages/index.liquid'
	text = File.read(file_name)
	text.gsub!(/Content of the home page/, "New content of the home page")
	File.open(file_name, "w") { \|file\| file.puts text}
	VCR.use_cassette('push') do
-	Locomotive::Builder.push("site", "http://locomotive.engine.dev:3000", "admin@locomotivecms.com", "locomotive")
+	Locomotive::Builder.push("site", {"host" => "locomotive.engine.dev:3000"}, "email" => "admin@locomotivecms.com", "password" => "locomotive")
	end

	WebMock.should have_requested(:put, /pages\/.+.json\?auth_token=.+/).with(:body => /page\[raw_template\]=New%20content%20of%20the%20home%20page/).once

spec/support/helpers.rb +2 -2

@@	@@ -4,9 +4,9 @@ module Spec
	FileUtils.rm_rf(File.expand_path('../../../site', __FILE__))
	end

-	def pull_site
+	def clone_site
	VCR.use_cassette('pull') do
-	Locomotive::Builder.pull("site", "http://locomotive.engine.dev:3000", "admin@locomotivecms.com", "locomotive")
+	Locomotive::Builder.clone("site", {"host" => "locomotive.engine.dev:3000"}, "email" => "admin@locomotivecms.com", "password" => "locomotive")
	end
	end
	end