sunrise-cms 0.6.10 → 0.6.11

data/README.md

@@ -102,6 +102,16 @@ class SunriseProduct < Sunrise::AbstractModel
 end
 ```
 
+Assets uploading detect ccurrent user by request.env['warden'].user. To overwrite it use:
+
+```ruby
+class Asset
+  def uploader_user(request)
+    request.env['warden'].user(:account) || request.env['warden'].user(:user)
+  end
+end
+```
+
 ### Export data
 
 #### XML, JSON, CSV

data/app/controllers/sunrise/manager_controller.rb

@@ -35,7 +35,7 @@ module Sunrise
     
     def create
       @record.update_attributes(model_params)
-      respond_with(@record, :location => redirect_after_update)
+      respond_with(@record, :location => redirect_after_update(@record))
     end
     
     def edit
@@ -46,7 +46,7 @@ module Sunrise
     
     def update
       @record.update_attributes(model_params)
-      respond_with(@record, :location => redirect_after_update)
+      respond_with(@record, :location => redirect_after_update(@record))
     end
     
     def destroy
@@ -154,7 +154,7 @@ module Sunrise
         index_path(query.merge(options))
       end
       
-      def redirect_after_update
+      def redirect_after_update(record = nil)
         if abstract_model.without_list?
           index_path(:model_name => abstract_model.plural)
         else

data/lib/generators/sunrise/install_generator.rb

@@ -26,7 +26,8 @@ module Sunrise
         
         template('config/database.yml', 'config/database.yml.sample')
         template('config/logrotate-config', 'config/logrotate-config.sample')
-        template('config/nginx-config', 'config/nginx-config.sample')
+        template('config/nginx-unicorn', 'config/nginx-unicorn.sample')
+        template('config/nginx-passenger', 'config/nginx-passenger.sample')
       end
       
       # copy models

data/lib/generators/sunrise/templates/config/nginx-passenger

@@ -0,0 +1,50 @@
+# <%= app_name %>
+#
+
+server {
+  listen 5.9.144.130:80;
+  server_name <%= app_name %>.fodojo.com;
+  
+  access_log off;
+  error_log off;
+  server_tokens off;
+  
+  root /var/www/<%= app_name %>/public;
+  
+  try_files $uri $uri.html $uri/index.html /cache/$uri/index.html /cache/$uri.html /cache/$uri @app;
+  
+  location ^~ /cache {
+    return 404;
+  }
+  
+  location ~ /\.[^\/]+ {
+    return 404;
+  }
+  
+  location @app {
+    client_max_body_size       20m;
+    client_body_buffer_size    128k;
+    
+    passenger_ruby /usr/local/rvm/wrappers/ruby-1.9.3-p448@global/ruby;
+    passenger_enabled on;
+  }
+  
+  location ~ ^/(assets|uploads|images|javascripts|stylesheets)/ {
+    expires 1y;
+    add_header Cache-Control public;
+    add_header Last-Modified "";
+    add_header ETag "";
+    break;
+  }
+  
+  # This rewrites all the requests to the maintenance.html page if it exists in the doc root.
+  if (-f $document_root/system/maintenance.html) {
+    return 503;
+  }
+   
+  error_page 503 @503;
+  location @503 {
+    root /var/www/<%= app_name %>/public;
+    rewrite ^(.*)$ /system/maintenance.html break;
+  }
+}

data/lib/sunrise/models/asset.rb

@@ -55,8 +55,8 @@ module Sunrise
       
       def as_json(options = nil)
         options = {
-          :only => [:id, :guid, :assetable_id, :assetable_type, :user_id], 
-          :root => 'asset',
+          :root => "asset",
+          :only => [:id, :guid, :assetable_id, :assetable_type, :user_id, :public_token], 
           :methods => [:filename, :url, :thumb_url, :size, :content_type]
         }.merge(options || {})
         

data/lib/sunrise/version.rb

@@ -1,3 +1,3 @@
 module Sunrise
-  VERSION = "0.6.10".freeze
+  VERSION = "0.6.11".freeze
 end

data/spec/generators/install_generator_spec.rb

@@ -27,7 +27,7 @@ describe Sunrise::Generators::InstallGenerator do
   
   it "should copy_configurations" do
     ["db/seeds.rb", "config/initializers/sunrise.rb", "config/database.yml.sample",
-     "config/logrotate-config.sample", "config/nginx-config.sample"].each do |file|
+     "config/logrotate-config.sample", "config/nginx-unicorn.sample", "config/nginx-passenger.sample"].each do |file|
       assert_file file
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sunrise-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -505,7 +505,8 @@ files:
 - lib/generators/sunrise/templates/config/database.yml
 - lib/generators/sunrise/templates/config/logrotate-config
 - lib/generators/sunrise/templates/config/mongoid/sunrise.rb
-- lib/generators/sunrise/templates/config/nginx-config
+- lib/generators/sunrise/templates/config/nginx-passenger
+- lib/generators/sunrise/templates/config/nginx-unicorn
 - lib/generators/sunrise/templates/config/seeds.rb
 - lib/generators/sunrise/templates/models/active_record/ability.rb
 - lib/generators/sunrise/templates/models/active_record/asset.rb