espresso 0.1.12 → 0.2.1

data/.gitignore

@@ -1,4 +1,6 @@
-pkg
 *.gem
-doc
 .yardoc
+coverage
+doc
+pkg
+vendor/gems

data/README.rdoc

@@ -1,9 +1,23 @@
-= espresso
+= Espresso
 
-Description goes here.
+Some useful extensions to default Rails environment.
+
+Can be more extended if using with InheritedResources, WillPaginate, Searchlogic and Formtastic.
+
+== Espresso::Model
+
+Enhances ActiveRecord::Base classes with #name_field and #make_slug methods.
+
+== Espresso::View
+
+Enhances ActionView with some useful helpers
+
+== Espresso::Controller
+
+Uses InheritedResources, WillPaginate and Searchlogic to provide enhanced RESTful resources controllers.
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -15,4 +29,4 @@ Description goes here.
 
 == Copyright
 
-Copyright (c) 2009 Alexander Semyonov. See LICENSE for details.
+© 2009 Alexander Semyonov. See LICENSE for details.

data/Rakefile

@@ -10,11 +10,12 @@ begin
     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('inherited_resources', '>= 0.8.5')
-    gem.add_dependency('will_paginate', '>= 2.3.11')
-    gem.add_dependency('formtastic', '>= 0.9.7')
+    gem.add_dependency('activesupport', '~> 2.3.5')
+    gem.add_dependency('activerecord', '~> 2.3.5')
+    gem.add_dependency('actionpack', '~> 2.3.5')
+    gem.add_dependency('inherited_resources', '~> 1.0.5')
     gem.add_development_dependency('shoulda')
+    gem.add_development_dependency('redgreen')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -32,13 +33,36 @@ end
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
-    test.libs << 'test'
+    test.libs << 'lib' << 'test'
     test.pattern = 'test/**/*_test.rb'
     test.verbose = true
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install rcov"
+  end
+end
+
+begin
+  require 'reek/rake/task'
+  Reek::Rake::Task.new do |test|
+    test.ruby_opts << '-rubygems'
+  end
+rescue LoadError
+  task :reek do
+    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
+  end
+end
+
+begin
+  require 'roodi'
+  require 'roodi_task'
+  RoodiTask.new do |t|
+    t.patterns << 'lib/*.rb' << 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :roodi do
+    abort "Roodi is not available. In order to run reek, you must: sudo gem install roodi"
   end
 end
 
@@ -48,7 +72,9 @@ task :default => :test
 
 begin
   require 'yard'
-  YARD::Rake::YardocTask.new
+  YARD::Rake::YardocTask.new do |yard|
+    yard.options << '--no-private'
+  end
 rescue LoadError
   task :yardoc do
     abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.2.1

data/espresso.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{espresso}
-  s.version = "0.1.12"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alexander Semyonov"]
-  s.date = %q{2010-03-25}
+  s.date = %q{2010-03-29}
   s.description = %q{Useful templates for controller and model functions}
   s.email = %q{rotuka@tokak.ru}
   s.extra_rdoc_files = [
@@ -25,20 +25,40 @@ Gem::Specification.new do |s|
      "espresso.gemspec",
      "init.rb",
      "lib/espresso.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/collection.rb",
+     "lib/espresso/collection/searchlogic.rb",
+     "lib/espresso/collection/will_paginate.rb",
+     "lib/espresso/concern.rb",
+     "lib/espresso/controller.rb",
+     "lib/espresso/controller/inherited_resources.rb",
+     "lib/espresso/deprecated.rb",
+     "lib/espresso/deprecated/resources.rb",
+     "lib/espresso/extensions/action_controller.rb",
+     "lib/espresso/extensions/action_view.rb",
+     "lib/espresso/extensions/active_record.rb",
+     "lib/espresso/extensions/all.rb",
+     "lib/espresso/extensions/haml.rb",
+     "lib/espresso/extensions/has_scope.rb",
+     "lib/espresso/extensions/inherited_resources.rb",
+     "lib/espresso/extensions/searchlogic.rb",
+     "lib/espresso/extensions/will_paginate.rb",
      "lib/espresso/model.rb",
-     "lib/espresso/resources.rb",
-     "lib/espresso/resources_helpers.rb",
+     "lib/espresso/model/inherited_resources.rb",
+     "lib/espresso/view.rb",
+     "lib/espresso/view/form_builder.rb",
+     "lib/espresso/view/has_scope.rb",
+     "lib/espresso/view/inherited_resources.rb",
+     "lib/espresso/view/searchlogic.rb",
+     "lib/espresso/view/will_paginate.rb",
+     "test/espresso_collection_test.rb",
+     "test/espresso_controller_test.rb",
+     "test/espresso_extensions_haml_test.rb",
+     "test/espresso_model_test.rb",
      "test/espresso_test.rb",
+     "test/espresso_view_has_scope_test.rb",
+     "test/espresso_view_test.rb",
+     "test/espresso_view_will_paginate_test.rb",
+     "test/example_model.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/krasivotokak/espresso}
@@ -47,8 +67,16 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Rails extender to simplify rails development}
   s.test_files = [
-    "test/espresso_test.rb",
-     "test/test_helper.rb"
+    "test/espresso_extensions_haml_test.rb",
+     "test/example_model.rb",
+     "test/espresso_collection_test.rb",
+     "test/espresso_model_test.rb",
+     "test/espresso_view_test.rb",
+     "test/espresso_test.rb",
+     "test/test_helper.rb",
+     "test/espresso_controller_test.rb",
+     "test/espresso_view_has_scope_test.rb",
+     "test/espresso_view_will_paginate_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -56,24 +84,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<searchlogic>, [">= 2.2.3"])
-      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_runtime_dependency(%q<activesupport>, ["~> 2.3.5"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.5"])
+      s.add_runtime_dependency(%q<actionpack>, ["~> 2.3.5"])
+      s.add_runtime_dependency(%q<inherited_resources>, ["~> 1.0.5"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<redgreen>, [">= 0"])
     else
-      s.add_dependency(%q<searchlogic>, [">= 2.2.3"])
-      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<activesupport>, ["~> 2.3.5"])
+      s.add_dependency(%q<activerecord>, ["~> 2.3.5"])
+      s.add_dependency(%q<actionpack>, ["~> 2.3.5"])
+      s.add_dependency(%q<inherited_resources>, ["~> 1.0.5"])
       s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<redgreen>, [">= 0"])
     end
   else
-    s.add_dependency(%q<searchlogic>, [">= 2.2.3"])
-    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<activesupport>, ["~> 2.3.5"])
+    s.add_dependency(%q<activerecord>, ["~> 2.3.5"])
+    s.add_dependency(%q<actionpack>, ["~> 2.3.5"])
+    s.add_dependency(%q<inherited_resources>, ["~> 1.0.5"])
     s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<redgreen>, [">= 0"])
   end
 end
 

data/lib/espresso.rb

@@ -1,32 +1,49 @@
-module Espresso
-  MODEL_PREFIX = 'b'
+$KCODE = 'u'
+require 'active_support/core_ext/module'
 
+module Espresso
   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', '*')]
+  autoload :View, 'espresso/view'
+  autoload :Controller, 'espresso/controller'
+  autoload :Collection, 'espresso/collection'
+  autoload :Concern, 'espresso/concern'
+
+  BASE_MODULES = %w(model view controller)
+
+  mattr_accessor :extensions
+  self.extensions = []
+
+  # Configures Espresso.
+  # By default, loads all extensions
+  def self.configure
+    if block_given?
+      yield
+    else
+      uses :all
+    end
+  end
+
+  # Loads Espresso extensions
+  # @param [String, Symbol] extension name of the Espresso extension
+  def self.uses(extension)
+    require("espresso/extensions/#{extension}")
   end
 end
 
 if defined?(ActiveRecord)
-  ActiveRecord::Base.send(:include, Espresso::Model)
+  Espresso.uses :active_record
 end
 
-if defined?(ActionController)
-  ActionController::Base.send(:include, Espresso::ResourcesHelpers)
-  ActionController::Base.extend(Espresso::ActionController)
+if defined?(ActionView)
+  Espresso.uses :action_view
 end
 
-if defined?(ActionView)
-  ActionView::Base.send(:include, Espresso::ActionView)
+if defined?(ActionController)
+  Espresso.uses :action_controller
 end
 
-require 'i18n'
-I18n.load_path.unshift(*Espresso.locale_files)
+if defined?(Haml)
+  Espresso.uses :haml
+end
 
-require 'espresso/haml'
+require 'espresso/deprecated'

data/lib/espresso/collection.rb

@@ -0,0 +1,44 @@
+require 'active_support/core_ext/class'
+
+module Espresso
+  self.extensions << :collection
+  # Represents collection of resources.
+  # Used in Espresso::Controller InheritedResources extension
+  class Collection < Array
+    cattr_accessor :per_page
+    self.per_page = 30
+
+    attr_accessor :base, :options, :collection, :search
+    protected :base, :options, :collection
+
+    # Initiates a collection of resources
+    # @param [AtiveRecord::Base] base Base class having {Espresso::Model} included
+    # @param [Hash] options options for building the collection
+    # @option options [Number] :page current page number
+    # @option options [Number] :per_page per-page limit
+    # @option options [Hash] :search conditions for searching
+    def initialize(base, options = {})
+      @base, @options = base, options
+      replace(collection)
+    end
+
+  protected
+    # All resources in {#base}
+    def collection
+      @collection ||= base.all(@options)
+    end
+
+    # Proxy to {#collection} methods
+    def method_missing(method_name, *args)
+      collection.send(method_name, *args)
+    end
+  end
+end
+
+if defined? Searchlogic
+  require 'espresso/collection/searchlogic'
+end
+
+if defined? WillPaginate
+  require 'espresso/collection/will_paginate'
+end

data/lib/espresso/collection/searchlogic.rb

@@ -0,0 +1,17 @@
+require 'espresso/collection'
+require 'searchlogic'
+
+module Espresso
+  class Collection
+    # Use ActiveRecord::Base#searchlogic method to generate
+    # base for finding the collection
+    # @return [ActiveRecord::Base] ActiveRecord model scoped with searchlogic
+    def base
+      unless @search
+        search_options = options.delete(:search) { {} }
+        @search = @base.searchlogic(search_options)
+      end
+      @search
+    end
+  end
+end

data/lib/espresso/collection/will_paginate.rb

@@ -0,0 +1,19 @@
+require 'espresso/collection'
+require 'will_paginate/collection'
+
+module Espresso
+  class Collection
+    # Finds collection by ActiveRecord::Base.paginate method
+    # and options provided in {Espresso::Collection#initialize} method
+    # @return [WillPaginate::Collection] single page of resources
+    def collection
+      unless @collection
+        page     = options.delete(:page) { 1 }
+        per_page = options.delete(:per_page) { Espresso::Collection.per_page }
+        @collection ||= base.paginate(:page => page,
+                                      :per_page => per_page)
+      end
+      @collection
+    end
+  end
+end

data/lib/espresso/concern.rb

@@ -0,0 +1,37 @@
+require 'espresso'
+
+module Espresso
+  # Code extracted from ActiveSupport 3.0.0beta
+  module Concern
+    def self.extended(base)
+      base.instance_variable_set('@_dependencies', [])
+    end
+
+    def append_features(base)
+      if base.instance_variable_defined?('@_dependencies')
+        base.instance_variable_get('@_dependencies') << self
+        return false
+      else
+        return false if base < self
+        @_dependencies.each { |dep| base.send(:include, dep) }
+        super
+        base.extend const_get('ClassMethods') if const_defined?('ClassMethods')
+        base.send :include, const_get('InstanceMethods') if const_defined?('InstanceMethods')
+        if instance_variable_defined?('@_included_blocks')
+          @_included_blocks.each do |included_block|
+            base.class_eval(&included_block)
+          end
+        end
+      end
+    end
+
+    def included(base = nil, &block)
+      if base.nil?
+        @_included_blocks ||= []
+        @_included_blocks << block
+      else
+        super
+      end
+    end
+  end
+end

data/lib/espresso/controller.rb

@@ -0,0 +1,17 @@
+require 'espresso'
+
+module Espresso
+  module Controller
+    extend Espresso::Concern
+
+    module ClassMethods
+    end
+
+    module InstanceMethods
+    end
+  end
+end
+
+if defined?(InheritedResources)
+  require 'espresso/controller/inherited_resources'
+end