lolita 3.1.7 → 3.1.8

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 # Thing how to seperate gems for Rails Engine from those that are only for lolita
-gem "rails", "~>3.0"
+gem "rails", "~>3.0.7"
 gem "kaminari", "~>0.12.4"
 gem "abstract"
 gem "builder", "~> 2.1.2" #cucumber asks for builder 3 but rails supports 2.1

data/History.rdoc

@@ -1,5 +1,9 @@
-=== Version 3.1.8 / 2011
+=== Version 3.1.9 / 
 
+=== Version 3.1.8 / 2011-06-15
+* Bug fixes
+  * Show layout on info page
+  
 === Version 3.1.7 / 2011-06-10
 * Enhancements
   * Builder refactored. Now support conditions. (Arturs Meisters)

data/VERSION

@@ -1 +1 @@
-3.1.7
+3.1.8

data/app/controllers/lolita/info_controller.rb

@@ -1,7 +1,10 @@
 class Lolita::InfoController < ApplicationController
   @@properties = []
+
   def index
+    render :layout => false
   end
+
   def properties
     if request.local?
       render :inline => to_html

data/app/views/components/lolita/configuration/tab/default/_display.html.erb

@@ -2,7 +2,7 @@
 # FIXME: move to /tab_types/
 #
 %>
-<%= form_tag "#", :id=>"tab-form-#{tab.__id__}" do |form| %>
+<%= form_tag "#",:multipart=>true, :id=>"tab-form-#{tab.__id__}",:method => resource.new_record? ? :post : :put do |form| %>
   <div class="tab-content">
     <%= render_component :"lolita/configuration/tab", :fields, :tab=>tab %>
   </div>

data/config/routes.rb

@@ -0,0 +1,4 @@
+Rails.application.routes.draw do 
+   match '/lolita' => "lolita/info#index"
+   match '/lolita/info/properties' => "lolita/info#properties"
+end

data/lib/lolita.rb

@@ -16,11 +16,13 @@ puts "=> Lolita #{LOLITA_VERSION} starting#{defined?(Rails) ? " with Rails" : ""
 # end
 
 require 'abstract'
-require 'active_support/core_ext/numeric/time'
-require 'active_support/core_ext/date_time/conversions'
-require 'active_support/concern'
-require 'active_support/callbacks'
-require 'active_support/dependencies'
+unless defined?(ActiveSupport)
+  require 'active_support/core_ext/numeric/time'
+  require 'active_support/core_ext/date_time/conversions'
+  require 'active_support/concern'
+  require 'active_support/callbacks'
+  require 'active_support/dependencies'
+end
 require 'lolita/errors'
 require "lolita/hooks"
 # Require all ruby extensions

data/lib/lolita/configuration/factory.rb

@@ -9,14 +9,24 @@ module Lolita
 
       def add(dbi,*args,&block)
         @create_temp_object=true
-        begin
-          temp_object=self.const_get(:Base).new(dbi,*args,&block)
-        rescue Exception => e
-          raise e
-        ensure
-          @create_temp_object=false
+        name =  nil
+        if self == Lolita::Configuration::Tab
+          if args && args.first
+            name = args.first
+          else
+            raise ArgumentError, "Define tab with type."
+          end
+        else
+          begin
+            temp_object=self.const_get(:Base).new(dbi,*args,&block)
+            name =temp_object.type
+          rescue Exception => e
+            raise e
+          ensure
+            @create_temp_object=false
+          end
         end
-        factory(temp_object.type).new(dbi,*args,&block)
+        factory(name).new(dbi,*args,&block)
       end
 
 

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

@@ -30,22 +30,22 @@ module Lolita
         # is used, than <code>conditions</code> is ignored.
         def association_values() #TODO test
           @association_values=if options_for_select
-          options_for_select
-        elsif @association
-          klass=@dbi.association_class_name(@association).camelize.constantize
-          current_text_method=@text_method || default_text_method(klass)
-          current_value_method=@value_method || :id
-          options=@find_options || {}
-          options[:conditions]||=@conditions
+            options_for_select
+          elsif @association
+            klass=@dbi.association_class_name(@association).camelize.constantize
+            current_text_method=@text_method || default_text_method(klass)
+            current_value_method=@value_method || :id
+            options=@find_options || {}
+            options[:conditions]||=@conditions
 
-          klass.find(:all,options).map{|r|
-            [r.send(current_text_method),r.send(current_value_method)]
-          }
-        else
-          []
+            klass.find(:all,options).map{|r|
+              [r.send(current_text_method),r.send(current_value_method)]
+            }
+          else
+            []
+          end
+          @association_values
         end
-        @association_values
-      end
 
       private
 

data/lib/lolita/rails/routes.rb

@@ -12,10 +12,6 @@ module ActionDispatch::Routing
       end
       Lolita.run(:before_routes_loaded)
       draw_without_lolita *args,&block
-      draw_without_lolita *args, do
-          match '/lolita' => "lolita/info#index"
-          match '/lolita/info/properties' => "lolita/info#properties"
-      end
       Lolita.run(:after_routes_loaded)
     end
 

data/lolita.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{lolita}
-  s.version = "3.1.7"
+  s.version = "3.1.8"
 
   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-10}
+  s.date = %q{2011-06-15}
   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 = [
@@ -86,6 +86,7 @@ Gem::Specification.new do |s|
     "config/locales/default/lv.yml",
     "config/locales/en.yml",
     "config/locales/lv.yml",
+    "config/routes.rb",
     "db/seed.rb",
     "features/create_page.feature",
     "features/step_definitions/lolita_steps.rb",
@@ -387,7 +388,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0.7"])
       s.add_runtime_dependency(%q<kaminari>, ["~> 0.12.4"])
       s.add_runtime_dependency(%q<abstract>, [">= 0"])
       s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
@@ -402,7 +403,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<database_cleaner>, [">= 0"])
       s.add_development_dependency(%q<akephalos>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 3.0"])
+      s.add_dependency(%q<rails>, ["~> 3.0.7"])
       s.add_dependency(%q<kaminari>, ["~> 0.12.4"])
       s.add_dependency(%q<abstract>, [">= 0"])
       s.add_dependency(%q<builder>, ["~> 2.1.2"])
@@ -418,7 +419,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<akephalos>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 3.0"])
+    s.add_dependency(%q<rails>, ["~> 3.0.7"])
     s.add_dependency(%q<kaminari>, ["~> 0.12.4"])
     s.add_dependency(%q<abstract>, [">= 0"])
     s.add_dependency(%q<builder>, ["~> 2.1.2"])

data/public/javascripts/lolita/main.js

@@ -1,7 +1,8 @@
 $(function(){
   $.ajaxSetup({
     headers:{
-      "X-CSRF-Token": $("meta[name='csrf-token']").attr("content")
+      "X-CSRF-Token": $("meta[name='csrf-token']").attr("content"),
+      "lolita_xhr": "true"
     }
   })
   $("#flash").slideUp("fast");

data/spec/configuration/tab_spec.rb

@@ -34,11 +34,8 @@ describe Lolita::Configuration::Tab do
 
   describe "add tab" do
     it "should recognize type of tab added and create it as a related class object" do
-      Lolita::Configuration::Tab.add(@dbi){ field(:email)}.class.to_s.should=="Lolita::Configuration::Tab::Default"
+      Lolita::Configuration::Tab.add(@dbi,:default){ field(:email)}.class.to_s.should=="Lolita::Configuration::Tab::Default"
       Lolita::Configuration::Tab.add(@dbi,:my).class.to_s.should == "Lolita::Configuration::Tab::My"
-      Lolita::Configuration::Tab.add(@dbi) {
-        type :my
-      }.class.to_s.should == "Lolita::Configuration::Tab::My"
     end
 
     it "should raise error when tab is not recognized" do
@@ -66,7 +63,7 @@ describe Lolita::Configuration::Tab do
   
   it "should raise error when no fields are given for default type tab" do
     lambda{
-      Lolita::Configuration::Tab.add(@dbi)
+      Lolita::Configuration::Tab.add(@dbi,:default)
     }.should raise_error Lolita::NoFieldsGivenError
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-10 00:00:00.000000000 +03:00
+date: 2011-06-15 00:00:00.000000000 +03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &76216020 !ruby/object:Gem::Requirement
+  requirement: &82526620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *76216020
+  version_requirements: *82526620
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &76215300 !ruby/object:Gem::Requirement
+  requirement: &82525820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.4
   type: :runtime
   prerelease: false
-  version_requirements: *76215300
+  version_requirements: *82525820
 - !ruby/object:Gem::Dependency
   name: abstract
-  requirement: &76214830 !ruby/object:Gem::Requirement
+  requirement: &82524740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76214830
+  version_requirements: *82524740
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &76214280 !ruby/object:Gem::Requirement
+  requirement: &82524030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *76214280
+  version_requirements: *82524030
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &76213800 !ruby/object:Gem::Requirement
+  requirement: &82523460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *76213800
+  version_requirements: *82523460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76213500 !ruby/object:Gem::Requirement
+  requirement: &82522850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *76213500
+  version_requirements: *82522850
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &76213200 !ruby/object:Gem::Requirement
+  requirement: &82522090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *76213200
+  version_requirements: *82522090
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &76212630 !ruby/object:Gem::Requirement
+  requirement: &82521240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76212630
+  version_requirements: *82521240
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &76211740 !ruby/object:Gem::Requirement
+  requirement: &82520260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76211740
+  version_requirements: *82520260
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &76211450 !ruby/object:Gem::Requirement
+  requirement: &82492180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76211450
+  version_requirements: *82492180
 - !ruby/object:Gem::Dependency
   name: cucumber-rails
-  requirement: &76211100 !ruby/object:Gem::Requirement
+  requirement: &82491400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76211100
+  version_requirements: *82491400
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &76210810 !ruby/object:Gem::Requirement
+  requirement: &82490780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76210810
+  version_requirements: *82490780
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &76210510 !ruby/object:Gem::Requirement
+  requirement: &82490200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76210510
+  version_requirements: *82490200
 - !ruby/object:Gem::Dependency
   name: akephalos
-  requirement: &76210170 !ruby/object:Gem::Requirement
+  requirement: &82486060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76210170
+  version_requirements: *82486060
 description: ! 'Great Rails CMS, that turns your business logic into good-looking,
   fully functional workspace. '
 email: support@ithouse.lv
@@ -244,6 +244,7 @@ files:
 - config/locales/default/lv.yml
 - config/locales/en.yml
 - config/locales/lv.yml
+- config/routes.rb
 - db/seed.rb
 - features/create_page.feature
 - features/step_definitions/lolita_steps.rb
@@ -497,7 +498,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 23472445
+      hash: -957983409
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: