alchemy_cms 2.2.rc13 → 2.2.rc14

data/db/migrate/20120608085509_create_alchemy_essence_selects.rb

@@ -0,0 +1,11 @@
+class CreateAlchemyEssenceSelects < ActiveRecord::Migration
+  def change
+    create_table :alchemy_essence_selects do |t|
+      t.string :value
+
+      t.timestamps
+      t.userstamps
+    end
+    add_index :alchemy_essence_selects, :value
+  end
+end

data/db/migrate/20120611221734_create_alchemy_essence_booleans.rb

@@ -0,0 +1,11 @@
+class CreateAlchemyEssenceBooleans < ActiveRecord::Migration
+  def change
+    create_table :alchemy_essence_booleans do |t|
+      t.boolean :value
+
+      t.timestamps
+      t.userstamps
+    end
+    add_index :alchemy_essence_booleans, :value
+  end
+end

data/lib/alchemy/authentication_helpers.rb

@@ -2,8 +2,8 @@ module Alchemy
   module AuthenticationHelpers
 
     def self.included(base)
-      base.send :helper_method, :current_user
       base.send :alias_method, :current_alchemy_user, :current_user
+      base.send :helper_method, :current_user
     end
 
     def current_user
@@ -11,16 +11,12 @@ module Alchemy
       @current_user = current_user_session && current_user_session.record
     end
 
+  private
+
     def current_user_session
       return @current_user_session if defined?(@current_user_session)
       @current_user_session = UserSession.find
     end
 
-    def logged_in?
-      !current_user.blank?
-    end
-
   end
 end
-
-ApplicationController.send :include, Alchemy::AuthenticationHelpers

data/lib/alchemy/engine.rb

@@ -1,12 +1,11 @@
 require File.join(File.dirname(__FILE__), '../middleware/flash_session_cookie')
+require File.join(File.dirname(__FILE__), 'authentication_helpers')
 
 module Alchemy
   class Engine < Rails::Engine
 
     isolate_namespace Alchemy
-
     engine_name 'alchemy'
-
     config.mount_at = '/'
 
     # Enabling assets precompiling
@@ -41,8 +40,8 @@ module Alchemy
       Alchemy::AuthEngine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))
     end
 
-    initializer 'alchemy.include_authentication_helpers' do
-      require File.join(File.dirname(__FILE__), 'authentication_helpers')
+    config.to_prepare do
+      ApplicationController.send :include, Alchemy::AuthenticationHelpers
     end
 
   end

data/lib/alchemy/essence.rb

@@ -15,9 +15,9 @@ module Alchemy #:nodoc:
       # Configuration options are:
       #
       # * +ingredient_column+ - specifies the column name you use for storing the content in the database (default: +body+)
-      # * +validate_column+ - which column should be validated. Takes the ingredient column if not present
+      # * +validate_column+ - which column should be validated. (default: ingredient_column)
       # * +preview_text_column+ - specifies the column for the preview_text method. (default: ingredient_column)
-      # * +preview_text_method+ - a method called on ingredient to get the preview text
+      # * +preview_text_method+ - a method called on ingredient to get the preview text. (default: ingredient_column)
       def acts_as_essence(options={})
         configuration = {}
         configuration.update(options) if options.is_a?(Hash)
@@ -31,31 +31,31 @@ module Alchemy #:nodoc:
           stampable(:stamper_class_name => 'Alchemy::User')
           validate :essence_validations, :on => :update
           has_many :contents, :as => :essence
-          
+
           def acts_as_essence_class
             #{self.name}
           end
-          
+
           def validation_column
             '#{validate_column}'
           end
-          
+
           def ingredient_column
             '#{ingredient_column}'
           end
-          
+
           def ingredient
             send('#{ingredient_column}')
           end
-          
+
           def preview_text_column
             '#{preview_text_column}'
           end
-          
+
           def preview_text_method
             '#{configuration[:preview_text_method]}'
           end
-          
+
         EOV
       end
 
@@ -64,24 +64,24 @@ module Alchemy #:nodoc:
     module InstanceMethods
 
       # Essence Validations:
-      # 
+      #
       # Essence validations can be set inside the config/elements.yml file.
       # Currently supported validations are:
       #   * presence
       #   * format
       #   * uniqueness
-      # 
+      #
       # If you want to validate the format you must additionally pass validate_format_as or validate_format_with:
-      # 
+      #
       # * validate_format_with has to be regex
       # * validate_format_as can be one of:
       # ** url
       # ** email
-      # 
+      #
       # Example:
-      # 
+      #
       #   - name: person
-      #     contents:  
+      #     contents:
       #     - name: name
       #       type: EssenceText
       #       validate: [presence]
@@ -93,7 +93,7 @@ module Alchemy #:nodoc:
       #       type: EssenceText
       #       validate: [format]
       #       validate_format_with: '^[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?$'
-      # 
+      #
       def essence_validations
         self.validation_errors ||= []
         return true if description.blank? || description['validate'].blank?
@@ -170,6 +170,14 @@ module Alchemy #:nodoc:
         self.class.name.split('::').last.underscore
       end
 
+      def acts_as_essence?
+        !acts_as_essence_class.blank?
+      end
+
+      def to_partial_path
+        "alchemy/essences/#{partial_name}_view"
+      end
+
     end
 
   end

data/lib/alchemy/resource.rb

@@ -43,9 +43,8 @@ module Alchemy
     end
 
     def attributes
-      #@_attributes ||=
       self.model.columns.collect do |col|
-        {:name => col.name, :type => col.type} unless self.skip_attributes.include?(col.name)
+        {:name => (resource_relation_name(col.name) || col.name), :type => (resource_relation_type(col.name) || col.type)} unless self.skip_attributes.include?(col.name)
       end.compact
     end
 
@@ -68,7 +67,7 @@ module Alchemy
       @module_definition and @module_definition['engine_name']
     end
 
-    protected
+  protected
 
     def controller_path_array
       @controller_path.split('/')
@@ -78,5 +77,25 @@ module Alchemy
       controller_path_array - model_array
     end
 
+    def resource_relation_name(column_name)
+      resource_relation(column_name)['attr_method'].to_s if resource_relation(column_name).present?
+    end
+
+    def resource_relation_type(column_name)
+      resource_relation(column_name)['attr_type'].to_sym if resource_relation(column_name).present?
+    end
+
+    def self.resource_relations
+      Config.get(:resource_relations)
+    end
+
+    def resource_relations
+      self.class.resource_relations[model_name.to_s] if self.class.resource_relations
+    end
+
+    def resource_relation(column_name)
+      resource_relations[column_name.to_s] if resource_relations
+    end
+
   end
 end

data/lib/alchemy/resources_helper.rb

@@ -52,5 +52,13 @@ module Alchemy
     def resource_model
       resource_handler.model
     end
+
+    def render_attribute(obj, attribute)
+      attr_array = attribute.split('.')
+      attr_array.each do |attr|
+        obj = obj.send(attr) if obj
+      end
+      obj
+    end
   end
 end

data/lib/alchemy/seeder.rb

@@ -59,7 +59,7 @@ module Alchemy
         end
       end
 
-      private
+    private
 
       def color(name)
         case name
@@ -84,6 +84,8 @@ module Alchemy
           puts "#{color(:yellow)}== Skipping! #{message}#{color(:clear)}"
         when :error
           puts "#{color(:red)}!! ERROR: #{message}#{color(:clear)}"
+        when :message
+          puts "#{color(:clear)}#{message}"
         else
           puts "#{color(:green)}== #{message}#{color(:clear)}"
         end
@@ -94,6 +96,29 @@ module Alchemy
         puts "#{'-' * message.length}\n"
       end
 
+      def todo(todo)
+        add_todo todo
+      end
+
+      def add_todo(todo)
+        todos << todo
+      end
+
+      def todos
+        @@todos ||= []
+      end
+
+      def display_todos
+        if todos.length > 0
+          log "\nTODOS:", :message
+          log "------\n", :message
+          todos.each_with_index do |todo, i|
+            log "\n#{i+1}. ", :message
+            log todo, :message
+          end
+        end
+      end
+
     end
 
   end

data/lib/alchemy/upgrader.rb

@@ -12,9 +12,13 @@ module Alchemy
         upgrade_layoutpages
         upgrade_essence_link_target_default
         upgrade_to_namespaced_essence_type
+        convert_essence_texts_displayed_as_select_into_essence_selects
+        convert_essence_texts_displayed_as_checkbox_into_essence_booleans
+
+        display_todos
       end
 
-      private
+    private
 
       # Creates Language model if it does not exist (Alchemy CMS prior v1.5)
       # Also creates missing associations between pages and languages
@@ -101,12 +105,77 @@ module Alchemy
         else
           log "No essence_type columns to be namespaced found.", :skip
         end
+        todo "Test mich nicht"
       end
 
       def strip_alchemy_from_schema_version_table
+        desc "Strip -alchemy suffix from schema_version table."
         database_yml = YAML.load_file(Rails.root.join("config", "database.yml"))
         connection = Mysql2::Client.new(database_yml.fetch(Rails.env.to_s).symbolize_keys)
         connection.query "UPDATE schema_migrations SET `schema_migrations`.`version` = REPLACE(`schema_migrations`.`version`,'-alchemy','')"
+        todo "Teste mich"
+      end
+
+      def convert_essence_texts_displayed_as_select_into_essence_selects
+        desc "Converting EssenceTexts displayed as select into EssenceSelects"
+        contents_found = 0
+        elements = Alchemy::Element.descriptions.select { |e| e['contents'].present? && !e['contents'].detect { |c| c['settings'].present? && c['settings']['display_as'] == 'select' }.nil? }
+        contents = elements.collect { |el| el['contents'] }.flatten.select { |c| c['settings'] && c['settings']['display_as'] == 'select' }.flatten
+        content_names = contents.collect { |c| c['name'] }
+        Alchemy::Content.essence_texts.where(
+          :name => content_names,
+          :alchemy_elements => {:name => elements.collect { |e| e['name'] }}
+        ).joins(:element).each do |content|
+          new_content = Alchemy::Content.new(:name => content.name, :element_id => content.element.id)
+          if new_content.create_essence!('name' => content.name, 'type' => 'EssenceSelect')
+            new_content.essence.value = content.ingredient
+            if new_content.essence.save
+              contents_found += 1
+              log "Converted #{content.name}'s essence_type into EssenceSelect"
+              content.destroy
+            else
+              log "Could not save essence: #{new_content.essence.errors.full_messages.join(', ')}", :error
+            end
+          else
+            log "Could not create content: #{new_content.errors.full_messages.join(', ')}", :error
+          end
+        end
+        if contents_found > 0
+          todo "Please open your elements.yml file and change all type values from these contents:\n\n#{content_names.join(', ')}\n\ninto EssenceSelect."
+        else
+          log "No EssenceTexts with display_as select setting found.", :skip
+        end
+      end
+
+      def convert_essence_texts_displayed_as_checkbox_into_essence_booleans
+        desc "Converting EssenceTexts displayed as checkbox into EssenceBooleans"
+        contents_found = 0
+        elements = Alchemy::Element.descriptions.select { |e| e['contents'].present? && !e['contents'].detect { |c| c['settings'].present? && c['settings']['display_as'] == 'checkbox' }.nil? }
+        contents = elements.collect { |el| el['contents'] }.flatten.select { |c| c['settings'] && c['settings']['display_as'] == 'checkbox' }.flatten
+        content_names = contents.collect { |c| c['name'] }
+        Alchemy::Content.essence_texts.where(
+          :name => content_names,
+          :alchemy_elements => {:name => elements.collect { |e| e['name'] }}
+        ).joins(:element).each do |content|
+          new_content = Alchemy::Content.new(:name => content.name, :element_id => content.element.id)
+          if new_content.create_essence!('name' => content.name, 'type' => 'EssenceBoolean')
+            new_content.essence.value = content.ingredient
+            if new_content.essence.save
+              contents_found += 1
+              log "Converted #{content.name}'s essence_type into EssenceBoolean"
+              content.destroy
+            else
+              log "Could not save essence: #{new_content.essence.errors.full_messages.join(', ')}", :error
+            end
+          else
+            log "Could not create content: #{new_content.errors.full_messages.join(', ')}", :error
+          end
+        end
+        if contents_found > 0
+          todo "Please open your elements.yml file and change all type values from these contents:\n\n#{content_names.join(', ')}\n\ninto EssenceBoolean."
+        else
+          log "No EssenceTexts with display_as checkbox setting found.", :skip
+        end
       end
 
     end

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.rc13"
+  VERSION = "2.2.rc14"
 
 end

data/lib/alchemy_cms.rb

@@ -10,6 +10,7 @@ if defined?(Rails) && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 2
   require 'userstamp'
   require 'yaml'
   require 'sass-rails'
+  require 'coffee-rails'
   require 'declarative_authorization'
   require 'extensions/hash'
   require 'extensions/array'

data/spec/controllers/admin/clipboard_controller_spec.rb

@@ -38,11 +38,23 @@ module Alchemy
     end
 
     describe "#clear" do
-      it "should be clearable" do
-        session[:clipboard][:elements] = {:id => element.id}
-        delete(:clear, :format => :js)
-        session[:clipboard].should be_empty
+
+      context "with elements as remarkable_type" do
+        it "should clear the elements clipboard" do
+          session[:clipboard][:elements] = {:id => element.id}
+          delete(:clear, {:remarkable_type => :elements, :format => :js})
+          session[:clipboard].should be_empty
+        end
+      end
+
+      context "with pages as remarkable_type" do
+        it "should clear the pages clipboard" do
+          session[:clipboard][:pages] = {:id => page.id}
+          delete(:clear, {:remarkable_type => :pages, :format => :js})
+          session[:clipboard].should be_empty
+        end
       end
+
     end
 
   end

data/spec/controllers/admin/contents_controller_spec.rb

@@ -7,10 +7,27 @@ describe Alchemy::Admin::ContentsController do
     Alchemy::UserSession.create FactoryGirl.create(:admin_user)
   end
 
-  it "should update a content via ajax" do
-    @element = FactoryGirl.create(:element)
-    post :update, {:id => @element.contents.find_by_name('intro').id, :content => {:body => 'Peters Petshop'}, :format => :js}
-    @element.ingredient('intro').should == "Peters Petshop"
+  describe '#create' do
+
+    let(:element) { FactoryGirl.create(:element, :name => 'headline') }
+
+    it "should create a content via ajax post" do
+      length_before = element.contents.length
+      post :create, {:content => {:element_id => element.id, :name => 'headline'}, :format => :js}
+      element.contents.reload
+      element.contents.length.should == length_before + 1
+    end
+
+  end
+
+  describe '#update' do
+
+    it "should update a content via ajax" do
+      @element = FactoryGirl.create(:element)
+      post :update, {:id => @element.contents.find_by_name('intro').id, :content => {:body => 'Peters Petshop'}, :format => :js}
+      @element.ingredient('intro').should == "Peters Petshop"
+    end
+
   end
 
   describe "#order" do