muck-engine 0.4.9 → 0.4.10

data/VERSION

@@ -1 +1 @@
-0.4.9
+0.4.10

data/lib/muck_engine/populate.rb

@@ -737,7 +737,7 @@ module Muck
         ['中文', 'Chinese', false, 'zh-CN', true],
         ['中文', 'Chinese Traditional', false, 'zh-TW', true],
         ['isiZulu', 'Zulu', false, 'zu', false]
-      ].each {|l| Language.create(:name => l[0], :english_name => l[1], :is_default => l[2], :locale => l[3], :supported => l[4]) }
+      ].each {|l| Language.create(:name => l[0], :english_name => l[1], :is_default => l[2], :locale => l[3], :supported => l[4]) unless Language.find_by_locale(s[3])  }
     end
   
   end

data/lib/muck_engine/tasks.rb

@@ -24,7 +24,7 @@ class MuckEngine
     def define
       
       namespace :muck do
-        
+      
         # just returns the names of the gems as specified by muck_gems
         def muck_gem_names
           if defined?(muck_gems)
@@ -33,7 +33,7 @@ class MuckEngine
             puts "Please create a method named 'muck_gems' in the namespace :muck in your rakefile."
           end
         end
-        
+      
         # Returns the folder name for each gem.  Note that muck-solr lives in the acts_as_solr directory
         def muck_gem_paths
           if defined?(muck_gems)
@@ -58,7 +58,7 @@ class MuckEngine
             gem_name.sub('-', '_')
           end
         end
-        
+      
         def muck_unpack(gem_name)
           system("gem unpack #{gem_name} --target=#{muck_gems_path}")
         end
@@ -90,7 +90,7 @@ class MuckEngine
         def projects_path
           File.join(RAILS_ROOT, '..')
         end
-        
+      
         def release_gem(path, gem_name)
           gem_path = File.join(path, muck_gem_path(gem_name))
           puts "releasing #{gem_name}"
@@ -120,29 +120,29 @@ class MuckEngine
           end
           version = IO.read(version_file).strip
           environment = IO.read(env_file)
-          
+        
           search = Regexp.new(/\:lib\s*=>\s*['"]#{gem_lib}['"],\s*\:version\s*=>\s*['"][ <>=~]*\d+\.\d+\.\d+['"]/)
           failure = environment.gsub!(search, ":lib => '#{gem_lib}', :version => '>=#{version}'").nil?
-          
+        
           if failure
             search = Regexp.new(/config.gem\s*['"]#{gem_name}['"],\s*\:version\s*=>\s*['"][ <>=~]*\d+\.\d+\.\d+['"]/)
             failure = environment.gsub!(search, "config.gem '#{gem_name}', :version => '>=#{version}'").nil?
           end  
-  
+
           if failure
             search = Regexp.new(/config.gem\s*['"]#{gem_name}['"],\s*\:lib\s*=>\s*['"]#{gem_lib}['"]/)
             failure = environment.gsub!(search, "config.gem '#{gem_name}', :lib => '#{gem_lib}', :version => '>=#{version}'").nil?
           end
-          
+        
           if failure
             search = Regexp.new(/config.gem\s*['"]#{gem_name}['"]/)
             failure = environment.gsub!(search, "config.gem '#{gem_name}', :version => '>=#{version}'").nil?
           end
-          
+        
           if failure
             puts "Could not update version for #{gem_name}"
           end
-  
+
           File.open(env_file, 'w') { |f| f.write(environment) }
         end
 
@@ -202,52 +202,105 @@ class MuckEngine
           FileUtils.cd(dir) { block.arity == 1 ? yield(dir) : yield }
         end
         
-        desc "Release and commit muck gems"
-        task :release_commit_gems do
-          muck_gem_names.each do |gem_name|
+        namespace :gems do
+          
+          desc "Release and commit muck gems"
+          task :release_commit do
+            muck_gem_names.each do |gem_name|
+              message = "Released new gem"
+              release_gem("#{projects_path}", gem_name)
+              git_commit("#{projects_path}/#{muck_gem_path(gem_name)}", message)
+              git_push("#{projects_path}/#{muck_gem_path(gem_name)}")
+            end
+          end
+
+          desc "Release muck gems"
+          task :release do
+            muck_gem_names.each do |gem_name|
+              release_gem("#{projects_path}", gem_name)
+            end
+          end
+
+          desc "commit gems after a release"
+          task :commit do
             message = "Released new gem"
-            release_gem("#{projects_path}", gem_name)
-            git_commit("#{projects_path}/#{muck_gem_path(gem_name)}", message)
-            git_push("#{projects_path}/#{muck_gem_path(gem_name)}")
+            muck_gem_paths.each do |gem_name|
+              git_commit("#{projects_path}/#{gem_name}", message)
+            end
           end
-        end
 
-        desc "Release muck gems"
-        task :release_gems do
-          muck_gem_names.each do |gem_name|
-            release_gem("#{projects_path}", gem_name)
+          desc "Pull code for all the gems (use with caution)"
+          task :pull do
+            muck_gem_paths.each do |gem_name|
+              git_pull("#{projects_path}/#{gem_name}")
+            end
           end
-        end
 
-        desc "commit gems after a release"
-        task :commit_gems do
-          message = "Released new gem"
-          muck_gem_paths.each do |gem_name|
-            git_commit("#{projects_path}/#{gem_name}", message)
+          desc "Push code for all the gems (use with caution)"
+          task :push do
+            muck_gem_paths.each do |gem_name|
+              git_push("#{projects_path}/#{gem_name}")
+            end
           end
-        end
 
-        desc "Pull code for all the gems (use with caution)"
-        task :pull_gems do
-          muck_gem_paths.each do |gem_name|
-            git_pull("#{projects_path}/#{gem_name}")
+          desc "Gets status for all the muck gems"
+          task :status do
+            muck_gem_paths.each do |gem_name|
+              git_status("#{projects_path}/#{gem_name}")
+            end
+          end
+        
+          desc "Test all muck gems"
+          task :test do
+            muck_gem_paths.each do |gem_name|
+              puts "***************************************************************"
+              puts "testing #{gem_name}"
+              puts "***************************************************************"
+              system("cd #{projects_path}/#{gem_name}/ && rake test")
+            end
           end
-        end
 
-        desc "Push code for all the gems (use with caution)"
-        task :push_gems do
-          muck_gem_paths.each do |gem_name|
-            git_push("#{projects_path}/#{gem_name}")
+          desc "Translate all muck gems"
+          task :translate do
+            muck_gem_paths.each do |gem_name|
+              puts "translating #{gem_name}"
+              system("babelphish -o -y #{projects_path}/#{gem_name}/locales/en.yml")
+            end
           end
-        end
 
-        desc "Gets status for all the muck gems"
-        task :status_gems do
-          muck_gem_paths.each do |gem_name|
-            git_status("#{projects_path}/#{gem_name}")
+          desc "Unpacks all muck gems into vendor/gems using versions installed on the local machine."
+          task :unpack do
+            ensure_muck_gems_path
+            muck_gems.each do |gem_name|
+              muck_unpack(gem_name)
+            end
+            muck_write_specs
           end
+          
+          desc "Install and unpacks all muck gems into vendor/gems."
+          task :unpack_install => :install do
+            ensure_muck_gems_path
+            muck_gems.each do |gem_name|
+              muck_unpack(gem_name)
+            end
+            muck_write_specs
+          end
+
+          desc "Install all the gems specified in muck_gems"
+          task :install do
+            muck_gems.each do |gem_name|
+              system("sudo gem install #{gem_name}")
+            end
+          end
+          
+          desc "write specs into muck gems"
+          task :specs do
+            muck_write_specs
+          end
+          
         end
         
+        
         desc "Write muck gem versions into muck"
         task :versions do
           muck_gem_names.each do |gem_name|
@@ -255,72 +308,25 @@ class MuckEngine
           end
         end
 
-        desc "Test all muck gems"
-        task :test_gems do
-          muck_gem_paths.each do |gem_name|
-            puts "***************************************************************"
-            puts "testing #{gem_name}"
-            puts "***************************************************************"
-            system("cd #{projects_path}/#{gem_name}/ && rake test")
-          end
-        end
-
-        desc "Translate all muck gems"
-        task :translate_gems do
-          muck_gem_paths.each do |gem_name|
-            puts "translating #{gem_name}"
-            system("babelphish -o -y #{projects_path}/#{gem_name}/locales/en.yml")
-          end
-        end
-        
         desc 'Translate app into all languages supported by Google'
         task :translate_app => :environment do
           puts 'translating app'
           system("babelphish -o -y #{RAILS_ROOT}/config/locales/en.yml")
         end
-        
-        desc "write specs into muck gems"
-        task :specs do
-          muck_write_specs
-        end
 
-        desc "Unpacks all muck gems into vendor/gems using versions installed on the local machine."
-        task :unpack do
-          ensure_muck_gems_path
-          muck_gems.each do |gem_name|
-            muck_unpack(gem_name)
-          end
-          muck_write_specs
-        end
-
-        desc "Install and unpacks all muck gems into vendor/gems."
-        task :unpack_install => :install_gems do
-          ensure_muck_gems_path
-          muck_gems.each do |gem_name|
-            muck_unpack(gem_name)
-          end
-          muck_write_specs
+        desc "Completely reset and repopulate the database and annotate models. THIS WILL DELETE ALL YOUR DATA"
+        task :reset do
+          Rake::Task[ "muck:sync" ].execute
+          Rake::Task[ "muck:reset_db" ].execute
         end
         
-        desc "Install all the gems specified in muck_gems"
-        task :install_gems do
-          muck_gems.each do |gem_name|
-            system("sudo gem install #{gem_name}")
-          end
-        end
-
-        task :setup do
-          Rake::Task[ "cms_lite:setup" ].execute if muck_gems.include?('cms-lite')
-          Rake::Task[ "disguise:setup" ].execute if muck_gems.include?('disguise')
-        end
-
         desc "Sync resources from all muck related gems."
         task :sync do
           puts 'syncronizing engines and gems'
           muck_gems.each do |gem_name|
             puts "syncronizing assets and code from #{gem_name}"
             if gem_name.include?('muck')
-              task = "muck:#{gem_name.gsub('muck-', '')}:sync"
+              task = "muck:sync:#{gem_name.gsub('muck-', '')}"
             else
               task = "#{gem_name}:sync"
             end
@@ -333,45 +339,9 @@ class MuckEngine
           end
         end
 
-        desc "Completely reset and repopulate the database and annotate models. THIS WILL DELETE ALL YOUR DATA"
-        task :reset do
-          Rake::Task[ "muck:sync" ].execute
-          Rake::Task[ "muck:reset_db" ].execute
-        end
-
-        desc "Drop, creates, migrations and populates the database"
-        task :reset_db => :environment do
-
-          puts 'droping databases'
-          Rake::Task[ "db:drop" ].execute
-
-          puts 'creating databases'
-          Rake::Task[ "db:create" ].execute
-
-          puts 'migrating'
-          Rake::Task[ "db:migrate" ].execute
-
-          Rake::Task[ "db:setup_db" ].execute
-        end
-
-        desc "populates the database with all required values"
-        task :setup_db => :environment do
-          puts 'populating db with locale info'
-          Rake::Task[ "muck:db:populate" ].execute
-
-          puts 'flagging the languages muck raker supports and adding services it supports'
-          Rake::Task[ "muck:raker:db:populate" ].execute
-
-          puts 'adding some oai endpoints and feeds to the db'
-          Rake::Task[ "muck:raker:db:bootstrap" ].execute
-
-          puts 'setting up admin account'
-          Rake::Task[ "muck:users:create_admin" ].execute
-        end
-        
-        namespace :engine do
+        namespace :sync do
           desc "Sync files from muck engine."
-          task :sync do
+          task :engine do
             path = File.join(File.dirname(__FILE__), *%w[.. ..])
             # FileUtils.cp_r "#{path}/db", ".", :verbose => true, :remove_destination => true
             # FileUtils.cp_r "#{path}/public", ".", :verbose => true, :remove_destination => true
@@ -386,10 +356,41 @@ class MuckEngine
             Muck::Populate.all
             puts 'Finished adding languages, countries and states'
           end
+          
+          desc "Drop, creates, migrations and populates the database"
+          task :reset => :environment do
+
+            puts 'droping databases'
+            Rake::Task[ "db:drop" ].execute
+
+            puts 'creating databases'
+            Rake::Task[ "db:create" ].execute
+
+            puts 'migrating'
+            Rake::Task[ "db:migrate" ].execute
+
+            Rake::Task[ "db:setup_db" ].execute
+          end
+
+          desc "populates the database with all required values"
+          task :setup => :environment do
+            puts 'populating db with locale info'
+            Rake::Task[ "muck:db:populate" ].execute
+
+            puts 'flagging the languages muck raker supports and adding services it supports'
+            Rake::Task[ "muck:raker:db:populate" ].execute
+
+            puts 'adding some oai endpoints and feeds to the db'
+            Rake::Task[ "muck:raker:db:bootstrap" ].execute
+
+            puts 'setting up admin account'
+            Rake::Task[ "muck:users:create_admin" ].execute
+          end
         end
       end
-      
+    
     end
   end
 end
+
 MuckEngine::Tasks.new

data/lib/test/shoulda_macros/controller.rb

@@ -15,7 +15,7 @@ module MuckControllerMacros
     login_url ||= '/login'
     args.each do |action, verb|
       should "Require login for '#{action}' action" do
-        if [:put, :delete].include?(verb) # put and delete require an id even if it is a bogus one
+        if [:put, :delete].include?(verb) || [:edit].include?(action)  # edit, put and delete require an id even if it is a bogus one
           send(verb, action, :id => 1)
         else
           send(verb, action)

data/locales/ar.yml

@@ -2,6 +2,13 @@
 ar: 
   muck: 
     engine: 
+      admin_access_codes: "رموز الوصول"
+      admin_home: منزل
+      admin_home_title: "مشرف الصفحة الرئيسية"
+      admin_logout: خروج
+      admin_roles: الأدوار
+      admin_users: شاهد
+      admin_welcome: "أرحب بك مرة أخرى {{user}}"
       choose_country: "اختيار البلد"
       choose_language: "اختيار اللغة"
       choose_state: "اختيار الدولة"

data/locales/bg.yml

@@ -2,6 +2,13 @@
 bg: 
   muck: 
     engine: 
+      admin_access_codes: "Кодове за достъп"
+      admin_home: Дом
+      admin_home_title: "Админ Начало"
+      admin_logout: Изход
+      admin_roles: Роли
+      admin_users: Потребители
+      admin_welcome: "Добре дошли отново {{user}}"
       choose_country: "Изберете Държава"
       choose_language: "Изберете език"
       choose_state: "Изберете държава"

data/locales/ca.yml

@@ -2,6 +2,13 @@
 ca: 
   muck: 
     engine: 
+      admin_access_codes: "Codis d'Accés"
+      admin_home: Inici
+      admin_home_title: "Administrador d'Inici"
+      admin_logout: "Tancar sessió"
+      admin_roles: Rols
+      admin_users: Usuaris
+      admin_welcome: "Benvingut de nou {{user}}"
       choose_country: "Selecciona país"
       choose_language: "Choose Language"
       choose_state: "Esculli Estat"
@@ -10,7 +17,7 @@ ca:
       select_language_prompt: "Si us plau, seleccioneu un idioma"
       select_state_prompt: "Si us plau, seleccioneu un estat"
     forms: 
-      please_enter_a_value: "Si us plau, introduïu un valor per {{label}}"
+      please_enter_a_value: "Introduïu un valor per {{label}}"
     general: 
       activate: Activar
       deactivate: Desactivar