alchemy_cms 2.9.1 → 3.0.0.rc5

data/lib/alchemy/picture_attributes.rb

@@ -16,7 +16,7 @@ module Alchemy
         Digest::SHA1.hexdigest(joined_attributes(attributes))[0..15]
       end
 
-    private
+      private
 
       # Takes attributes and joins them with the +security_token+ of your rails app.
       #

data/lib/alchemy/resource.rb

@@ -28,13 +28,18 @@ module Alchemy
   #
   # == Resource relations
   #
-  # Alchemy::Resource can take care of ActiveRecord relations. You will have to announce relations by defining a
-  # resource_relations class method in your model class that returns a hash like this:
+  # Alchemy::Resource can take care of ActiveRecord relations.
   #
-  #     {
-  #       :location_id => {:attr_method => "location#name", :attr_type => :string},
-  #       :organizer_id => {:attr_method => "organizer#name", :attr_type => :string}
-  #     }
+  # === BelongsTo Relations
+  #
+  # For belongs_to associations you will have to define a +alchemy_resource_relations+ class method in your model class:
+  #
+  #     def self.alchemy_resource_relations
+  #       {
+  #         location: {attr_method: 'name', attr_type: 'string'},
+  #         organizer: {attr_method: 'name', attr_type: 'string'}
+  #       }
+  #     end
   #
   # With this knowledge Resource#attributes will return location#name and organizer#name instead of location_id
   # and organizer_id. Refer to Alchemy::ResourcesController for further details on usage.
@@ -73,7 +78,7 @@ module Alchemy
       @module_definition = module_definition
       @model = (custom_model or guess_model_from_controller_path)
       self.skip_attributes = model.respond_to?(:skip_attributes) ? model.skip_attributes : DEFAULT_SKIPPED_ATTRIBUTES
-      if model.respond_to?(:resource_relations)
+      if model.respond_to?(:alchemy_resource_relations)
         if not model.respond_to?(:reflect_on_all_associations)
           raise MissingActiveRecordAssociation
         end
@@ -101,11 +106,6 @@ module Alchemy
       @_namespaced_resource_name = resource_name_array.join('_').singularize
     end
 
-    def permission_scope
-      #(resource_namespaced? ? "#{resource_namespace.underscore}_admin_#{resources_name}" : "admin_#{resources_name}").to_sym
-      @_permission = @controller_path.gsub('/', '_').to_sym
-    end
-
     def namespace_for_scope
       namespace_array = namespace_diff
       namespace_array.delete(engine_name) if in_engine?
@@ -178,14 +178,10 @@ module Alchemy
     # Expands the resource_relations hash with matching activerecord associations data.
     def map_relations
       self.resource_relations = {}
-      model.resource_relations.each do |name, options|
+      model.alchemy_resource_relations.each do |name, options|
         name = name.to_s.gsub(/_id$/, '') # ensure that we don't have an id
         association = association_from_relation_name(name)
         foreign_key = association.options[:foreign_key] || "#{association.name}_id".to_sym
-        if options[:attr_method].to_s =~ /#/
-          ActiveSupport::Deprecation.warn('Old style :attr_method used in Alchemy::Ressource#resource_relations. Please remove the # and pass column name only.', caller[2..10])
-          options[:attr_method] = options[:attr_method].split('#').last
-        end
         self.resource_relations[foreign_key] = options.merge(:model_association => association, :name => name)
       end
     end

data/lib/alchemy/resources_helper.rb

@@ -48,10 +48,6 @@ module Alchemy
       edit_polymorphic_path path_segments, options
     end
 
-    def resource_permission_scope
-      resource_handler.permission_scope
-    end
-
     def resource_name
       resource_handler.resource_name
     end
@@ -87,9 +83,22 @@ module Alchemy
       _t(:not_found)
     end
 
-    def resource_help_text(attribute)
-      if help_text = resource_handler.help_text_for(attribute)
-        content_tag(:p, help_text, class: 'foot_note')
+    # Returns a options hash for simple_form input fields.
+    def resource_attribute_field_options(attribute)
+      options = {hint: resource_handler.help_text_for(attribute)}
+      case attribute[:type].to_s
+      when 'boolean'
+        options
+      when 'date', 'datetime'
+        options.merge as: 'string',
+          input_html: {
+            type: 'date',
+            value: l(resource_instance_variable.send(attribute[:name]) || Time.now, format: :datepicker)
+          }
+      when 'text'
+        options.merge(as: 'text', input_html: {rows: 4})
+      else
+        options.merge(as: 'string')
       end
     end
 
@@ -120,16 +129,5 @@ module Alchemy
       end
     end
 
-    # Returns resource relations options hash for a rails select helper.
-    #
-    # @param [Hash] relation
-    # @returns Hash
-    #
-    def options_for_resource_relation_select(relation)
-      relation[:model_association].klass.all.collect do |r|
-        [r.send(relation[:attr_method]), r.id]
-      end
-    end
-
   end
 end

data/lib/alchemy/seeder.rb

@@ -16,7 +16,7 @@ module Alchemy
     protected
 
       def create_default_site
-        desc "Creating default site"
+        desc "Creating default Alchemy site"
         if Alchemy::Site.count == 0
           site = Alchemy::Site.new(
             name: 'Default Site',
@@ -26,24 +26,22 @@ module Alchemy
             site.languages = Alchemy::Language.all
           end
           site.save!
-          log "Created default site with default language."
+          log "Created default Alchemy site with default language."
         else
-          log "Default site was already present.", :skip
+          log "Default Alchemy site was already present.", :skip
         end
       end
 
       def create_root_page
-        desc "Creating root page"
-        root = Alchemy::Page.find_or_initialize_by_name(
-          :name => 'Root',
-          :do_not_sweep => true
-        )
+        desc "Creating Alchemy root page"
+        root = Alchemy::Page.find_or_initialize_by(name: 'Root')
+        root.do_not_sweep = true
         if root.new_record?
           if root.save!
-            log "Created page #{root.name}."
+            log "Created Alchemy root page."
           end
         else
-          log "Page #{root.name} was already present.", :skip
+          log "Alchemy root page was already present.", :skip
         end
       end
 

data/lib/alchemy/shell.rb

@@ -13,8 +13,8 @@ module Alchemy
       puts "#{'-' * message.length}\n"
     end
 
-    def todo(todo)
-      add_todo todo
+    def todo(todo, title='')
+      add_todo [title, todo]
     end
 
     # Adds a sentence to the todos Array
@@ -37,16 +37,18 @@ module Alchemy
     #
     def display_todos
       if todos.length > 0
-        log "\nTODOS:", :message
+        log "\nTODOs:", :message
         log "------\n", :message
         todos.each_with_index do |todo, i|
-          log "\n#{i+1}. ", :message
-          log todo, :message
+          title = "\n#{i+1}. #{todo[0]}"
+          log title, :message
+          puts '-' * title.length
+          log todo[1], :message
         end
       end
     end
 
-    # Prints out the given todo message with the color due to its type
+    # Prints out the given log message with the color due to its type
     #
     # @param [String] message
     # @param [Symbol] type

data/lib/alchemy/tasks/helpers.rb

@@ -12,10 +12,12 @@ module Alchemy
 
       def database_config
         raise "Could not find #{database_config_file}!" if !File.exists?(database_config_file)
-        config_file = YAML.load_file(database_config_file)
-        config_file.fetch(environment)
-      rescue KeyError
-        raise "Database configuration for #{environment} not found!"
+        @database_config ||= begin
+          config_file = YAML.load_file(database_config_file)
+          config_file.fetch(environment)
+          rescue KeyError
+            raise "Database configuration for #{environment} not found!"
+        end
       end
 
       private

data/lib/alchemy/test_support/auth_helpers.rb

@@ -9,8 +9,8 @@ module Alchemy
         controller.stub current_alchemy_user: user
       end
 
-      def registered_user
-        mock_user([:registered])
+      def member_user
+        mock_user([:member])
       end
 
       def author_user
@@ -26,7 +26,7 @@ module Alchemy
       end
 
       def mock_user(roles)
-        mock_model(Alchemy.user_class, alchemy_roles: roles.map(&:to_sym), role_symbols: roles.map(&:to_sym))
+        mock_model(Alchemy.user_class, alchemy_roles: roles.map(&:to_sym))
       end
 
     end

data/lib/alchemy/test_support/controller_requests.rb

@@ -29,7 +29,7 @@ module Alchemy
 
       def process_alchemy_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
         parameters ||= {}
-        process(action, parameters.merge!(:use_route => :alchemy), session, flash, method)
+        process(action, method, parameters.merge!(:use_route => :alchemy), session, flash)
       end
 
     end

data/lib/alchemy/test_support/essence_shared_examples.rb

@@ -0,0 +1,141 @@
+require 'spec_helper'
+
+shared_examples_for "an essence" do
+
+  let(:element) { Alchemy::Element.new }
+  let(:content) { Alchemy::Content.new(name: 'foo') }
+  let(:content_description) { {'name' => 'foo'} }
+
+  it "touches the content after update" do
+    essence.save
+    content.update(essence: essence, essence_type: essence.class.name)
+    d = content.updated_at
+    content.essence.update(essence.ingredient_column.to_sym => ingredient_value)
+    content.reload
+    content.updated_at.should_not eq(d)
+  end
+
+  it "should have correct partial path" do
+    underscored_essence = essence.class.name.demodulize.underscore
+    expect(essence.to_partial_path).to eq("alchemy/essences/#{underscored_essence}_view")
+  end
+
+  describe '#description' do
+    subject { essence.description }
+
+    context 'without element' do
+      it { should eq({}) }
+    end
+
+    context 'with element' do
+      before { essence.stub(element: element) }
+
+      context 'but without content descriptions' do
+        it { should eq({}) }
+      end
+
+      context 'and content descriptions' do
+        before do
+          essence.stub(content: content)
+        end
+
+        context 'containing the content name' do
+          before { element.stub(content_descriptions: [content_description]) }
+
+          it "returns the content description" do
+            should eq(content_description)
+          end
+        end
+
+        context 'not containing the content name' do
+          before { element.stub(content_descriptions: []) }
+
+          it { should eq({}) }
+        end
+      end
+    end
+  end
+
+  describe '#ingredient=' do
+    it 'should set the value to ingredient column' do
+      essence.ingredient = ingredient_value
+      expect(essence.ingredient).to eq ingredient_value
+    end
+  end
+
+  describe 'validations' do
+    context 'without essence description in elements.yml' do
+      it 'should return an empty array' do
+        essence.stub(:description).and_return nil
+        expect(essence.validations).to eq([])
+      end
+    end
+
+    context 'without validations defined in essence description in elements.yml' do
+      it 'should return an empty array' do
+        essence.stub(:description).and_return({name: 'test', type: 'EssenceText'})
+        expect(essence.validations).to eq([])
+      end
+    end
+
+    describe 'presence' do
+      before do
+        essence.stub(:description).and_return({'validate' => ['presence']})
+      end
+
+      context 'when the ingredient column is empty' do
+        before { essence.update(essence.ingredient_column.to_sym => nil) }
+
+        it 'should not be valid' do
+          expect(essence).to_not be_valid
+        end
+      end
+
+      context 'when the ingredient column is not nil' do
+        before { essence.update(essence.ingredient_column.to_sym => ingredient_value) }
+
+        it 'should be valid' do
+          expect(essence).to be_valid
+        end
+      end
+    end
+
+    describe 'uniqueness' do
+      before do
+        essence.stub(element: build_stubbed(:element))
+        essence.stub(:description).and_return({'validate' => ['uniqueness']})
+        essence.update(essence.ingredient_column.to_sym => ingredient_value)
+      end
+
+      context 'when a duplicate exists' do
+        before { essence.stub(:duplicates).and_return([essence.dup]) }
+
+        it 'should not be valid' do
+          expect(essence).to_not be_valid
+        end
+
+        context 'when validated essence is not public' do
+          before { essence.stub(public?: false) }
+
+          it 'should be valid' do
+            expect(essence).to be_valid
+          end
+        end
+      end
+
+      context 'when no duplicate exists' do
+        before { essence.stub(:duplicates).and_return([]) }
+
+        it 'should be valid' do
+          expect(essence).to be_valid
+        end
+      end
+    end
+
+    describe '#acts_as_essence?' do
+      it 'should return true' do
+        expect(essence.acts_as_essence?).to be_true
+      end
+    end
+  end
+end

data/lib/alchemy/test_support/factories.rb

@@ -26,7 +26,7 @@ FactoryGirl.define do
 
   factory :page, :class => 'Alchemy::Page' do
 
-    language { Alchemy::Language.get_default || FactoryGirl.create(:language) }
+    language { Alchemy::Language.default || FactoryGirl.create(:language) }
     sequence(:name) { |n| "A Page #{n}" }
     parent_id { (Alchemy::Page.find_by_language_root(true) || FactoryGirl.create(:language_root_page)).id }
     page_layout "standard"
@@ -63,8 +63,8 @@ FactoryGirl.define do
   end
 
   factory :cell, :class => 'Alchemy::Cell' do
-    page { Alchemy::Page.find_by_language_root(true) || FactoryGirl.create(:language_root_page) }
-    name "A Cell"
+    page { Alchemy::Page.find_by(language_root: true) || FactoryGirl.create(:language_root_page) }
+    name "a_cell"
   end
 
   factory :element, :class => 'Alchemy::Element' do
@@ -84,6 +84,30 @@ FactoryGirl.define do
     upload_hash Time.now.hash
   end
 
+  factory :content, :class => 'Alchemy::Content' do
+    name "text"
+    essence_type "Alchemy::EssenceText"
+    association :essence, :factory => :essence_text
+  end
+
+  factory :essence_text, :class => 'Alchemy::EssenceText' do
+    body ''
+  end
+
+  factory :essence_picture, :class => 'Alchemy::EssencePicture' do
+    picture
+  end
+
+  factory :essence_file, :class => 'Alchemy::EssenceFile' do
+    attachment
+  end
+
+  factory :attachment, :class => 'Alchemy::Attachment' do
+    file File.new(File.expand_path('../../../../spec/fixtures/image.png', __FILE__))
+    name 'image'
+    file_name 'image.png'
+  end
+
   factory :event do
     name 'My Event'
     hidden_name 'not shown'
@@ -98,10 +122,4 @@ FactoryGirl.define do
     name 'A Site'
     host 'domain.com'
   end
-
-  factory :attachment, :class => 'Alchemy::Attachment' do
-    file File.new(File.expand_path('../../../../spec/fixtures/image.png', __FILE__))
-    name 'image'
-    file_name 'image.png'
-  end
 end