overlord 0.1.22 → 3.0.0

data/.gitignore

@@ -3,3 +3,4 @@
 coverage
 rdoc
 pkg
+google.yml

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Tatemae.com
+Copyright (c) 2009-2010 Tatemae.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -16,47 +16,18 @@ In case it doesn't install dependencies:
 
 === Settings
 This gem requires some configuration before it will work in your Rails application:
-You will need a global_config file with 'google_ajax_api_key' and 'request_referer' defined.  You can set it up thus:
+You will need an initializer file with 'google_ajax_api_key' and 'request_referer' defined.  You can set it up thus:
 
-  # Load a global constant so the initializers can use them
-  require 'ostruct'
-  require 'yaml'
-  ::GlobalConfig = OpenStruct.new(YAML.load_file("#{RAILS_ROOT}/config/global_config.yml")[RAILS_ENV])
+In initializers/overlord.rb
 
-Then in global_config.yml:
-
-  default: &DEFAULT
-  
-    application_url: localhost:3000
-  
-    # sign up options
-    automatically_activate: true
-    automatically_login_after_account_create: true
-    send_welcome: true
-  
-    application_url: localhost:3000
-  
-    # session key information
-    session_key: _test_session
-    session_secret: 882585c5d472d21e832965410ab233be541ea626e50ed0eb68a00a2f49b59073480e58599404e3dc62105a803ee42d67872e3f95eb48e2d6508b42038436abd6
-
-    # Google related
-    google_ajax_api_key:            # Google ajax api key
-    request_referer:                # Website making the request.  Required by Google.
-    show_google_search: true        # Determines whether or not a google search is displayed on the topic page
-    load_feeds_on_server: false     # Determines whether feeds on a topic page are loaded on the server or the client.  Loading on the server can take a while
-    combine_feeds_on_server: false  # Combines feeds loaded on the server
-   
-  production:
-    <<: *DEFAULT
-  
-  development:
-    <<: *DEFAULT
-  
-  test:
-    <<: *DEFAULT
-
-    application_url: 'localhost:3000'
+  Overlord.configure do |config|
+    config.google_ajax_api_key = ''         # A google ajax api key - http://code.google.com/apis/ajaxsearch/signup.html
+    config.request_referer = ''             # The url of the site making the request.
+    config.show_google_search = true        # Determines whether or not a google search is displayed on the topic page
+    config.load_feeds_on_server = false     # Determines whether feeds on a topic page are loaded on the server or the client.  Loading on the server can take a while
+    config.combine_feeds_on_server = false  # Combines feeds loaded on the server
+    config.google_ad_partner_pub            # Ad partner id (optional) used for 'searchControl.enableAds'
+  end
 
 === Models
 If you want to use the methods 'convert_google_feed_json_to_feed', 'convert_google_find_feeds_json_to_feeds', and 
@@ -120,7 +91,23 @@ inside of the test directory for more information on how to create these classes
     t.string  "api_uri",             :limit => 2083, :default => ""
     t.string  "uri_key"
   end
+
+== Testing
+
+If you want to run the test application you will need to add a file with your google credentials
+Create a file 'test/rails_test/config.googl.yml'
+
+  default: &DEFAULT
+  
+    google_ajax_api_key: 'YOUR GOOGLE AJAX API KEY from http://code.google.com/apis/ajaxsearch/signup.html'
+    request_referer: 'www.example.com'
+         
+  development:
+    <<: *DEFAULT
+  
+  test:
+    <<: *DEFAULT
                          
 == Copyright
 
-Copyright (c) 2009 Tatemae.com. See LICENSE for details.
+Copyright (c) 2009-2010 Tatemae.com. See LICENSE for details.

data/Rakefile

@@ -14,7 +14,6 @@ begin
     gem.authors = ["Justin Ball", "Joel Duffin"]
     gem.add_dependency "httparty"
     gem.add_development_dependency "shoulda"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -67,6 +66,6 @@ end
 
 desc 'Translate this gem'
 task :translate do
-  file = File.join(File.dirname(__FILE__), 'locales', 'en.yml')
+  file = File.join(File.dirname(__FILE__), 'config', 'locales', 'en.yml')
   system("babelphish -o -y #{file}")
 end

data/VERSION

@@ -1 +1 @@
-0.1.22
+3.0.0

data/app/helpers/overlord_google_helper.rb

@@ -280,7 +280,7 @@ module OverlordGoogleHelper
   def google_ajax_api_scripts
     return '' if defined?(@google_ajax_api_scripts_included)
     script = '<script type="text/javascript" src="http://www.google.com/jsapi'
-    script << "?key=#{GlobalConfig.google_ajax_api_key}" if GlobalConfig.google_ajax_api_key
+    script << "?key=#{Overlord.configuration.google_ajax_api_key}" if Overlord.configuration.google_ajax_api_key
     script << '"></script>'
     @google_ajax_api_scripts_included = true
     script
@@ -322,7 +322,7 @@ module OverlordGoogleHelper
   end
 
   # Output include script to load jquery ui from google
-  def google_load_jquery_ui(http_protocol = 'http://', version = '1.8.1')
+  def google_load_jquery_ui(http_protocol = 'http://', version = '1.8.4')
     return '' if defined?(@google_load_jquery_ui_included)
     @google_load_jquery_ui_included = true
     %Q{<script src="#{http_protocol}ajax.googleapis.com/ajax/libs/jqueryui/#{version}/jquery-ui.min.js" type="text/javascript"></script>}
@@ -333,7 +333,7 @@ module OverlordGoogleHelper
   # blitzer, cupertino, dark-hive, dot-luv, eggplant, excite-bike, flick, hot-sneaks
   # humanity, le-frog, mint-choc, overcast, pepper-grinder, redmond, smoothness, south-street
   # start, sunny, swanky-purse, trontastic, ui-darkness, ui-lightness, vader
-  def google_load_jquery_ui_css(http_protocol = 'http://', theme = "smoothness", version = '1.8.1')
+  def google_load_jquery_ui_css(http_protocol = 'http://', theme = "smoothness", version = '1.8.4')
     return '' if defined?(@google_load_jquery_ui_css_included)
     @google_load_jquery_ui_css_included = true
     %Q{<link rel="stylesheet" href="#{http_protocol}ajax.googleapis.com/ajax/libs/jqueryui/#{version}/themes/#{theme}/jquery-ui.css" type="text/css" />}

data/app/views/google/_search.html.erb

@@ -10,8 +10,8 @@ function google_load_search() {
     <%= google_typed_search(type, feeds, locale) %>
   <% end -%>
   
-  <% if GlobalConfig.google_ad_partner_pub -%>
-    searchControl.enableAds('<%= GlobalConfig.google_ad_partner_pub %>');
+  <% if Overlord.configuration.google_ad_partner_pub -%>
+    searchControl.enableAds('<%= Overlord.configuration.google_ad_partner_pub %>');
   <% end -%>
   
   <% if search_types.length > 1 -%>

data/config/locales/ar.yml

@@ -0,0 +1,9 @@
+--- 
+ar: 
+  overlord: 
+    close: أغلق
+    loading_image: "تحميل صورة"
+    loading_message: تحميل...
+    no_entries_found: "لم يتم العثور على إدخالات"
+    read_more: "قراءة المزيد"
+    remove: إزالة

data/config/locales/bg.yml

@@ -0,0 +1,9 @@
+--- 
+bg: 
+  overlord: 
+    close: Близо
+    loading_image: "Зареждане на изображението"
+    loading_message: "Зарежда се ..."
+    no_entries_found: "Не са намерени записи"
+    read_more: "прочети повече"
+    remove: Премествам

data/{locales → config/locales}/ca.yml

@@ -4,6 +4,6 @@ ca:
     close: Tancar
     loading_image: "Carregant Imatge"
     loading_message: "Carregant ..."
-    no_entries_found: "No hi ha entrades"
-    read_more: "Llegir més"
+    no_entries_found: "No es van trobar elements"
+    read_more: "llegir més"
     remove: Eliminar

data/{locales → config/locales}/cs.yml

@@ -5,5 +5,5 @@ cs:
     loading_image: "Načítání obrázků"
     loading_message: "Loading ..."
     no_entries_found: "Nebyly nalezeny žádné záznamy"
-    read_more: více
-    remove: Odebrat
+    read_more: "Přečtěte si více"
+    remove: Odstranit

data/{locales → config/locales}/da.yml

@@ -2,8 +2,8 @@
 da: 
   overlord: 
     close: Luk
-    loading_image: "Loading Image"
+    loading_image: "Henter billedet"
     loading_message: "Loading ..."
-    no_entries_found: "No entries found"
+    no_entries_found: "Ingen poster fundet"
     read_more: "Læs mere"
-    remove: Fjerne
+    remove: Fjern

data/config/locales/el.yml

@@ -0,0 +1,9 @@
+--- 
+el: 
+  overlord: 
+    close: Κοντά
+    loading_image: "Φόρτωση εικόνας"
+    loading_message: "Φόρτωση ..."
+    no_entries_found: "Δεν βρέθηκαν καταχωρήσεις"
+    read_more: "διαβάστε περισσότερα"
+    remove: Αφαιρέστε

data/{locales → config/locales}/es.yml

@@ -4,6 +4,6 @@ es:
     close: Cerrar
     loading_image: "Cargando Imagen"
     loading_message: "Cargando ..."
-    no_entries_found: "No hay entradas"
-    read_more: "Leer más"
+    no_entries_found: "No se encontraron elementos"
+    read_more: "leer más"
     remove: Eliminar

data/config/locales/et.yml

@@ -0,0 +1,9 @@
+--- 
+et: 
+  overlord: 
+    close: Lähedal
+    loading_image: "Loading Image"
+    loading_message: "Loading ..."
+    no_entries_found: "Nr Sissekanded leitud"
+    read_more: "Loe edasi"
+    remove: Kõrvaldama

data/config/locales/fa.yml

@@ -0,0 +1,9 @@
+--- 
+fa: 
+  overlord: 
+    close: بستن
+    loading_image: "در حال بارگذاری تصویر"
+    loading_message: "در حال بارگذاری..."
+    no_entries_found: "هیچ ورودی در بر داشت"
+    read_more: "ادامه مطلب"
+    remove: برداشتن

data/{locales → config/locales}/fi.yml

@@ -1,9 +1,9 @@
 --- 
 fi: 
   overlord: 
-    close: Sulje
+    close: Lähellä
     loading_image: "Loading Image"
     loading_message: "Loading ..."
-    no_entries_found: "Ei merkintöjä löytynyt"
-    read_more: Lisää
+    no_entries_found: "Ei hakutuloksia"
+    read_more: "Lue lisää"
     remove: Poistaa

data/{locales → config/locales}/fr.yml

@@ -3,7 +3,7 @@ fr:
   overlord: 
     close: Fermer
     loading_image: "Chargement de l'image"
-    loading_message: "Chargement ..."
+    loading_message: "Chargement en cours ..."
     no_entries_found: "Aucun article trouvé"
     read_more: "lire la suite"
     remove: Supprimer

data/{locales → config/locales}/gl.yml

@@ -2,7 +2,7 @@
 gl: 
   overlord: 
     close: Pechar
-    loading_image: "Cargando imaxe"
+    loading_image: "Cargando Imaxe"
     loading_message: "Cargando ..."
     no_entries_found: "Non se atoparon entradas"
     read_more: "ler máis"

data/{locales → config/locales}/hi.yml

@@ -1,9 +1,9 @@
 --- 
 hi: 
   overlord: 
-    close: "बंद करना"
-    loading_image: "छवि लोड हो रहा है"
+    close: पास
+    loading_image: "लोड हो रहा है छवि"
     loading_message: "लोड हो रहा है ..."
     no_entries_found: "कोई प्रविष्टि नहीं मिली"
     read_more: "और अधिक पढ़ें"
-    remove: हटाना
+    remove: निकालें

data/{locales → config/locales}/hr.yml

@@ -4,6 +4,6 @@ hr:
     close: Zatvoriti
     loading_image: "Loading Image"
     loading_message: "Loading ..."
-    no_entries_found: "No entries found"
-    read_more: "pročitaj više"
+    no_entries_found: "Zapis nije pronađen"
+    read_more: "pročitajte više"
     remove: Ukloniti

data/config/locales/hu.yml

@@ -0,0 +1,9 @@
+--- 
+hu: 
+  overlord: 
+    close: Közeli
+    loading_image: "Kép betöltése"
+    loading_message: "Loading ..."
+    no_entries_found: "Nem találtam bejegyzéseket"
+    read_more: tovább
+    remove: Eltávolít

data/config/locales/id.yml

@@ -0,0 +1,9 @@
+--- 
+id: 
+  overlord: 
+    close: Dekat
+    loading_image: "Loading Image"
+    loading_message: "Loading ..."
+    no_entries_found: "Tidak ada entri yang ditemukan"
+    read_more: "read more"
+    remove: Menghapus

data/{locales → config/locales}/it.yml

@@ -3,7 +3,7 @@ it:
   overlord: 
     close: Chiudere
     loading_image: "Caricamento delle immagini"
-    loading_message: "Loading ..."
+    loading_message: "Caricamento in corso ..."
     no_entries_found: "Nessun risultato trovato"
     read_more: "Per saperne di più"
     remove: Rimuovere

data/{locales → config/locales}/iw.yml

@@ -1,9 +1,9 @@
 --- 
 iw: 
   overlord: 
-    close: סגור
-    loading_image: "טוען תמונה"
+    close: קרוב
+    loading_image: "טעינת תמונה"
     loading_message: "טוען ..."
     no_entries_found: "לא נמצאו ערכים"
-    read_more: "קרא עוד"
+    read_more: "לפרטים נוספים"
     remove: להסיר

data/config/locales/ja.yml

@@ -0,0 +1,9 @@
+--- 
+ja: 
+  overlord: 
+    close: クローズ
+    loading_image: 読み込んでいます画像
+    loading_message: ロード中...
+    no_entries_found: いいえエントリが見つかりました
+    read_more: 続きを読む
+    remove: 削除

data/{locales → config/locales}/ko.yml

@@ -1,9 +1,9 @@
 --- 
 ko: 
   overlord: 
-    close: 닫기
-    loading_image: "이미지 로딩"
+    close: 가까운
+    loading_image: "로딩 이미지"
     loading_message: "로드 중입니다 ..."
     no_entries_found: "항목을 찾을 수 없음"
-    read_more: "더 읽기"
+    read_more: "더 많은 것을 읽으"
     remove: 제거

data/config/locales/lt.yml

@@ -0,0 +1,9 @@
+--- 
+lt: 
+  overlord: 
+    close: Arti
+    loading_image: "Kraunasi vaizdo"
+    loading_message: "Loading ..."
+    no_entries_found: "Nėra įrašų rasta"
+    read_more: "Skaityti daugiau"
+    remove: Pašalinti

data/{locales → config/locales}/lv.yml

@@ -4,6 +4,6 @@ lv:
     close: Aizvērt
     loading_image: "Loading Image"
     loading_message: "Loading ..."
-    no_entries_found: "Vērtējumu nav atrasts"
+    no_entries_found: "Nav ierakstu atrasts"
     read_more: "lasīt vairāk"
-    remove: Aizvākt
+    remove: Noņemt

data/config/locales/mt.yml

@@ -0,0 +1,9 @@
+--- 
+mt: 
+  overlord: 
+    close: Agħlaq
+    loading_image: "Tagħbija Image"
+    loading_message: "Tagħbija ..."
+    no_entries_found: "Nru entrati misjuba"
+    read_more: "aqra aktar"
+    remove: Neħħi

data/{locales → config/locales}/nl.yml

@@ -1,8 +1,8 @@
 --- 
 nl: 
   overlord: 
-    close: Sluiten
-    loading_image: "Loading Image"
+    close: Dicht
+    loading_image: "Afbeelding wordt geladen"
     loading_message: "Loading ..."
     no_entries_found: "Geen items gevonden"
     read_more: "lees meer"

data/config/locales/no.yml

@@ -0,0 +1,10 @@
+--- 
+? "no"
+: 
+  overlord: 
+    close: Lukk
+    loading_image: "Laster bilde"
+    loading_message: "Laster ..."
+    no_entries_found: "Ingen oppføringer funnet"
+    read_more: "Les mer"
+    remove: Fjern

data/config/locales/pl.yml

@@ -0,0 +1,9 @@
+--- 
+pl: 
+  overlord: 
+    close: Blisko
+    loading_image: "Wczytywanie obrazków"
+    loading_message: "Trwa ładowanie ..."
+    no_entries_found: "Nie znaleziono wpisów"
+    read_more: "czytaj więcej"
+    remove: Usunąć