odania_core 0.0.6 → 0.0.7

data/app/views/odania/info/contact.html.erb

@@ -0,0 +1,23 @@
+<h1><%= t('odania.Contact') %></h1>
+
+<p>
+<%= form_tag '/contact' do %>
+	<p>
+		<%= t('odania.name') %>:
+		<input type="text" name="<%= @contact_post_name %>[contact_name]" value=""/>
+	</p>
+
+	<p>
+		<%= t('odania.email') %>:
+		<input type="text" name="<%= @contact_post_name %>[email]" value=""/>
+	</p>
+
+	<p>
+		<%= t('odania.ContactText') %>
+		<textarea name="<%= @contact_post_name %>[body]" cols="50" rows="10"></textarea>
+	</p>
+	<p>
+		<input type="submit" name="submit" value="<%= t('odania.send') %>"/>
+	</p>
+<% end %>
+</p>

data/app/views/odania/info/contact_send.html.erb

@@ -0,0 +1,3 @@
+<h1><%= t('odania.Contact') %></h1>
+
+<p><%= t('odania.Your request is send') %></p>

data/app/views/odania/info/imprint.html.erb

@@ -0,0 +1,9 @@
+<h1><%= t('odania.Imprint') %></h1>
+
+<%=raw current_site.imprint %>
+
+<h2><%= t('odania.This page is created with the Open Source Portal') %></h2>
+<p><a href="http://www.odania.com">Odania Open Source Portal</a></p>
+
+<br/><br/><br/>
+<%= render :partial => 'odania/info/copyright' %>

data/app/views/odania/info/terms_and_conditions.html.erb

@@ -0,0 +1,3 @@
+<h1><%= t('odania.Terms and Conditions') %></h1>
+
+<%=raw current_site.terms_and_conditions %>

data/app/views/odania/notify/contact_form.html.erb

@@ -0,0 +1,5 @@
+Site: <%= link_to @site.name, @site.host %>
+<br/>Name: <%= @data['contact_name'] %>
+<br/>Email: <%= @data['email'] %>
+<br/>Message:
+<p><%= @data['body'] %></p>

data/app/views/odania/notify/notify_admin.html.erb

@@ -0,0 +1,3 @@
+<br/>Site: <%= link_to @site.name, @site.host %>
+<br/>Message:
+<p><%= @msg %></p>

data/app/views/odania/shared/_errors.html.erb

@@ -0,0 +1,11 @@
+<% if obj.errors.any? %>
+	<div id="error_explanation">
+		<h2><%= pluralize(obj.errors.count, 'error') %> prohibited this admin_ad_type from being saved:</h2>
+
+		<ul>
+			<% obj.errors.full_messages.each do |msg| %>
+				<li><%= msg %></li>
+			<% end %>
+		</ul>
+	</div>
+<% end %>

data/app/views/protected/dashboard/index.html.erb

@@ -0,0 +1,2 @@
+<h1>Protected::Dashboard#index</h1>
+<p>Find me in app/views/protected/dashboard/index.html.erb</p>

data/app/views/protected/odania/shared/_menu.html.erb

@@ -0,0 +1,10 @@
+<div class="container-fluid">
+	<div class="nav-collapse">
+		<ul class="nav nav-list">
+			<li><%= link_to t('Dashboard'), protected_path %></li>
+			<% Odania.protected.pages.each do |protected_page| %>
+				<li><%= link_to protected_page[:name], protected_page[:path] %></li>
+			<% end %>
+		</ul>
+	</div>
+</div>

data/config/locales/de.yml

@@ -9,3 +9,17 @@ de:
   Read more: 'Weiter lesen'
   Language: 'Sprache'
   No content defined: 'Kein Inhalt definiert'
+  Dashboard: 'Dashboard'
+  odania:
+    save_and_back: 'Speichern & Zurück'
+    save: 'Speichern'
+    send: 'Senden'
+    name: 'Name'
+    email: 'Email'
+    ContactText: 'Nachricht'
+    Contact: 'Kontakt'
+    Your request is send: 'Deine Anfrage wurde gesendet'
+    Imprint: 'Impressum'
+    Terms and Conditions: 'AGB'
+    Or you can contact us via this form: 'Oder kontaktiere uns über diese Formular'
+    This page is created with the Open Source Portal: 'Diese Seite wurde mit dem Open Source Portal "Odania" erstellt'

data/config/locales/en.yml

@@ -9,3 +9,17 @@ en:
   Read more: 'Read more'
   Language: 'Language'
   No content defined: 'No content defined'
+  Dashboard: 'Dashboard'
+  odania:
+    save_and_back: 'Save & Back'
+    save: 'Save'
+    send: 'Send'
+    name: 'Name'
+    email: 'Email'
+    ContactText: 'Message'
+    Contact: 'Contact'
+    Your request is send: 'Your message has been sent'
+    Imprint: 'Imprint'
+    Terms and Conditions: 'Terms and Conditions'
+    Or you can contact us via this form: 'Or you can contact us via this form'
+    This page is created with the Open Source Portal: 'This page is created with the Open Source Portal "Odania"'

data/config/routes.rb

@@ -3,9 +3,10 @@ Rails.application.routes.draw do
 
 	match '/deliver/click' => 'odania/deliver#click', via: [:get, :post], as: :deliver_click
 
-	get '/imprint' => 'info#imprint'
-	get '/contact' => 'info#contact'
-	post '/contact' => 'info#contact_send'
+	get 'imprint' => 'odania/info#imprint'
+	get 'terms_and_conditions' => 'odania/info#terms_and_conditions'
+	get 'contact' => 'odania/info#contact'
+	post 'contact' => 'odania/info#contact_send'
 
 	namespace :admin do
 		namespace :odania do
@@ -29,6 +30,10 @@ Rails.application.routes.draw do
 		get '/' => 'dashboard#index'
 	end
 
+	namespace :protected do
+		get '/' => 'dashboard#index'
+	end
+
 	# Track views
 	match 'track_view/:type/:id' => 'odania/statistics#track_view', :as => :update_views, via: [:get, :post, :put]
 

data/db/migrate/20140512153554_add_email_info_to_site.rb

@@ -0,0 +1,6 @@
+class AddEmailInfoToSite < ActiveRecord::Migration
+	def change
+		add_column :odania_sites, :default_from_email, :string
+		add_column :odania_sites, :notify_email_address, :string
+	end
+end

data/db/migrate/20140512161811_add_imprint_terms_to_site.rb

@@ -0,0 +1,6 @@
+class AddImprintTermsToSite < ActiveRecord::Migration
+	def change
+		add_column :odania_sites, :imprint, :text
+		add_column :odania_sites, :terms_and_conditions, :text
+	end
+end

data/lib/odania.rb

@@ -10,10 +10,13 @@ module Odania
 
 	autoload :Configuration, 'odania/configuration'
 	autoload :Admin, 'odania/admin'
+	autoload :Protected, 'odania/protected'
 	autoload :CoreTargetTypeUtil, 'odania/core_target_type_util'
 	autoload :TextHelper, 'odania/text_helper'
 	autoload :Taggable, 'odania/taggable'
 	autoload :Filter, 'odania/filter'
+	autoload :DisabledBackgroundJob, 'odania/disabled_background_job'
+	autoload :TargetType, 'odania/target_type'
 
 	# Define a set of helpers that are called on setup.
 	mattr_reader :helpers
@@ -30,14 +33,16 @@ module Odania
 	def self.setup
 		yield Odania::Configuration
 		@@helpers.each { |h| h.define_helpers(self.config) }
+	end
 
+	def self.setup_enqueue
 		# Enqueue for background processing
 		if Odania.config.background_enqueue.blank?
 			Rails.logger.error 'No background_enqueue defined!'
 			Odania.config.background_enqueue = 'puts \'FallbackEnqueue\';puts'
 		end
 		module_eval <<-METHODS, __FILE__, __LINE__ + 1
-			def self.enqueue(background_type, opts)
+			def self.enqueue(background_type, *opts)
 				#{Odania.config.background_enqueue}(background_type, opts)
 			end
 		METHODS
@@ -96,4 +101,8 @@ module Odania
 	def self.admin
 		Odania::Admin
 	end
+
+	def self.protected
+		Odania::Protected
+	end
 end

data/lib/odania/admin.rb

@@ -2,16 +2,16 @@
 module Odania
 	module Admin
 		# Registered Templates for the admin pages
-		mattr_reader :admin_templates
-		@@admin_templates = Hash.new
+		mattr_reader :templates
+		@@templates = Hash.new
 
 		# Registered Admin Pages
-		mattr_accessor :admin_pages
-		@@admin_pages = Set.new
-		@@admin_pages << {name: 'Sites', path: '/admin/odania/sites'}
-		@@admin_pages << {name: 'Contents', path: '/admin/odania/contents'}
-		@@admin_pages << {name: 'Languages', path: '/admin/odania/languages'}
-		@@admin_pages << {name: 'Menus', path: '/admin/odania/menus'}
-		@@admin_pages << {name: 'Menu Items', path: '/admin/odania/menu_items'}
+		mattr_accessor :pages
+		@@pages = Set.new
+		@@pages << {name: 'Sites', path: '/admin/odania/sites'}
+		@@pages << {name: 'Contents', path: '/admin/odania/contents'}
+		@@pages << {name: 'Languages', path: '/admin/odania/languages'}
+		@@pages << {name: 'Menus', path: '/admin/odania/menus'}
+		@@pages << {name: 'Menu Items', path: '/admin/odania/menu_items'}
 	end
 end

data/lib/odania/disabled_background_job.rb

@@ -0,0 +1,7 @@
+# This is meant as a fallback/test background processor. It directly executes the action.
+module DisabledBackgroundJob
+	def self.enqueue(background_type, opts)
+		puts "Directly processing: #{background_type} with options: #{opts}"
+		background_type.to_s.constantize.new.perform(*opts)
+	end
+end

data/lib/odania/protected.rb

@@ -0,0 +1,12 @@
+# Administration related information
+module Odania
+	module Protected
+		# Registered Templates for the protected pages
+		mattr_reader :templates
+		@@templates = Hash.new
+
+		# Registered Admin Pages
+		mattr_accessor :pages
+		@@pages = Set.new
+	end
+end

data/lib/odania_core/engine.rb

@@ -9,6 +9,7 @@ require 'sass-rails'
 require 'coffee-rails'
 require 'jquery-rails'
 require 'bootstrap-sass'
+require 'rails-i18n'
 
 # Require internals
 require 'odania'

data/lib/odania_core/version.rb

@@ -1,3 +1,3 @@
 module OdaniaCore
-	VERSION = '0.0.6'
+	VERSION = '0.0.7'
 end

data/lib/tasks/odania_core_tasks.rake

@@ -32,9 +32,10 @@ namespace :odania do
 			language = Odania::Language.first
 
 			if language.nil?
-				puts "Create a language first"
+				puts 'Create a language first'
 			elsif site.nil?
-				site = Odania::Site.create!(default_language_id: language.id, :name => host_name, :host => host_name, :is_default => (Odania::Site.count == 0))
+				site = Odania::Site.create!(default_language_id: language.id, :name => host_name, :host => host_name, :is_default => (Odania::Site.count == 0), tracking_code: '')
+				site.menus.create!(language_id: language.id, title: language.iso_639_1)
 				puts "Site #{site.host} created!"
 			else
 				puts "Site #{site.host} already exists!"

data/test/controllers/admin/odania/dashboard_controller_test.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+require 'test_helper'
+
+class Admin::DashboardControllerTest < ActionController::TestCase
+	def setup
+		site = create(:default_site)
+		@request.host = site.host
+		@content = create(:content, site: site)
+		@language = create(:language)
+		@menu = create(:menu_with_items, site: site, amount: 4, language: site.default_language)
+	end
+
+	test 'test should get index' do
+		get :index
+		assert_response :success
+	end
+end

data/test/controllers/odania/deliver_controller_test.rb

@@ -23,6 +23,7 @@ class Odania::DeliverControllerTest < ActionController::TestCase
 		Odania.setup do |config|
 			config.background_enqueue = 'TestBackgroundWorker.enqueue'
 		end
+		Odania.setup_enqueue
 
 		get :click, {target: URI.escape(target), id: 'myid', type: 'test-type'}
 		assert_response :redirect

data/test/controllers/protected/odania/dashboard_controller_test.rb

@@ -0,0 +1,17 @@
+# -*- encoding : utf-8 -*-
+require 'test_helper'
+
+class Protected::DashboardControllerTest < ActionController::TestCase
+	def setup
+		site = create(:default_site)
+		@request.host = site.host
+		@content = create(:content, site: site)
+		@language = create(:language)
+		@menu = create(:menu_with_items, site: site, amount: 4, language: site.default_language)
+	end
+
+	test 'test should get index' do
+		get :index
+		assert_response :success
+	end
+end

data/test/dummy/config/database.yml

@@ -7,6 +7,11 @@ development:
   password: testpw
   pool: 5
 
+#development:
+#  adapter: sqlite3
+#  database: db/development.sqlite3
+#  timeout: 5000
+
 test:
   adapter: sqlite3
   database: db/test.sqlite3

data/test/dummy/config/environments/development.rb

@@ -14,6 +14,7 @@ Dummy::Application.configure do
 	config.action_controller.perform_caching = false
 
 	# Don't care if the mailer can't send.
+	config.action_mailer.default_url_options = {:host => 'www.lvh.me:3000'}
 	config.action_mailer.raise_delivery_errors = false
 
 	# Print deprecation notices to the Rails logger.

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140425202800) do
+ActiveRecord::Schema.define(version: 20140512161811) do
 
   create_table "ckeditor_assets", force: true do |t|
     t.string   "data_file_name",               null: false
@@ -26,8 +26,8 @@ ActiveRecord::Schema.define(version: 20140425202800) do
     t.datetime "updated_at"
   end
 
-  add_index "ckeditor_assets", ["assetable_type", "assetable_id"], name: "idx_ckeditor_assetable"
-  add_index "ckeditor_assets", ["assetable_type", "type", "assetable_id"], name: "idx_ckeditor_assetable_type"
+  add_index "ckeditor_assets", ["assetable_type", "assetable_id"], name: "idx_ckeditor_assetable", using: :btree
+  add_index "ckeditor_assets", ["assetable_type", "type", "assetable_id"], name: "idx_ckeditor_assetable_type", using: :btree
 
   create_table "odania_contents", force: true do |t|
     t.string   "title",                         null: false
@@ -45,15 +45,15 @@ ActiveRecord::Schema.define(version: 20140425202800) do
     t.datetime "updated_at"
   end
 
-  add_index "odania_contents", ["site_id", "language_id", "is_active"], name: "index_odania_contents_on_site_id_and_language_id_and_is_active"
-  add_index "odania_contents", ["user_id"], name: "index_odania_contents_on_user_id"
+  add_index "odania_contents", ["site_id", "language_id", "is_active"], name: "index_odania_contents_on_site_id_and_language_id_and_is_active", using: :btree
+  add_index "odania_contents", ["user_id"], name: "index_odania_contents_on_user_id", using: :btree
 
   create_table "odania_languages", force: true do |t|
     t.string "name"
     t.string "iso_639_1"
   end
 
-  add_index "odania_languages", ["iso_639_1"], name: "index_odania_languages_on_iso_639_1", unique: true
+  add_index "odania_languages", ["iso_639_1"], name: "index_odania_languages_on_iso_639_1", unique: true, using: :btree
 
   create_table "odania_menu_items", force: true do |t|
     t.integer "menu_id"
@@ -66,7 +66,7 @@ ActiveRecord::Schema.define(version: 20140425202800) do
     t.string  "full_path"
   end
 
-  add_index "odania_menu_items", ["menu_id", "full_path"], name: "index_odania_menu_items_on_menu_id_and_full_path"
+  add_index "odania_menu_items", ["menu_id", "full_path"], name: "index_odania_menu_items_on_menu_id_and_full_path", using: :btree
 
   create_table "odania_menus", force: true do |t|
     t.string   "title"
@@ -78,7 +78,28 @@ ActiveRecord::Schema.define(version: 20140425202800) do
     t.datetime "updated_at"
   end
 
-  add_index "odania_menus", ["site_id", "language_id"], name: "index_odania_menus_on_site_id_and_language_id", unique: true
+  add_index "odania_menus", ["site_id", "language_id"], name: "index_odania_menus_on_site_id_and_language_id", unique: true, using: :btree
+
+  create_table "odania_omniauth_identities", force: true do |t|
+    t.string   "email"
+    t.string   "name"
+    t.string   "password_digest"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "odania_omniauth_identities", ["email"], name: "omniauth_identities_email", using: :btree
+
+  create_table "odania_omniauth_user_authentications", force: true do |t|
+    t.integer  "user_id"
+    t.string   "provider"
+    t.string   "uid"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "odania_omniauth_user_authentications", ["provider", "uid"], name: "omniauth_authentications_provider_uid", using: :btree
+  add_index "odania_omniauth_user_authentications", ["user_id", "provider"], name: "omniauth_authentications_user_id_provider", using: :btree
 
   create_table "odania_sites", force: true do |t|
     t.string  "name"
@@ -88,12 +109,16 @@ ActiveRecord::Schema.define(version: 20140425202800) do
     t.text    "tracking_code"
     t.text    "description"
     t.string  "template"
-    t.boolean "user_signup_allowed", default: false
+    t.boolean "user_signup_allowed",  default: false
     t.integer "default_language_id"
     t.integer "redirect_to_id"
+    t.string  "default_from_email"
+    t.string  "notify_email_address"
+    t.text    "imprint"
+    t.text    "terms_and_conditions"
   end
 
-  add_index "odania_sites", ["host"], name: "index_odania_sites_on_host", unique: true
+  add_index "odania_sites", ["host"], name: "index_odania_sites_on_host", unique: true, using: :btree
 
   create_table "odania_tag_xrefs", force: true do |t|
     t.integer "tag_id"
@@ -102,8 +127,8 @@ ActiveRecord::Schema.define(version: 20140425202800) do
     t.string  "context",  limit: 128
   end
 
-  add_index "odania_tag_xrefs", ["ref_type", "ref_id", "context"], name: "index_odania_tag_xrefs_on_ref_type_and_ref_id_and_context"
-  add_index "odania_tag_xrefs", ["tag_id", "context"], name: "index_odania_tag_xrefs_on_tag_id_and_context"
+  add_index "odania_tag_xrefs", ["ref_type", "ref_id", "context"], name: "index_odania_tag_xrefs_on_ref_type_and_ref_id_and_context", using: :btree
+  add_index "odania_tag_xrefs", ["tag_id", "context"], name: "index_odania_tag_xrefs_on_tag_id_and_context", using: :btree
 
   create_table "odania_tags", force: true do |t|
     t.string  "name",                    null: false
@@ -112,18 +137,18 @@ ActiveRecord::Schema.define(version: 20140425202800) do
     t.integer "language_id"
   end
 
-  add_index "odania_tags", ["site_id", "language_id", "name"], name: "index_odania_tags_on_site_id_and_language_id_and_name", unique: true
+  add_index "odania_tags", ["site_id", "name"], name: "index_odania_tags_on_site_id_and_name", unique: true, using: :btree
 
   create_table "odania_user_roles", force: true do |t|
     t.integer "user_id"
     t.integer "role",    default: 0
   end
 
-  add_index "odania_user_roles", ["user_id"], name: "index_odania_user_roles_on_user_id"
+  add_index "odania_user_roles", ["user_id"], name: "index_odania_user_roles_on_user_id", using: :btree
 
   create_table "odania_users", force: true do |t|
     t.string   "name"
-    t.string   "email"
+    t.string   "email",        null: false
     t.string   "admin_layout"
     t.string   "ip"
     t.datetime "last_login"