lolita 3.2.0.rc.7 → 3.2.0.rc.9

data/.gitignore

@@ -0,0 +1,31 @@
+coverage.data
+sinatra-test.rb
+tmp/
+diagramm.rb
+log/
+nbproject/
+_public/_gsdata
+.DS_Store
+_public/_gsdata_/*
+.rvmrc
+.document
+*~
+doc/
+rdoc/
+unused_classes/
+spec/debug.log
+.git.zip
+.idea/
+.gem
+lib/test.rb
+coverage/
+spec/rails_app/log/
+spec/rails_app/tmp/
+.project
+Gemfile.lock
+.redcar
+pkg
+.bundle
+.pivotalrc
+.project
+*.swp

data/Gemfile

@@ -1,42 +1,21 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-# Thing how to seperate gems for Rails Engine from those that are only for lolita
-gem "rails", "~>3.1.1"
-gem "kaminari", "~>0.12.4"
-gem "abstract"
+gemspec
 
-gem "builder", "~> 3.0" 
-
-gem "haml", "~> 3.1.2"
-gem 'jquery-rails'
-gem 'tinymce-rails', :require => 'tinymce-rails'
-
-group :mongoid do
-	gem "mongo", "~> 1.4.0"
-	gem "mongoid", "~> 2.3.0"
-	gem "bson_ext", "~> 1.4.0"
+group :test, :development do 
+  gem "debugger"
 end
 
-#gem 'cover_me', '>= 1.0.0.rc6', :group => :test
-group :assets do
- 	gem 'sass-rails',   "~> 3.1.4"
-  gem 'coffee-rails', "~> 3.1.1"
-  gem 'uglifier'
+group :rails do 
+  gem "rails" , "~> 3.2.0"
+  gem "rspec-rails", "~> 2.9.0"
+  gem "jquery-rails"
+  gem "tinymce-rails", "~>3.4.8"
 end
-
-gem "jeweler", "~> 1.6.4", :group=>:development
-group :test,:development do
-	gem "metric_fu"
-	gem "fattr"
-	gem "arrayfields"
-	gem "map"
-	gem "rspec", "~>2.6.0"
-	gem "rspec-rails","~>2.6.1"
-	gem "factory_girl"
-	gem 'ffaker'
-	gem "ruby-debug19"
-	# gem "cucumber-rails"
-	# gem "capybara"
-	gem "database_cleaner"
-	# gem "akephalos"
+  
+group :mongoid do
+	gem 'mongo', '~> 1.4.0'
+	gem 'mongoid', '~> 2.3.0'
+	gem 'bson_ext', '~> 1.4.0'
 end
+

data/History.rdoc

@@ -17,12 +17,17 @@
   * :once options added to hook #run
   * #use_mapping added in InternalHelpers, switch block to given mapping
   * :on option added to fields, that allow to determine when to show field
+  * Sublists for columns and list itself for 1-to-many, many-to-many and 1-to-many throught for AR
+  * Version class added in Support
+  * #skip_routes added for Lolita.application, that allow to add specific behaviour for application when rake or rails or other commands is called
+  * #action added to list 
 
 * Changes
-  * noew using rails 3.1.x
+  * using rails 3.1.x
   * #value, #value=, #record_value removed from Lolita::Configuration::Field
   * Created pagination in list and in adapters; its possible to customize it for model.
   * All fields must have name as well as tabs must have type
+  * List #per renamed to #per_page
 
 * Removed
   * Lolita::Generator::FileHelper from generators removed
@@ -34,6 +39,7 @@
   * All classes fixed to work with both mongoid and AR
   * String disabled builder fixed to use form object
   * Error msg list is visible in all tabs even there is no field that failed validation (fixed)
+  * only run #lolita_for when <em>rails console</em> or <em>rails server</em> is running
   
 === Version 3.1.18 
 * Bug fixes
@@ -59,7 +65,7 @@
 * Enhancements
   * By default content tab excludes technical columns, like created_at, updated_at etc.
   * It's possible to define and lolita uses nested fields in each tab through nested_fields_for.
-  * All fields (except array/habtm) uses #tab_form for field generation, that is current tab form.
+  * All fields (except array/habtm) uses #current_form for field generation, that is current tab form.
   * Lolita know how to vizualize habtm relation
   * Added #component_locals method for views, so it is possible to access next component locals.
   * Hidden field type added
@@ -80,7 +86,7 @@
 === Version 3.1.13 / 2011-08-16
 * Enhancements
   * Color for Lolita-Alert popup changed
-  * #tab_form method added in lolita helpers
+  * #current_form method added in lolita helpers
 * Bug fixes
   * DBI for AR - method names fixed 
   * Messages encoding bug fixed

data/README.md

@@ -18,18 +18,24 @@ Then go to your rails project and
 That will create initializer and copy all assets.
 Also it will call *install* on all added modules to lolita. 
 So if you in Gemfile have following
-  
-    gem "lolita"
-    gem "lolita-file-upload"
+
+```ruby  
+gem "lolita"
+gem "lolita-file-upload"
+```
+
 It will also call *lolita_file_upload:install*.
 ##Usage
  
 To make your model use Lolita do like this
 
-    class Post < ActiveRecord::Base
-      include Lolita::Configuration
-      lolita
-    end
+```ruby
+class Post < ActiveRecord::Base
+  include Lolita::Configuration
+  lolita
+end
+```
+
 Then in routes.rb file make resources accessable for lolita with  
   
     lolita_for :posts
@@ -46,13 +52,19 @@ For more detailed usage read [Usage](https://github.com/ithouse/lolita/wiki/Usag
 Easiest way to add authentication is with Devise. First install Devise as gem, than add it to your project.
 Make Devise model, lets say, *User*. After that add these lines in */config/initializers/lolita.rb*
 
-    config.user_classes << User
-    config.authentication = :authenticate_user!
+```ruby
+config.user_classes << User
+config.authentication = :authenticate_user!
+```
+
 This will make before each Lolita requests call before filter, that than will call *authenticate_user!*
 that is Devise method for authenticating user. Without it Lolita will be acessable for everyone.
 You can also add any other authentication method like
-  
-    config.authentication = :authenticate_admin
+
+```ruby
+config.authentication = :authenticate_admin
+```
+
 And than put this method for common use in *ApplicationController* or in some other place that is accessable
 to all controllers.
 
@@ -65,45 +77,60 @@ There are two kind of hooks for all actions - *before_[action name]* and *after_
 Define callbacks for those hooks outside of controller. This will call User#log_action each time when #destroy 
 action is requested.
 
-    Lolita::RestController.before_destroy do
-      User.log_action("Going to delete #{params[:id]}") 
-    end
+```ruby
+Lolita::RestController.before_destroy do
+  User.log_action("Going to delete #{params[:id]}") 
+end
+```
+
 Also you can define callbacks in your controllers that extend Lolita::RestController. This will call #set\_default\_params
 each time #new action is requested.
 
-    class PostController < Lolita::RestController
-      before_new :set_default_params
+```ruby
+class PostController < Lolita::RestController
+  before_new :set_default_params
+
+  private
 
-      private
+  def set_default_params
+    params[:post][:title]="-Your title goes here-"
+  end
+end
+```
 
-      def set_default_params
-        params[:post][:title]="-Your title goes here-"
-      end
-    end
 ####Component hooks
 
 Components have three hooks - *before*, *after* and *around*.
 Component hooks are different from controller hooks with names. Each component has it's own name, that is used to
 call component, like
 
-    render_component :"lolita/configuration/list/display"
-    #same as
-    render_component :"lolita/configuration/list", :display
+```ruby
+render_component :"lolita/configuration/list/display"
+#same as
+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
-      "<div>My Custom text</div>"
-    end
+```ruby
+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 _.rb_ file, than you
 should put HTML in quotes, if in _.erb_ and similar files then there is no need for that. Also blocks with 
 Ruby code only return last line, so you should probably define HTML as shown in previous example.
 For _around_ 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
-      "<div style='color:red'>#{let_content}</div>"
-    end
+```ruby
+Lolita::Hooks.component(:"/lolita/configuration/list/display").around do
+  "<div style='color:red'>#{let_content}</div>"
+end
+```
+
 ##License
 
 Lolita is under MIT license. See [LICENSE.txt](https://github.com/ithouse/lolita/blob/master/LICENSE.txt)

data/Rakefile

@@ -1,47 +1,4 @@
 require 'rubygems'
 require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "lolita"
-  gem.homepage = "http://github.com/ithouse/lolita"
-  gem.license = "MIT"
-  gem.summary = %Q{Great Rails CMS.}
-  gem.description = %Q{Great Rails CMS, that turns your business logic into good-looking, fully functional workspace. }
-  gem.email = "support@ithouse.lv"
-  gem.authors = ["ITHouse (Latvia) and Arturs Meisters"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "lolita #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-require 'metric_fu'
-MetricFu::Configuration.run do |config|
-  config.rcov[:test_files] = ['spec/**/*_spec.rb']  
-  config.rcov[:rcov_opts] << "-Ispec" # Needed to find spec_helper
-  config.metrics -= [:flog]
-end
+Bundler::GemHelper.install_tasks

data/app/assets/javascripts/lolita/list.js

@@ -0,0 +1,28 @@
+$(function(){
+  $("td.with-nested-list a, tr.with-nested-list").live("click",function(event){
+    event.preventDefault()
+    var was_active = $(this).data("active")
+    $("td.with-nested-list a, tr.with-nested-list").data("active",false)
+    $(this).data("active",true)
+
+    if($(this).prop("tagName") == "A"){
+      var $tr = $(this).parents("tr").eq(0)
+      var url = $(this).parent().data("nested-list-url")
+    }else{
+      $tr = $(this)
+      url = $(this).data("nested-list-url")
+    }
+    if(was_active && $tr.next().hasClass("nested-list")){
+      $tr.next().remove()
+      $(this).data("active",false)
+    }else{
+      $.get(url,function(data){
+        if($tr.next().hasClass("nested-list")){
+          $tr.next().replaceWith(data)
+        }else{
+          $tr.after(data) 
+        }
+      })
+    }
+  })
+})

data/app/assets/javascripts/lolita/main.js

@@ -12,22 +12,91 @@ $(function(){
   })
 
   $("#flash").ajaxComplete(function(e,request){
-    var notice=request.getResponseHeader("Lolita-Notice");
-    var error=request.getResponseHeader("Lolita-Error");
-    var alert_msg=request.getResponseHeader("Lolita-Alert");
-    if(notice){
-      show_flash("<span style='color:green'>"+Base64.decode(notice)+"</span>");
+    show_lolita_messages(request)
+  })
+})
+
+function show_lolita_messages(request){
+  var notice=request.getResponseHeader("Lolita-Notice");
+  var error=request.getResponseHeader("Lolita-Error");
+  var alert_msg=request.getResponseHeader("Lolita-Alert");
+  if(notice){
+    show_notice_msg(Base64.decode(notice))
+  }else{
+    if(error){
+      show_error_msg(Base64.decode(error))
     }else{
-      if(error){
-        show_flash("<span style='color:red'>"+Base64.decode(error)+"</span>");
-      }else{
-        if(alert_msg){
-          show_flash("<span style='color:#ea7c15'>"+Base64.decode(alert_msg)+"</span>");
-        }
+      if(alert_msg){
+        show_alert_msg(Base64.decode(alert_msg))
       }
     }
+  }
+}
+
+
+function resize_all_tinymce_editors(){
+  $("textarea").each(function(item,index){
+    try{
+      tinymce_id = $(this).tinymce().editorId
+    }catch(err){
+      tinymce_id = false
+    }
+    if(tinymce_id){
+      var $textarea = $("#"+tinymce_id)
+      var $parent = $textarea.parent()
+      var h = $textarea.height();
+      $parent.find('.mceEditor').css('width','100%').css('minHeight',h + "px");
+      $parent.find('.mceLayout').css('width','100%').css('minHeight',h + "px");
+      $parent.find('.mceIframeContainer').css('width','100%').css('minHeight',h + "px");
+      $parent.find("iframe").css("width","100%").css("minHeight",h + "px") 
+    }
   })
-})
+}
+
+function params(object_or_name,new_value){
+  var url = window.location.href
+  if(typeof(object_or_name) && object_or_name.constructor.toString().match(/Object/)){
+    for(var name in object_or_name){
+      var value = object_or_name[name]
+      url = apply_param_to_url(name,value,url)
+    }
+  }else{
+    url = apply_param_to_url(object_or_name,new_value,url)
+  }
+  window.location.href = url.replace(/&{2,}/,"&")
+}
+
+function apply_param_to_url(name,new_value,url){
+  var value = (url.match(RegExp(name+"=([^&]*)(&|$)")) || [])
+  if(new_value){
+    if(value[0]){
+      replace_value = !new_value ? "" : (name + "=" + new_value + value[2])
+      url = url.replace(RegExp(name+"=([^&]*)(&|$)"),replace_value)
+    }else{
+      start_sym = url.match(/\?/) ? "&" : "?"
+      url = url + (start_sym+name+"="+new_value)
+    }
+  }else{
+    url =  url.replace(RegExp(name+"=([^&]*)(&|$)"),"")
+  }
+  return encodeURI(url)
+}
+
+function show_notice_msg(msg){
+  show_msg("green",msg)
+}
+
+function show_error_msg(msg){
+  show_msg("red",msg)
+}
+
+function show_alert_msg(msg){
+  show_msg("#ea7c15",msg)
+}
+
+function show_msg(color,msg){
+  show_flash("<span style='color:"+color+"'>"+msg+"</span>");
+}
 
 function show_flash(html){
   var flash=$("#flash")