locomotive_cms 2.1.1 → 2.1.2

data/app/presenters/locomotive/account_presenter.rb

@@ -3,7 +3,7 @@ module Locomotive
 
     ## properties ##
     properties  :name, :email, :locale
-    properties  :admin, :api_key, only_getter: true
+    property    :admin, only_getter: true
 
     with_options only_setter: true do |presenter|
       presenter.properties :password, :password_confirmation

data/app/views/locomotive/my_account/edit.html.haml

@@ -2,7 +2,7 @@
 
 - content_for :backbone_view_data do
   :plain
-    account: #{escape_json @account.to_json.html_safe}
+    account: #{escape_json to_json(@account)}
 
 - content_for :submenu do
   = render_cell 'locomotive/settings_menu', :show

data/app/views/locomotive/public/pages/show_toolbar.html.haml

@@ -13,18 +13,18 @@
 
     %script{ type: 'text/javascript' }
       :plain
-        window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' };
+        window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' }
 
     = stylesheet_link_tag     'locomotive/inline_editor', media: 'screen'
     = javascript_include_tag  'locomotive/inline_editor'
 
     %script{ type: 'text/javascript' }
       :plain
-        window.locale         = '#{I18n.locale}';
-        window.content_locale = '#{::Mongoid::Fields::I18n.locale}';
+        window.locale                     = '#{I18n.locale}';
+        window.content_locale             = '#{::Mongoid::Fields::I18n.locale}';
 
-        Locomotive.current_site     = new Locomotive.Models.Site(#{escape_json current_site.to_json.html_safe});
-        Locomotive.current_account  = new Locomotive.Models.Account(#{escape_json current_locomotive_account.to_json.html_safe});
+        window.Locomotive.current_site    = new Locomotive.Models.Site(#{escape_json to_json(current_site)});
+        window.Locomotive.current_account = new Locomotive.Models.Account(#{escape_json to_json(current_locomotive_account)});
 
         $(document).ready(function() {
 

data/app/views/locomotive/shared/_head.html.haml

@@ -9,19 +9,19 @@
 
 %script{ type: 'text/javascript' }
   :plain
-    window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' };
+    window.Locomotive = { mounted_on: '#{Locomotive.mounted_on}' }
 
 = stylesheet_link_tag     'locomotive', media: 'screen'
 = javascript_include_tag  'locomotive'
 
 %script{ type: 'text/javascript' }
   :plain
-    window.locale                 = '#{I18n.locale}';
-    window.content_locale         = '#{::Mongoid::Fields::I18n.locale}';
-    window.permalink_service_url  = '#{Locomotive.mounted_on}/_permalink.json';
+    window.locale                     = '#{I18n.locale}';
+    window.content_locale             = '#{::Mongoid::Fields::I18n.locale}';
+    window.permalink_service_url      = '#{Locomotive.mounted_on}/_permalink.json';
 
-    Locomotive.current_site     = new Locomotive.Models.Site(#{escape_json current_site.to_presenter.as_json_for_html_view.to_json.html_safe});
-    Locomotive.current_account  = new Locomotive.Models.Account(#{escape_json current_locomotive_account.to_json.html_safe});
+    window.Locomotive.current_site    = new Locomotive.Models.Site(#{escape_json to_json(current_site)});
+    window.Locomotive.current_account = new Locomotive.Models.Account(#{escape_json to_json(current_locomotive_account)});
 
     $(document).ready(function() {
 

data/lib/locomotive/render.rb

@@ -49,7 +49,7 @@ module Locomotive
     # the "Page Not Found" page.
     #
     def render_no_page_error
-      render template: 'locomotive/errors/no_page', layout: false, status: 404
+      render template: '/locomotive/errors/no_page', layout: false, status: 404, formats: [:html]
     end
 
     # Prepare and set the response object for the Locomotive page retrieved

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1373,7 +1373,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -869763622149797030
+      hash: 2534107307124546099
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -1382,7 +1382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -869763622149797030
+      hash: 2534107307124546099
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23