locomotive_cms 2.0.0.rc5 → 2.0.0.rc6

data/Gemfile

@@ -45,5 +45,7 @@ group :test do
 
   gem 'xpath', '~> 0.1.4'
 
+  gem 'json_spec'
+
   gem 'database_cleaner'
 end

data/app/controllers/locomotive/public/content_entries_controller.rb

@@ -8,6 +8,8 @@ module Locomotive
 
       skip_before_filter :verify_authenticity_token
 
+      skip_load_and_authorize_resource
+
       self.responder = Locomotive::ActionController::PublicResponder # custom responder
 
       respond_to :html, :json
@@ -15,6 +17,7 @@ module Locomotive
       def create
         @entry = @content_type.entries.create(params[:entry] || params[:content])
         flash[@content_type.slug.singularize] = @entry.to_presenter(:include_errors => true).as_json
+        Rails.logger.debug @entry.to_presenter(:include_errors => true).as_json
         respond_with @entry, :location => self.callback_url
       end
 

data/lib/locomotive/action_controller/responder.rb

@@ -10,10 +10,14 @@ module Locomotive
       end
 
       def options
+        current_site    = self.controller.send(:current_site)
+        current_account = self.controller.send(:current_locomotive_account)
+        ability         = current_account.nil? ? nil : self.controller.send(:current_ability)
+
         super.merge({
-          :current_site     => self.controller.send(:current_site),
-          :current_account  => self.controller.send(:current_locomotive_account),
-          :ability          => self.controller.send(:current_ability)
+          :current_site     => current_site,
+          :current_account  => current_account,
+          :ability          => ability
         })
       end
 

data/lib/locomotive/haml.rb

@@ -17,7 +17,9 @@ module ActionView
             content_tag_without_haml(name, content_or_options_with_block, *args, &block)
           end
         else
-          if preserve && content_or_options_with_block
+          if name == 'textarea'
+            tab_down(haml_buffer.tabulation)
+          elsif preserve && content_or_options_with_block
             content_or_options_with_block = Haml::Helpers.preserve(content_or_options_with_block)
           end
           content_tag_without_haml(name, content_or_options_with_block, *args, &block)

data/lib/locomotive/version.rb

@@ -1,3 +1,3 @@
 module Locomotive #:nodoc
-  VERSION = '2.0.0.rc5'
+  VERSION = '2.0.0.rc6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotive_cms
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc5
+  version: 2.0.0.rc6
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152269500 !ruby/object:Gem::Requirement
+  requirement: &2152167580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152269500
+  version_requirements: *2152167580
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152268040 !ruby/object:Gem::Requirement
+  requirement: &2152022600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152268040
+  version_requirements: *2152022600
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2152133040 !ruby/object:Gem::Requirement
+  requirement: &2152020640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152133040
+  version_requirements: *2152020640
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2152132220 !ruby/object:Gem::Requirement
+  requirement: &2152019000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *2152132220
+  version_requirements: *2152019000
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &2152130880 !ruby/object:Gem::Requirement
+  requirement: &2152180180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152130880
+  version_requirements: *2152180180
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2152129900 !ruby/object:Gem::Requirement
+  requirement: &2152178640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152129900
+  version_requirements: *2152178640
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &2152128800 !ruby/object:Gem::Requirement
+  requirement: &2152177040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152128800
+  version_requirements: *2152177040
 - !ruby/object:Gem::Dependency
   name: locomotive-mongoid-tree
-  requirement: &2152127880 !ruby/object:Gem::Requirement
+  requirement: &2152175700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152127880
+  version_requirements: *2152175700
 - !ruby/object:Gem::Dependency
   name: custom_fields
-  requirement: &2152126860 !ruby/object:Gem::Requirement
+  requirement: &2152174340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 2.0.0.rc9
   type: :runtime
   prerelease: false
-  version_requirements: *2152126860
+  version_requirements: *2152174340
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &2152125800 !ruby/object:Gem::Requirement
+  requirement: &2152173440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152125800
+  version_requirements: *2152173440
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2152161020 !ruby/object:Gem::Requirement
+  requirement: &2152172640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152161020
+  version_requirements: *2152172640
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2152159520 !ruby/object:Gem::Requirement
+  requirement: &2152188000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.16
   type: :runtime
   prerelease: false
-  version_requirements: *2152159520
+  version_requirements: *2152188000
 - !ruby/object:Gem::Dependency
   name: rails-backbone
-  requirement: &2152157680 !ruby/object:Gem::Requirement
+  requirement: &2152186500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152157680
+  version_requirements: *2152186500
 - !ruby/object:Gem::Dependency
   name: codemirror-rails
-  requirement: &2152155460 !ruby/object:Gem::Requirement
+  requirement: &2152185160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: '2.21'
   type: :runtime
   prerelease: false
-  version_requirements: *2152155460
+  version_requirements: *2152185160
 - !ruby/object:Gem::Dependency
   name: locomotive-tinymce-rails
-  requirement: &2152212800 !ruby/object:Gem::Requirement
+  requirement: &2152184040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 3.4.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152212800
+  version_requirements: *2152184040
 - !ruby/object:Gem::Dependency
   name: locomotive-aloha-rails
-  requirement: &2152210420 !ruby/object:Gem::Requirement
+  requirement: &2152181920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.20.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152210420
+  version_requirements: *2152181920
 - !ruby/object:Gem::Dependency
   name: flash_cookie_session
-  requirement: &2152209360 !ruby/object:Gem::Requirement
+  requirement: &2152180740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152209360
+  version_requirements: *2152180740
 - !ruby/object:Gem::Dependency
   name: locomotive_liquid
-  requirement: &2152208600 !ruby/object:Gem::Requirement
+  requirement: &2152263740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -208,10 +208,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152208600
+  version_requirements: *2152263740
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &2152207760 !ruby/object:Gem::Requirement
+  requirement: &2152261540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152207760
+  version_requirements: *2152261540
 - !ruby/object:Gem::Dependency
   name: responders
-  requirement: &2152316820 !ruby/object:Gem::Requirement
+  requirement: &2152300500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +230,10 @@ dependencies:
         version: 0.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152316820
+  version_requirements: *2152300500
 - !ruby/object:Gem::Dependency
   name: cells
-  requirement: &2152316020 !ruby/object:Gem::Requirement
+  requirement: &2152299700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -241,10 +241,10 @@ dependencies:
         version: 3.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152316020
+  version_requirements: *2152299700
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2152315200 !ruby/object:Gem::Requirement
+  requirement: &2152298780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -252,10 +252,10 @@ dependencies:
         version: 4.2.8
   type: :runtime
   prerelease: false
-  version_requirements: *2152315200
+  version_requirements: *2152298780
 - !ruby/object:Gem::Dependency
   name: sanitize
-  requirement: &2152314280 !ruby/object:Gem::Requirement
+  requirement: &2152298000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -263,10 +263,10 @@ dependencies:
         version: 2.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152314280
+  version_requirements: *2152298000
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &2152313520 !ruby/object:Gem::Requirement
+  requirement: &2152292920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -274,10 +274,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152313520
+  version_requirements: *2152292920
 - !ruby/object:Gem::Dependency
   name: unidecoder
-  requirement: &2152312740 !ruby/object:Gem::Requirement
+  requirement: &2152322980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -285,10 +285,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152312740
+  version_requirements: *2152322980
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &2152310080 !ruby/object:Gem::Requirement
+  requirement: &2152320340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -296,10 +296,10 @@ dependencies:
         version: 2.12.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152310080
+  version_requirements: *2152320340
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
-  requirement: &2152445600 !ruby/object:Gem::Requirement
+  requirement: &2152318520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -307,10 +307,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152445600
+  version_requirements: *2152318520
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &2152443360 !ruby/object:Gem::Requirement
+  requirement: &2152348760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -318,10 +318,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152443360
+  version_requirements: *2152348760
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &2152440280 !ruby/object:Gem::Requirement
+  requirement: &2152346900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -329,10 +329,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152440280
+  version_requirements: *2152346900
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &2152437840 !ruby/object:Gem::Requirement
+  requirement: &2152345800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -340,10 +340,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *2152437840
+  version_requirements: *2152345800
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &2152436720 !ruby/object:Gem::Requirement
+  requirement: &2152341480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -351,10 +351,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2152436720
+  version_requirements: *2152341480
 - !ruby/object:Gem::Dependency
   name: mimetype-fu
-  requirement: &2152435240 !ruby/object:Gem::Requirement
+  requirement: &2152356720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -362,10 +362,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152435240
+  version_requirements: *2152356720
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2152433720 !ruby/object:Gem::Requirement
+  requirement: &2152356080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -373,10 +373,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152433720
+  version_requirements: *2152356080
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &2152426200 !ruby/object:Gem::Requirement
+  requirement: &2152355220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -384,10 +384,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152426200
+  version_requirements: *2152355220
 - !ruby/object:Gem::Dependency
   name: actionmailer-with-request
-  requirement: &2152418020 !ruby/object:Gem::Requirement
+  requirement: &2152354540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -395,7 +395,7 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152418020
+  version_requirements: *2152354540
 description: Locomotive is a next generation CMS system with sexy admin tools, liquid
   templating, and inline editing powered by mongodb and rails 3.2
 email:
@@ -975,7 +975,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3180682494187684957
+      hash: -2291864863036399309
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: