lolita 3.1.18 → 3.2.0.rc1

data/app/views/components/lolita/shared/_header.html.erb

@@ -3,7 +3,7 @@
   <% if lolita_current_user %>
 	  <nav>
 	    <a href="<%=send(:"edit_#{lolita_current_user.class.to_s.downcase}_password_path")%>" class="username"><%=lolita_current_user.email%></a>
-	    <%= link_to ::I18n.t("lolita.shared.log_out"), send(:"destroy_#{lolita_current_user.class.to_s.downcase}_session_path"), :class => "button grey", :method => Devise.sign_out_via %>
+	    <a href="<%=send(:"destroy_#{lolita_current_user.class.to_s.downcase}_session_path")%>" class="button grey"><%=::I18n.t("lolita.shared.log_out")%></a>
 	  </nav>
   <% end %>
 </header>

data/app/views/components/lolita/shared/_right_sidebar.html.erb

@@ -4,6 +4,11 @@
       <h1><%= t "lolita.tabs.save" %></h1>
       <div class="arrow"></div>
     </div>
-    <%= render_component "lolita/shared", :save_button%>
+    <div class="save black">
+      <div class="last-save">
+        <%= resource.updated_at.strftime("#{t("lolita.tabs.last_save")}: %m/%d/%Y %H:%M ") if resource.respond_to?(:updated_at) && resource.updated_at %>
+      </div>
+      <button class="save-all"><%=::I18n.t("lolita.tabs.save")%></button>
+    </div>
   </div>
 </div>

data/app/views/layouts/lolita/application.html.erb

@@ -15,16 +15,16 @@
     <%= stylesheet_link_tag "lolita/default","lolita/style" %>
     <%= yield :style %>
     
-     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script>
+     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>
      <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.13/jquery-ui.min.js"></script>
     <script>
       if(!window.jQuery){
-        document.write('<script src="/javascripts/jquery-1.6.min.js">\x3C/script>');
+        document.write('<script src="/javascripts/jquery-1.6.2.min.js">\x3C/script>');
         document.write('<script src="/javascripts/jquery-ui-1.8.13.min.js">\x3C/script>');
       }
     </script>
     <%= javascript_include_tag "modernizr-1.7.min" %>
-    <%= javascript_include_tag "rails","lolita/tab","lolita/main","lolita/application", "lolita/base64" %>
+    <%= javascript_include_tag "lolita/tab","lolita/main","lolita/application", "lolita/base64" %>
     <%= yield :script %>
     <%= raw csrf_meta_tag %>
   </head>

data/config/locales/en.yml

@@ -23,7 +23,30 @@ en:
     filter:
       apply_button: Apply
       include_blank_by_title: " -- Filter by %{title} -- "
-    search: "Search"
+  lolita:
+    shared:
+      save_notice: Successfully saved.
+      save_alert: Save did not succeed.
+      log_out: Sign out
+      edit: Edit
+      delete: Delete
+      and: and
+      powered: Powered Lolita (2010-%{year})
+    nested_form:
+      add: "Add %{resource_name}"
+    tabs:
+      last_save: Last save
+      save: Save
+      save_all: Save all
+      titles:
+        default: "Default"
+        content: "Content"
+    list:
+      add_new: Add new %{name}
+      confirm: "Are you sure you want to delete record?"
+    filter:
+      apply_button: Apply
+      include_blank_by_title: " -- Filter by %{title} -- "
   views:
     pagination:
       previous: "« Previous"

data/config/locales/lv.yml

@@ -23,7 +23,6 @@ lv:
     filter:
       apply_button: Pielietot
       include_blank_by_title: " -- Filtrēt pēc %{title} -- "
-    search: "Meklēt"
   views:
     pagination:
       previous: "« Iepriekšējā"

data/config/routes.rb

@@ -1,6 +1,4 @@
 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
+end

data/lib/generators/lolita/install_generator.rb

@@ -5,17 +5,13 @@ module Lolita
     class InstallGenerator < Rails::Generators::Base
       include Lolita::Generators::FileHelper
       source_root File.expand_path("../../templates", __FILE__)
-      desc "Create lolita initializer. Copy assets and create migrations. Load seed data."
+      desc "Create lolita initializer."
 
       
       def copy_initializer
         template "lolita.rb", "config/initializers/lolita.rb" unless file_exists?("config/initializers/lolita.rb")
       end
 
-      def copy_assets
-        generate("lolita:assets")
-      end
-
       def install_modules
         Lolita.modules.each do |module_name|
           

data/lib/lolita.rb

@@ -1,23 +1,30 @@
 
 $:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
 LOLITA_VERSION=File.read(File.expand_path("../../VERSION",__FILE__)).gsub(/[^.\w]/,"")
-FRAMEWORK = if defined?(Rails)
-  " with Rails #{::Rails::VERSION::STRING}"
-end
-puts "=> Lolita #{LOLITA_VERSION} starting#{FRAMEWORK}"
-
+puts "=> Lolita #{LOLITA_VERSION} starting#{defined?(Rails) ? " with Rails" : ""}"
+
+# TODO should allow run lolita seperated
+# unless (["-d","--debug"] & ARGV).empty?
+#   require "ruby-debug"
+#   Debugger.settings[:autoeval]=true
+# else
+#   unless self.respond_to?(:debugger)
+#     def debugger
+#       warn "Debugger called at #{caller.first} was ignored, run lolita with -d to attatch debugger."
+#     end
+#   end
+# end
 require "rubygems"
 require 'abstract'
-
-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'
-
-
+require "base64"
+require 'kaminari'
+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
@@ -33,7 +40,6 @@ module Lolita
   autoload(:VERSION,'lolita/version')
   autoload(:ObservedArray,'lolita/observed_array')
   autoload(:Builder,'lolita/builder')
-  autoload(:ControllerAdditions,'lolita/controller_additions')
   module Builder
     autoload(:Custom, 'lolita/builder')
   end
@@ -60,7 +66,6 @@ module Lolita
  
   # Keep all configuration classes and modules, that is used to configure classes with lolita.
   module Configuration
-
     autoload :Base, 'lolita/configuration/base'
     autoload :Column, 'lolita/configuration/column'
     autoload :Columns, 'lolita/configuration/columns'
@@ -70,7 +75,6 @@ module Lolita
     autoload :Tabs, 'lolita/configuration/tabs'
     autoload :Filter, 'lolita/configuration/filter'
     autoload :NestedForm, 'lolita/configuration/nested_form'
-    autoload :Search, 'lolita/configuration/search'
 
     # Module contains classes that is used to create specific type class based on given arguments.
     module Factory
@@ -99,9 +103,6 @@ module Lolita
     
     def self.included(base)
       base.class_eval do
-        include Lolita::Hooks
-        add_hook :after_lolita_loaded
-
         extend ClassMethods
         def lolita
           self.class.lolita
@@ -113,7 +114,6 @@ module Lolita
       def lolita(&block)
         Lolita::LazyLoader.lazy_load(self,:@lolita,Lolita::Configuration::Base,self,&block)
       end
-      
       def lolita=(value)
         if value.is_a?(Lolita::Configuration::Base)
           @lolita=value
@@ -133,7 +133,7 @@ module Lolita
     autoload :UserHelpers, 'lolita/controllers/user_helpers'
     autoload :UrlHelpers, 'lolita/controllers/url_helpers'
     autoload :ComponentHelpers, 'lolita/controllers/component_helpers'
-    autoload :AuthorizationHelpers, 'lolita/controllers/authorization_helpers'
+    autoload :ViewUserHelpers, 'lolita/controllers/view_user_helpers'
   end
 
   module Navigation
@@ -148,10 +148,6 @@ module Lolita
     end
   end
 
-  module Search
-    autoload :Simple, 'lolita/search/simple'
-  end
-
   @@scopes={}
 
   def self.scope name=nil
@@ -179,13 +175,6 @@ module Lolita
   end
   
   def self.method_missing method_name, *args, &block
-    self.class_eval <<-LOLITA_SETUP,__FILE__,__LINE__+1
-      class << self
-        def #{method_name}(*args,&block)
-          scope.send(:#{method_name},*args,&block)
-        end
-      end
-    LOLITA_SETUP
     scope.send(method_name,*args,&block)
   end
 
@@ -200,9 +189,5 @@ module Lolita
 end
 
 if Lolita.rails3?
-  require "base64"
-  require 'kaminari'
-  # require 'tinymce-rails'
-  # require 'jquery-rails'
   require 'lolita/rails/all'
 end

data/lib/lolita/adapter/abstract_adapter.rb

@@ -8,7 +8,6 @@ module Lolita
       abstract_method 'method_name,page,per,options', :pagination_scope_from_klass
       abstract_method 'name',:reflect_on_association,:field_by_name,:field_by_association
       abstract_method 'id',:find_by_id
-      abstract_method 'query', :search
     end
   end
 end

data/lib/lolita/adapter/active_record.rb

@@ -24,26 +24,15 @@ module Lolita
         end
 
         def key
-          if @association.macro == :belongs_to 
-            @association.primary_key_name
-          else
-            @association.association_foreign_key
-          end 
+          @association.association_foreign_key
         end
 
         def polymorphic?
           @association.options[:polymorphic]
         end
 
-        def native_macro
-          @association.macro
-        end
-
         def macro
-          convertator = {
-            :has_many => :many, :has_one => :one, :belongs_to => :one, 
-            :has_and_belongs_to_many => :many_to_many
-          }
+          convertator = {:has_many => :many, :has_one => :one, :belongs_to => :one, :has_and_belongs_to_many => :many}
           convertator[@association.macro]
         end
       end
@@ -88,15 +77,11 @@ module Lolita
         end
 
         def association
-          if @association.nil?
+          unless @association
             possible_association = @adapter.associations.detect{|name,association|
               [association.key.to_s].include?(@name.to_s)
             }
-            @association = if possible_association
-              possible_association.last 
-            else
-              false
-            end
+            @association = possible_association.last if possible_association
           end
           @association
         end
@@ -200,29 +185,6 @@ module Lolita
         end
       end
 
-      def search(query, options = {})
-        #TODO raise error or warn when there are lot of records and no index on field
-        unless query.blank?
-          resources = self.klass.arel_table
-          content_fields = @dbi.fields.map{|field| field.type!="string" ? nil : field.name.to_sym}.compact
-          if options[:fields] && options[:fields].any?
-            content_fields = content_fields & options[:fields]
-          end
-          scope = nil
-          content_fields.each_with_index do |field,index|
-            new_scope = resources[field].matches("%#{query}%")
-            unless index == 0
-              scope = scope.or(new_scope)
-            else
-              scope = new_scope
-            end
-          end
-          self.klass.where(scope)
-        else
-          self.klass.where(nil)
-        end
-      end
-
       def db
         self.klass.connection
       end

data/lib/lolita/adapter/mongoid.rb

@@ -24,17 +24,13 @@ module Lolita
         end
 
         def key
-          @association.foreign_key
-        end
-
-        def native_macro
-          @association.macro
+          @association.key
         end
 
         def macro
           convertator = {
             :references_many => :many, :references_one => :one, :referenced_in => :one, 
-            :references_and_referenced_in_many => :many_to_many, :embeds_one => :one, :embeds_many => :many
+            :references_and_referenced_in_many => :many, :embeds_one => :one, :embeds_many => :many
           }
           convertator[@association.macro]
         end
@@ -80,15 +76,11 @@ module Lolita
         end
 
         def association
-          if @association.nil?
+          unless @association
             possible_association = @adapter.associations.detect{|name,association|
               [association.key.to_s].include?(@name.to_s)
             }
-            @association = if possible_association
-              possible_association.last 
-            else
-              false
-            end
+            @association = possible_association.last if possible_association
           end
           @association
         end
@@ -184,70 +176,6 @@ module Lolita
         end
       end
 
-      def search(query, options = {})
-        unless query.blank?
-          content_fields = @dbi.fields.map{|field| 
-            if field.type!="string" || field.name.match(/^_/)
-              nil
-            else
-              field.name.to_sym
-            end
-          }.compact
-          if options[:fields] && options[:fields].any?
-            content_fields = content_fields & options[:fields]
-          end
-          content_fields = content_fields.slice(0..3)
-          #result = self.map_reduce_search(content_fields,query)
-          #debugger
-          #result
-          where_hash = {}
-          content_fields.each do |field|
-            where_hash[field] = /#{Regexp.escape(query.to_s)}/
-          end
-          klass.where(where_hash)
-        else
-          klass.where(nil)
-        end
-      end
-
-      #FIXME
-      def map_reduce_search(content_fields,query)
-        keys = "[" + @dbi.fields.map{|f| 
-          f.primary? || f.name.to_s.match(/^_/)  ? nil : "'#{f.name}'"
-        }.compact.join(",").to_s + "]"
-        content_keys = "[" + content_fields.map{|f| "'#{f.name}'"}.join(",").to_s + "]"
-        result_obj = @dbi.fields.map{|f|
-          f.name.to_s.match(/^_/) ? nil : "'#{f.name}': false"
-        }.compact.join(",")
-        result_obj = "{#{result_obj}}"
-        map = %^
-          function(){
-            var doc = #{result_obj};
-            var do_emit = false;
-            for(var k in #{content_keys}){
-              var c_val = this[k];
-              if(c_val && c_val.match(/#{Regexp.escape(query)}/i)){
-                do_emit = true;
-                break;
-              };
-            };
-            if(true){
-              #{keys}.forEach(function(k){
-                doc[k] = this.name;
-              })
-              emit(this.id,doc);
-            };
-          };
-        ^
-        reduce = %^
-          function(key,values){
-
-            return values[values.length-1];
-          };
-        ^
-        self.collection.map_reduce(map,reduce, {:out => "custom_mr", :query => {}})
-      end
-
       def db
         self.klass.db
       end

data/lib/lolita/configuration/base.rb

@@ -15,11 +15,9 @@ module Lolita
 
       attr_reader :dbi,:klass
       @@generators=[:tabs,:list]
-
       class << self
-
         def add_generator(method)
-          @@generators<<method.to_sym 
+          @@generators<<method.to_sym
         end
       end
       # When configuration is defined in class than you don't need to worry about
@@ -40,7 +38,6 @@ module Lolita
       #     Person.lolita=Lolita::Configuration::Base.new(Person)
       #     Person.lolita.klass #=> Person
       def initialize(orm_class,&block)
-        @in_callback_mode = false
         @klass=orm_class
         @dbi=Lolita::DBI::Base.create(orm_class)
         block_given? ? self.instance_eval(&block) : self.generate!
@@ -53,10 +50,6 @@ module Lolita
         Lolita::LazyLoader.lazy_load(self,:@list,Lolita::Configuration::List,@dbi,&block)
       end
 
-      def list=(new_list)
-        @list = new_list if new_list.is_a?(Lolita::Configuration::List)
-      end
-
       # Create collection of Lolita::Configuration::Tab, loading lazy.
       # See Lolita::Configuration::Tabs for details.
       def tabs &block
@@ -76,13 +69,7 @@ module Lolita
           self.send(generator)
         }
       end
-
-      private
-
-      def after_initialize
-        @dbi.klass.run(:after_lolita_loaded, :once => self)
-      end
-
+      
     end
   end
 end