goldencobra 1.4.0 → 1.4.27

data/app/assets/stylesheets/goldencobra/ikusei_active_admin.scss

@@ -2,53 +2,61 @@
 @import "/compass/css3";
 
 
-$light_color:#EFC;
-$dark_color:#636E2A;
+$light_color: #EFC;
+$dark_color: #800080;
 
-#header{
+#header {
 	text-shadow: $dark_color 0 1px 0;
-	@include background( linear-gradient($light_color,$dark_color ) );
-	h1{
-		color:$dark_color;
+	@include background(linear-gradient($light_color, $dark_color));
+	
+	h1 {
+		color: $dark_color;
 	}
+
 	ul#tabs > li a {
-		color:darken($dark_color,15%);
+		color: darken($dark_color, 15%);
 	}
+
 	ul#tabs > li.current a {
-		background-color:$dark_color;
-		color:$light_color;
+		background-color: $dark_color;
+		color: $light_color;
 	}
+
 	ul#tabs > li:hover a {
-		background-color:$dark_color;
-		color:$light_color;
+		background-color: $dark_color;
+		color: $light_color;
 	}
 	
 	ul#tabs > li.has_nested:hover a {
-		background-color:$dark_color;
-		color:$light_color;
+		background-color: $dark_color;
+		color: $light_color;
 		border-bottom: 5px solid $dark_color;
 	}
 	
-	p#utility_nav{
-		color:darken($dark_color,15%);
+	p#utility_nav {
+		color: darken($dark_color, 15%);
 	}
-	a,a:link{
-		color:$light_color;
+
+	a, a:link {
+		color: $light_color;
+		display: block;
 	}
-	ul#tabs > li ul{
-		background-color:$dark_color;
+
+	ul#tabs > li ul {
+		background-color: $dark_color;
 	}
 }
 
-#title_bar{
-	@include background( linear-gradient(lighten($light_color,50%), $light_color) );
+#title_bar {
+	@include background(linear-gradient(lighten($light_color, 50%), $light_color));
+	
 	h2 {
-		color:$dark_color;
+		color: $dark_color;
 	}
 }
 
 .breadcrumb a, .breadcrumb a:link {
-	color:lighten($dark_color,25%);
+	color: lighten($dark_color, 25%);
 }
 
 div#title_bar.title_bar div#titlebar_left span.breadcrumb{
@@ -57,7 +65,8 @@ div#title_bar.title_bar div#titlebar_left span.breadcrumb{
 
 table.dashboard .dashboard_section{
 	background-color:$light_color;
-	h3{
-		@include background( linear-gradient($light_color, lighten($dark_color,20%)) );	
+	
+	h3 
+		@include background(linear-gradient($light_color, lighten($dark_color,20%)));	
 	}
-}
+}

data/app/assets/stylesheets/goldencobra/jquery.Jcrop.min.css

@@ -0,0 +1,29 @@
+/* jquery.Jcrop.min.css v0.9.12 (build:20130126) */
+.jcrop-holder{direction:ltr;text-align:left;}
+.jcrop-vline,.jcrop-hline{background:#FFF url(/assets/goldencobra/Jcrop.gif);font-size:0;position:absolute;}
+.jcrop-vline{height:100%;width:1px!important;}
+.jcrop-vline.right{right:0;}
+.jcrop-hline{height:1px!important;width:100%;}
+.jcrop-hline.bottom{bottom:0;}
+.jcrop-tracker{-webkit-tap-highlight-color:transparent;-webkit-touch-callout:none;-webkit-user-select:none;height:100%;width:100%;}
+.jcrop-handle{background-color:#333;border:1px #EEE solid;font-size:1px;height:7px;width:7px;}
+.jcrop-handle.ord-n{left:50%;margin-left:-4px;margin-top:-4px;top:0;}
+.jcrop-handle.ord-s{bottom:0;left:50%;margin-bottom:-4px;margin-left:-4px;}
+.jcrop-handle.ord-e{margin-right:-4px;margin-top:-4px;right:0;top:50%;}
+.jcrop-handle.ord-w{left:0;margin-left:-4px;margin-top:-4px;top:50%;}
+.jcrop-handle.ord-nw{left:0;margin-left:-4px;margin-top:-4px;top:0;}
+.jcrop-handle.ord-ne{margin-right:-4px;margin-top:-4px;right:0;top:0;}
+.jcrop-handle.ord-se{bottom:0;margin-bottom:-4px;margin-right:-4px;right:0;}
+.jcrop-handle.ord-sw{bottom:0;left:0;margin-bottom:-4px;margin-left:-4px;}
+.jcrop-dragbar.ord-n,.jcrop-dragbar.ord-s{height:7px;width:100%;}
+.jcrop-dragbar.ord-e,.jcrop-dragbar.ord-w{height:100%;width:7px;}
+.jcrop-dragbar.ord-n{margin-top:-4px;}
+.jcrop-dragbar.ord-s{bottom:0;margin-bottom:-4px;}
+.jcrop-dragbar.ord-e{margin-right:-4px;right:0;}
+.jcrop-dragbar.ord-w{margin-left:-4px;}
+.jcrop-light .jcrop-vline,.jcrop-light .jcrop-hline{background:#FFF;filter:alpha(opacity=70)!important;opacity:.70!important;}
+.jcrop-light .jcrop-handle{-moz-border-radius:3px;-webkit-border-radius:3px;background-color:#000;border-color:#FFF;border-radius:3px;}
+.jcrop-dark .jcrop-vline,.jcrop-dark .jcrop-hline{background:#000;filter:alpha(opacity=70)!important;opacity:.7!important;}
+.jcrop-dark .jcrop-handle{-moz-border-radius:3px;-webkit-border-radius:3px;background-color:#FFF;border-color:#000;border-radius:3px;}
+.solid-line .jcrop-vline,.solid-line .jcrop-hline{background:#FFF;}
+.jcrop-holder img,img.jcrop-preview{max-width:none;}

data/app/controllers/goldencobra/api/v2/articles_controller.rb

@@ -0,0 +1,221 @@
+# encoding: utf-8
+
+module Goldencobra
+  module Api
+    module V2
+      class ArticlesController < ActionController::Base
+        skip_before_filter :verify_authenticity_token
+
+        respond_to :json
+
+        # /api/v2/articles/search[.json]
+        # ---------------------------------------------------------------------------------------
+        def search
+
+          # Check if we have an argument.
+          unless params[:q]
+            render status: 200, json: { :status => 200 }
+            return
+          end
+
+          # Check if the query string contains something.
+          if params[:q].length == 0
+            render status: 200, json: { :status => 200 }
+          else
+            # Search and return the result array.
+            render status: 200, json: Goldencobra::Article.simple_search(
+                ActionController::Base.helpers.sanitize(params[:q])
+            ).to_json
+          end
+        end
+
+
+        # /api/v2/articles[.json]
+        # 
+        # @return [json] Liefert Alle Artikel :id,:title, :ancestry
+        # map{|c| [c.parent_path, c.id]}
+        def index
+          render status: 200, json: Goldencobra::Article.select([:id,:title, :ancestry]).sort{ |a, b| 
+              a[0] <=> b[0]
+            }.map{ |a| 
+              a.as_json(:only => [:id, :title], :methods => [:parent_path])
+            }
+        end
+
+
+        # /api/v2/articles/create[.json]
+        # ---------------------------------------------------------------------------------------
+        def create
+          # Check if a user is currently logged in.
+          unless current_user
+            render status: 403, json: { :status => 403 }
+            return
+          end
+
+          # Check if we do have an article passed by the parameters.
+          unless params[:article]
+            render status: 400, json: { :status => 400, :error => "article data missing" }
+            return
+          end
+
+          #check if an external referee is passed by the parameters
+          unless params[:referee_id]
+            render status: 400, json: { :status => 400, :error => "referee_id missing"  }
+            return
+          end
+
+          #check if Article already exists by comparing external referee and current user of caller
+          existing_articles = Goldencobra::Article.where(:creator_id => current_user.id, :external_referee_id => params[:referee_id])
+          if existing_articles.any?
+            render status: 423, json: { :status => 423, :error => "article already exists", :id => existing_articles.first.id  }
+            return
+          end
+
+          # Try to save the article
+          response = create_article(params[:article])
+          if response.id.present?
+            render status: 200, json: { :status => 200, :id => response.id }
+          else
+            render status: 500, json: { :status => 500, :error => response.errors, :id => nil }
+          end
+
+        end
+
+
+        def update
+          unless current_user
+            render status: 403, json: { :status => 403 }
+            return
+          end
+
+          # Check if we do have an article passed by the parameters.
+          unless params[:article]
+            render status: 400, json: { :status => 400, :error => "article data missing" }
+            return
+          end
+
+          #check if an external referee is passed by the parameters
+          unless params[:referee_id]
+            render status: 400, json: { :status => 400, :error => "referee_id missing"  }
+            return
+          end
+
+          #check if Article already exists by comparing external referee and current user of caller
+          existing_articles = Goldencobra::Article.where(:creator_id => current_user.id, :external_referee_id => params[:referee_id])
+          if existing_articles.blank?
+            render status: 423, json: { :status => 423, :error => "article not found", :id => nil  }
+            return
+          end
+
+          # Try to save the article
+          response = update_article(params[:article])
+          if response.id.present?
+            render status: 200, json: { :status => 200, :id => response.id }
+
+            #Erst render ergebnis dann den rest machen
+            if params[:images].present?
+              params[:images].each do |key,value|
+                existing_images = Goldencobra::Upload.where(:image_remote_url => value[:image][:image_url])
+                if existing_images.blank?
+                  img = Goldencobra::Upload.create(value[:image])
+                else
+                  img = existing_images.first
+                end
+                image_position = Goldencobra::Setting.for_key("goldencobra.article.image_positions").to_s.split(",").map(&:strip).first
+                existing_articles.first.article_images.create(:image => img, :position => image_position)
+              end
+            end
+
+          else
+            render status: 500, json: { :status => 500, :error => response.errors, :id => nil }
+          end
+        end
+
+
+        protected
+
+        # Creates an article from the given article array.
+        # ---------------------------------------------------------------------------------------
+        def create_article(article_param)
+
+          # Input validation
+          return nil unless article_param
+          return nil unless params[:article]
+          return nil unless current_user
+          return nil unless params[:referee_id]
+
+          # Create a new article
+          new_article = Goldencobra::Article.new(params[:article])
+          new_article.creator_id = current_user.id
+
+          if params[:article][:article_type]
+            new_article.article_type = params[:article][:article_type]
+          else
+            new_article.article_type = 'Default Show'
+          end
+
+          if params[:author].present? && params[:author][:lastname].present?
+            author = Goldencobra::Author.find_or_create_by_lastname(params[:author][:lastname])
+            new_article.author = author
+          end
+
+          if params[:images].present?
+            params[:images].each do |i|
+              img = Goldencobra::Upload.create(i[:image])
+              article.images << img
+            end
+          end
+
+
+          #Set externel Referee
+          new_article.external_referee_id = params[:referee_id]
+          new_article.external_referee_ip = request.env['REMOTE_ADDR']
+
+          # Try to save the article
+          new_article.save
+          return new_article
+        end
+
+
+        def update_article(article_param)
+          # Input validation
+          return nil unless article_param
+          return nil unless params[:article]
+          return nil unless current_user
+          return nil unless params[:referee_id]
+
+          # Get existing article
+          article = Goldencobra::Article.where(:creator_id => current_user.id).find_by_external_referee_id(params[:referee_id])
+
+          if params[:author].present? && params[:author][:lastname].present?
+            author = Goldencobra::Author.find_or_create_by_lastname(params[:author][:lastname])
+            article.author = author
+            article.save
+          end
+
+          # if params[:images].present?
+          #   params[:images].each do |key,value|
+          #     existing_images = Goldencobra::Upload.where(:image_remote_url => value[:image][:image_url])
+          #     if existing_images.blank?
+          #       img = Goldencobra::Upload.create(value[:image])
+          #     else
+          #       img = existing_images.first
+          #     end
+          #     image_position = Goldencobra::Setting.for_key("goldencobra.article.image_positions").to_s.split(",").map(&:strip).first
+          #     article.article_images.create(:image => img, :position => image_position)
+          #   end
+          # end
+
+          # Update existing article
+          article.update_attributes(params[:article])
+
+          # Try to save the article
+          return article
+
+        end
+
+
+      end
+    end
+  end
+end

data/app/controllers/goldencobra/api/v2/locales_controller.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+module Goldencobra
+  module Api
+    module V2
+      class LocalesController < ActionController::Base
+
+        respond_to :text
+
+        # /api/v2/locale_string
+        # ---------------------------------------------------------------------------------------
+        def get_string
+          # check if we have the argument
+          unless params[:locale_key]
+            render status: 200, text: ""
+            return
+          end
+
+          # check if the locale_key contains something
+          if params[:locale_key].length == 0
+            render status: 200, text: ""
+          else
+            # get the translation for locale_key and return the locale value
+            render status: 200, text: t(params[:locale_key])
+          end
+        end
+
+      end
+    end
+  end
+end

data/app/controllers/goldencobra/api/v2/settings_controller.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+module Goldencobra
+  module Api
+    module V2
+      class SettingsController < ActionController::Base
+
+        respond_to :text
+
+        # /api/v2/setting_string
+        # ---------------------------------------------------------------------------------------
+        def get_string
+          # check if we have the argument
+          unless params[:setting_key]
+            render status: 200, text: ""
+            return
+          end
+
+          # check if the setting_key contains something
+          if params[:setting_key].length == 0
+            render status: 200, text: ""
+          else
+            # get the translation for setting_key and return the locale value
+            render status: 200, text: s(params[:setting_key])
+          end
+        end
+
+      end
+    end
+  end
+end

data/app/controllers/goldencobra/articles_controller.rb

@@ -4,6 +4,7 @@ module Goldencobra
   class ArticlesController < Goldencobra::ApplicationController
     layout "application"
     before_filter :check_format
+    before_filter :get_redirectors, :only => [:show]
     before_filter :get_article, :only => [:show, :convert_to_pdf]
     before_filter :verify_token, :only => [:show]
     before_filter :geocode_ip_address, only: [:show]
@@ -21,22 +22,26 @@ module Goldencobra
       user_cache = current_user.present? ? current_user.id : "no_user"
       flash_message = session.present? && session['flash'].present? ? Time.now.to_i : ""
       auth_code = params[:auth_token].present? ? 'with_auth' : ''
-      "c-#{current_client_id}/g/#{I18n.locale.to_s}/#{geo_cache}/#{user_cache}/#{date_cache}/#{params[:article_id]}/#{art_cache}_#{params[:pdf]}_#{params[:frontend_tags]}__#{params[:iframe]}#{flash_message}_#{auth_code}"
+      offset = params[:start].present? ? "offset_#{params[:start].to_i}" : ""
+      limit = params[:limit].present? ? "limit_#{params[:limit].to_i}" : ""
+      generated_cache_key = "c-#{current_client_id}/g/#{I18n.locale.to_s}/#{geo_cache}/#{user_cache}/#{date_cache}/#{params[:article_id]}/#{art_cache}_#{params[:pdf]}_#{params[:frontend_tags]}__#{params[:iframe]}#{flash_message}_#{auth_code}#{offset}#{limit}"
+      return Zlib.crc32(generated_cache_key).to_s
     end
 
 
     def show
-      #flash[:confirmation] = "test"
       ActiveSupport::Notifications.instrument("goldencobra.article.show", :params => params)  #Possible Callbacks on start
       before_init() #Possible Callbacks on start
+      params[:session] = session.except(:user_location)
+      Goldencobra::Article::LiquidParser["url_params"] = params
       if serve_iframe?
         respond_to do |format|
           format.html { render layout: "/goldencobra/bare_layout" }
         end
       elsif serve_basic_article?
         initialize_article(@article)
+        # TODO fix session_params like url_params mit liquid method
         Goldencobra::Article.load_liquid_methods(location: session[:user_location], article: @article, params: params)
-        Goldencobra::Article::LiquidParser["url_params"] = params
         load_associated_model_into_liquid() if can_load_associated_model?
         after_init()
 
@@ -47,8 +52,8 @@ module Goldencobra
         end
 
         if serve_fresh_page?
-          set_expires_in()
-          ActiveSupport::Notifications.instrument("goldencobra.article.render", :params => params)
+         set_expires_in()
+         ActiveSupport::Notifications.instrument("goldencobra.article.render", :params => params)
           before_render()
           respond_to do |format|
             format.html { render layout: choose_layout() }
@@ -73,8 +78,12 @@ module Goldencobra
     end
 
     def switch_language
-      I18n.locale = params[:locale] || session[:locale]
-      session[:locale] = I18n.locale
+      if params[:locale].present?
+        I18n.locale = params[:locale]
+        session[:locale] = I18n.locale.to_s
+      else
+        I18n.locale = session[:locale]
+      end
       if params[:redirect_to].present?
         redirect_to params[:redirect_to]
       else
@@ -108,7 +117,7 @@ module Goldencobra
 
     def get_article
       if is_startpage?
-        I18n.locale = :de
+        I18n.locale = I18n.default_locale
         @article = Goldencobra::Article.active.startpage.first
       else
         begin
@@ -122,7 +131,18 @@ module Goldencobra
     end
 
 
+
     # ------------------ Redirection ------------------------------------------
+    def get_redirectors
+      #check if Goldencobra::Redirector has any redirections, with match before rendering this article
+      #request.original_url
+      #base_request_url = request.original_url.to_s.split("?")[0]  # nimmt nur den teil ohne urlparameter
+      redirect_url, redirect_code = Goldencobra::Redirector.get_by_request(request.original_url)
+      if redirect_url.present? && redirect_code.present?
+        redirect_to redirect_url, :status => redirect_code
+      end
+    end
+
     def redirect_dynamically
       target_article = @article.find_related_subarticle
       if target_article.present?
@@ -187,7 +207,7 @@ module Goldencobra
     end
 
     def serve_basic_article?
-      @article && @article.external_url_redirect.blank? && @article.dynamic_redirection == "false"
+      @article.present? && @article.external_url_redirect.blank? && @article.dynamic_redirection == "false"
     end
 
     def serve_fresh_page?
@@ -254,14 +274,23 @@ module Goldencobra
         @article = Goldencobra::Article.search_by_url(params[:article_id])
       else
         article = Goldencobra::Article.active.search_by_url(params[:article_id])
-        if article
+        if article.present?
           operator = current_user || current_visitor
-          a = Ability.new(operator)
+          a = Ability.new(operator,@current_client)
+          logger.warn("###"*40)
+          logger.warn(a.can?(:read, article))
           if a.can?(:read, article)
             @article = article
           else
             @unauthorized = true
           end
+        # elsif current_visitor.present?
+        #   ap = Goldencobra::Permission.where(:subject_class => "Goldencobra::Article", :operator_id => current_visitor.id, :action => "read").pluck(:subject_id)
+        #   if ap.any?
+        #     @article = Goldencobra::Article.where("id in (?)", ap).search_by_url(params[:article_id])
+        #   else
+        #     @unauthorized = true
+        #   end
         end
       end
     end
@@ -285,11 +314,9 @@ module Goldencobra
           if session[:user_location].blank?
             #Geokit::Geocoders::MultiGeocoder.geocode("194.39.218.11") schlägt fehl (Completed 500 Internal Server Error) daher...
             begin
-                @ip_result = Geokit::Geocoders::MultiGeocoder.geocode(request.remote_ip)
-                session[:user_location] = @ip_result
+              @ip_result = Geokit::Geocoders::MultiGeocoder.geocode(request.remote_ip)
+              session[:user_location] = @ip_result
             rescue Exception => e
-              logger.error("***********")
-              logger.error(e)
               @ip_result = nil
             end
             if @ip_result.present? && @ip_result.city.present?
@@ -325,6 +352,5 @@ module Goldencobra
       Goldencobra::Tracking.analytics(request, session[:user_location])
     end
 
-
   end
 end