espresso 0.1.1 → 0.1.12

data/.gitignore

@@ -1,2 +1,4 @@
 pkg
 *.gem
+doc
+.yardoc

data/README.rdoc

@@ -10,7 +10,7 @@ Description goes here.
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
   (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
+  bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright

data/Rakefile

@@ -4,16 +4,17 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "espresso"
+    gem.name = 'espresso'
     gem.summary = %Q{Rails extender to simplify rails development}
     gem.description = %Q{Useful templates for controller and model functions}
-    gem.email = "rotuka@tokak.ru"
-    gem.homepage = "http://github.com/krasivotokak/espresso"
-    gem.authors = ["Alexander Semyonov"]
-    gem.add_development_dependency "thoughtbot-shoulda"
+    gem.email = 'rotuka@tokak.ru'
+    gem.homepage = 'http://github.com/krasivotokak/espresso'
+    gem.authors = ['Alexander Semyonov']
     gem.add_dependency('searchlogic', '>= 2.2.3')
-    gem.add_dependency('josevalim-inherited_resources', '>= 0.8.5')
-    gem.add_dependency('mislav-will_paginate', '>= 2.3.11')
+    gem.add_dependency('inherited_resources', '>= 0.8.5')
+    gem.add_dependency('will_paginate', '>= 2.3.11')
+    gem.add_dependency('formtastic', '>= 0.9.7')
+    gem.add_development_dependency('shoulda')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -54,5 +55,8 @@ rescue LoadError
   end
 end
 
+desc 'Generate documentation'
+task :doc => :yard
+
 desc "Bump patch version and release to github and gemcutter"
 task :bump => %w(version:bump:patch release gemcutter:release install)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.12

data/espresso.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{espresso}
-  s.version = "0.1.1"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Semyonov"]
-  s.date = %q{2009-10-05}
+  s.date = %q{2010-03-25}
   s.description = %q{Useful templates for controller and model functions}
   s.email = %q{rotuka@tokak.ru}
   s.extra_rdoc_files = [
@@ -25,18 +25,26 @@ Gem::Specification.new do |s|
      "espresso.gemspec",
      "init.rb",
      "lib/espresso.rb",
-     "lib/espresso/helpers.rb",
+     "lib/espresso/action_controller.rb",
+     "lib/espresso/action_view.rb",
+     "lib/espresso/action_view/form_builder.rb",
+     "lib/espresso/action_view/navigation.rb",
+     "lib/espresso/action_view/resources.rb",
+     "lib/espresso/action_view/scopes.rb",
+     "lib/espresso/action_view/stats.rb",
+     "lib/espresso/haml.rb",
      "lib/espresso/locales/en.yml",
      "lib/espresso/locales/ru.yml",
      "lib/espresso/model.rb",
-     "lib/espresso/objects_controller.rb",
+     "lib/espresso/resources.rb",
+     "lib/espresso/resources_helpers.rb",
      "test/espresso_test.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/krasivotokak/espresso}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Rails extender to simplify rails development}
   s.test_files = [
     "test/espresso_test.rb",
@@ -48,20 +56,24 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<searchlogic>, [">= 2.2.3"])
-      s.add_runtime_dependency(%q<josevalim-inherited_resources>, [">= 0.8.5"])
-      s.add_runtime_dependency(%q<mislav-will_paginate>, [">= 2.3.11"])
+      s.add_runtime_dependency(%q<inherited_resources>, [">= 0.8.5"])
+      s.add_runtime_dependency(%q<will_paginate>, [">= 2.3.11"])
+      s.add_runtime_dependency(%q<formtastic>, [">= 0.9.7"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
       s.add_dependency(%q<searchlogic>, [">= 2.2.3"])
-      s.add_dependency(%q<josevalim-inherited_resources>, [">= 0.8.5"])
-      s.add_dependency(%q<mislav-will_paginate>, [">= 2.3.11"])
+      s.add_dependency(%q<inherited_resources>, [">= 0.8.5"])
+      s.add_dependency(%q<will_paginate>, [">= 2.3.11"])
+      s.add_dependency(%q<formtastic>, [">= 0.9.7"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     s.add_dependency(%q<searchlogic>, [">= 2.2.3"])
-    s.add_dependency(%q<josevalim-inherited_resources>, [">= 0.8.5"])
-    s.add_dependency(%q<mislav-will_paginate>, [">= 2.3.11"])
+    s.add_dependency(%q<inherited_resources>, [">= 0.8.5"])
+    s.add_dependency(%q<will_paginate>, [">= 2.3.11"])
+    s.add_dependency(%q<formtastic>, [">= 0.9.7"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
   end
 end
+

data/init.rb

@@ -1,4 +1 @@
-require 'activerecord'
-require 'espresso/model'
-
-ActiveRecord::Base.send(:include, Espresso::Model)
+require 'espresso'

data/lib/espresso/action_controller.rb

@@ -0,0 +1,7 @@
+module Espresso
+  module ActionController
+    def resources
+      Espresso::Resources.resources(self)
+    end
+  end
+end

data/lib/espresso/action_view/form_builder.rb

@@ -0,0 +1,58 @@
+require 'formtastic'
+
+module Espresso
+  module ActionView
+    class FormBuilder < Formtastic::SemanticFormBuilder
+      def submit(value=nil, options={})
+        value, options = nil, value if value.is_a?(Hash)
+        value ||= submit_default_value
+        @template.submit_tag(value, options.reverse_merge(:id => "#{object_name}_submit"))
+      end
+
+      def inline_errors_for(method, options = nil) #:nodoc:
+        if render_inline_errors?
+          errors = Array(@object.errors[method.to_sym]) +
+            Array(@object.errors[:"#{method}_id"])
+          send(:"error_#{@@inline_errors}", [*errors]) if errors.present?
+        else
+          nil
+        end
+      end
+
+      def submit_default_value
+        model = if object.class.respond_to?(:model_name)
+                  object.class.human_name
+                else
+                  @object_name.to_s.humanize
+                end
+
+        defaults = []
+        defaults << :"helpers.submit.#{object_name}.#{form_action}"
+        defaults << :"helpers.submit.#{form_action}"
+        defaults << "#{form_action.to_s.humanize} #{model}"
+
+        I18n.t(defaults.shift, :model => model, :default => defaults)
+      end
+
+      def commit_button(*args)
+        options = args.extract_options!
+
+        button_html = options.delete(:button_html) || {}
+        button_html.merge!(:class => [button_html[:class], form_action].compact.join(' '))
+        element_class = ['commit', options.delete(:class)].compact.join(' ')
+        accesskey = (options.delete(:accesskey) || @@default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
+        button_html = button_html.merge(:accesskey => accesskey) if accesskey  
+        template.content_tag(:li, self.submit(options.delete(:label), button_html), :class => element_class)
+      end
+
+    protected
+      def model_object
+        @object.respond_to?(:to_model) ? @object.to_model : @object
+      end
+
+      def form_action
+        model_object ? (model_object.new_record? ? :create : :update) : :submit
+      end
+    end
+  end
+end

data/lib/espresso/action_view/navigation.rb

@@ -0,0 +1,100 @@
+require 'will_paginate/view_helpers'
+
+module Espresso
+  module ActionView
+    module Navigation
+      VIEW_PLACEHOLDERS = {
+        'create' => 'new',
+        'update' => 'edit'
+      }
+
+      # Finds apropriate view name
+      def view_name
+        unless @view_name
+          action_name = controller.action_name
+          @view_name = VIEW_PLACEHOLDERS[action_name] || action_name
+        end
+        @view_name
+      end
+
+      # Make default page title, based on controller and action
+      def default_page_title
+        text = case view_name
+               when 'index'
+                 controller_name.camelize
+               when 'new'
+                 "#{t('espresso.navigation.new', :default => 'New')} #{controller_name.classify.constantize.human_name}"
+               when 'edit'
+                 "#{t('espresso.navigation.edit', :default => 'Editing')} #{controller_name.classify.constantize.human_name}"
+               else
+                 t("navigation.#{controller_name}.#{view_name}")
+               end
+        %(<span class="translation_missing">#{text}</span>)
+      end
+
+      def page_title(title = nil, strip = false)
+        @page_title = if title
+                        title
+                      elsif @page_title
+                        @page_title
+                      else
+                        default = if Rails.env.production?
+                                    default_page_title
+                                  else
+                                    nil
+                                  end
+
+                        rsrc  = if resource?
+                                  if resource.new_record?
+                                    resource_class.human_name
+                                  else
+                                    link_to(resource, resource_path)
+                                  end
+                                else
+                                  nil
+                                end
+
+                        t("navigation.#{controller_name}.#{view_name}",
+                          :default => default,
+                          :resource => rsrc
+                         )
+                      end
+        if strip
+          strip_tags(@page_title)
+        else
+          @page_title
+        end
+      end
+
+      def head_title(default = false, separator = ' | ')
+        default ||= t('application.meta.title')
+        strip_tags([page_title, default].compact.join(separator))
+      end
+
+      def navigation_list(menu)
+        returning '' do |result|
+          menu.each do |item|
+            path = "/#{item}"
+            uri = request.request_uri
+            title = t("navigation.#{item}.index", :default => item.to_s.camelize)
+            result << content_tag(:li, :class => uri.starts_with?(path) ? 'selected' : nil) do
+              link_to_unless_current(title, path) {
+                content_tag(:strong, title)
+              }
+            end
+          end
+        end
+      end
+
+      include WillPaginate::ViewHelpers
+      def will_paginate_with_i18n(collection, options = {})
+        will_paginate_without_i18n(collection,
+                                   options.merge({
+          :class => 'b-pagination',
+          :previous_label => t('espresso.navigation.previous', :default => '← Previous'),
+          :next_label =>     t('espresso.navigation.next', :default => 'Next →')}))
+      end
+      alias_method_chain :will_paginate, :i18n
+    end
+  end
+end

data/lib/espresso/action_view/resources.rb

@@ -0,0 +1,59 @@
+module Espresso
+  module ActionView
+    module Resources
+      def link_to_new(klass=nil, path=nil)
+        klass ||= resource_class
+        klass_underscored = klass.name.underscore
+        path ||= if klass == resource_class
+                   new_resource_path
+                 else
+                   [:new, klass_underscored]
+                 end
+        link_to(t("helpers.action.#{klass_underscored}.new",
+                  :default => [:'helpers.action.new', 'Добавить']),
+                path,
+                :class => 'b-action b-action_new')
+      rescue
+      end
+
+      def link_to_show(object=nil)
+        object ||= resource
+        link_to(t("helpers.action.#{object.class.name.underscore}.show",
+                  :default => [:'helpers.action.show', object.to_s]),
+                object,
+                :class => 'b-action b-action_show')
+      rescue
+      end
+
+      def link_to_edit(object=nil, path=nil)
+        object ||= resource
+        path ||= object == resource ? edit_resource_path : [:edit, object]
+        link_to(t("helpers.action.#{object.class.name.underscore}.edit",
+                  :default => [:'helpers.action.edit', 'Редактировать']),
+                path,
+                :class => 'b-action b-action_edit')
+      rescue
+      end
+
+      def link_to_destroy(object=nil, path=nil)
+        object ||= resource
+        path ||= object == resource ? resource_path : object
+        link_to(t("helpers.action.#{object.class.name.underscore}.edit",
+                  :default => [:'helpers.action.destroy', 'Удалить']),
+                path,
+                :class => 'b-action b-action_destroy',
+                :method => :delete,
+                :confirm => 'Вы уверены?')
+      end
+
+      def link_to_index
+        link_to(t("helpers.action.#{controller_name.singularize}.index",
+                  :default => [:'helpers.action.index', '← К списку']),
+                collection_path,
+                :class => 'b-action b-action_index'
+               )
+      rescue
+      end
+    end
+  end
+end

data/lib/espresso/action_view/scopes.rb

@@ -0,0 +1,38 @@
+module Espresso
+  module ActionView
+    module Scopes
+      def simple_search
+        returning '' do |form|
+          form << form_tag(url_for(:action => :index), :method => :get)
+          form << content_tag(:table, :class => 'b-search') do
+                    content_tag(:tr) do
+                      returning '' do |result|
+                        result << content_tag(:td,
+                                              content_tag(:div, text_field_tag(:q, params[:q], :type => 'search'), :class => 'b-input'),
+                                              :class => 'input')
+                        result << content_tag(:td,
+                                              submit_tag(t('krasivotokak.espresso.find', :default => 'Find!'), :class => 'submit'),
+                                              :class => 'button')
+                      end
+                    end
+                  end
+          form << yield if block_given?
+          form << '</form>'
+        end
+      end
+
+      def scope_filter(scopes)
+        items = scopes.inject([]) do |list, scope|
+          list << link_to_unless_current(t(".#{scope}"), collection_path(scope => true))
+          list
+        end
+
+        content_tag(:div, :class => 'b-scope-filter') do
+          content_tag(:ul, :class => 'b-hlist b-hlist_vline') do
+                                  "<li>#{items.join('<li></li>')}</li>"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/espresso/action_view/stats.rb

@@ -0,0 +1,54 @@
+module Espresso
+  module ActionView
+    module Stats
+      # Set online statistics trackers
+      # @options
+      def online_stats(options = {})
+        static_includes = []
+        dynamic_includes = ''
+        noscript_includes = []
+        initializers = []
+
+        if piwik = options.delete(:piwik)
+          static_includes   << "//#{piwik[:site]}/piwik.js"
+          initializers      << "var piwikTracker=Piwik.getTracker('//#{piwik[:site]}/piwik.php',#{piwik[:id]});piwikTracker.trackPageView();piwikTracker.enableLinkTracking();"
+          noscript_includes << "//#{piwik[:site]}/piwik.php?idsite=#{piwik[:id]}"
+        end
+
+        if metrika = options.delete(:metrika)
+          static_includes   << '//mc.yandex.ru/resource/watch.js'
+          initializers      << "var yaCounter#{metrika}=new Ya.Metrika(#{metrika});"
+          noscript_includes << "//mc.yandex.ru/watch/#{metrika}"
+        end
+
+        if analytics = options.delete(:analytics)
+          dynamic_includes << 'var gaJsHost=("https:"==document.location.protocol)?"https://ssl.":"http://www.";'
+          dynamic_includes << 'document.write(unescape("%3Cscript src=\'"+gaJsHost+"google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3Ei"));'
+          initializers     << "var pageTracker=_gat._getTracker('#{analytics}');pageTracker._trackPageview();"
+        end
+
+        returning('') do |result|
+          unless dynamic_includes.empty?
+            result << javascript_tag(dynamic_includes)
+          end
+          result << javascript_include_tag(static_includes) unless static_includes.empty?
+          unless initializers.empty?
+            initializers = initializers.collect do |initializer|
+              "try {#{initializer}} catch(e) {}"
+            end.join("\n")
+            result << javascript_tag(initializers)
+          end
+          unless noscript_includes.empty?
+            includes = noscript_includes.collect do |noscript|
+              %(<img src="#{noscript}" style="border:0" alt="" />)
+            end.join("\n")
+            result << content_tag(:noscript,
+                                  content_tag(:div,
+                                              includes,
+                                              :style => 'position: absolute'))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/espresso/action_view.rb

@@ -0,0 +1,21 @@
+module Espresso
+  module ActionView
+    autoload :Resources, 'espresso/action_view/resources'
+    autoload :Scopes, 'espresso/action_view/scopes'
+    autoload :Navigation, 'espresso/action_view/navigation'
+    autoload :FormBuilder, 'espresso/action_view/form_builder'
+    autoload :Stats, 'espresso/action_view/stats'
+
+    include Resources
+    include Scopes
+    include Navigation
+    include Stats
+
+    # Make body’s modifiers, based on controller_name and action_name
+    def body_modifiers
+      {:class => "m-#{controller_name} m-#{controller_name}_#{action_name}"}
+    end
+  end
+end
+
+Formtastic::SemanticFormHelper.builder = Espresso::ActionView::FormBuilder

data/lib/espresso/haml.rb

@@ -0,0 +1,26 @@
+require 'haml'
+require 'haml/buffer'
+
+class Haml::Buffer
+  # Takes an array of objects and uses the class and id of the first
+  # one to create an attributes hash.
+  # The second object, if present, is used as a prefix,
+  # just like you can do with `dom_id()` and `dom_class()` in Rails
+  def parse_object_ref(ref)
+    prefix = ref[1]
+    ref = ref[0]
+    # Let's make sure the value isn't nil. If it is, return the default Hash.
+    return {} if ref.nil?
+    class_name = underscore(ref.class)
+    id = "#{class_name}_#{ref.id || 'new'}"
+
+    if ref.respond_to?(:model_class)
+      class_name = ref.model_class
+    elsif prefix
+      class_name = "#{prefix}_#{class_name}"
+      id = "#{prefix}_#{id}"
+    end
+
+    {'id' => id, 'class' => class_name}
+  end
+end

data/lib/espresso/locales/ru.yml

@@ -1,6 +1,11 @@
 ru:
   krasivotokak:
     espresso:
+
+  espresso:
+    navigation:
+      new: Новый
+      edit: Редактирование
       previous: ← Туда
       next: Сюда →
       find: Найти

data/lib/espresso/model.rb

@@ -1,17 +1,47 @@
 require 'searchlogic'
+require 'will_paginate'
 
 module Espresso
   # @author Alexander Semyonov
   module Model
-    unloadable
-
     def self.included(model)
+      super
       model.class_eval do
         extend ClassMethods
-        include InstanceMethods
+
+        class_inheritable_accessor :model_attrs, :name_field, :per_page
+
+        self.model_attrs = []
+        self.name_field = :name
+        self.per_page = 10
+
+        named_scope :for_index, :conditions => '1 = 1'
+        named_scope :for_feed, :order => 'created_at DESC'
+        named_scope :for_show, :conditions => '1 = 1'
+        named_scope :recent, lambda {
+          {:limit => per_page}
+        }
       end
     end
 
+    # String representation of model, based on Model’s name_field
+    def to_s
+      send(self.class.name_field).to_s
+    end
+
+    # Model’s classes, based on Model.model_attrs
+    def model_class
+      main_class = "#{::Espresso::MODEL_PREFIX}-#{self.class.name.underscore}"
+      classes = [main_class] +
+      self.class.model_attrs.inject([]) do |collection, attribute|
+                     if send("#{attribute}?")
+                       collection << " #{main_class}_#{attribute}"
+                     end
+                     collection
+                   end
+      classes.join(' ')
+    end
+
     module ClassMethods
       # Paginates search results
       #
@@ -24,9 +54,9 @@ module Espresso
       def paginate_found(page = nil, query = {}, simple_query = nil)
         query ||= {}
         query.merge!(self.parse_simple_query(simple_query)) if simple_query
-        @search = search(query)
-        @results = @search.paginate(:page => page)
-        [@search, @results]
+        searchlogic = search(query)
+        results = searchlogic.paginate(:page => page)
+        [searchlogic, results]
       end
       alias_method :search_results, :paginate_found
 
@@ -39,13 +69,6 @@ module Espresso
         {:"#{name_field}_like" => query}
       end
 
-      # «NameField» is a main field, used to represent model in to_s method and in simple queries
-      # @param [Symbol, String] new_name_field new field name
-      # @return [Symbol] field name
-      def name_field
-        :name
-      end
-
       # Make a slug from object’s NameField
       # @param [ActiveRecord::Base] object, which slug is making
       # @return [String] slug
@@ -53,13 +76,5 @@ module Espresso
         object.send(name_field).parameterize
       end
     end
-
-    module InstanceMethods
-      def to_s
-        send(self.class.name_field).to_s
-      end
-
-    protected
-    end
   end
 end

data/lib/espresso/resources.rb

@@ -0,0 +1,79 @@
+require 'inherited_resources'
+require 'has_scope'
+
+module Espresso
+  module Resources
+    def self.resources(controller = nil)
+      controller ||= self
+      controller.inherit_resources
+      controller.extend ClassMethods
+      controller.send(:include, InstanceMethods)
+    end
+
+    def self.included(controller)
+      resources(controller)
+    end
+
+    module ClassMethods
+      # Adds ability to build feeds for resource’s collections.
+      # By default adds Atom feed
+      # @example Add Atom feed for #index
+      #   has_feed :atom
+      # @example Add Atom and RSS feed for #index
+      #   has_feed :atom, :rss
+      # @example Add Atom, Rss, and ITunes feed for #index, #list and #archive
+      #   has_feed :atom, :rss, :itunes_feed, :only => [:index, :list, :archive]
+      def has_feed(*args)
+        options = args.extract_options!
+        if options.empty?
+          options[:only] = :index
+        end
+
+        class_inheritable_accessor(:feed_formats) unless respond_to?(:feed_formats)
+        self.feed_formats = args.empty? ? [:atom] : args
+        self.feed_formats = self.feed_formats.map(&:to_sym)
+
+        self.feed_formats.each do |format|
+          respond_to format, options
+        end
+
+        include FeedScope
+        has_scope :for_feed, options.merge(:default => true,
+                                           :type => :boolean,
+                                           :if => :feed_scope_applicable?)
+      end
+    end
+
+    module FeedScope
+      def feed_scope_applicable?
+        params[:format] && self.class.feed_formats.include?(params[:format].to_sym)
+      end
+    end
+
+    module InstanceMethods
+    protected
+
+      # Find collection of objects with pagination.
+      # Also made Searchlogic object @search
+      #
+      # @return [WillPaginate::Collection] collection of objects
+      def collection
+        unless (result = get_collection_ivar).present?
+          @search, result = end_of_association_chain.for_index.
+                              search_results(params[:page],
+                                             params[:query],
+                                             params[:q])
+          set_collection_ivar(result)
+        end
+        result
+      end
+
+      # Build interpolation options for flash messages
+      def interpolation_options
+        if resource?
+          { :resource_title => resource.to_s }
+        end
+      end
+    end
+  end
+end

data/lib/espresso/resources_helpers.rb

@@ -0,0 +1,24 @@
+module Espresso
+  module ResourcesHelpers
+    def self.included(base)
+      super
+      base.send(:helper_method, :resource?, :collection?)
+    end
+
+    # Does the action or view have a resource
+    # @return [Boolean] having a resource
+    def resource?
+      resource
+    rescue
+      false
+    end
+
+    # Does the action or view have a collection of objects
+    # @return [Boolean] having a collection
+    def collection?
+      collection
+    rescue
+      false
+    end
+  end
+end

data/lib/espresso.rb

@@ -1,14 +1,32 @@
 module Espresso
+  MODEL_PREFIX = 'b'
+
+  autoload :Model, 'espresso/model'
+  autoload :Resources, 'espresso/resources'
+  autoload :ActionView, 'espresso/action_view'
+  autoload :ActionController, 'espresso/action_controller'
+  autoload :ResourcesHelpers, 'espresso/resources_helpers'
+
+  # Make a list of locale files, provided by gem
   def self.locale_files
     Dir[File.join(File.dirname(__FILE__), 'espresso', 'locales', '*')]
   end
 end
 
-require 'espresso/objects_controller'
-require 'espresso/model'
+if defined?(ActiveRecord)
+  ActiveRecord::Base.send(:include, Espresso::Model)
+end
 
-if defined? Rails
-  ActiveRecord::Base.send :include, Espresso::Model if defined? ActiveRecord
-  ActionView::Base.send :include, Espresso::Helpers if defined? ActionView
-  I18n.load_path.unshift(*Espresso.locale_files)
+if defined?(ActionController)
+  ActionController::Base.send(:include, Espresso::ResourcesHelpers)
+  ActionController::Base.extend(Espresso::ActionController)
 end
+
+if defined?(ActionView)
+  ActionView::Base.send(:include, Espresso::ActionView)
+end
+
+require 'i18n'
+I18n.load_path.unshift(*Espresso.locale_files)
+
+require 'espresso/haml'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: espresso
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Alexander Semyonov
@@ -9,49 +14,77 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 +04:00
+date: 2010-03-25 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: searchlogic
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: searchlogic
+        segments: 
+        - 2
+        - 2
+        - 3
+        version: 2.2.3
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: inherited_resources
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.2.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: josevalim-inherited_resources
+        segments: 
+        - 0
+        - 8
+        - 5
+        version: 0.8.5
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: will_paginate
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.5
-    version: 
+        segments: 
+        - 2
+        - 3
+        - 11
+        version: 2.3.11
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mislav-will_paginate
+  name: formtastic
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 7
+        version: 0.9.7
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.11
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Useful templates for controller and model functions
 email: rotuka@tokak.ru
 executables: []
@@ -70,11 +103,19 @@ files:
 - espresso.gemspec
 - init.rb
 - lib/espresso.rb
-- lib/espresso/helpers.rb
+- lib/espresso/action_controller.rb
+- lib/espresso/action_view.rb
+- lib/espresso/action_view/form_builder.rb
+- lib/espresso/action_view/navigation.rb
+- lib/espresso/action_view/resources.rb
+- lib/espresso/action_view/scopes.rb
+- lib/espresso/action_view/stats.rb
+- lib/espresso/haml.rb
 - lib/espresso/locales/en.yml
 - lib/espresso/locales/ru.yml
 - lib/espresso/model.rb
-- lib/espresso/objects_controller.rb
+- lib/espresso/resources.rb
+- lib/espresso/resources_helpers.rb
 - test/espresso_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -90,18 +131,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Rails extender to simplify rails development

data/lib/espresso/helpers.rb

@@ -1,34 +0,0 @@
-module Espresso
-  module Helpers
-    include WillPaginate::ViewHelpers
-
-    def simple_search
-      returning '' do |form|
-        form << form_tag(url_for(:action => :index), :method => :get)
-        form << content_tag(:table, :class => 'b_search') do
-                  content_tag(:tr) do
-                    returning '' do |result|
-                      result << content_tag(:td,
-                                            content_tag(:div, text_field_tag(:q, params[:q], :type => 'search'), :class => 'b_input'),
-                                            :class => 'input')
-                      result << content_tag(:td,
-                                            submit_tag(t('krasivotokak.espresso.find', :default => 'Find!'), :class => 'submit'),
-                                            :class => 'button')
-                    end
-                  end
-                end
-        form << yield if block_given?
-        form << '</form>'
-      end
-    end
-
-    def will_paginate_with_i18n(collection, options = {})
-      will_paginate_without_i18n(collection,
-                                 options.merge({
-        :class => 'b_pagination',
-        :previous_label => t('krasivotokak.espresso.previous', :default => '← Previous'),
-        :next_label =>     t('krasivotokak.espresso.next', :default => 'Next →')}))
-    end
-    alias_method_chain :will_paginate, :i18n
-  end
-end

data/lib/espresso/objects_controller.rb

@@ -1,42 +0,0 @@
-require 'inherited_resources'
-
-module Espresso
-  class ObjectsController < InheritedResources::Base
-    unloadable
-
-    # Same as default InheritedResources::Base#new, but render 'edit' view,
-    # other than 'new'
-    def new
-      new! do |format|
-        format.html { render 'edit' }
-      end
-    end
-
-    # Same as default InheritedResources::Base#create, but render 'edit' view,
-    # other than 'new'
-    def create
-      create! do |success, failure|
-        failure.html { render 'edit' }
-      end
-    end
-
-  protected
-
-    # Find collection of objects with pagination.
-    # Also made Searchlogic object @search
-    #
-    # @return [WillPaginate::Collection] collection of objects
-    def collection
-      unless (result = get_collection_ivar).present?
-        @search, result = end_of_association_chain.search_results(params[:page], params[:query], params[:q])
-        set_collection_ivar(result)
-      end
-      result
-    end
-
-    # Build interpolation options for flash messages
-    def interpolation_options
-      { :resource_title => resource.to_s }
-    end
-  end
-end