zena 1.2.7 → 1.2.8

data/bricks/currency/zena/test/unit/currency_test.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class CurrencyTest < Zena::Unit::TestCase
+  APP_ID_PATH = File.join(Zena::ROOT, 'config', 'currency_app_id.txt')
+  include Bricks::Currency::ViewMethods
+  
+  if File.exist?(APP_ID_PATH)
+    Bricks::Currency.app_id = File.read(APP_ID_PATH).strip
+    
+    context 'with an app_id' do
+      should 'get currencies' do
+        list = Bricks::Currency.get_currencies
+        assert_equal 'Swiss Franc', list['CHF']
+        assert_equal 'Peruvian Nuevo Sol', list['PEN']
+        assert_equal 'Euro', list['EUR']
+      end
+      
+      should 'get rates' do
+        list = Bricks::Currency.get_rates(%w{EUR CHF USD}, 'CHF')
+        eur = list[0]
+        chf = list[1]
+        usd = list[2]
+        
+        assert_equal 'CHF',         chf[0]
+        assert_equal 1.0,           chf[1]
+        assert_equal 'Swiss Franc', chf[2]
+        
+        assert_equal 'EUR',   eur[0]
+        assert_kind_of Float, eur[1]
+        assert_equal 'Euro',  eur[2]
+        
+        assert_equal 'USD',                  usd[0]
+        assert_kind_of Float,                usd[1]
+        assert_equal 'United States Dollar', usd[2]
+      end
+      
+      should 'get rates for views' do
+        res = currency_rates(%w{EUR CHF USD}, 'CHF')
+        assert_match /^\[\["EUR", [0-9\.]+, "Euro"\], \["CHF", 1.0, "Swiss Franc"\], \["USD", [0-9\.]+, "United States Dollar"\]\]$/, res
+      end
+    end
+  end
+end

data/bricks/fs_skin/lib/bricks/fs_skin.rb

@@ -65,7 +65,7 @@ module Bricks
         
         base.class_eval do
           property do |p|
-            p.string 'z_fs_skin'
+            p.string 'z_fs_skin', :index => '.idx_string1'
           end
 
           safe_property 'z_fs_skin'

data/bricks/fs_skin/zena/skins/blog/Node-+search.zafu

@@ -3,7 +3,7 @@
 
     <h2 do='t'>search results</h2>
 
-    <ul id='search_results' do='search_results'>
+    <ul id='search_results' do='nodes where fulltext match #{params[:q]} in site'>
       <li class='result_entry' do='each'>
         <p class='result_image' do='if' kind_of='Document'> <r:link format='data' do='img' alt_src='icon' mode='pv'/><r:else do='img' alt_src='icon' mode='pv' link='self'/></p>
         <p class='result_name'><r:link/></p>      

data/bricks/fs_skin/zena/skins/blog/Node.zafu

@@ -33,7 +33,7 @@
         </ul>
       </div>
       <r:void name='latest_comments'/>
-      <div id='pages' do='nodes'>
+      <div id='pages' do='block' do='nodes'>
         <h2>pages</h2>
         <ul>
           <li do='each' do='link'/>

data/bricks/fs_skin/zena/test/unit/fs_skin_view_test.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../../../../test/test_helper'
+
+class FsSkinViewTest < Zena::View::TestCase
+
+  context 'A page using a fs_skin Skin' do
+    setup do
+      login(:lion)
+      skin = secure(Skin) { Skin.create(:title => 'foo', :z_fs_skin => 'fs_skin-blog', :parent_id => nodes_id(:skins), :v_status => Zena::Status::Pub)}
+      assert skin.errors.empty?
+    end
+    
+    context 'with a normal user' do
+      setup do
+        login(:anon)
+        visiting(:status)
+      end
+      
+      should 'build template partial on template_path_from_template_url and ignore skin' do
+        puts "\n\n\n\n ********************************************************"
+        puts " ********************************************************"
+        puts " ******************** RUNNING FS_SKIN TESTS **************"
+        puts " ********************************************************"
+        puts " ********************************************************\n\n\n"
+        fullpath  = fullpath_from_template_url('$fs_skin-blog/Node/pages', false)
+        main_path = fullpath_from_template_url('$fs_skin-blog/Node/_main', false)
+        FileUtils.rm(fullpath)  if File.exist?(fullpath)
+        FileUtils.rm(main_path) if File.exist?(main_path)
+        assert_equal '/test.host/zafu/$fs_skin-blog/Node/en/pages.erb', template_path_from_template_url('', '$fs_skin-blog/Node/pages', true)
+        assert File.exist?(main_path)
+        assert File.exist?(fullpath)
+        FileUtils.rm(fullpath)
+      end
+    end
+  end # A page using a fs_skin Skin
+end

data/bricks/pdf/lib/bricks/pdf.rb

@@ -71,7 +71,7 @@ module Bricks
         template_path = template_url(opts)
 
         # Produce html
-        data = render_to_string(:file => template_path, :layout=>false)
+        data = render_to_string(:file => template_path, :layout => false)
 
         target_file = Tempfile.new('trg').path + '.pdf'
 

data/bricks/sphinx/lib/bricks/sphinx.rb

@@ -4,6 +4,8 @@ module Bricks
   module Sphinx
     module NodeClassMethods
       include Zena::Acts::Secure
+      
+      # This seems overly complex.... FIXME: can't we only use the qb 'match' clause ?
       def search_text(query, opts = {})
         if offset = opts[:offset]
           limit = opts[:limit] || 20

data/bricks/sphinx/zena/init.rb

@@ -4,3 +4,17 @@ if errors = Bricks.runtime_requirement_errors('sphinx')
 end
 
 Node.send(:include, Bricks::Sphinx::NodeSearch)
+
+# add 'sphinx match xxxx' to QueryNode
+Node.query_compiler.add_fulltext_field('sphinx') do |processor, table, right|
+  helper = processor.instance_variable_get(:@rubyless_helper)
+  case right[0]
+  when :string, :dstring, :real, :integer
+    value = RubyLess.translate_string(helper, right[1])
+  when :rubyless
+    value = RubyLess.translate(helper, right[1])
+  else
+    raise ::QueryBuilder::Error.new("Can only match against literal or rubyless values.")
+  end
+  "#{table}.id IN (#{processor.send(:insert_bind, "Node.search_for_ids(#{value})")})"
+end

data/bricks/tags/zena/test/zafu/tags.yml

@@ -46,4 +46,8 @@ checkbox_tagged:
 
 tag_cloud:
   src: "<r:void do='tag_cloud from nodes in site' do='each' join=', '><r:name/> (<r:link_count/>)</r:void>"
-  res: "blue (2), sky (1)"
+  res: "blue (2), sky (1)"
+
+tag_cloud_where:
+  src: "<r:void do='tag_cloud where name like \"s%\" from nodes in site' do='each' join=', '><r:name/> (<r:link_count/>)</r:void>"
+  res: "sky (1)"

data/bricks/worker/lib/bricks/worker.rb

@@ -5,12 +5,13 @@ module Bricks
       include RubyLess
       set_table_name :delayed_jobs
 
-      safe_method  :run_at => Time, :created_at => Time, :info   => String
+      safe_method  :run_at => Time, :created_at => Time, :info   => {:class => String, :html_safe => true}
       # can be nil
       safe_context :locked_at => Time, :locked_by => String
 
       def info
-        obj = YAML.load(self[:handler])
+        # We load struct, not just a hash
+        obj = YAML.load(self[:handler], :safe => false)
         if obj.respond_to?(:info)
           obj.info
         else

data/bricks/zena/zena/migrate/20130829093753_add_versioned_flag_to_column.rb

@@ -0,0 +1,10 @@
+class AddVersionedFlagToColumn < ActiveRecord::Migration
+  def self.up
+    add_column :columns, :versioned, :boolean
+    execute "UPDATE columns SET versioned = 1"
+  end
+
+  def self.down
+    remove_column :columns, :versioned
+  end
+end

data/bricks/zena/zena/migrate/20130903084909_count_login_attempts.rb

@@ -0,0 +1,11 @@
+class CountLoginAttempts < ActiveRecord::Migration
+  def self.up
+    add_column :users, :login_attempt_count, :integer
+    add_column :users, :login_attempted_at, :datetime
+  end
+
+  def self.down
+    remove_column :users, :login_attempt_count
+    remove_column :users, :login_attempted_at
+  end
+end

data/bricks/zena/zena/migrate/20131104153126_index_fullpath.rb

@@ -0,0 +1,10 @@
+class IndexFullpath < ActiveRecord::Migration
+  def self.up                                                             
+    # 255 length = InnoDB limit
+    add_index "nodes", ["fullpath", "site_id"], :name => "index_on_fullpath_and_site_id", :length => {"fullpath"=>"255", "site_id"=>nil}
+  end
+
+  def self.down
+    remove_index  :nodes, :column => ['fullpath', 'site_id']
+  end
+end

data/bricks/zena/zena/migrate/20131104210011_rebuild_fullpath_after_change.rb

@@ -0,0 +1,10 @@
+class RebuildFullpathAfterChange < ActiveRecord::Migration
+  def self.up
+    Site.master_sites.each do |site|
+      site.rebuild_fullpath
+    end
+  end
+
+  def self.down
+  end
+end

data/bricks/zena/zena/migrate/20131105160420_add_skin_id_to_sites.rb

@@ -0,0 +1,9 @@
+class AddSkinIdToSites < ActiveRecord::Migration
+  def self.up
+    add_column :sites, :skin_id, :integer
+  end
+
+  def self.down
+    remove_column :sites, :skin_id
+  end
+end

data/bricks/zena/zena/migrate/20131105175822_add_profile_to_users.rb

@@ -0,0 +1,11 @@
+class AddProfileToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :is_profile, :boolean
+    add_column :users, :profile_id, :integer
+  end
+
+  def self.down
+    remove_column :users, :profile_id
+    remove_column :users, :is_profile
+  end
+end

data/bricks/zena/zena/migrate/20140213120038_fix_idx_scope.rb

@@ -0,0 +1,13 @@
+class FixIdxScope < ActiveRecord::Migration
+  FLDS  = %w{idx_class idx_scope idx_reverse_scope}
+  TABLE = :roles
+  def self.up
+    FLDS.each do |fld|
+      remove_column TABLE, fld rescue nil
+    end
+  end
+
+  def self.down
+    # noop
+  end
+end

data/bricks/zena/zena/migrate/20140628140247_add_site_readonly.rb

@@ -0,0 +1,9 @@
+class AddSiteReadonly < ActiveRecord::Migration
+  def self.up
+    add_column :sites, :site_readonly, :boolean
+  end
+
+  def self.down
+    remove_column :sites, :site_readonly
+  end
+end

data/config/bricks.yml

@@ -4,16 +4,19 @@ test:
   captcha:     ON
   acls:        ON
   grid:        ON
-  fs_skin:     OFF
+  fs_skin:     ON
   sphinx:      OFF
   worker:      OFF
   uv:          OFF
   spreadsheet: ON
   activity:    ON
-
+  currency:
+    switch: ON
+    app_id: test_app_id_xxx # APP_ID for testing is in config/currency_app_id.txt
 
 development:
-#  asset_port: 7999  
+#  asset_port: 7999    
+  cache_path: '/public'
   activity:  ON
   mongrel:   OFF
   passenger: ON
@@ -61,8 +64,9 @@ production:
 # 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
+# index_on_fullpath: ON
   activity:  ON
-  cache_path: '/public/cache'
+  cache_path: '/public'
   mongrel:   OFF
   passenger: ON
   uv:

data/config/gems.yml

@@ -11,6 +11,8 @@ fast_gettext:   '~> 0.4.16'
 will_paginate:  '~> 2.3.12'
 differ:         '= 0.1.2'
 shoulda:        '= 2.10.3'
+#rubyzip:        '= 0.9.9'
+httparty:       '= 0.7.8'
 httmultiparty : '= 0.3.8'
 open4:
 daemons:        # upload progress
@@ -18,11 +20,11 @@ gem_plugin:     # upload progress
 simple_xlsx_writer:    # spreadsheet
   lib:          'simple_xlsx'
 
-querybuilder:   '= 1.2.2'
+querybuilder:   '= 1.2.3'
 yamltest:       '= 0.7.0'
 safe_yaml:      '= 0.8.0'
-rubyless:       '= 0.8.10'
-property:       '= 2.3.3'
+rubyless:       '= 0.8.11'
+property:       '= 2.3.4'
 versions:       '= 0.3.1'
 
 RedCloth:

data/db/init/base/skins/default/Node-+login.zafu

@@ -14,6 +14,7 @@ a:hover { color:#04a;}
 table { margin:20px;}
 td { padding:5px; }
 #login_form { border:1px solid grey; background:#eee; width:400px; margin:120px auto; padding:0;}
+.error {background:#fcc; padding:8px; border-bottom:1px solid #333}
 </style>
 </head>
 
@@ -31,7 +32,13 @@ td { padding:5px; }
 
             <td><input name="password" size="20" type="password" /></td>
           </tr>
-          <tr><td></td><td><input name="commit" type="submit" value=" login " /> <p class='cancel' do='link' do='t'>cancel</p></td></tr>
+          <tr>
+            <td></td>
+            <td>
+              <input name="commit" type="submit" value=" login " /> <p class='cancel' do='link' do='t'>cancel</p>
+              <input name='lang' type='hidden' value='#{visitor.lang}'/>
+            </td>
+          </tr>
         </table>
       </form>
     </div>

data/db/init/base/skins/default/Node-+search.zafu

@@ -4,7 +4,7 @@
 
     <h2 do='t'>search results</h2>
 
-    <ul id='search_results' do='search_results'>
+    <ul id='search_results' do='nodes where fulltext match #{params[:q]} in site'>
       <li class='result_entry' do='each'>
         <p class='result_image' do='Document?'>
           <r:link format='data' do='img' alt_src='icon' mode='pv'/>

data/lib/bricks/loader.rb

@@ -133,11 +133,11 @@ module Bricks
           require mod_path
           mod = eval "Bricks::#{mod.camelcase}"
           Zena.use mod
-        
-          init_rb = "#{path}/zena/init.rb"
-          if File.exist?(init_rb)
-            require init_rb
-          end
+        end
+      
+        init_rb = "#{path}/zena/init.rb"
+        if File.exist?(init_rb)
+          require init_rb
         end
       end
     end

data/lib/gettext_strings.rb

@@ -50,6 +50,8 @@ module Zena
     N_('img_custom_inherit') # icon
     N_('img_user')          # edit users (admin)
     N_('img_user_admin')    # edit users (admin)
+    N_('img_user_manager')  # edit users (admin)
+    N_('img_user_profile')  # edit users (admin)
     N_('img_user_su')       # edit users (admin)
     N_('img_user_pub')      # edit users (admin)
     N_('img_group')         # edit groups (admin)
@@ -155,6 +157,7 @@ module Zena
 
     N_('User name:')  # login form
     N_('Password:')   # login form
+    N_('Login for')   # login form
 
     # temporary (seems like the updatepo script does not parse 'templates' directory)
     N_('you are editing the original')

data/lib/tasks/zena.rake

@@ -42,11 +42,15 @@ def symlink_assets(from, to)
   end
 end
 
-def copy_assets(from, to)
+def copy_assets(from, to, copy_all = false)
   from = File.expand_path(from)
   to = File.expand_path(to)
   return if from == to
-  ['config/mongrel_upload_progress.conf', 'lib/upload_progress_server.rb', 'config/deploy.rb', 'config/bricks.yml', 'public/**/*'].each do |base_path|
+  folders = ['public/**/*']
+  if copy_all
+    folders += ['config/mongrel_upload_progress.conf', 'lib/upload_progress_server.rb', 'config/deploy.rb', 'config/bricks.yml']
+  end
+  folders.each do |base_path|
     if base_path =~ /\*/
       Dir["#{from}/#{base_path}"].each do |path|
         path = path[(from.length + 1)..-1]
@@ -103,6 +107,15 @@ def copy_files(from, to)
 end
 
 namespace :zena do
+  desc "Copy all assets including gem and deploy config from zena gem to application."
+  task :all_assets => :zena_config do
+    if Zena::ROOT == RAILS_ROOT
+      puts "Copy all assets should only be used when zena is loaded externally (via gem for example)."
+    else
+      copy_assets(Zena::ROOT, RAILS_ROOT, true)
+    end
+  end
+
   desc "Copy latest assets from zena gem to application (images, stylesheets, javascripts)."
   task :assets => :zena_config do
     if Zena::ROOT == RAILS_ROOT
@@ -235,28 +248,16 @@ namespace :zena do
   end
 
   desc "Remove all zafu compiled templates"
-  task :clear_zafu => :zena_config do
-    if File.exist?(SITES_ROOT)
-      Dir.foreach(SITES_ROOT) do |site|
-        next if site =~ /^\./
-        FileUtils.rmtree(File.join(SITES_ROOT, site, 'zafu'))
-      end
+  task :clear_zafu => :environment do
+    Site.all.each do |site|
+      site.clear_zafu
     end
   end
 
   desc "Remove all cached data" # FIXME: cachedPages db should be cleared to
   task :clear_cache => :environment do
-    if File.exist?(SITES_ROOT)
-      Dir.foreach(SITES_ROOT) do |site|
-        next if site =~ /^\./ || !File.exist?(File.join(SITES_ROOT,site,'public'))
-        Dir.foreach(File.join(SITES_ROOT,site,'public')) do |elem|
-          next unless elem =~ /^(\w\w\.html|\w\w)$/
-          FileUtils.rmtree(File.join(SITES_ROOT, site, 'public', elem))
-        end
-      end
-      ['caches', 'cached_pages', 'cached_pages_nodes'].each do |tbl|
-        Site.connection.execute "DELETE FROM #{tbl}"
-      end
+    Site.all.each do |site|
+      site.clear_cache
     end
   end
 
@@ -278,7 +279,7 @@ namespace :zena do
   end
 
   task :full_backup => :environment do
-    data_folders = Site.find(:all).map { |s| File.join(SITES_ROOT, s.data_path) }.reject { |p| !File.exist?(p) }
+    data_folders = Site.all.map { |s| File.join(SITES_ROOT, s.data_path) }.reject { |p| !File.exist?(p) }
     cmd = "tar czf #{RAILS_ROOT}/sites_data.tgz #{data_folders.join(' ')}"
     puts cmd
     puts `#{cmd}`
@@ -376,7 +377,7 @@ namespace :zena do
         end
       end
 
-      %w{db:fixtures:load zena:rebuild_index}.each do |task|
+      %w{db:fixtures:load fs_skin:index zena:rebuild_index}.each do |task|
         puts "******************************* #{task}"
         Rake::Task[task].invoke
       end
@@ -425,8 +426,10 @@ namespace :zena do
       sites = Site.master_sites
     end
     sites.each do |site|
+      puts "************** Rebuild paths for '#{site.host}' *************"
       # Does not use SiteWorker.
-      site.rebuild_fullpath
+      setup_visitor(site.any_admin, site)
+      site.rebuild_fullpath(nil, 1)
     end
   end