lolita 3.1.8 → 3.1.9

data/History.rdoc

@@ -1,4 +1,6 @@
 === Version 3.1.9 / 
+* Bug fixes
+  * Rails view helpers uses html options and options from field configuration
 
 === Version 3.1.8 / 2011-06-15
 * Bug fixes

data/VERSION

@@ -1 +1 @@
-3.1.8
+3.1.9

data/app/views/components/lolita/configuration/field/boolean/_display.html.erb

@@ -1 +1 @@
-<%= check_box resource_name, field.name %>
+<%= check_box resource_name, field.name, field.html_options %>

data/app/views/components/lolita/configuration/field/date/_display.html.erb

@@ -1 +1 @@
-<%= date_select resource_name, field.name %>
+<%= date_select resource_name, field.name, field.options, field.html_options %>

data/app/views/components/lolita/configuration/field/date_time/_display.html.erb

@@ -1 +1 @@
-<%= datetime_select resource_name, field.name %>
+<%= datetime_select resource_name, field.name,field.options,field.html_options %>

data/app/views/components/lolita/configuration/field/date_time/date/_display.html.erb

@@ -1 +1 @@
-<%= date_select resource_name, field.name %>
+<%= date_select resource_name, field.name,field.options,field.html_options %>

data/app/views/components/lolita/configuration/field/date_time/time/_display.html.erb

@@ -1 +1 @@
-<%= time_select resource_name, field.name %>
+<%= time_select resource_name, field.name,field.options,field.html_options %>

data/app/views/components/lolita/configuration/field/float/_display.html.erb

@@ -1 +1 @@
-<%= text_field resource_name, field.name %>
+<%= text_field resource_name, field.name,field.html_options %>

data/app/views/components/lolita/configuration/field/string/_display.html.erb

@@ -1,5 +1,5 @@
 <% if field.options[:native_type] == "text" %>
  <%= render_component :"lolita/configuration/field/string/text", :display, :field=>field %>
 <% else %>
-  <%= text_field resource_name, field.name %>
+  <%= text_field resource_name, field.name, field.html_options %>
 <% end %>

data/app/views/components/lolita/configuration/field/string/password/_display.html.erb

@@ -1,3 +1,3 @@
 <div class="field-value" id="field_<%=field.__id__%>_value">
-  <%= password_field resource_name, field.name %>
+  <%= password_field resource_name, field.name,field.html_options %>
 </div>

data/lib/lolita/configuration/field.rb

@@ -140,6 +140,7 @@ module Lolita
 
         def set_default_values
           self.options||={}
+          self.html_options ||= {}
         end
 
          def before_init *args

data/lib/lolita/controllers/internal_helpers.rb

@@ -91,7 +91,9 @@ module Lolita
           end
         end
         date_attributes.each_pair do |k,v|
-          attributes[k] = v.size == 3 ? Date.new(v[1],v[2],v[3]) : Time.new(v[1],v[2],v[3],v[4],v[5])
+          unless v.detect{|index,value| value == 0}
+            attributes[k] = v.size == 3 ? Date.new(v[1],v[2],v[3]) : Time.new(v[1],v[2],v[3],v[4],v[5])
+          end
         end
         attributes
       end

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita}
-  s.version = "3.1.8"
+  s.version = "3.1.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse (Latvia) and Arturs Meisters"]
-  s.date = %q{2011-06-15}
+  s.date = %q{2011-06-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.8
+  version: 3.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-15 00:00:00.000000000 +03:00
+date: 2011-06-30 00:00:00.000000000 +03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &82526620 !ruby/object:Gem::Requirement
+  requirement: &84526140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *82526620
+  version_requirements: *84526140
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &82525820 !ruby/object:Gem::Requirement
+  requirement: &84499540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *82525820
+  version_requirements: *84499540
 - !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &82524740 !ruby/object:Gem::Requirement
+  requirement: &84498790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *82524740
+  version_requirements: *84498790
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &82524030 !ruby/object:Gem::Requirement
+  requirement: &84497690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *82524030
+  version_requirements: *84497690
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &82523460 !ruby/object:Gem::Requirement
+  requirement: &84496820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *82523460
+  version_requirements: *84496820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82522850 !ruby/object:Gem::Requirement
+  requirement: &84496370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *82522850
+  version_requirements: *84496370
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &82522090 !ruby/object:Gem::Requirement
+  requirement: &84495930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *82522090
+  version_requirements: *84495930
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &82521240 !ruby/object:Gem::Requirement
+  requirement: &84495570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82521240
+  version_requirements: *84495570
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &82520260 !ruby/object:Gem::Requirement
+  requirement: &84495130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82520260
+  version_requirements: *84495130
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &82492180 !ruby/object:Gem::Requirement
+  requirement: &84494700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82492180
+  version_requirements: *84494700
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &82491400 !ruby/object:Gem::Requirement
+  requirement: &84493800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82491400
+  version_requirements: *84493800
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &82490780 !ruby/object:Gem::Requirement
+  requirement: &84493430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82490780
+  version_requirements: *84493430
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &82490200 !ruby/object:Gem::Requirement
+  requirement: &84493100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82490200
+  version_requirements: *84493100
 - !ruby/object:Gem::Dependency
   name: akephalos
-  requirement: &82486060 !ruby/object:Gem::Requirement
+  requirement: &84492780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82486060
+  version_requirements: *84492780
 description: ! 'Great Rails CMS, that turns your business logic into good-looking,
   fully functional workspace. '
 email: support@ithouse.lv
@@ -498,7 +498,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -957983409
+      hash: -943574577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: