alchemy_cms 2.2.rc1 → 2.2.rc2

data/app/models/alchemy/element.rb

@@ -123,9 +123,9 @@ module Alchemy
       return if element_descriptions.blank?
       element_scratch = element_descriptions.select { |m| m["name"] == attributes['name'].split('#').first }.first
       element = Element.new(
-        element_scratch.except('contents', 'available_contents', 'display_name').merge({
-                                                                                         :page_id => attributes['page_id']
-                                                                                       })
+        element_scratch.except('contents', 'available_contents', 'display_name', 'amount').merge({
+          :page_id => attributes['page_id']
+        })
       )
       element
     end
@@ -178,18 +178,23 @@ module Alchemy
       elements_for_layout = []
       elements_for_layout += all_definitions_for(page_layout['elements'])
       return [] if elements_for_layout.blank?
-      # all unique elements from this layout
-      unique_elements = elements_for_layout.select { |m| m["unique"] == true }
+      # all unique and limited elements from this layout
+      limited_elements = elements_for_layout.select{ |m| m["unique"] == true || (m["amount"] > 0 unless m["amount"].nil?) }
       elements_already_on_the_page = page.elements
-      # delete all elements from the elements that could be placed that are unique and already and the page
-      unique_elements.each do |unique_element|
-        elements_already_on_the_page.each do |already_placed_element|
-          if already_placed_element.name == unique_element["name"]
-            elements_for_layout.delete(unique_element)
-          end
+      # delete all elements from the elements that could be placed that are unique or limited and already and the page
+      elements_counts = Hash.new(0)
+      elements_already_on_the_page.each { |e| elements_counts[e.name] += 1 }
+      limited_elements.each do |limited_element|
+        next if elements_counts[limited_element["name"]] == 0
+        if limited_element["unique"]
+          elements_for_layout.delete(limited_element) if elements_counts[limited_element["name"]] > 0
+          next
+        end
+        unless limited_element["amount"].nil?
+          elements_for_layout.delete(limited_element) if elements_counts[limited_element["name"]] >= limited_element["amount"]
         end
       end
-      return elements_for_layout
+      elements_for_layout
     end
 
     def self.all_definitions_for(element_names)

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.rc1"
+  VERSION = "2.2.rc2"
 
 end

data/spec/models/element_spec.rb

@@ -78,6 +78,44 @@ describe Alchemy::Element do
     Alchemy::Element.trashed.should include(@element)
   end
 
+  context "limited amount" do
+    before(:each) do
+      descriptions = Alchemy::Element.descriptions
+      descriptions << {
+        'name' => 'column_headline',
+        'amount' => 3,
+        'contents' => [{'name' => 'headline', 'type' => 'EssenceText'}]
+      }
+      descriptions << {
+        'name' => 'unique_headline',
+        'unique' => true,
+        'amount' => 3,
+        'contents' => [{'name' => 'headline', 'type' => 'EssenceText'}]
+      }
+      Alchemy::Element.stub!(:descriptions).and_return(descriptions)
+      Alchemy::PageLayout.add(
+        'name' => 'columns',
+        'elements' => ['column_headline', 'unique_headline'],
+        'autogenerate' => ['unique_headline', 'column_headline', 'column_headline', 'column_headline']
+      )
+      @page = Factory(:page, :page_layout => 'columns')
+    end
+
+    it "should be readable" do
+      element = Alchemy::Element.all_definitions_for(['column_headline']).first
+      element['amount'].should be 3
+    end
+
+    it "should limit elements" do
+      Alchemy::Element.all_for_page(@page).each { |e| e['name'].should_not == 'column_headline' }
+    end
+    
+    it "should be ignored if unique" do
+      Alchemy::Element.all_for_page(@page).each { |e| e['name'].should_not == 'unique_headline' }
+    end
+
+  end
+
   context "trashed" do
 
     before(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.rc1
+  version: 2.2.rc2
   prerelease: 4
 platform: ruby
 authors:
@@ -16,7 +16,7 @@ date: 2012-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70345801404800 !ruby/object:Gem::Requirement
+  requirement: &70253002665740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -24,10 +24,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70345801404800
+  version_requirements: *70253002665740
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70345801403120 !ruby/object:Gem::Requirement
+  requirement: &70253002665240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345801403120
+  version_requirements: *70253002665240
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70345801402000 !ruby/object:Gem::Requirement
+  requirement: &70253002663400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -46,10 +46,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70345801402000
+  version_requirements: *70253002663400
 - !ruby/object:Gem::Dependency
   name: declarative_authorization
-  requirement: &70345801560280 !ruby/object:Gem::Requirement
+  requirement: &70253002662260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -57,10 +57,10 @@ dependencies:
         version: 0.5.4
   type: :runtime
   prerelease: false
-  version_requirements: *70345801560280
+  version_requirements: *70253002662260
 - !ruby/object:Gem::Dependency
   name: tvdeyen-fleximage
-  requirement: &70345801559060 !ruby/object:Gem::Requirement
+  requirement: &70253002830180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +68,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70345801559060
+  version_requirements: *70253002830180
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70345801557220 !ruby/object:Gem::Requirement
+  requirement: &70253002829200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70345801557220
+  version_requirements: *70253002829200
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
-  requirement: &70345801556420 !ruby/object:Gem::Requirement
+  requirement: &70253002828020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70345801556420
+  version_requirements: *70253002828020
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70345801555280 !ruby/object:Gem::Requirement
+  requirement: &70253002827120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70345801555280
+  version_requirements: *70253002827120
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
-  requirement: &70345801554340 !ruby/object:Gem::Requirement
+  requirement: &70253002826360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70345801554340
+  version_requirements: *70253002826360
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70345801553380 !ruby/object:Gem::Requirement
+  requirement: &70253002825200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70345801553380
+  version_requirements: *70253002825200
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70345801589120 !ruby/object:Gem::Requirement
+  requirement: &70253002824020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70345801589120
+  version_requirements: *70253002824020
 - !ruby/object:Gem::Dependency
   name: attachment_magic
-  requirement: &70345801588220 !ruby/object:Gem::Requirement
+  requirement: &70253002822820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -145,10 +145,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70345801588220
+  version_requirements: *70253002822820
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &70345801586560 !ruby/object:Gem::Requirement
+  requirement: &70252998873340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +156,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70345801586560
+  version_requirements: *70252998873340
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70345801585780 !ruby/object:Gem::Requirement
+  requirement: &70252998872260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -167,10 +167,10 @@ dependencies:
         version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *70345801585780
+  version_requirements: *70252998872260
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70345801585100 !ruby/object:Gem::Requirement
+  requirement: &70252998871700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +178,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345801585100
+  version_requirements: *70252998871700
 - !ruby/object:Gem::Dependency
   name: jasminerice
-  requirement: &70345801584240 !ruby/object:Gem::Requirement
+  requirement: &70252998870900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,7 +189,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70345801584240
+  version_requirements: *70252998870900
 description: Alchemy is a Rails 3 CMS with a flexible content storing architecture.
 email:
 - alchemy@magiclabs.de
@@ -855,7 +855,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 802306676812212571
+      hash: 2832410516678511225
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: