constructor-pages 0.2.2 → 0.2.3

data/app/controllers/constructor_pages/pages_controller.rb

@@ -6,12 +6,12 @@ module ConstructorPages
     include ConstructorCore::DeviseHelper
 
     caches_page :show
-    
+
     before_filter :authenticate_user!, :except => [:show, :search, :sitemap]
     before_filter {@roots = Page.roots}
     layout 'constructor_core/application_admin', :except => [:show, :search, :sitemap]
     before_filter :cache, :only => [:create, :update, :destroy, :move_up, :move_down]
-        
+
     # TODO
     def index
       @user_signed_in = user_signed_in?
@@ -28,7 +28,7 @@ module ConstructorPages
       @multipart = false
 
       if params[:page]
-        @parent = Page.find(params[:page])        
+        @parent = Page.find(params[:page])
         @page.parent_id = @parent.id
 
         if @parent.template.child_id.nil? and !@parent.template.leaf?
@@ -38,7 +38,7 @@ module ConstructorPages
         end
       end
     end
-    
+
     def show
       if params[:all].nil?
         @page = Page.first
@@ -67,7 +67,7 @@ module ConstructorPages
           _template = render_to_string :partial => "json_templates/#{@page.template.code_name}.json.erb", :layout => false, :locals => {@page.template.code_name.to_sym => @page, :page => @page}
           _js = render_to_string :partial => "js_partials/#{@page.template.code_name}.js"
 
-          render :json => @page, :template => _template.gsub(/\n/, '\\\\n'), :js => _js
+          render :json => @page, :ancestors => @page.ancestors.map{|a| a.id}, :template => _template.gsub(/\n/, '\\\\n'), :js => _js
         }
       end
     end
@@ -117,7 +117,7 @@ module ConstructorPages
 
       render :template => "templates/#{template.code_name}_search"
     end
-    
+
     def edit
       @page = Page.find(params[:id])
       @page.template ||= Template.first
@@ -126,7 +126,7 @@ module ConstructorPages
       @multipart = @page.template.fields.map{|f| f.type_value == "image"}.include?(true) ? true : false
     end
 
-    def create              
+    def create
       @page = Page.new params[:page]
 
       if @page.save
@@ -136,7 +136,7 @@ module ConstructorPages
       end
     end
 
-    def update   
+    def update
       @page = Page.find params[:id]
 
       @page.template.fields.each do |field|
@@ -193,9 +193,9 @@ module ConstructorPages
 
       redirect_to :back
     end
-    
+
     private
-        
+
     def cache
       expire_page :action => :show
       cache_dir = ActionController::Base.page_cache_directory
@@ -203,5 +203,5 @@ module ConstructorPages
         FileUtils.rm_r(Dir.glob(cache_dir+"/*")) rescue Errno::ENOENT
       end
     end
-  end  
+  end
 end

data/config/initializers/dragonfly.rb

@@ -4,12 +4,6 @@ app = Dragonfly[:images]
 app.configure_with(:imagemagick)
 app.configure_with(:rails)
 
-app.datastore = Dragonfly::DataStorage::S3DataStore.new({
-    :bucket_name        => 'avgustklimat',
-    :access_key_id      => 'AKIAIGSQM22DEELECHJQ',
-    :secret_access_key  => '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'
-})
-
 app.configure do |c|
   c.url_format = '/images/:job/:basename.:format'
 end

data/constructor-pages.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform          = Gem::Platform::RUBY
   s.name              = %q{constructor-pages}
-  s.version           = '0.2.2'
+  s.version           = '0.2.3'
   s.summary           = %q{Pages for ConstructorCms}
   s.authors           = ['Ivan Zotov']
   s.require_paths     = %w(lib)
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'awesome_nested_set', '~> 2.0'
   s.add_dependency 'haml-rails'
   s.add_dependency 'aws-s3'
-  s.add_dependency 'fog'
   s.add_dependency 'russian', '~> 0.6.0'
   s.add_dependency 'RedCloth'  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: constructor-pages
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: russian
   requirement: !ruby/object:Gem::Requirement