lolita 3.1.15 → 3.1.16

data/History.rdoc

@@ -1,3 +1,8 @@
+=== Version 3.1.16 / 2011-08-30
+* Bug fixes
+  * Component helper name detection fixed
+  * Nested forms normal style fixed
+  
 === Version 3.1.15 / 2011-08-29
 * Enhancements
   * By default content tab excludes technical columns, like created_at, updated_at etc.

data/README.rdoc

@@ -84,7 +84,7 @@ call component, like
   render_component :"lolita/configuration/list", :display
 and this name is used to add callback for component. As components is not related to specific class, then there
 are only one way to define callback for them.
-  Lolita::Hooks.component(:"lolita/configuration/list/display").before do
+  Lolita::Hooks.component(:"/lolita/configuration/list/display").before do
     "<div>My Custom text</div>"
   end
 That what are inside of blocks depends on place where you define callback if it is in <i>.rb</i> file, than you
@@ -92,7 +92,7 @@ should put HTML in quotes, if in <i>.erb</i> and similar files then there is no
 Ruby code only return last line, so you should probably define HTML as shown in previous example.
 For <b>around</b> callback if you pass block, then original content will be replaced with that, but if you want
 to let original content inside of your block content than it is done like this with #let_content method.
-  Lolita::Hooks.component(:"lolita/configuration/list/display").around do
+  Lolita::Hooks.component(:"/lolita/configuration/list/display").around do
     "<div style='color:red'>#{let_content}</div>"
   end
 ==License

data/VERSION

@@ -1 +1 @@
-3.1.15
+3.1.16

data/app/views/components/lolita/configuration/nested_form/_fields.html.erb

@@ -1,4 +1,4 @@
-<div class = "fields" >
+<div class = "<%=nested_form.field_style == :normal ? "" : "fields"%>" >
   <% nested_form.fields.each do |field| %>
     <% if nested_form.field_style == :normal %>
       <%= render_component "lolita/configuration/field", :display, :field => field %>

data/lib/lolita/controllers/component_helpers.rb

@@ -94,22 +94,29 @@ module Lolita
       #     will_use_component :"lolita/configuration/list"
       def will_use_component component_name
         helpers_for_component(component_name) do |possible_component_name|
-          @used_component_helpers||=[]
+          @used_component_helpers||={}
           unless @used_component_helpers.include?(possible_component_name)
             if path=component_helper_path(possible_component_name)
               self.class.class_eval do
                 require path
               end
               class_name=possible_component_name.to_s.camelize
-              self.extend("Components::#{class_name}Component".constantize) rescue nil #FIXME too slow
+              helper_module = "Components::#{class_name}Component".constantize rescue nil
+              if helper_module
+                self.extend(helper_module) 
+              end
+            end
+            @used_component_helpers[possible_component_name] = helper_module
+          else
+            if helper_module = @used_component_helpers[possible_component_name]
+              self.extend(helper_module)
             end
-            @used_component_helpers<<possible_component_name
           end
         end
       end
       
       def helpers_for_component component_name
-        names=component_name.to_s.split("/")
+        names=component_name.to_s.gsub(/^\//,"").split("/")
         start_index=1 # first is lolita
         start_index.upto(names.size) do |index|
           yield names.slice(0..index).join("/")

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita}
-  s.version = "3.1.15"
+  s.version = "3.1.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{ITHouse (Latvia) and Arturs Meisters}]
-  s.date = %q{2011-08-29}
+  s.date = %q{2011-08-30}
   s.description = %q{Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. }
   s.email = %q{support@ithouse.lv}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.1.15
+  version: 3.1.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-29 00:00:00.000000000Z
+date: 2011-08-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &73616060 !ruby/object:Gem::Requirement
+  requirement: &69808170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *73616060
+  version_requirements: *69808170
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &73615600 !ruby/object:Gem::Requirement
+  requirement: &69807300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *73615600
+  version_requirements: *69807300
 - !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &73615120 !ruby/object:Gem::Requirement
+  requirement: &69806460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73615120
+  version_requirements: *69806460
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &73614730 !ruby/object:Gem::Requirement
+  requirement: &69805420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *73614730
+  version_requirements: *69805420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &73614340 !ruby/object:Gem::Requirement
+  requirement: &69804570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *73614340
+  version_requirements: *69804570
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &73613780 !ruby/object:Gem::Requirement
+  requirement: &69803630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *73613780
+  version_requirements: *69803630
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &73613080 !ruby/object:Gem::Requirement
+  requirement: &69801110 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *73613080
+  version_requirements: *69801110
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &73600600 !ruby/object:Gem::Requirement
+  requirement: &69798870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73600600
+  version_requirements: *69798870
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &73599670 !ruby/object:Gem::Requirement
+  requirement: &69796060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73599670
+  version_requirements: *69796060
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &73597230 !ruby/object:Gem::Requirement
+  requirement: &69792800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73597230
+  version_requirements: *69792800
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &73596840 !ruby/object:Gem::Requirement
+  requirement: &69789790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73596840
+  version_requirements: *69789790
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &73596270 !ruby/object:Gem::Requirement
+  requirement: &69787330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73596270
+  version_requirements: *69787330
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &73595610 !ruby/object:Gem::Requirement
+  requirement: &69785560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73595610
+  version_requirements: *69785560
 - !ruby/object:Gem::Dependency
   name: akephalos
-  requirement: &73594910 !ruby/object:Gem::Requirement
+  requirement: &69784660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *73594910
+  version_requirements: *69784660
 description: ! 'Great Rails CMS, that turns your business logic into good-looking,
   fully functional workspace. '
 email: support@ithouse.lv
@@ -507,7 +507,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 91287757
+      hash: 833067379
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: