classiccms 0.3.4 → 0.3.5

data/.gitignore

@@ -7,3 +7,4 @@ pkg/*
 .rspec
 tmp
 .sass-cache
+vendor/**/*

data/lib/classiccms/controllers/cms.rb

@@ -15,11 +15,20 @@ module Classiccms
       if params['cms'] != nil and params['cms'].length > 2
         begin
           params['cms'] = Base64.decode64(params['cms']).decrypt
-          new = eval(params['cms']).first
-          record = new[0].new
-
-          record.connections << Connection.new(:parent_id => new[1], :section => new[2], :files => new[2..new.length])
-          show :add_window, {}, {:record => record}
+          new_params= eval(params['cms'])
+          records = []
+          new_params.each do |new|
+            record = new[0].new
+            records.each do |i|
+              if i.kind_of? new[0]
+                record = i
+                records.delete(i)
+              end
+            end
+            record.connections << Connection.new(:parent_id => new[1], :section => new[2], :files => new[2..new.length])
+            records << record
+          end
+          show :add_window, {}, {:records => records}
         rescue TypeError, ArgumentError
           ''
         end

data/lib/classiccms/version.rb

@@ -1,3 +1,3 @@
 module Classiccms #:nodoc
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/lib/classiccms/views/cms/add_window.haml

@@ -2,7 +2,8 @@
   .background
   #logo
   #edit_box
-    /- models.each do |model|
+    /- records.each do |record|
+    - record = records.first if defined? records
     = show :form, {}, {:record => record}
     #edit_bottom
     #edit_bottom_nav

data/spec/controllers/cms_spec.rb

@@ -71,6 +71,25 @@ describe Classiccms do
       post '/add', {:cms => string}
       last_response.body.should match("action='/cms/create'")
     end
+    it 'should render multiple connections' do
+      login
+      m = Menu.new
+      string = Base64.encode64([[Menu, 0, 'first'], [Menu, 0, 'second']].to_s.encrypt)
+      post '/add', {:cms => string}
+      last_response.body.should match("value='first'")
+      last_response.body.should match("value='second'")
+    end
+    it 'should render only the first model' do
+      #create model
+      set_file "models/article.rb", "class Article < Base; field :name, input: 'input'; validates_length_of :name, maximum: 10; end"
+      require_models
+
+      login
+      string = Base64.encode64([[Menu, 0, 'first'], [Article, 0, 'second']].to_s.encrypt)
+      post '/add', {:cms => string}
+      last_response.body.should match("value='first'")
+      last_response.body.should_not match("value='second'")
+    end
   end
 
   describe 'edit' do
@@ -215,6 +234,6 @@ describe Classiccms do
   end
 
   after :all do
-    #clear_tmp
+    clear_tmp
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: classiccms
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec