lolita 3.4.2 → 3.4.3

data/author

@@ -1 +1 @@
-This software is developed by IT House (Latvia) and Artūrs Meisters
+This software is developed by IT House (Latvia) and Artūrs Meisters

data/config/routes.rb

@@ -1,6 +1,6 @@
-Rails.application.routes.draw do 
-   match '/lolita' => "lolita/info#index"
-   match '/lolita/info/properties' => "lolita/info#properties"
-   match "/lolita/array_field/:name/:field_class/:class/:id" => "lolita/field_data#array_polymorphic", :as => "array_field_data_collector"
-	 match "/lolita/autocomplete_field/:field_class/:field_name" => "lolita/field_data#autocomplete_field", :as => "autocomplete_field"
-end
+Rails.application.routes.draw do 
+   match '/lolita' => "lolita/info#index"
+   match '/lolita/info/properties' => "lolita/info#properties"
+   match "/lolita/array_field/:name/:field_class/:class/:id" => "lolita/field_data#array_polymorphic", :as => "array_field_data_collector"
+	 match "/lolita/autocomplete_field/:field_class/:field_name" => "lolita/field_data#autocomplete_field", :as => "autocomplete_field"
+end

data/lib/generators/lolita/install_generator.rb

@@ -1,19 +1,19 @@
-module Lolita
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../templates", __FILE__)
-      desc "Create lolita initializer."
-
-      def copy_initializer
-        template "lolita.rb", "config/initializers/lolita.rb" unless File.exist?(Rails.root + "config/initializers/lolita.rb")
-      end
-
-      def install_modules
-        Lolita.modules.each do |module_name|
-          invoke "lolita:#{module_name.to_s.underscore.gsub("/","_").gsub(/^lolita_/,"")}:install" rescue nil
-        end
-      end
-
-    end
-  end
-end
+module Lolita
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("../../templates", __FILE__)
+      desc "Create lolita initializer."
+
+      def copy_initializer
+        template "lolita.rb", "config/initializers/lolita.rb" unless File.exist?(Rails.root + "config/initializers/lolita.rb")
+      end
+
+      def install_modules
+        Lolita.modules.each do |module_name|
+          invoke "lolita:#{module_name.to_s.underscore.gsub("/","_").gsub(/^lolita_/,"")}:install" rescue nil
+        end
+      end
+
+    end
+  end
+end

data/lib/generators/lolita/uninstall_generator.rb

@@ -1,71 +1,71 @@
-module Lolita
-  module Generators
-    class UninstallGenerator < Rails::Generators::Base
-      ROUTE_NAME = "lolita_for"
-      INCLUDE_MODULE = "Lolita::Configuration"
-      MODEL_METHOD = "lolita"
-
-      desc "Uninstall Lolita and remove all dependencies"
-
-      # Remove lolita initializer file
-      def remove_initializer
-        remove_file "config/initializers/lolita.rb"
-      end
-
-      # Remove all not-commented lines that begins with lolita_for
-      def clear_routes
-        gsub_file Rails.root.join("config","routes.rb"), /^\s*#{ROUTE_NAME}.*/ do |match|
-          match.clear
-          match
-        end
-      end
-
-      # Remove configuration include line and lolita block or single lolita method call.
-      # Block will be removed correctly if it starts with _do_ and ends with _end_. 
-      def clear_models
-        Dir[Rails.root.join("app","models","*.rb")].each do |file_name|
-          matched = false
-          gsub_file file_name, /^\s*include\s+#{INCLUDE_MODULE}.*/ do |match|
-            matched = true
-            match.clear
-            match
-          end
-          if matched
-            new_lines = []
-            File.open(file_name,"r") do |file|
-              do_count = nil
-              file.each_line do |line|
-                if do_count.nil?
-                  if line.match(/^(\s*)lolita\s+(do)?/)
-                    if $2 == "do"
-                      do_count = 1
-                    else
-                      do_count = 0
-                    end
-                  else
-                    new_lines << line
-                  end
-                elsif do_count > 0
-                  if line.match(/(^|\s+)do(\s+|$)/)
-                    do_count +=1
-                  elsif line.match(/(^|\s+)end(\s+|$)/)
-                    do_count -=1
-                  end
-                else
-                  new_lines << line
-                end
-              end
-            end
-            File.open(file_name,"w") do |file|
-              new_lines.each do |line|
-                file.puts(line)
-              end
-            end
-
-          end
-        end
-      end
-
-    end
-  end
+module Lolita
+  module Generators
+    class UninstallGenerator < Rails::Generators::Base
+      ROUTE_NAME = "lolita_for"
+      INCLUDE_MODULE = "Lolita::Configuration"
+      MODEL_METHOD = "lolita"
+
+      desc "Uninstall Lolita and remove all dependencies"
+
+      # Remove lolita initializer file
+      def remove_initializer
+        remove_file "config/initializers/lolita.rb"
+      end
+
+      # Remove all not-commented lines that begins with lolita_for
+      def clear_routes
+        gsub_file Rails.root.join("config","routes.rb"), /^\s*#{ROUTE_NAME}.*/ do |match|
+          match.clear
+          match
+        end
+      end
+
+      # Remove configuration include line and lolita block or single lolita method call.
+      # Block will be removed correctly if it starts with _do_ and ends with _end_. 
+      def clear_models
+        Dir[Rails.root.join("app","models","*.rb")].each do |file_name|
+          matched = false
+          gsub_file file_name, /^\s*include\s+#{INCLUDE_MODULE}.*/ do |match|
+            matched = true
+            match.clear
+            match
+          end
+          if matched
+            new_lines = []
+            File.open(file_name,"r") do |file|
+              do_count = nil
+              file.each_line do |line|
+                if do_count.nil?
+                  if line.match(/^(\s*)lolita\s+(do)?/)
+                    if $2 == "do"
+                      do_count = 1
+                    else
+                      do_count = 0
+                    end
+                  else
+                    new_lines << line
+                  end
+                elsif do_count > 0
+                  if line.match(/(^|\s+)do(\s+|$)/)
+                    do_count +=1
+                  elsif line.match(/(^|\s+)end(\s+|$)/)
+                    do_count -=1
+                  end
+                else
+                  new_lines << line
+                end
+              end
+            end
+            File.open(file_name,"w") do |file|
+              new_lines.each do |line|
+                file.puts(line)
+              end
+            end
+
+          end
+        end
+      end
+
+    end
+  end
 end

data/lib/generators/templates/lolita.rb

@@ -1,14 +1,14 @@
-Lolita.setup do |config|
-  #= More info about setup - https://github.com/ithouse/lolita/wiki/Lolita-setup
-  #= More info about authentication - https://github.com/ithouse/lolita/wiki/Authorization-and-authentication
-<% if defined?(Devise) && Devise.respond_to?(:mappings) && default_user_class = Devise.mappings.keys.first %>
-  config.user_classes << <%= default_user_class.to_s.camelize %>
-  config.authentication=:authenticate_<%= default_user_class %>!
-<% else %>
-  #= Sample config for Admin user managing Lolita
-  # config.user_classes << Admin
-  # config.authentication = :authenticate_admin!
-<% end %>
-  ## add this if you manage your authorization with CanCan
-  # config.authorization = "CanCan"
+Lolita.setup do |config|
+  #= More info about setup - https://github.com/ithouse/lolita/wiki/Lolita-setup
+  #= More info about authentication - https://github.com/ithouse/lolita/wiki/Authorization-and-authentication
+<% if defined?(Devise) && Devise.respond_to?(:mappings) && default_user_class = Devise.mappings.keys.first %>
+  config.user_classes << <%= default_user_class.to_s.camelize %>
+  config.authentication=:authenticate_<%= default_user_class %>!
+<% else %>
+  #= Sample config for Admin user managing Lolita
+  # config.user_classes << Admin
+  # config.authentication = :authenticate_admin!
+<% end %>
+  ## add this if you manage your authorization with CanCan
+  # config.authorization = "CanCan"
 end

data/lib/lolita.rb

@@ -1,141 +1,141 @@
-require 'lolita/version'
-
-module Lolita
-
-  CONFIGURATIONS = {}
-  DEFAULT_CONFIGURATION_NAME = :default
-
-  def self.configuration name = nil
-    name ||= DEFAULT_CONFIGURATION_NAME
-    CONFIGURATIONS[name] ||= Lolita::SystemConfiguration::Base.new(name)
-    CONFIGURATIONS[name]
-  end
-
-  def self.setup
-    self.run(:before_setup)
-    yield configuration
-    self.run(:after_setup)
-  end
-
-  def self.root
-    @@root||=File.expand_path("#{__FILE__}/../..")
-  end
-
-  def self.app_root
-    @@app_root||=File.join(File.expand_path("#{__FILE__}/../.."),"app")
-  end
-
-  def self.method_missing method_name, *args, &block
-    self.class_eval <<-LOLITA_SETUP,__FILE__,__LINE__+1
-      class << self
-        def #{method_name}(*args,&block)
-          configuration.send(:#{method_name},*args,&block)
-        end
-      end
-    LOLITA_SETUP
-    configuration.send(method_name,*args,&block)
-  end
-
-  def self.load!
-    load_frameworks!
-    load_dependencies!
-    load_base!
-
-    self.send(:include, Lolita::Hooks)
-    self.send(:add_hook, :before_setup, :after_setup, :after_routes_loaded,:before_routes_loaded)
-
-
-    if rails?
-      load_rails!
-    end
-    load_modules!
-  end
-
-  def self.load_frameworks!
-    frameworks.each do |framework|
-      begin
-        require framework
-        puts "=> Loading Lolita #{version} with #{framework}"
-      rescue Execption => e
-        raise "Can't load #{framework}. Check you Gemfile."
-      end
-    end
-  end
-
-  def self.frameworks
-    frameworks = []
-    if rails?
-      frameworks << "rails"
-    end
-    frameworks
-  end
-
-  def self.load_dependencies!
-    require 'abstract'
-    require 'observer'
-    require 'ostruct'
-    require "base64"
-    require 'active_support'
-    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'
-    require 'active_support/inflector'
-  end
-
-  def self.load_base!
-    Dir["#{File.dirname(__FILE__)}/lolita/ruby_ext/**/*.*"].each do |path|
-      require path
-    end
-    require 'lolita/errors'
-    require 'lolita/utils'
-    require 'lolita/hooks'
-    require 'lolita/mapping'
-    require 'lolita/hooks/named_hook'
-    require 'lolita/system_configuration/base'
-    require 'lolita/system_configuration/application'
-    require 'lolita/extensions/extensions'
-  end
-
-  def self.load_modules!
-    require 'lolita/base'
-    require 'lolita/orm'
-    require 'lolita/configuration'
-    require 'lolita/helpers'
-    require 'lolita/processors/request_processor'
-    require 'lolita/navigation/tree'
-    require 'lolita/navigation/branch'
-
-    require 'lolita/test/matchers'
-    require 'lolita/support/formatter'
-    require 'lolita/support/formatter/rails'
-
-    require 'lolita/search/simple'
-    require 'lolita/components/base'
-    require 'lolita/components/configuration/column_component'
-  end
-
-  def self.load_rails!
-    require 'kaminari'
-    require 'jquery-rails'
-    require 'tinymce-rails'
-    require 'tinymce-rails-config-manager'
-    require 'lolita/rails/railtie'
-    require 'lolita/rails/engine'
-  end
-
-  def self.version
-    Lolita::Version::STRING
-  end
-
-  def self.rails?
-    !!defined?(::Rails)
-  end
-
-  def self.rails3?
-    !!defined?(::Rails) && ::Rails::VERSION::MAJOR == 3
-  end
-end
-
+require 'lolita/version'
+
+module Lolita
+
+  CONFIGURATIONS = {}
+  DEFAULT_CONFIGURATION_NAME = :default
+
+  def self.configuration name = nil
+    name ||= DEFAULT_CONFIGURATION_NAME
+    CONFIGURATIONS[name] ||= Lolita::SystemConfiguration::Base.new(name)
+    CONFIGURATIONS[name]
+  end
+
+  def self.setup
+    self.run(:before_setup)
+    yield configuration
+    self.run(:after_setup)
+  end
+
+  def self.root
+    @@root||=File.expand_path("#{__FILE__}/../..")
+  end
+
+  def self.app_root
+    @@app_root||=File.join(File.expand_path("#{__FILE__}/../.."),"app")
+  end
+
+  def self.method_missing method_name, *args, &block
+    self.class_eval <<-LOLITA_SETUP,__FILE__,__LINE__+1
+      class << self
+        def #{method_name}(*args,&block)
+          configuration.send(:#{method_name},*args,&block)
+        end
+      end
+    LOLITA_SETUP
+    configuration.send(method_name,*args,&block)
+  end
+
+  def self.load!
+    load_frameworks!
+    load_dependencies!
+    load_base!
+
+    self.send(:include, Lolita::Hooks)
+    self.send(:add_hook, :before_setup, :after_setup, :after_routes_loaded,:before_routes_loaded)
+
+
+    if rails?
+      load_rails!
+    end
+    load_modules!
+  end
+
+  def self.load_frameworks!
+    frameworks.each do |framework|
+      begin
+        require framework
+        puts "=> Loading Lolita #{version} with #{framework}"
+      rescue Execption => e
+        raise "Can't load #{framework}. Check you Gemfile."
+      end
+    end
+  end
+
+  def self.frameworks
+    frameworks = []
+    if rails?
+      frameworks << "rails"
+    end
+    frameworks
+  end
+
+  def self.load_dependencies!
+    require 'abstract'
+    require 'observer'
+    require 'ostruct'
+    require "base64"
+    require 'active_support'
+    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'
+    require 'active_support/inflector'
+  end
+
+  def self.load_base!
+    Dir["#{File.dirname(__FILE__)}/lolita/ruby_ext/**/*.*"].each do |path|
+      require path
+    end
+    require 'lolita/errors'
+    require 'lolita/utils'
+    require 'lolita/hooks'
+    require 'lolita/mapping'
+    require 'lolita/hooks/named_hook'
+    require 'lolita/system_configuration/base'
+    require 'lolita/system_configuration/application'
+    require 'lolita/extensions/extensions'
+  end
+
+  def self.load_modules!
+    require 'lolita/base'
+    require 'lolita/orm'
+    require 'lolita/configuration'
+    require 'lolita/helpers'
+    require 'lolita/processors/request_processor'
+    require 'lolita/navigation/tree'
+    require 'lolita/navigation/branch'
+
+    require 'lolita/test/matchers'
+    require 'lolita/support/formatter'
+    require 'lolita/support/formatter/rails'
+
+    require 'lolita/search/simple'
+    require 'lolita/components/base'
+    require 'lolita/components/configuration/column_component'
+  end
+
+  def self.load_rails!
+    require 'kaminari'
+    require 'jquery-rails'
+    require 'tinymce-rails'
+    require 'tinymce-rails-config-manager'
+    require 'lolita/rails/railtie'
+    require 'lolita/rails/engine'
+  end
+
+  def self.version
+    Lolita::Version::STRING
+  end
+
+  def self.rails?
+    !!defined?(::Rails)
+  end
+
+  def self.rails3?
+    !!defined?(::Rails) && ::Rails::VERSION::MAJOR == 3
+  end
+end
+
 Lolita.load!