lolita 3.0.5 → 3.0.6

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format d

data/GUIDELINE

@@ -1,20 +1,20 @@
-# Creating GEM for Lolita
-
-When creating GEM, that include new module in one or more of lolita modules, use
-Lolita.send(:include,YourModule) instead of reopening module.
-
-# How to install
-  
-gem install lolita
-
-cd your_project
-
-rails g lolita:install
-
-change your project initializers/lolita.rb
-
-# For cucumber testing 
-gem install akephalos
-bundle exec cucumber features
-
-
+# Creating GEM for Lolita
+
+When creating GEM, that include new module in one or more of lolita modules, use
+Lolita.send(:include,YourModule) instead of reopening module.
+
+# How to install
+  
+gem install lolita
+
+cd your_project
+
+rails g lolita:install
+
+change your project initializers/lolita.rb
+
+# For cucumber testing 
+gem install akephalos
+bundle exec cucumber features
+
+

data/VERSION

@@ -1 +1 @@
-3.0.5
+3.0.6

data/app/views/components/lolita/field/_boolean.html.erb

@@ -0,0 +1 @@
+<%= check_box resource_name, field.name %>

data/app/views/components/lolita/field/_select.html.erb

@@ -1 +1 @@
-<%= select resource_name, field.name, field.association_values %>
+<%= select resource_name, field.name, field.association_values.respond_to?(:call) ? field.association_values.call(self) : field.association_values %>

data/app/views/components/lolita/field/_text.html.erb

@@ -7,7 +7,7 @@
         theme: "advanced",
         skin: "cirkuit",
         mode: "textareas",
-        theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,|,formatselect,|,link,unlink,image",
+        theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,|,formatselect,|,link,unlink,image,code",
         theme_advanced_buttons2 : "",
         theme_advanced_buttons3 : "",
         theme_advanced_toolbar_location: "top",

data/app/views/components/lolita/navigation/_display.html.erb

@@ -1,6 +1,6 @@
 <nav>
   <ul>
-    <% Lolita.mappings.each do |name,mapping| %>
+    <% Lolita.resources.each do |name,mapping| %>
     <li <%=mapping.to==resource_class ? "class='active'" : ""%> >
       <%= link_to mapping.name.to_s.humanize, lolita_resources_path(mapping) %>
     </li>

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

@@ -9,5 +9,5 @@
     setTimeout(function() { 
       $("#flash").slideUp("fast") 
     }, 10000); //wait 10 seconds and then slide up
-  </script>
+  </script>
 <% end%>

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

@@ -13,6 +13,7 @@
     <link rel="shortcut icon" href="/favicon.ico">
 
     <%= stylesheet_link_tag "lolita/default","lolita/style" %>
+    <%= yield :style %>
     <%= javascript_include_tag "modernizr-1.7.min" %>
     <%= raw csrf_meta_tag %>
   </head>
@@ -32,9 +33,9 @@
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js">
     </script>
     <script>
-      window.jQuery || document.write('<script src="jquery-1.5.1.min.js">\x3C/script>')
+      window.jQuery || document.write('<script src="/javascripts/jquery-1.5.1.min.js">\x3C/script>')
     </script>
-    <%= javascript_include_tag "rails","lolita/tab" %>
+    <%= javascript_include_tag "rails","lolita/tab","lolita/main" %>
     <%= content_for :script %>
   </body>
 </html>

data/lib/generators/lolita/{copy_assets_generator.rb → assets_generator.rb}

@@ -1,7 +1,7 @@
 require 'generators/helpers/file_helper'
 module Lolita
   module Generators
-    class CopyAssetsGenerator < Rails::Generators::Base
+    class AssetsGenerator < Rails::Generators::Base
       include Lolita::Generators::FileHelper
       desc "Copy all from lolita public directory to project public directory."
       def copy_all

data/lib/generators/lolita/install_generator.rb

@@ -13,11 +13,14 @@ module Lolita
       end
 
       def copy_assets
-        generate("lolita:copy_assets")
+        generate("lolita:assets")
       end
 
-      def load_seed
-        eval(File.new(File.join(LOLITA_ROOT,"db","seed.rb")).read)
+      def install_modules
+        Lolita.modules.each do |module_name|
+          
+          invoke "#{module_name.to_s.underscore.gsub("/","_")}:install" 
+        end
       end
      
     end

data/lib/lolita.rb

@@ -1,136 +1,137 @@
-main_time=Time.now
-
-$:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
-
-require 'abstract' #FIXME remove from gem
-require 'active_support/core_ext/numeric/time'
-require 'active_support/concern'
-require 'active_support/callbacks'
-require 'active_support/dependencies'
-require 'lolita/errors'
-# Require all ruby extensions
-Dir["#{File.dirname(__FILE__)}/lolita/ruby_ext/**/*.*"].each do |path|
-  require path
-end
-
-module Lolita
-  autoload(:LazyLoader,'lolita/lazy_loader')
-  autoload(:VERSION,'lolita/version')
-  autoload(:ObservedArray,'lolita/observed_array')
-  autoload(:Builder,'lolita/builder')
-  autoload(:BaseConfiguration,'lolita/base_configuration')
-  module Adapter
-    autoload :AbstractAdapter, 'lolita/adapter/abstract_adapter'
-    autoload :ActiveRecord, 'lolita/adapter/active_record'
-    autoload :Mongoid, 'lolita/adapter/mongoid'
-  end
-
-  module DBI
-    autoload :Base, 'lolita/dbi/base'
-  end
-  
-  module Hooks
-    require 'lolita/hooks/hooks'
-    include Lolita::Hooks::Hooks
-    autoload :Base, 'lolita/hooks/base'
-    autoload :Component, 'lolita/hooks/component'
-  end
-
-  module Configuration
-    autoload :Base, 'lolita/configuration/base'
-    autoload :Column, 'lolita/configuration/column'
-    autoload :Columns, 'lolita/configuration/columns'
-    autoload :Field, 'lolita/configuration/field'
-    autoload :FieldSet, 'lolita/configuration/field_set'
-    autoload :List, 'lolita/configuration/list'
-    autoload :Page, 'lolita/configuration/page'
-    autoload :Tab, 'lolita/configuration/tab'
-    autoload :Tabs, 'lolita/configuration/tabs'
-
-     Dir["#{File.dirname(__FILE__)}/lolita/configuration/tab/**/*.*"].each do |path|
-        base_name=File.basename(path,".rb")
-        autoload :"#{base_name.capitalize}Tab", "lolita/configuration/tab/#{base_name}"
-     end
-
-    module FieldExtensions
-      Dir["#{File.dirname(__FILE__)}/lolita/configuration/field_extensions/**/*.*"].each do |path|
-        base_name=File.basename(path,".rb")
-        autoload base_name.capitalize.to_sym, "lolita/configuration/field_extensions/#{base_name}"
-      end
-    end
-
-    
-    def self.included(base)
-      base.class_eval do
-        extend ClassMethods
-        def lolita
-          self.class.lolita
-        end
-      end
-    end
-
-    module ClassMethods
-      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
-        else
-          raise ArgumentError.new("Only Lolita::Configuration::Base is acceptable.")
-        end
-      end
-    end
-  end
-
-  module Test
-    autoload :Matchers, 'lolita/test/matchers'
-  end
-  
-  module Controllers
-    autoload :InternalHelpers, 'lolita/controllers/internal_helpers'
-    autoload :UserHelpers, 'lolita/controllers/user_helpers'
-    autoload :UrlHelpers, 'lolita/controllers/url_helpers'
-    autoload :ComponentHelpers, 'lolita/controllers/component_helpers'
-    autoload :ViewUserHelpers, 'lolita/controllers/view_user_helpers'
-  end
-
-  @@scopes={}
-
-  def self.scope name=nil
-    name||=scope_name
-    @@scopes[name]||=Lolita::BaseConfiguration.new(name)
-    @@scopes[name]
-  end
-
-  def self.setup
-    yield scope
-  end
-
-  def self.scope_name
-    :default
-  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
-    scope.send(method_name,*args,&block)
-  end
-  
-end
-
-engine_time=Time.now
-
-if defined?(Rails)
-  require 'lolita/rails/all'
-end
-
-puts "Lolita engine started in #{Time.at(Time.now-engine_time).strftime("%M:%S.%3N")}"
-
+main_time=Time.now
+
+$:<<File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
+
+require 'abstract' #FIXME remove from gem
+require 'active_support/core_ext/numeric/time'
+require 'active_support/concern'
+require 'active_support/callbacks'
+require 'active_support/dependencies'
+require 'lolita/errors'
+# Require all ruby extensions
+Dir["#{File.dirname(__FILE__)}/lolita/ruby_ext/**/*.*"].each do |path|
+  require path
+end
+
+module Lolita
+  autoload(:LazyLoader,'lolita/lazy_loader')
+  autoload(:VERSION,'lolita/version')
+  autoload(:ObservedArray,'lolita/observed_array')
+  autoload(:Builder,'lolita/builder')
+  autoload(:BaseConfiguration,'lolita/base_configuration')
+  module Adapter
+    autoload :AbstractAdapter, 'lolita/adapter/abstract_adapter'
+    autoload :ActiveRecord, 'lolita/adapter/active_record'
+    autoload :Mongoid, 'lolita/adapter/mongoid'
+  end
+
+  module DBI
+    autoload :Base, 'lolita/dbi/base'
+  end
+  
+  module Hooks
+    require 'lolita/hooks/hooks'
+    include Lolita::Hooks::Hooks
+    autoload :Base, 'lolita/hooks/base'
+    autoload :Component, 'lolita/hooks/component'
+  end
+
+  module Configuration
+    autoload :Factory, 'lolita/configuration/factory'
+    autoload :Base, 'lolita/configuration/base'
+    autoload :Column, 'lolita/configuration/column'
+    autoload :Columns, 'lolita/configuration/columns'
+    autoload :Field, 'lolita/configuration/field'
+    autoload :FieldSet, 'lolita/configuration/field_set'
+    autoload :List, 'lolita/configuration/list'
+    autoload :Page, 'lolita/configuration/page'
+    autoload :Tab, 'lolita/configuration/tab'
+    autoload :Tabs, 'lolita/configuration/tabs'
+
+    ["tab","field"].each do |type|
+      Dir["#{File.dirname(__FILE__)}/lolita/configuration/#{type}/**/*.*"].each do |path|
+        base_name=File.basename(path,".rb")
+        autoload :"#{base_name.capitalize}#{type.humanize}", "lolita/configuration/#{type}/#{base_name}"
+      end
+    end
+
+    
+    def self.included(base)
+      base.class_eval do
+        extend ClassMethods
+        def lolita
+          self.class.lolita
+        end
+      end
+    end
+
+    module ClassMethods
+      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
+        else
+          raise ArgumentError.new("Only Lolita::Configuration::Base is acceptable.")
+        end
+      end
+    end
+  end
+
+  module Test
+    autoload :Matchers, 'lolita/test/matchers'
+  end
+  
+  module Controllers
+    autoload :InternalHelpers, 'lolita/controllers/internal_helpers'
+    autoload :UserHelpers, 'lolita/controllers/user_helpers'
+    autoload :UrlHelpers, 'lolita/controllers/url_helpers'
+    autoload :ComponentHelpers, 'lolita/controllers/component_helpers'
+    autoload :ViewUserHelpers, 'lolita/controllers/view_user_helpers'
+  end
+
+
+  @@scopes={}
+
+  def self.scope name=nil
+    name||=scope_name
+    @@scopes[name]||=Lolita::BaseConfiguration.new(name)
+    @@scopes[name]
+  end
+
+  def self.setup
+    yield scope
+  end
+
+  def self.scope_name
+    :default
+  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
+    scope.send(method_name,*args,&block)
+  end
+
+  module Generators
+    autoload :FileHelper, File.join(Lolita.root,"lib","generators","helpers","file_helper")
+  end
+  
+end
+
+engine_time=Time.now
+
+if defined?(Rails)
+  require 'lolita/rails/all'
+end
+
+puts "Lolita engine started in #{Time.at(Time.now-engine_time).strftime("%M:%S.%3N")}"
+
 puts "Lolita started in #{Time.at(Time.now-main_time).strftime("%M:%S.%3N")}"

data/lib/lolita/adapter/active_record.rb

@@ -1,111 +1,111 @@
-module Lolita
-  module Adapter
-    class ActiveRecord
-      include Lolita::Adapter::AbstractAdapter
-      
-      attr_reader :dbi, :klass
-      def initialize(dbi)
-        @dbi=dbi
-        @klass=dbi.klass
-      end
-
-      def associations
-        klass.reflections
-      end
-
-      # Same as in mongoid
-      def associations_klass_names
-        names=[]
-        associations.each{|name,association|
-          names << association.class_name
-        }
-        names
-      end
-
-      def reflect_on_association(name)
-        klass.reflect_on_association(name)
-      end
-
-      def association_macro(association)
-        type=association.macro
-        case type
-        when :has_many
-          :many
-        when :has_one
-          :one
-        when :belongs_to
-          :one
-        when :has_and_belongs_to_many
-          :many
-        end
-      end
-
-      def association_class_name(association)
-        association.class_name
-      end
-
-      def fields
-        @fields||=self.klass.columns.collect{|column|
-          field_to_hash(column)
-        }.reject{|column|
-          column[:options][:primary]
-        }
-        @fields
-      end
-
-      def find_by_id(id)
-        self.klass.where(:id=>id).first
-      end
-      
-      def find(*args)
-        self.klass.find(*args)
-      end
-
-      def paginate(opt={})
-        #FIXME depend on will_paginate
-        if order=opt.delete(:sort)
-          order.map{|c| c.join(" ")}.join(", ")
-          opt[:order_by]=order
-        end
-        self.klass.paginate(opt)
-      end
-
-      def db
-        self.klass.connection
-      end
-
-      def db_name
-        db.current_database
-      end
-
-      def collection
-        self.klass #FIXME not realy same as in mongoid
-      end
-
-      def collection_name
-        self.klass.table_name
-      end
-
-      def collections
-        self.klass #FIXME not  realy same as in mongoid
-      end
-
-      def collection_names
-        self.klass.connection.select_all("show tables from #{db_name}").map{|r| r.values.first}
-      end
-
-      private
-
-      def field_to_hash(column)
-        {
-          :name=>column.name,
-          :type=>column.type.to_s,
-          :title=>column.name.to_s.humanize,
-          :options=>{
-            :primary=>column.primary
-          }
-        }
-      end
-    end
-  end
+module Lolita
+  module Adapter
+    class ActiveRecord
+      include Lolita::Adapter::AbstractAdapter
+      
+      attr_reader :dbi, :klass
+      def initialize(dbi)
+        @dbi=dbi
+        @klass=dbi.klass
+      end
+
+      def associations
+        klass.reflections
+      end
+
+      # Same as in mongoid
+      def associations_klass_names
+        names=[]
+        associations.each{|name,association|
+          names << association.class_name
+        }
+        names
+      end
+
+      def reflect_on_association(name)
+        klass.reflect_on_association(name)
+      end
+
+      def association_macro(association)
+        type=association.macro
+        case type
+        when :has_many
+          :many
+        when :has_one
+          :one
+        when :belongs_to
+          :one
+        when :has_and_belongs_to_many
+          :many
+        end
+      end
+
+      def association_class_name(association)
+        association.class_name
+      end
+
+      def fields
+        @fields||=self.klass.columns.collect{|column|
+          field_to_hash(column)
+        }.reject{|column|
+          column[:options][:primary]
+        }
+        @fields
+      end
+
+      def find_by_id(id)
+        self.klass.where(:id=>id).first
+      end
+      
+      def find(*args)
+        self.klass.find(*args)
+      end
+
+      def paginate(opt={})
+        #FIXME depend on will_paginate
+        if order=opt.delete(:sort)
+          order.map{|c| c.join(" ")}.join(", ")
+          opt[:order_by]=order
+        end
+        self.klass.paginate(opt)
+      end
+
+      def db
+        self.klass.connection
+      end
+
+      def db_name
+        db.current_database
+      end
+
+      def collection
+        self.klass #FIXME not realy same as in mongoid
+      end
+
+      def collection_name
+        self.klass.table_name
+      end
+
+      def collections
+        self.klass #FIXME not  realy same as in mongoid
+      end
+
+      def collection_names
+        self.klass.connection.select_all("show tables from #{db_name}").map{|r| r.values.first}
+      end
+
+      private
+
+      def field_to_hash(column)
+        {
+          :name=>column.name,
+          :type=>column.type.to_s,
+          :title=>column.name.to_s.humanize,
+          :options=>{
+            :primary=>column.primary
+          }
+        }
+      end
+    end
+  end
 end