scribble_cms 0.0.14a → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c898a802da8482759884f104b6a4153c6f2df0c
-  data.tar.gz: 36fd977e38546d26600253cd39c0244a8a87e41b
+  metadata.gz: 3e706ebc8a03c8b726759571b427213eb4d8ea32
+  data.tar.gz: 10483fa6ec2cfe7828d673a247c9debc595120fc
 SHA512:
-  metadata.gz: fd6f535f50e41ad02cfc0000b11af5ca28060a24c5750713320290372968a49fba0fb564d0a50b7560ade3dc14298e872f2d05e6996d7a46955eeb01a767410b
-  data.tar.gz: b4db6e34f7e90c8734e4b46769f689d4a8b2a599305d64b644a03cf24161f6ab987e2813c0fb3b71be49b3e124fd3bc73b8fca5e7ce28d6c284a67800c4d105c
+  metadata.gz: af9d8f97bcc4552ec0daa73ae054266b1108c53cba23465388e78ef0ac127a8c1fbbc078f4b39abbc2510b625378aa94cbc2be56c9f5b949b0c7995daf8ad4b2
+  data.tar.gz: 406fec9bc5750bb74ab314d1d379fb65641b00cb77c902e8d47987f8f3e6917afb27f001c4bbba409181a0a1367ec7f75b385b7c6fb48db7f5c75592420f5447

data/app/controller/scribbler_pictures_controller.rb

@@ -0,0 +1,20 @@
+class ScribblerPicturesController < ApplicationController
+  
+  skip_before_filter :main_app_default_before_filter
+  
+  def show
+    img = ScribblerImage.find_by_image_name("#{params[:name]}.#{params[:format]}")  
+    
+    if img
+      begin
+          send_file(img.image.path,  :disposition => 'inline', :status => 200)
+      rescue Dragonfly::Job::Fetch::NotFound
+        render :text => nil, :status => 404  
+      end
+    else
+      render :text => nil 
+    end    
+    
+  end  
+  
+end  

data/app/helpers/scribbler_admin_helper.rb

@@ -1,2 +1,13 @@
 module ScribblerAdminHelper
+  
+  # Form
+  def scribbler_form_element(element,form)
+    render :partial => "/scribbler_content/forms/#{element.element_type}", :locals => {:element => element, :f => form} 
+  end    
+  
+  
+  def scribbler_layout(&block)
+    render :partial => "/scribbler_admin/scribbler_layout", :locals => {:content => capture(&block)}
+  end 
+  
 end

data/app/helpers/scribbler_content_helper.rb

@@ -5,31 +5,30 @@ module ScribblerContentHelper
     q = {:name => container_name, :scaleable => (options[:scaleable].nil? ? false : options[:scaleable]), :element_id => (options[:element] ? options[:element].id : nil)}
     container = ScribblerContainer.where(:name => container_name).first || ScribblerContainer.create(q)
     container.update_attributes(:scaleable => options[:scaleable]) if options[:scaleable] && container.scaleable != options[:scaleable]
-    capture(container, &block)
+    yield(container)
   end
   
   def scribbler_group(container, group, &block)
     scribbler_container(container) do |c|
       c.scribbler_group(group) do |g|
-        capture(g, &block)
+        yield(g)
       end  
     end  
   end
   
-  def scribbler_element(container, group, type, name)
-    scribbler_group(container, group) do |g|
-      g.send(type, name)
+  def scribbler_element(container, group, type, name, options = {}, &block)
+    if block_given?
+      options[:default] = capture(&block).html_safe.strip.force_encoding("UTF-8")
+    end  
+    
+    scribbler_group(container.to_s, group.to_s) do |g|
+      v = g.send(type.to_s, name.to_s, options)
+      if v.blank? && options[:default]
+        options[:default]
+      else  
+        return v
+      end  
     end
   end  
   
-  # Form
-  def scribbler_form_element(element,form)
-    render :partial => "/scribbler_content/forms/#{element.element_type}", :locals => {:element => element, :f => form} 
-  end    
-  
-  
-  def scribbler_layout(&block)
-    render :partial => "/scribbler_admin/scribbler_layout", :locals => {:content => capture(&block)}
-  end  
-  
 end  

data/app/models/scribbler_container.rb

@@ -23,6 +23,10 @@ class ScribblerContainer < ActiveRecord::Base
           
           
     # => END
+  
+    def ordered_groups
+      self.groups.sort_by {|g| g.human_name.to_s }
+    end  
     
   def scribbler_group(name, &block)
     yield(self.get_group(name))
@@ -32,6 +36,9 @@ class ScribblerContainer < ActiveRecord::Base
     ScribblerGroup.where(:name => name, :container_id => self.id).first || ScribblerGroup.create(:name => name, :container_id => self.id)
   end  
   
+  def description
+    I18n.t(self.name, :scope => "scribbler.container_names", :default => self.name.humanize)
+  end  
   
     
   

data/app/models/scribbler_group.rb

@@ -16,7 +16,8 @@ class ScribblerGroup < ActiveRecord::Base
       ELEMENTS = {:row => ScribblerText, 
                   :text => ScribblerText,
                   :link => ScribblerLink,
-                  :image => ScribblerImage}
+                  :image => ScribblerImage,
+                  :var => ScribblerVar}
   
       #== Validation and Callbacks
         #=== Validation
@@ -24,17 +25,24 @@ class ScribblerGroup < ActiveRecord::Base
           
         #=== Callbacks
         after_destroy :destroy_elements
-          
-          
+         
     # => END
     
     # Display data
-    def row(row_name)
-      get_element(:row, row_name).content
+    def row(row_name, options = {})
+      e = get_element(:row, row_name)
+      if e.content.blank? && options[:default]
+        e.update_attributes(:content => options[:default])
+      end
+      return e.content.to_s.html_safe
     end
     
-    def text(text_name)
-      get_element(:text, text_name).content.to_s.html_safe
+    def text(text_name, options = {})
+      e = get_element(:text, text_name)
+      if e.content.blank? && options[:default]
+        e.update_attributes(:content => options[:default])
+      end
+      return e.content.to_s.html_safe
     end  
     
     def link(link_name, options = {})
@@ -43,10 +51,29 @@ class ScribblerGroup < ActiveRecord::Base
       ActionController::Base.helpers.link_to(link.title, link.url, options)
     end
     
-    def image(image_name, size)
-      get_element(:image, image_name, :opt_size => size).image.url(:default)
+    def image(image_name, options = {})
+      e = get_element(:image, image_name, options)
+      if e.image
+        e.image.url
+      else
+        ""
+      end    
     end
     
+    def var(name, options = {})
+      get_element :var, name
+    end  
+    
+    def clone!(new_name)
+      group = self.class.new(:name => new_name, :container_id => self.container_id)
+      if group.save
+        self.elements.each do |el|
+          el.class.create(el.attributes.except("id").merge(:group_id => group.id))
+        end  
+      end  
+    end  
+    
+    
     # Helpers
     def get_element(type, name, options = {:released => true})
       options[:released] ||= true
@@ -77,7 +104,7 @@ class ScribblerGroup < ActiveRecord::Base
     end  
     
     def elements(options = {:released => true})
-      ELEMENTS.values.uniq.map {|c| c.where(:group_id => self.id, :released => options[:released] == true)}.flatten.sort_by {|e| e.created_at}
+      ELEMENTS.values.uniq.map {|c| c.where(:group_id => self.id, :released => options[:released] == true)}.flatten.sort_by {|e| e.name}
     end
     
     def released_elements
@@ -98,7 +125,7 @@ class ScribblerGroup < ActiveRecord::Base
       self.process_data!(data[:released])
       
       # Update unrealesed data
-      self.process_data!(data[:unreleased])
+      self.process_data!(data[:unreleased]) if data[:unreleased]
     end 
     
     def process_data!(data)
@@ -115,6 +142,10 @@ class ScribblerGroup < ActiveRecord::Base
       end  
     end
     
+    def human_name
+      I18n.t(self.name, :scope => "scribbler.group_names", :default => self.name.humanize) rescue self.name
+    end  
+    
     
        
     

data/app/models/scribbler_image.rb

@@ -1,10 +1,25 @@
 class ScribblerImage < ActiveRecord::Base
   
   #= Configuration
-  has_attached_file :image, :styles => {:default => "300x200"}, :processors => [:cropper]
-  validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/
+  dragonfly_accessor :image, app: :scribbler do
+    after_assign{|i| i.name = sanitize_filename(image.name) }
+  end
+
+
+  def sanitize_filename(filename)
+    [filename.split(".").first.parameterize, filename.split(".").last].join(".")
+  end
+
+  #validates_presence_of :image
+  validates_size_of :image, maximum: 2.megabytes
+  validates_property :format,
+    of: :image,
+    in: [:gif, :png, :jpg, :jpeg],
+    case_sensitive: false,
+    message: I18n.t("not a valid image")
+    
+    
   
-  attr_accessor :crop_x, :crop_y, :crop_w, :crop_h
       #== Associations
       
       #== Plugins and modules
@@ -28,20 +43,5 @@ class ScribblerImage < ActiveRecord::Base
     # => END
     
     
-    def cropping?
-      !crop_x.blank? && !crop_y.blank? && !crop_w.blank? && !crop_h.blank?
-    end
-    
-    def crop_image
-      self.image.reprocess!
-      crop_x = crop_y = crop_w = crop_h = nil
-    end
-    
-    def opt_image_width
-      self.opt_size.split("x").first
-    end
     
-    def opt_image_height
-      self.opt_size.split("x").last
-    end  
 end

data/app/models/scribbler_var.rb

@@ -0,0 +1,44 @@
+class ScribblerVar < ActiveRecord::Base
+  
+  #= Configuration
+      #== Associations
+      
+      
+      #== Plugins and modules
+        #=== PlugIns
+          # => Stuff in Here        
+  
+        #=== include Modules
+        include ScribbleCms::ScribblerElementSetup
+  
+      #== Konstanten
+      VAR_TYPES = {
+        :decimal => ""
+      }
+  
+      #== Validation and Callbacks
+        #=== Validation
+       
+          
+        #=== Callbacks
+          # => Stuff in Here
+          
+          
+    # => END
+    
+    
+    def self.get(container_name, group_name, name, type)
+      
+      q = {:name => container_name}
+      container = ScribblerContainer.where(:name => container_name).first || ScribblerContainer.create(q)
+      container.scribbler_group(group_name) do |g|
+        return g.var(name, type)
+      end  
+      
+      
+    end
+    
+    def self.set(group, name, value)
+    end    
+  
+end  

data/app/views/scribbler_admin/_scribbler_layout.html.erb

@@ -1,6 +1,10 @@
 <div id="scribbler-admin-area" class="cf">
-  <div id="scribbler-sidebar">
-    <%= render :partial => "/scribbler_admin/scribbler_sidebar" unless request.xhr? %>
-  </div>
-  <div id="scribbler-edit-area"><%= content %></div>
+  <% if @containers.empty? %>
+    <span class="metainfo">Es liegen keine Inhalte vor, die bearbeitet werden können</span>
+  <% else %>
+    <div id="scribbler-sidebar">
+      <%= render :partial => "/scribbler_admin/scribbler_sidebar" unless request.xhr? %>
+    </div>
+    <div id="scribbler-edit-area"><%= content %></div>
+  <% end %>  
 </div>

data/app/views/scribbler_admin/_scribbler_sidebar.html.erb

@@ -1,11 +1,16 @@
-<ul>
+<ul data-no-turbolink>
+  <li>
+    <%= form_for :scribbler, :url => alchemy.admin_static_content_search_url, :html => {:method => :get} do |f| %>
+      <%= f.labeled_text_field :query, :label => "Suchbegriff" %>
+      <%= f.submit "Suchen" %>
+    <% end %>
+  </li>
   <% ScribblerContainer.all.each do |container| %>
-    <li class="scribbler-group">
-      <%= link_to container.description, scribbler.url_for({:controller => "/scribbler_admin", :action => "container_edit", :id => container.id}) %><br />
-      <div class="metainfo small"><%= container.name %></div>
-      <ul class="">
-        <% container.groups.each do |group| %>
-          <li><%= link_to group.name, scribbler.url_for({:controller => "/scribbler_admin", :action => "group_edit", :id => group.id}), default_ajax_link(:update => "scribbler-edit-area")  %></li>
+    <li class="scribbler-group" data-scribbler-container-id="<%= container.id %>">
+      <%= container.description %><br />
+      <ul class="" data-scribbler-container-id="<%= container.id %>">
+        <% container.ordered_groups.each do |group| %>
+          <li><%= link_to_unless_current group.human_name, {:action => "group_edit", :id => group.id}  %></li>
         <% end %>
       </ul>
     </li>

data/app/views/scribbler_admin/group_edit.html.erb

@@ -1,46 +1,54 @@
+<% element_ids = [] %>
 <%= scribbler_layout do %>
   
-  <p>
-    Element in <i>'<%= @group.container.description %>'</i>
-    <% if @group.container.element %>
-      auf Seite <i>'<%= @group.container.element.page.name %>'</i>
-    <% end %>
-  </p>
-  
-  <%= form_for @group, :url => scribbler.url_for({:action => "group_update", :id => @group.id}), :html => {:class => "section", :method => :post} do |f| %>
-  <table style="min-width: 940px;" cellspacing="5">
+  <%= form_for @group, :url => {:action => "group_update", :id => @group.id}, :html => {:class => "section", :method => :post} do |f| %>
+  <table id="scribbler-group-edit-table" cellspacing="5">
+    <% if !controller.hide_scribbler_edit_status %>
     <tr>
       <td>
         <b><%= link_to_function("Aktueller Zustand", "toggleCol('released')") %></b><br />
         <i>Klicken um Bereich ein- bzw auszublenden</i>
       </td>
+      
       <td>
         <b><%= link_to_function("In Bearbeitung", "toggleCol('unreleased')") %></b><br />
         <i>Klicken um Bereich ein- bzw auszublenden</i>
       </td>
     </tr>
+    <% end %>
+    
     <tr>
       <td id="released" class="">
         <%= f.fields_for :released do |u| %>
             <% @group.released_elements.each do |e| %>
-              <div style="margin-bottom: 5px;"><%= scribbler_form_element(e,u) %></div>
-            <% end %>
-        <% end %>
-      </td>
-      <td id="unreleased" class="">
-        <%= f.fields_for :unreleased do |u| %>
-            <% @group.unreleased_elements.each do |e| %>
-              <div style="margin-bottom: 5px;"><%= scribbler_form_element(e,u) %></div>
+              <div class="scribbler-element scribbler-<%= e.element_type %>" style="<%= 'background-color: #ffffdc;' if params[:active].to_i == e.id %> padding: 5px;">
+                <h3 class="scribbler-header"><%= e.human_name %></h3>
+                <% unless e.hint.blank? %>
+                  <p class="scribbler-element-hint"><%= raw(e.hint) %></p>
+                <% end %>
+                <% element_ids << e.id %>
+                <div style="margin-bottom: 5px;"><%= scribbler_form_element(e,u) %></div>
+              </div>  
             <% end %>
         <% end %>
       </td>
+      <% if !controller.hide_scribbler_edit_status %>
+        <td id="unreleased" class="">
+          <%= f.fields_for :unreleased do |u| %>
+              <% @group.unreleased_elements.each do |e| %>
+                <h3 class="scribbler-header"><%= e.human_name %></h3>
+                <div style="margin-bottom: 5px;"><%= scribbler_form_element(e,u) %></div>
+              <% end %>
+          <% end %>
+        </td>
+      <% end %>
     </tr>
   </table>
   
   <%= f.submit "Änderungen speichern" %>
   
   <% if @group.container.scaleable %>
-    <%= link_to "Dieses Element löschen", scribbler.url_for({:action => "group_destroy", :id => @group.id}), 
+    <%= link_to "Dieses Element löschen", {:action => "group_destroy", :id => @group.id}, 
       :confirm => "Soll dieses Element gelöscht werden? Dies kann nicht rückgängig gemacht werden.", :class => "icon-minus" %>
   <% end %>  
   
@@ -48,21 +56,12 @@
 
 <% end %>
 
-<%= tinymce %>
-
 <script type="text/javascript">
-  
-toggleCol = function(name){
-  col = $("#"+name)
-  if(col.hasClass("col-visible")){
-    $("#"+name+" *").hide();
-    col.removeClass("col-visible")
-  }else{
-     $("#"+name+" *").show();
-     col.addClass("col-visible")
-  }
-}
-  
-toggleCol('released')  
+  f = "Alchemy.Tinymce.init(<%= element_ids %>)"
+  window.setTimeout(f, 250)
 </script>
 
+
+
+
+

data/app/views/scribbler_admin/index.html.erb

@@ -1,3 +1,4 @@
+
 <%= scribbler_layout do %>
-  <h2>Inhalte verwalten</h2>
+  
 <% end %>

data/app/views/scribbler_admin/search.html.erb

@@ -0,0 +1,20 @@
+<%= scribbler_layout do %>
+  <h1>Suchergebnisse für '<%= params[:scribbler][:query] %>'</h1>
+  
+  <table class="list">
+    <% @items.each do |item| %>
+      <tr>
+        <td>
+          <%= link_to :action => "group_edit", :id => item.group.id, :active => item.id do %>
+           <h2> <b><%= item.human_name %></b> - <%= item.group.human_name %></h2>
+          <% end %>  
+          
+          
+          <%= item.content.to_s.html_safe %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+  
+  
+<% end %>

data/app/views/scribbler_content/forms/_image.html.erb

@@ -1,23 +1,15 @@
 <%= f.fields_for "#{element.element_type}_#{element.id}" do |e| %>
- 
-  
-  
-  <%= e.label :image, "Bilddatei" %><br />
-  <%= e.file_field :image %>
-  
-  
-  <p>Klicken Sie auf das Bild um die Abmessungen anzupassen</p>
-  <%= link_to image_tag(element.image.url(:default), :width => "100%"), {:action => "image_cropper", :id => element.id} %>
-  
+  <div class="image-container">
+    <%= image_tag element.image.url if element.image_stored? %>
+    <%= e.label :image, "Bilddatei" %> <div class="input"><%= e.file_field :image %></div>
+  </div>
   <div style="margin-bottom: 5px;">
-    <%= e.label :copyright, "Copyright" %><br />
-    <%= e.text_field :copyright, :value => element.copyright %>
+    <%= e.label :copyright, "Copyright" %> <div class="input"><%= e.text_field :copyright, :value => element.copyright %></div>
   </div>
 
   <div style="margin-bottom: 5px;">
-    <%= e.label :alt_text, "ALT-Attribut" %><br />
-    <%= e.text_field :alt_text, :value => element.alt_text %>
-  </div>  
+    <%= e.label :alt_text, "ALT-Attribut" %> <div class="input"><%= e.text_field :alt_text, :value => element.alt_text %></div>
+  </div>
 
   <%= e.hidden_field :type, :value => element.element_type %>
   <%= e.hidden_field :id, :value => element.id %>

data/app/views/scribbler_content/forms/_row.html.erb

@@ -1,5 +1,4 @@
 <%= f.fields_for "#{element.element_type}_#{element.id}" do |e| %>
-  <%= e.label :content, element.name %><br />
   <%= e.text_field :content, :value => element.content %>
   <%= e.hidden_field :type, :value => element.element_type %>
   <%= e.hidden_field :id, :value => element.id %>

data/app/views/scribbler_content/forms/_text.html.erb

@@ -1,6 +1,5 @@
 <%= f.fields_for "#{element.element_type}_#{element.id}" do |e| %>
-  <%= e.label :content, element.name %>
-  <%= e.text_area :content, :class => "tinymce", :value => element.content %>
+  <%= e.text_area :content, :class => ScribbleCms.tiny_mce_css, :id => "tinymce_#{element.id}", :value => element.content %>
   <br />
   <%= e.hidden_field :type, :value => element.element_type %>
   <%= e.hidden_field :id, :value => element.id %>

data/config/routes.rb

@@ -1,15 +1,6 @@
-ScribbleCms::Engine.routes.draw do
-  
-  %w( container_edit container_add_item group_edit group_destroy image_cropper).each do |a|
-    get "/scribbler_admin/#{a}/(:id)", :controller => "scribbler_admin", :action => a
-  end  
-  
-  get "/scribbler_admin", :controller => "scribbler_admin", :action => "index", :as => :scribbler_admin
-  
-  %w(container_update group_update crop_image).each do |a|
-    post "/scribbler_admin/#{a}/(:id)", :controller => "scribbler_admin", :action => a
-  end  
+Scribbler::Engine.routes.draw do
   
+  get "/s/static/pictures/:job/:name.:format" => "scribbler_pictures#show"
   
   
 end  

data/db/migrate/20140313012637_create_scribblers.rb

@@ -2,7 +2,6 @@ class CreateScribblers < ActiveRecord::Migration
   def change
     create_table :scribbler_containers, :force => true do |t|
       t.string      :name
-      t.string      :description
       t.boolean     :scaleable, :default => false
       t.integer     :element_id
       t.timestamps
@@ -34,6 +33,15 @@ class CreateScribblers < ActiveRecord::Migration
       t.timestamps
     end
     
+    create_table :scribbler_vars, :force => true do |t|
+      t.string :name
+      t.text :content
+      t.string :var_type
+      t.integer :group_id
+      t.boolean :released, :default => false
+      t.timestamps
+    end
+    
     create_table :scribbler_images, :force => true do |t|
       t.string :name
       t.string :group_id
@@ -41,7 +49,8 @@ class CreateScribblers < ActiveRecord::Migration
       t.string :copyright
       t.string :alt_text
       t.string :opt_size, :default => "128x128"
-      t.attachment :image
+      t.string :image_uid 
+      t.string :image_name
       t.timestamps
     end
   end

data/lib/scribble_cms/engine.rb

@@ -1,6 +1,20 @@
-module ScribbleCms
+module Scribbler
   class Engine < Rails::Engine
-    engine_name "scribble_cms"
+    
+    engine_name 'scribbler'
+      
+    initializer "dragonfly.scribbler" do
+      
+      # Pictures
+      Dragonfly.app(:scribbler).configure do
+        plugin :imagemagick
+        datastore :file, root_path:  Rails.root.join('public/system/uploads/scribbler').to_s, store_meta: false
+        url_format "/s/static/pictures/:job/:name.:format"
+        secret Digest::SHA1.hexdigest(Rails.root.to_s)
+      end
+      
+      
+    end  
     
   end
 end    

data/lib/scribble_cms/scribbler_controller_plugin.rb

@@ -0,0 +1,115 @@
+module ScribbleCms
+  module ScribblerControllerPlugin
+
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+
+      def scribbler_cms_controller(options = {})
+
+        self.send(:include, InstanceMethods)
+        self.send :before_filter, :get_container, :only => %w(container_edit container_update container_add_item)
+        self.send :before_filter, :get_group, :only => %w(group_edit group_update group_destroy)
+        self.cattr_accessor :hide_scribbler_edit_status
+
+        self.hide_scribbler_edit_status = (options[:hide_scribbler_edit_status] == true)
+      end
+
+    end
+
+
+    module InstanceMethods
+
+
+
+
+      def index
+        @containers = ScribblerContainer.all
+        render "/scribbler_admin/index"
+      end
+
+      # Containers
+      def container_edit
+        render "/scribbler_admin/container_edit"
+      end
+
+      def container_update
+        @container.update_attributes(container_params)
+        flash[:notice] = "Container #{@container.name} was saved"
+        redirect_to :action => "index"
+      end
+
+      def container_add_item
+        @container.get_group("#{@container.id}-#{Time.now.to_i}")
+        flash[:notice] = "Neues Element für #{@container.name} wurde angelegt"
+        redirect_to :back
+      end
+
+      def search
+        @containers = ScribblerContainer.all
+        @items = ScribblerText.find_by_tags(params[:scribbler][:query])
+         render "/scribbler_admin/search"
+      end
+
+
+      # Groups
+      def group_edit
+        @containers = ScribblerContainer.all
+        render "/scribbler_admin/group_edit"
+      end
+
+      def group_update
+        @group.process_group_data(params.require(:scribbler_group).permit!)
+        flash[:notice] = "Änderungen wurden gespeichert"
+        redirect_to :back
+      end
+
+      def group_destroy
+        @group.destroy
+        flash[:notice] = "Daten wurden gelöscht"
+        redirect_to :action => "index"
+      end
+
+      # images
+      def image_cropper
+        @element = ScribblerImage.find(params[:id])
+      end
+
+      def crop_image
+        @element = ScribblerImage.find(params[:id])
+        @element.update_attributes(image_params)
+        @element.image.reprocess!
+        redirect_to :action => "group_edit", :id => @element.group_id
+      end
+
+
+      def picture
+
+      end
+
+
+      # Private - permit parameters
+      private
+
+      def get_container
+        @container = ScribblerContainer.find(params[:id])
+      end
+
+      def get_group
+        @group = ScribblerGroup.find(params[:id])
+      end
+
+      def container_params
+        params.require(:scribbler_container).permit(:description)
+      end
+
+      def image_params
+        params.require(:scribbler_image).permit(:crop_x, :crop_y, :crop_w, :crop_h)
+      end
+
+    end
+
+  end
+end

data/lib/scribble_cms/scribbler_element_setup.rb

@@ -1,29 +1,59 @@
 module ScribbleCms
   module ScribblerElementSetup
-    
+
     def self.included(base)
       base.send(:belongs_to, :group, :class_name => "ScribblerGroup", :foreign_key => "group_id", :touch => true)
       base.send(:validates_presence_of, :group_id)
       base.send(:before_save, :check_uniqueness)
+      base.send(:smart_search, :on => [
+          {:field_name => :human_name, :boost => 0.7}, {:field_name => "group.human_name", :boost => 0.5}, {:field_name => :searchable_content, :boost => 1}
+        ],
+        :conditions => "released = 1"
+      )
+
     end
-    
-    
+
+
     def check_uniqueness
       items = self.class.where(:name => self.name, :group_id => self.group_id, :released => self.released)
       items.empty? || items.size == 1
-    end 
-    
+    end
+
     def element_type
       if self.is_a?(ScribblerLink)
         return :link
       elsif self.is_a?(ScribblerText) && self.plain
         return :row
-      elsif self.is_a?(ScribblerText) && !self.plain   
+      elsif self.is_a?(ScribblerText) && !self.plain
         return :text
-      elsif self.is_a?(ScribblerImage)  
+      elsif self.is_a?(ScribblerImage)
         return :image
-      end  
-    end     
-    
+      elsif self.is_a?(ScribblerVar)
+        return :var
+      end
+    end
+
+    def searchable_content
+      case self.element_type
+      when :link
+        return [name, url, title]
+      when :row
+        return content
+      when :text
+        return content
+      when :image
+      when :var
+      end
+    end
+
+    def human_name
+      I18n.t(self.name, :scope => "scribbler.element_names.#{self.group.name}", :default => self.name.to_s.humanize)
+    end
+
+    def hint
+      h = I18n.t(self.name, :scope => "scribbler.element_hints.#{self.group.name}", :default => "")
+      h.is_a?(Array) ? h.join("") : h
+    end
+
   end
-end  
+end

data/lib/scribble_cms.rb

@@ -1,5 +1,26 @@
+require "scribble_cms/engine"
+require 'scribble_cms/scribbler_controller_plugin'  
+require 'scribble_cms/scribbler_element_setup'
+require 'dragonfly'
+require "smart_search"
+
 module ScribbleCms
-end
+  mattr_accessor :tiny_mce_css, :tiny_mce_js
+  
+  self.tiny_mce_css = "default_tinymce"
+  self.tiny_mce_js  = "Alchemy.Tinymce.initAll();"
+end  
+
+ActionController::Base.send(:include, ScribbleCms::ScribblerControllerPlugin)
 
-require 'scribble_cms/engine'  
-require 'scribble_cms/scribbler_element_setup'
+String.class_eval do
+  
+  def replace_scribbler_vars(vars = {})
+    r = self
+    vars.each do |var_name, var_content|
+      r = r.gsub("*#{var_name}*", var_content.to_s)
+    end
+    return r  
+  end  
+  
+end  

metadata

@@ -1,43 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: scribble_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.14a
+  version: '0.5'
 platform: ruby
 authors:
 - Florian Eck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.66
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.66
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: paperclip
+  name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: smart_search
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.78
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.78
 description: Easy-to-use tool for placing user-editable content in your pages
 email:
 - it-support@friends-systems.de
@@ -50,7 +64,7 @@ files:
 - app/assets/stylesheets/ext/jquery.Jcrop.css
 - app/assets/stylesheets/scribbler.css.erb
 - app/assets/stylesheets/scribbler_layout.css.erb
-- app/controllers/scribbler_admin_controller.rb
+- app/controller/scribbler_pictures_controller.rb
 - app/helpers/scribbler_admin_helper.rb
 - app/helpers/scribbler_content_helper.rb
 - app/models/scribbler_container.rb
@@ -58,21 +72,23 @@ files:
 - app/models/scribbler_image.rb
 - app/models/scribbler_link.rb
 - app/models/scribbler_text.rb
+- app/models/scribbler_var.rb
 - app/views/scribbler_admin/_scribbler_layout.html.erb
 - app/views/scribbler_admin/_scribbler_sidebar.html.erb
 - app/views/scribbler_admin/container_edit.html.erb
 - app/views/scribbler_admin/group_edit.html.erb
 - app/views/scribbler_admin/image_cropper.html.erb
 - app/views/scribbler_admin/index.html.erb
+- app/views/scribbler_admin/search.html.erb
 - app/views/scribbler_content/forms/_image.html.erb
 - app/views/scribbler_content/forms/_link.html.erb
 - app/views/scribbler_content/forms/_row.html.erb
 - app/views/scribbler_content/forms/_text.html.erb
 - config/routes.rb
 - db/migrate/20140313012637_create_scribblers.rb
-- lib/paperclip_processors/cropper.rb
 - lib/scribble_cms.rb
 - lib/scribble_cms/engine.rb
+- lib/scribble_cms/scribbler_controller_plugin.rb
 - lib/scribble_cms/scribbler_element_setup.rb
 homepage: http://www.friends-systems.de
 licenses: []
@@ -88,12 +104,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Easy-to-use tool for placing user-editable content in your pages

data/app/controllers/scribbler_admin_controller.rb

@@ -1,77 +0,0 @@
-class ScribblerAdminController < ApplicationController
-  
-  before_filter :get_container, :only => %w(container_edit container_update container_add_item )
-  before_filter :get_group, :only => %w(group_edit group_update group_destroy)
-    
-    
-  def index
-    @containers = ScribblerContainer.all
-  end
-  
-  # Containers
-  def container_edit
-  end
-  
-  def container_update
-    @container.update_attributes(container_params)
-    flash[:notice] = "Container #{@container.name} was saved"
-    redirect_to :action => "index"
-  end
-  
-  def container_add_item
-    @container.get_group("#{@container.id}-#{Time.now.to_i}")
-    flash[:notice] = "Neues Element für #{@container.name} wurde angelegt"
-    redirect_to :back
-  end  
-  
-  
-  
-  
-  # Groups
-  def group_edit
-    render :layout => false
-  end
-  
-  def group_update
-    @group.process_group_data(params[:scribbler_group])
-    flash[:notice] = "Änderungen wurden gespeichert"
-    redirect_to :back
-  end
-  
-  def group_destroy
-    @group.destroy
-    flash[:notice] = "Daten wurden gelöscht"
-    redirect_to :action => "index"
-  end    
-  
-  # images
-  def image_cropper
-    @element = ScribblerImage.find(params[:id])
-  end
-  
-  def crop_image
-    @element = ScribblerImage.find(params[:id])
-    @element.update_attributes(image_params)
-    @element.image.reprocess!
-    redirect_to :action => "group_edit", :id => @element.group_id
-  end    
-  
-  # Private - permit parameters
-  private
-  
-  def get_container
-    @container = ScribblerContainer.find(params[:id])
-  end
-  
-  def get_group
-    @group = ScribblerGroup.find(params[:id])
-  end  
-  
-  def container_params
-    params.require(:scribbler_container).permit(:description)
-  end
-  
-  def image_params
-    params.require(:scribbler_image).permit(:crop_x, :crop_y, :crop_w, :crop_h)
-  end
-end

data/lib/paperclip_processors/cropper.rb

@@ -1,23 +0,0 @@
-module Paperclip
-  class Cropper < Thumbnail
-    def transformation_command
-      if crop_command
-        crop_command
-      else
-        super
-      end
-    end
-    
-    def crop_command
-      target = @attachment.instance
-      puts "try Croppper"
-      if target.cropping?
-        puts "cropper!"
-        cmd = [" -crop '#{target.crop_w.to_i}x#{target.crop_h.to_i}+#{target.crop_x.to_i}+#{target.crop_y.to_i}'"]
-        cmd << "-auto-orient"
-        cmd << "-resize #{target.opt_image_width}x#{target.opt_image_height}"
-      end
-    end
-  end
-end
-