lolita 3.1.14 → 3.1.15

data/spec/configuration/tab_spec.rb

@@ -125,7 +125,7 @@ describe Lolita::Configuration::Tab do
   it "should add nested fields" do
     tab=tab_class.new(@dbi) do
       default_fields
-      nested_fields_for("Comment") do
+      nested_fields_for(:comments) do
         default_fields
       end
     end
@@ -137,7 +137,7 @@ describe Lolita::Configuration::Tab do
   it "should detect that field is nested" do
     tab=tab_class.new(@dbi) do
       default_fields
-      nested_fields_for("Comment") do
+      nested_fields_for(:comments) do
         default_fields
       end
     end
@@ -147,11 +147,11 @@ describe Lolita::Configuration::Tab do
   it "should return nested fields for specified class" do
     tab=tab_class.new(@dbi) do
       default_fields
-      nested_fields_for("Comment") do
+      nested_fields_for(:comments) do
         default_fields
       end
     end
-    tab.nested_fields_of("Comment").size.should > 0
+    tab.nested_fields_of(:comments).size.should > 0
   end
 
   it "should return field with given name" do
@@ -161,15 +161,34 @@ describe Lolita::Configuration::Tab do
     tab.fields.by_name(:title).name.should == :title
   end
 
-  it "should have nested forms" do
-    tab = tab_class.new(@dbi) do
-      default_fields
-      nested_fields_for("Comment") do
+  context "nested fields" do
+    it "should have nested forms" do
+      tab = tab_class.new(@dbi) do
         default_fields
+        nested_fields_for(:comments) do
+          default_fields
+        end
+      end
+      tab.nested_forms.should have(1).item
+      tab.nested_forms[0].fields.size.should > 0
+    end 
+
+    it "should return nested field sets" do
+      tab = tab_class.new(@dbi) do
+        field :name => "one"
+        nested_fields_for(:comments) do
+          default_fields
+        end
+        field :name => "two"
+        nested_fields_for(:profile) do
+          default_fields
+        end
+        field :name => "last"
       end
+
+      tab.fields_in_groups.size.should == 5
+      tab.fields_in_groups[3].first.dbi == Profile
     end
-    tab.nested_forms.should have(1).item
-    tab.nested_forms[0].fields.size.should > 0
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.1.14
+  version: 3.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-24 00:00:00.000000000Z
+date: 2011-08-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &76358470 !ruby/object:Gem::Requirement
+  requirement: &73616060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *76358470
+  version_requirements: *73616060
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &76358100 !ruby/object:Gem::Requirement
+  requirement: &73615600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *76358100
+  version_requirements: *73615600
 - !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &76357760 !ruby/object:Gem::Requirement
+  requirement: &73615120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76357760
+  version_requirements: *73615120
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &76357360 !ruby/object:Gem::Requirement
+  requirement: &73614730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *76357360
+  version_requirements: *73614730
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &76356900 !ruby/object:Gem::Requirement
+  requirement: &73614340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *76356900
+  version_requirements: *73614340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76356130 !ruby/object:Gem::Requirement
+  requirement: &73613780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *76356130
+  version_requirements: *73613780
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &76355880 !ruby/object:Gem::Requirement
+  requirement: &73613080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *76355880
+  version_requirements: *73613080
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &76355570 !ruby/object:Gem::Requirement
+  requirement: &73600600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76355570
+  version_requirements: *73600600
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &76345000 !ruby/object:Gem::Requirement
+  requirement: &73599670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76345000
+  version_requirements: *73599670
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &76344190 !ruby/object:Gem::Requirement
+  requirement: &73597230 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76344190
+  version_requirements: *73597230
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &76343620 !ruby/object:Gem::Requirement
+  requirement: &73596840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76343620
+  version_requirements: *73596840
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &76342900 !ruby/object:Gem::Requirement
+  requirement: &73596270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76342900
+  version_requirements: *73596270
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &76342440 !ruby/object:Gem::Requirement
+  requirement: &73595610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76342440
+  version_requirements: *73595610
 - !ruby/object:Gem::Dependency
   name: akephalos
-  requirement: &76341940 !ruby/object:Gem::Requirement
+  requirement: &73594910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76341940
+  version_requirements: *73594910
 description: ! 'Great Rails CMS, that turns your business logic into good-looking,
   fully functional workspace. '
 email: support@ithouse.lv
@@ -186,6 +186,7 @@ files:
 - app/controllers/lolita/info_controller.rb
 - app/controllers/lolita/rest_controller.rb
 - app/helpers/components/lolita/configuration/list_component.rb
+- app/helpers/components/lolita/configuration_component.rb
 - app/helpers/lolita_helper.rb
 - app/views/components/lolita/configuration/column/_display.html.erb
 - app/views/components/lolita/configuration/column/_header.html.erb
@@ -213,6 +214,7 @@ files:
 - app/views/components/lolita/configuration/field/date_time/date/_display.html.erb
 - app/views/components/lolita/configuration/field/date_time/time/_display.html.erb
 - app/views/components/lolita/configuration/field/float/_display.html.erb
+- app/views/components/lolita/configuration/field/hidden/_display.html.erb
 - app/views/components/lolita/configuration/field/integer/_display.html.erb
 - app/views/components/lolita/configuration/field/string/_display.html.erb
 - app/views/components/lolita/configuration/field/string/disabled/_display.html.erb
@@ -225,9 +227,11 @@ files:
 - app/views/components/lolita/configuration/list/_new_resource.html.erb
 - app/views/components/lolita/configuration/list/_paginator.html.erb
 - app/views/components/lolita/configuration/list/_title.html.erb
+- app/views/components/lolita/configuration/nested_form/_display.html.erb
+- app/views/components/lolita/configuration/nested_form/_fields.html.erb
 - app/views/components/lolita/configuration/tab/_display.html.erb
 - app/views/components/lolita/configuration/tab/_fields.html.erb
-- app/views/components/lolita/configuration/tab/_nested_form.html.erb
+- app/views/components/lolita/configuration/tab/_form.html.erb
 - app/views/components/lolita/configuration/tab/content/_display.html.erb
 - app/views/components/lolita/configuration/tab/default/_display.html.erb
 - app/views/components/lolita/configuration/tabs/_display.html.erb
@@ -271,12 +275,14 @@ files:
 - lib/lolita/configuration/field/boolean.rb
 - lib/lolita/configuration/field/date.rb
 - lib/lolita/configuration/field/date_time.rb
+- lib/lolita/configuration/field/hidden.rb
 - lib/lolita/configuration/field/integer.rb
 - lib/lolita/configuration/field/string.rb
 - lib/lolita/configuration/field/time.rb
 - lib/lolita/configuration/field_set.rb
 - lib/lolita/configuration/fields.rb
 - lib/lolita/configuration/filter.rb
+- lib/lolita/configuration/helper.rb
 - lib/lolita/configuration/list.rb
 - lib/lolita/configuration/nested_form.rb
 - lib/lolita/configuration/page.rb
@@ -372,6 +378,8 @@ files:
 - public/javascripts/tinymce/utils/mctabs.js
 - public/javascripts/tinymce/utils/validate.js
 - public/javascripts/tinymce_config.js
+- public/stylesheets/lolita/PIE-custom.htc
+- public/stylesheets/lolita/PIE.htc
 - public/stylesheets/lolita/default.css
 - public/stylesheets/lolita/style.css
 - spec/adapter_helper.rb
@@ -499,7 +507,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 161329459
+      hash: 91287757
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/views/components/lolita/configuration/tab/_nested_form.html.erb

@@ -1,16 +0,0 @@
-<div class = "nested-fields" >
-  <%= tab_form.fields_for field.nested_form.resource_name do |nested_form| %>
-    <% 
-      old_tab_form = tab_form
-      self.tab_form = nested_form
-    %>
-    <%- fields.each do |field| %>
-      <% if field.is_a?(Array) %>
-        <%# implement fieldset in nested form here%>
-      <% else %>
-        <%= render_component *field.build(field.nested_form.options) %>
-      <% end %>
-    <%- end %>
-    <% self.tab_form = old_tab_form %>
-  <% end %>
-</div>