burp_cms 1.3.20 → 1.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d802a4742ce33b8f7328c3d0c4403c178bc28d7e
-  data.tar.gz: ad45d06949b739f1b7390f0f70fdad51e74b4702
+  metadata.gz: 90816dfafb7b8d198d375659eded50e913cb071d
+  data.tar.gz: 699e7ab650690613be2e0eda642a03554e849511
 SHA512:
-  metadata.gz: 0cdc26a4f3b0b0376030ff19e614bd2cac0d3219f58eeae5952e6056d9344286141b864cd6b3293279500b296d8a717c96265c95ea9b7bf2314f9b1cd6600347
-  data.tar.gz: f6cf1dbad3d5e1ddd5dc185c5635702a2ef8cc7a18c6c3b1c5ef4e23592dad65af3cd110b16f0dcacf325adb528b842ba2a1cad74d8e5e357431170bfb643d60
+  metadata.gz: d4b98fddc20fc618794efb84b183d1e8e3fc71a0822ba92fc57d8628a87bb495dc06e0a6696f839f264dac6f38446c7f3c29d20a43a77b8ea66323c3d94c65b2
+  data.tar.gz: 34ae4f281246c95e51a18c0b47440aa893557de93aa3423f85da1ca7a36a10902dc9d287d6eca3bdf2f81709b31647d449d7b5921e5e02430da0e58325b8b8a5

data/app/assets/packages/burp/editing/js/content-decorator.js

@@ -287,11 +287,13 @@
       this.element.html("");
       this.element.append(tempElement.children());
       
-      initializeMovable(this, this.element.find('img'), function(element, positionClass) { 
-        $(element).removeClass('left center right');
-        $(element).addClass(positionClass);
-        return element;
-      });
+      setTimeout(function() {
+        initializeMovable(_this, _this.element.find('> img'), function(element, positionClass) { 
+          $(element).removeClass('left center right');
+          $(element).addClass(positionClass);
+          return element;
+        });
+      },10);
     },
     
     makeDroppable: function(elements, createCallback) {

data/app/controllers/burp/application_controller.rb

@@ -2,7 +2,6 @@ module Burp
   class ApplicationController < ActionController::Base
     
     protect_from_forgery
-    before_filter :refresh_access
     before_filter :authenticate
     before_filter :init_body_classes
     
@@ -19,12 +18,12 @@ module Burp
     
     private
     
-    def refresh_access
-      Burp.access.refresh
+    def access
+      @access ||= Burp.new_access_instance(request, self)
     end
     
     def authenticate
-      unless Burp.access.may_skip_http_auth? || Rails.env == "test"
+      unless access.may_skip_http_auth? || Rails.env == "test"
       
         if !Rails.application.config.respond_to?(:burp_password) or !Rails.application.config.respond_to?(:burp_username)
           raise "config.burp_username and config.burp_password are not set.\n\nYou can fix this by adding them to application.rb."

data/app/controllers/burp/catch_all_controller.rb

@@ -7,8 +7,9 @@ class Burp::CatchAllController < ApplicationController
     @menu = Burp::Menu.find("main")
     @burp_page_path = params[:burp_page_path] || request.path
     @cms_page = Burp.find_page(@burp_page_path)
-    Burp.access.refresh
-    Burp.access.may_view_page!(@cms_page)
+    
+    @access = self.respond_to?(:access) ? self.access : Burp.new_access_instance(request, self)
+    @access.may_view_page!(@cms_page)
 
     raise ActionController::RoutingError.new('Page not Found') if @cms_page.nil?
 

data/app/controllers/burp/files_controller.rb

@@ -8,7 +8,7 @@ module Burp
     
     def index
       
-      Burp.access.may_view_file_list! do
+      access.may_view_file_list! do
       
         @files = FileModel.all
       
@@ -39,7 +39,7 @@ module Burp
       if File.expand_path(file_path) != file_path
         render :text => "403, Forbiden!", :status => 403, :content_type => "text/plain"
       elsif File.exist?(file_path)
-        Burp.access.may_view_file!(file_path) do
+        access.may_view_file!(file_path) do
           
           headers["Cache-Control"] = "Public"
           headers["Last-Modified"] = File.mtime(file_path).utc.rfc2822
@@ -56,7 +56,7 @@ module Burp
     end
     
     def create 
-      Burp.access.may_upload_a_file! do
+      access.may_upload_a_file! do
         Util::UploadHandler.handle(params[:qqfile],request) do |file|
         
           errors = []

data/app/controllers/burp/pages_controller.rb

@@ -2,14 +2,14 @@ module Burp
   class PagesController < Burp::ApplicationController
 
     def index
-      Burp.access.may_view_page_list! do
+      access.may_view_page_list! do
         @pages = PageModel.all
       end
     end
     
     def edit
       @page = PageModel.find(("/"+params[:id]).gsub("/$root","/"))
-      Burp.access.may_edit_page!(@page) do    
+      access.may_edit_page!(@page) do    
           
         respond_to do |format|
           format.html {}
@@ -21,7 +21,7 @@ module Burp
     def show
       path = ("/"+params[:id]).gsub("/$root","/")
       @page = PageModel.find(path)
-      Burp.access.may_view_page_data!(@page) do
+      access.may_view_page_data!(@page) do
 
         respond_to do |format|
           format.html {
@@ -34,14 +34,14 @@ module Burp
     
     def new
       @page = PageModel.new
-      Burp.access.may_create_new_page! do
+      access.may_create_new_page! do
         render :action => :edit
       end
     end
     
     def create
       
-      Burp.access.may_create_new_page! do
+      access.may_create_new_page! do
         
         @page = PageModel.new
         
@@ -73,7 +73,7 @@ module Burp
     def update
       
       @page = PageModel.find(("/"+params[:id]).gsub("/$root","/")) || PageModel.new(:path => ("/"+params[:id]).gsub("/$root","/"))
-      Burp.access.may_update_page!(@page) do
+      access.may_update_page!(@page) do
   
         @page.title = params[:page][:title] if params[:page][:title]
         @page.path = params[:page][:path] if params[:page][:path]
@@ -99,7 +99,7 @@ module Burp
     def destroy
       
       @page = PageModel.find(("/"+params[:id]).gsub("/$root","/"))
-      Burp.access.may_remove_page!(@page) do
+      access.may_remove_page!(@page) do
         
         @page.remove
         redirect_to "/burp/pages/"

data/app/controllers/burp/static_controller.rb

@@ -1,7 +1,7 @@
 module Burp
   class StaticController < Burp::ApplicationController
     def index
-      Burp.access.may_view_static_page!(params[:action])
+      access.may_view_static_page!(params[:action])
     end 
     
     def help

data/app/lib/burp/access.rb

@@ -1,8 +1,7 @@
 module Burp
   class Access
     
-    def initialize(data)
-    end
+    include MayI
     
     # If true no http auth check will be made. (Ment as a way to remove Burp's default auth method.)
     def may_skip_http_auth

data/lib/burp/version.rb

@@ -1,3 +1,3 @@
 module Burp
-  VERSION = "1.3.20"
+  VERSION = "1.3.21"
 end

data/lib/burp_cms.rb

@@ -10,6 +10,7 @@ require "burp/version"
 module Burp
   
   @@content_directory = nil
+  @@access_builder = nil
   
   
   def self.find_page(path)
@@ -21,8 +22,16 @@ module Burp
   
   
   
-  def self.access
-    @@access ||= MayI::Access.new("Burp::Access")
+  def self.new_access_instance(request, controller)
+    if @@access_builder
+      @@access_builder.call(request, controller)
+    else
+      Burp::Access.new
+    end
+  end
+  
+  def self.set_access_builder=(&block)
+    @@access_builder = block
   end
   
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: burp_cms
 version: !ruby/object:Gem::Version
-  version: 1.3.20
+  version: 1.3.21
 platform: ruby
 authors:
 - Darwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -56,16 +56,16 @@ dependencies:
   name: mayi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement