Added 'local_ips' option to bricks.yml, Fixed dependency on newer ver…

…sions of rails.
zena · Aug 16, 2013 · f6f3bdf · f6f3bdf
1 parent 0064f76
commit f6f3bdf
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 66 deletions.
diff --git a/History.txt b/History.txt
@@ -3,6 +3,11 @@
 * Major changes
   * Support for multiple domains (site alias) for a single site.
 
+* Minor changes
+  * Added 'cmd' option for pdf brick. <== TODO: Document
+  * Added 'local_ips' option to bricks.yml (used when pdf engine cannot render non-public assets). <== TODO: Document
+  * Fixed dependency on newer versions of rails.
+
 == 1.2.5 2013-07-15
 
 * Major changes

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -405,7 +405,7 @@ def user_before_validation
 
       if !is_admin?
         # Make sure we remove dev_skin settings if user is not an admin.
-        self[:dev_skin_id] = nil
+        self.dev_skin_id = nil
       end
     end
 

diff --git a/config/bricks.yml b/config/bricks.yml
@@ -54,7 +54,12 @@ development:
 production:
 # Port used only to provide assets during custom rendering (pdf).
 # We need this to avoid deadlocks with round-robin based serving.
+# Do not use with Passenger.
 #  asset_port: 7999
+#
+# When external rendering engines (pdf) cannot get non-public assets, add the server ip to
+# what Zena considers 'local'
+#  local_ips: 123.45.67.89, 127.0.0.1
   activity:  ON
   cache_path: '/public/cache'
   mongrel:   OFF

diff --git a/config/gems.yml b/config/gems.yml
@@ -22,7 +22,7 @@ querybuilder:   '= 1.2.2'
 yamltest:       '= 0.7.0'
 safe_yaml:      '= 0.8.0'
 rubyless:       '= 0.8.10'
-property:       '= 2.3.2'
+property:       '= 2.3.3'
 versions:       '= 0.3.1'
 
 jeweler:

diff --git a/lib/zena.rb b/lib/zena.rb
@@ -21,6 +21,8 @@ def self.has_executable(*list)
   end
 
   ASSET_PORT     = Bricks.raw_config['asset_port'].to_i
+  LOCAL_IPS      = ((Bricks.raw_config['local_ips'] || '').split(',').map(&:strip) + %w{127.0.0.1 ::1}).uniq
+
 
   ENABLE_LATEX   = true  && has_executable('pdflatex') # enable LateX post-rendering
   ENABLE_FOP     = true  && has_executable('fop', 'xsltproc') # enable xsl-fo post-rendering

diff --git a/lib/zena/use/authlogic.rb b/lib/zena/use/authlogic.rb
@@ -86,11 +86,11 @@ def token_visitor
               User.find_by_single_access_token(user_token)
             end
           end
-
+          
           # Create a fake cookie based on HTTP_AUTH using session_id and render_token. This is
           # only used for requests from localhost (asset host).
           def forge_cookie_with_http_auth
-            if (request.headers['REMOTE_ADDR'] == '127.0.0.1' || request.headers['REMOTE_ADDR'] == '::1') && 
+            if Zena::LOCAL_IPS.include?(request.headers['REMOTE_ADDR']) &&
                (Zena::ASSET_PORT.to_i == 0 || request.port.to_i == Zena::ASSET_PORT)
               authenticate_with_http_basic do |login, password|
                 # login    = visitor.id

diff --git a/test/functional/nodes_controller_test.rb b/test/functional/nodes_controller_test.rb
@@ -983,7 +983,7 @@ def test_create_from_url
     if Zena::Use::Upload.has_network?
       preserving_files('test.host/data') do
         assert_difference('Node.count', 1) do
-          post 'create', 'attachment_url' => 'http://zenadmin.org/fr/blog/image5.jpg', 'node' => {'parent_id' => nodes_zip(:zena)}
+          post 'create', 'attachment_url' => 'http://zenadmin.org/fr/blog/image5.0c8db.jpg', 'node' => {'parent_id' => nodes_zip(:zena)}
         end
         document = assigns(:node)
         assert_equal 73633, document.size

diff --git a/test/integration/query_node/relations.yml b/test/integration/query_node/relations.yml
@@ -93,4 +93,12 @@ from_home:
   context:
     site: alias
   src: nodes from home limit 3
-  res: 'bird, flower'
+  res: 'bird, flower'
+
+# openging in art(33) and news(34)
+having_on_relation_count:
+  context:
+    params:
+      ids: '33,34'
+  src: 'tagged from tag select id.count as t_count where id in (#{params[:ids].split(",")}) in site having t_count = #{params[:ids].split(",").size}'
+  res: 'super ouverture'
diff --git a/test/unit/zena/use/upload_test.rb b/test/unit/zena/use/upload_test.rb
@@ -20,13 +20,13 @@ class UploadTest < Zena::View::TestCase
 
       context 'to a file too large' do
         setup do
-          @params = {'attachment_url' => "http://zenadmin.org/zena_playground.zip"}
+          @params = {'attachment_url' => "http://apod.nasa.gov/apod/image/0901/gcenter_hstspitzer_big.jpg"}
         end
 
         should 'return an error about file being too big, without a download' do
           file, error = get_attachment
           assert_nil file
-          assert_equal 'size (631.6 MB) too big to fetch url', error
+          assert_equal 'size (10.9 MB) too big to fetch url', error
         end
       end
 

diff --git a/zena.gemspec b/zena.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2013-07-16}
+  s.date = %q{2013-08-16}
   s.default_executable = %q{zena}
   s.description = %q{zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
   s.email = %q{gaspard@teti.ch}
@@ -2479,86 +2479,86 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
+      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_runtime_dependency(%q<property>, ["= 2.3.3"])
+      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
+      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
+      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
+      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_runtime_dependency(%q<simple_xlsx_writer>, [">= 0"])
       s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
       s.add_runtime_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_runtime_dependency(%q<open4>, [">= 0"])
       s.add_runtime_dependency(%q<will_paginate>, ["~> 2.3.12"])
       s.add_runtime_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_runtime_dependency(%q<safe_yaml>, ["= 0.8.0"])
-      s.add_runtime_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_runtime_dependency(%q<json>, ["= 1.5.1"])
-      s.add_runtime_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_runtime_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_runtime_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<property>, ["= 2.3.2"])
-      s.add_runtime_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_runtime_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_runtime_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_runtime_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_runtime_dependency(%q<tzinfo>, [">= 0"])
-      s.add_runtime_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_runtime_dependency(%q<rubyless>, ["= 0.8.10"])
       s.add_runtime_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
+      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+      s.add_dependency(%q<property>, ["= 2.3.3"])
+      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+      s.add_dependency(%q<gettext>, ["= 2.1.0"])
       s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<differ>, ["= 0.1.2"])
+      s.add_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_dependency(%q<tzinfo>, [">= 0"])
+      s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
+      s.add_dependency(%q<json>, ["= 1.5.1"])
+      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+      s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+      s.add_dependency(%q<versions>, ["= 0.3.1"])
+      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
       s.add_dependency(%q<rails>, ["= 2.3.18"])
-      s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<gettext>, ["= 2.1.0"])
+      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+      s.add_dependency(%q<open4>, [">= 0"])
       s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
       s.add_dependency(%q<gem_plugin>, [">= 0"])
-      s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
-      s.add_dependency(%q<versions>, ["= 0.3.1"])
-      s.add_dependency(%q<json>, ["= 1.5.1"])
-      s.add_dependency(%q<syntax>, ["= 1.0.0"])
+      s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<property>, ["= 2.3.2"])
-      s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-      s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-      s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-      s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-      s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-      s.add_dependency(%q<tzinfo>, [">= 0"])
-      s.add_dependency(%q<differ>, ["= 0.1.2"])
-      s.add_dependency(%q<rubyless>, ["= 0.8.10"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
-    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
+    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
+    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
+    s.add_dependency(%q<property>, ["= 2.3.3"])
+    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
+    s.add_dependency(%q<gettext>, ["= 2.1.0"])
     s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<differ>, ["= 0.1.2"])
+    s.add_dependency(%q<syntax>, ["= 1.0.0"])
+    s.add_dependency(%q<tzinfo>, [">= 0"])
+    s.add_dependency(%q<authlogic>, ["= 2.1.3"])
+    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
+    s.add_dependency(%q<json>, ["= 1.5.1"])
+    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
+    s.add_dependency(%q<simple_xlsx_writer>, [">= 0"])
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.3"])
+    s.add_dependency(%q<versions>, ["= 0.3.1"])
+    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
     s.add_dependency(%q<rails>, ["= 2.3.18"])
-    s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<gettext>, ["= 2.1.0"])
+    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
+    s.add_dependency(%q<open4>, [">= 0"])
     s.add_dependency(%q<will_paginate>, ["~> 2.3.12"])
     s.add_dependency(%q<gem_plugin>, [">= 0"])
-    s.add_dependency(%q<safe_yaml>, ["= 0.8.0"])
-    s.add_dependency(%q<versions>, ["= 0.3.1"])
-    s.add_dependency(%q<json>, ["= 1.5.1"])
-    s.add_dependency(%q<syntax>, ["= 1.0.0"])
+    s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
     s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-    s.add_dependency(%q<httmultiparty>, ["= 0.3.8"])
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<property>, ["= 2.3.2"])
-    s.add_dependency(%q<querybuilder>, ["= 1.2.2"])
-    s.add_dependency(%q<RedCloth>, ["= 3.0.4"])
-    s.add_dependency(%q<fast_gettext>, ["~> 0.4.16"])
-    s.add_dependency(%q<yamltest>, ["= 0.7.0"])
-    s.add_dependency(%q<authlogic>, ["= 2.1.3"])
-    s.add_dependency(%q<tzinfo>, [">= 0"])
-    s.add_dependency(%q<differ>, ["= 0.1.2"])
-    s.add_dependency(%q<rubyless>, ["= 0.8.10"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end