lolita 3.2.0.rc.10 → 3.2.0.rc.11

data/app/assets/stylesheets/lolita/style.css.erb

@@ -69,7 +69,7 @@ header nav .username {margin-right: 15px;}
 #main .box form input {background: #FFF;}
 #main .box form label {color: #c3c3c3; font-size: 13px;}
 #main .box form select {min-width: 150px;}
-#main .box form .date_time select {min-width: 50px;}
+#main .box form .field_date_time select, #main .box form .field_time select,#main .box form .field_date select {min-width: 0px;}
 #main .box form .field {margin: 10px 0; overflow: hidden;}
 #main .box form .field:first-child input {
   font-size: 24px;

data/lib/generators/templates/lolita.rb

@@ -11,7 +11,7 @@ Lolita.setup do |config|
 
   <% if defined?(Devise) %>
     <% default_user_class = Devise.mappings.keys.first %>
-    config.user_classes << <%= default_user.to_s.camelize %>
+    config.user_classes << <%= default_user_class.to_s.camelize %>
     config.authentication=:authenticate_<%= default_user_class %>!
   <% end %>
 end

data/lib/lolita/adapter/mongoid.rb

@@ -92,7 +92,7 @@ module Lolita
         end
 
         def primary?
-          !!self.options[:primary]
+          !!self.options[:primary] || @field.type.to_s =~ /ObjectId/
         end
 
         private

data/lib/lolita/configuration/factory/field.rb

@@ -27,7 +27,6 @@ module Lolita
           if !name || !type
             raise Lolita::FieldTypeError, "type not defined. Set is as second argument or as :dbi_field where value is Adapter::[ORM]::Field object."
           else
-             
             field_class(type).new(dbi,name,type,options,&block)
           end
 

data/lib/lolita/configuration/tab.rb

@@ -200,6 +200,9 @@ module Lolita
 
         def get_class(association_name)
           if association_name.is_a?(Symbol) && assoc = self.current_dbi.reflect_on_association(association_name)
+            if dbi.klass.nested_attributes_options[association_name].nil?
+              raise ArgumentError, "#{dbi.klass} association named `#{association_name}` called nested_fields_XXX without accepts_nested_attributes_for :#{association_name}"
+            end
             assoc.klass
           else
             raise ArgumentError, "Association named `#{association_name}` not found for #{self.current_dbi.klass}."

data/lib/lolita/controllers/component_helpers.rb

@@ -131,7 +131,7 @@ module Lolita
       # 
       #    component_helper_path :"lolita/list" #=> [path_to_lolita]/app/helpers/components/lolita/list_component.rb
       def component_helper_path component_name
-         @helper_paths||=$:.reject{|p| !p.match(/\/helpers$/)}
+         @helper_paths||=$:.reject{|p| !p.match(/\/helpers$/) rescue nil}
          get_path=lambda{|paths|
           extra_path=component_name.to_s.split("/")
           component=extra_path.pop

data/lib/lolita/version.rb

@@ -3,7 +3,7 @@ module Lolita
     MAJOR = 3
     MINOR = 2
     PATCH = 0
-    BUILD = 'rc.10'
+    BUILD = 'rc.11'
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
 

data/lib/tasks/tinymce-assets.rake

@@ -0,0 +1,7 @@
+Rake::Task['assets:precompile:primary'].enhance do
+  assets = File.expand_path(File.dirname(__FILE__) + "/../../vendor/assets/javascripts/tinymce")
+  target = File.join(Rails.public_path, Rails.application.config.assets.prefix)
+
+  mkdir_p target
+  cp_r assets, target
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc.10
+  version: 3.2.0.rc.11
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -419,6 +419,7 @@ files:
 - lib/lolita/test/matchers.rb
 - lib/lolita/utils.rb
 - lib/lolita/version.rb
+- lib/tasks/tinymce-assets.rake
 - lolita.gemspec
 - spec/adapter_helper.rb
 - spec/builder_spec.rb
@@ -576,6 +577,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 756764070292779788
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: