goldencobra 1.2.0 → 1.2.8

data/config/settings.yml

@@ -1,4 +1,6 @@
 goldencobra:
+    locations:
+        geocoding: "true"
     live-support:
         active: "false"
         email: "metz@ikusei.de"

data/db/migrate/20131129143509_add_remote_to_goldencobra_menues.rb

@@ -0,0 +1,5 @@
+class AddRemoteToGoldencobraMenues < ActiveRecord::Migration
+  def change
+    add_column :goldencobra_menues, :remote, :boolean, :default => false
+  end
+end

data/db/migrate/20131216110750_add_main_to_goldencobra_domains.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+class AddMainToGoldencobraDomains < ActiveRecord::Migration
+  def change
+    add_column :goldencobra_domains, :main, :boolean, :default => false
+  end
+end

data/lib/generators/goldencobra/articletype/templates/edit_index.html.erb

@@ -1,9 +1,9 @@
-<% f.inputs "Index of Articles" do %>
-  <% f.input :index_of_articles_tagged_with, :hint => "Auf der Uebersichtsseite werden alle Artikel des gleichen Typs mit diesen Tags ausgegeben. Sind keine Tags angegeben, werden alle Artikel des gleichen Typs ausgegeben."%>
-  <% f.input :not_tagged_with, :hint => "Artikel mit diesen Tags NICHT anzeigen!", :label => "Liste von ausschlie&szlig;enden Tags" %>
-  <% f.input :use_frontend_tags, hint: "Soll eine Filterauswahl eingeblendet werden?" %>
+<% f.inputs "Artikelübersicht einschränken" do %>
+  <% f.input :index_of_articles_tagged_with, :label => "Artikel mit folgenden Tags", :hint => "Auf der Übersichtsseite werden alle Artikel des gleichen Artikeltyps mit diesen Tags ausgegeben. Sind keine Tags angegeben, werden alle Artikel des gleichen Artikeltyps ausgegeben."%>
+  <% f.input :not_tagged_with, :label => "Artikel ohne folgende Tags", :hint => "Artikel mit diesen Tags nicht anzeigen!" %>
+  <% f.input :sorter_limit, :label => "Anzahl anzuzeigender Artikel", :hint => "Wieviel Artikel sollen maximal auf der Übersichtsseite erscheinen?" %>
   <% sort_options = Goldencobra::Article::SortOptions %>
-  <% f.input :sort_order, as: :select, collection: sort_options, include_blank: false %>
-  <% f.input :sorter_limit %>
-  <% f.input :reverse_sort, hint: "Soll absteigend sortiert werden? Standard: Aufsteigend" %>
+  <% f.input :sort_order, :hint => "Created_at - Reihenfolge nach Erstellungsdatum | Updated_at - Reihenfolge nach Aktualisierungsdatum | Random - Reihenfolge zufällig | Alphabetically - Reihenfolge alphabetisch", as: :select, collection: sort_options, include_blank: false %>
+  <% f.input :reverse_sort, hint: "Soll absteigend sortiert werden? Standard: aufsteigend" %>
+  <% f.input :use_frontend_tags, :label => "Filterauswahl einblenden?", hint: "Soll eine Möglichkeit zur Filterung nach vorhandenen Tags eingeblendet werden?" %>
 <% end %>

data/lib/goldencobra/select_current_client.rb

@@ -21,6 +21,7 @@ module Goldencobra
       def determine_client
         @current_client = Goldencobra::Domain.find_by_hostname(request.host) || Goldencobra::Domain.first
         Goldencobra::Domain.current = @current_client
+        Goldencobra::Article::LiquidParser["current_client"] = @current_client
       end
 
       def add_view_path_for_client

data/lib/goldencobra/version.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Goldencobra
-  VERSION = "1.2.0"
+  VERSION = "1.2.8"
 end

data/lib/tasks/cap_info.rb

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+# run in a cap-managed project to get pertinent variable info
+# output in YAML
+
+require 'rubygems'
+require 'capistrano/configuration'
+require 'pp'
+
+config = Capistrano::Configuration.new
+config.load("Capfile")
+config.logger.level = 1   # -v
+
+for stage in config.stages do
+  stage_config = Capistrano::Configuration.new
+  stage_config.load("Capfile")
+  stage_config.logger.level = 1   # -v
+  stage_config.find_and_execute_task(stage)
+  puts "#{stage}:"
+  puts "  gateway: #{stage_config[:gateway]}"
+  puts "  user: #{stage_config[:ssh_options][:user]}"
+  puts "  deploy_to: #{stage_config[:deploy_to]}"
+  puts "  roles:"
+  for role in stage_config.roles do
+    puts "    #{role[0]}:"
+    for server in role[1].servers do
+      puts "      - #{server}"
+    end
+  end
+end

data/lib/tasks/goldencobra_tasks.rake

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # desc "Explaining what the task does"
 # task :goldencobra do
 #   # Task goes here

data/lib/tasks/i18n.rake

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 namespace :i18n do
   desc "Find and create db translation"
   task :missing_keys => :environment do

data/lib/tasks/import.rake

@@ -1,16 +1,54 @@
+# encoding: utf-8
+
 namespace :db do
+  desc 'Dump DB to backup.sql'
+  task :dump => :environment do
+    server_config = ActiveRecord::Base.configurations["production"]
+    remote_db = server_config["database"]
+    user_name = server_config["username"]
+    password = server_config["password"]
+    system("mysqldump --opt --add-drop-table -hlocalhost -u#{user_name} -p#{password} #{remote_db} > backup.sql")
+  end
+
+
   desc 'Import Production Database to local Database'
   task :import => :environment do
-    local_db = ENV['LOCAL']
-    remote_db = ENV['REMOTE']
-    user_name = ENV['USER']
-    password = ENV['PASSWORD']
-    server = ENV['SERVER']
-    if local_db.present? &&
-      system("ssh -C #{server} mysqldump --opt --add-drop-table -hlocalhost -u#{user_name} -p#{password} #{remote_db} |mysql #{local_db}")
+    puts "Your lokal database will be overwritten by server db! Are you sure? (yes)"
+    input = STDIN.gets.strip
+    if ["yes", "Yes", "Y", "y", "YES"].include?(input)
+      local_config = ActiveRecord::Base.configurations["development"]
+      if defined?(Capistrano) == "constant"
+        puts "Loading remote configuration..."
+        config = Capistrano::Configuration.new
+        config.load("Capfile")
+        config.logger.level = 1
+        ssh_user = config[:user]
+        ssh_server = config[:ip_address]
+        deploy_to = config[:deploy_to]
+        puts "Connecting to #{ssh_user}@#{ssh_server} and generating db dump..."
+        system("cap invoke COMMAND='cd #{deploy_to}/current && RAILS_ENV=production bundle exec rake db:dump'")
+        puts "MysqlDump created on server as 'backup.sql'. Transfering data..."
+        local_db_password = ""
+        if local_config['password'].present?
+          local_db_password = "-p#{local_config['password']}"
+        end
+        system("ssh -C #{ssh_user}@#{ssh_server} less #{deploy_to}/current/backup.sql |mysql -u#{local_config['username']} #{local_db_password} #{local_config['database']}")
+        puts "Dumpfile copied and transfered to local DB: #{local_config['username']}@#{local_config['database']}"
+      else
+        remote_db = ENV['REMOTE']
+        user_name = ENV['USER']
+        password = ENV['PASSWORD']
+        server = ENV['SERVER']
+        if server.present? &&
+          system("ssh -C #{server} mysqldump --opt --add-drop-table -hlocalhost -u#{user_name} -p#{password} #{remote_db} |mysql -u#{local_config['username']} -p#{local_config['password']} #{local_config['database']}")
+        else
+          puts "Missing Attributes! e.g.:"
+          puts "rake db:import SERVER=taurus REMOTE=db_qvnia USER=user_qvnia PASSWORD=yq1rx5qiHIz"
+        end
+      end
     else
-      puts "Missing Attributes! e.g.:"
-      puts "rake db:import SERVER=taurus LOCAL=qvnia_development REMOTE=db_qvnia USER=user_qvnia PASSWORD=yq1rx5qiHIz"
+      puts "Import-Task aborted"
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goldencobra
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script-source
@@ -161,33 +161,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -2216,6 +2216,7 @@ files:
 - app/views/goldencobra/admin/articles/_widgets_sidebar.html.erb
 - app/views/goldencobra/admin/articles/toggle_expert_mode.js.erb
 - app/views/goldencobra/admin/helps/_index.html.erb
+- app/views/goldencobra/admin/shared/_help.html.erb
 - app/views/goldencobra/admin/shared/_item.html.erb
 - app/views/goldencobra/admin/shared/_next_item.html.erb
 - app/views/goldencobra/admin/shared/_overview.html.erb
@@ -2224,6 +2225,7 @@ files:
 - app/views/goldencobra/articles/_bugherd.html.erb
 - app/views/goldencobra/articles/_edit_article_link.html.erb
 - app/views/goldencobra/articles/_headers.html.erb
+- app/views/goldencobra/articles/_navigation_menue.html.erb
 - app/views/goldencobra/articles/_show.html.erb
 - app/views/goldencobra/articles/show.html.erb
 - app/views/goldencobra/articles/show.rss.builder
@@ -2254,12 +2256,14 @@ files:
 - config/initializers/liquid_tags.rb
 - config/initializers/locale.rb
 - config/initializers/notification.rb
+- config/initializers/papertrail_versions.rb
 - config/initializers/settings.rb
 - config/locales/active_admin.de.yml
 - config/locales/active_admin.en.yml
 - config/locales/activerecord.de.yml
 - config/locales/activerecord.en.yml
 - config/locales/article_types.de.yml
+- config/locales/article_types.en.yml
 - config/locales/de.yml
 - config/locales/devise.de.yml
 - config/locales/devise.en.yml
@@ -2379,6 +2383,8 @@ files:
 - db/migrate/20130909143144_create_goldencobra_domains.rb
 - db/migrate/20130925133203_add_prefix_to_goldencobra_domains.rb
 - db/migrate/20131018111343_add_cache_to_goldencobra_menues.rb
+- db/migrate/20131129143509_add_remote_to_goldencobra_menues.rb
+- db/migrate/20131216110750_add_main_to_goldencobra_domains.rb
 - db/seeds.rb
 - lib/generators/goldencobra/articletype/articletype_generator.rb
 - lib/generators/goldencobra/articletype/templates/edit_index.html.erb
@@ -2424,6 +2430,7 @@ files:
 - lib/goldencobra/select_current_client.rb
 - lib/goldencobra/version.rb
 - lib/goldencobra.rb
+- lib/tasks/cap_info.rb
 - lib/tasks/goldencobra_tasks.rake
 - lib/tasks/i18n.rake
 - lib/tasks/import.rake