padrino-contrib 0.0.6 → 0.1.0

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in padrino-contrib.gemspec
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Padrino
+Copyright (c) 2011 Padrino
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -21,8 +21,8 @@ In your Padrino project edit:
 
   # boot.rb
   require 'padrino-contrib/exception_notifier'
-  # require 'padrino-contrib/orm/ar/permalink'
-  # require 'padrino-contrib/orm/ar/textile'
+  # require 'padrino-contrib/orm/active_record/permalink'
+  # require 'padrino-contrib/orm/active_record/textile'
 
   Padrino.load! # Remember to add contribs before that line!
 

data/Rakefile

@@ -1,62 +1,27 @@
-require 'rubygems/specification' unless defined?(Gem::Specification)
-require 'rake' unless defined?(Rake)
+require 'rubygems' unless defined?(Gem)
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-# Runs the sh command with sudo if the rake command is run with sudo
-def sudo_sh(command)
-  command = `whoami`.strip! != "root" ? "sudo #{command}" : command
-  sh command
-end
-
-# Returns the gem specification object for a gem
-def gemspec
-  @gemspec ||= begin
-    ::Gem::Specification.load("padrino-contrib.gemspec")
+%w(install release).each do |task|
+  Rake::Task[task].enhance do
+    sh "rm -rf pkg"
   end
 end
 
-# Most notable functions are:
-#   $ rake package # packages the gem into the pkg folder
-#   $ rake install # installs the gem into system
-#   $ rake release # publishes gem to rubygems
-
-desc "Validates the gemspec"
-task :gemspec do
-  gemspec.validate
-end
-
-desc "Displays the current version"
-task :version do
-  puts "Current version: #{gemspec.version}"
+desc "Bump version on github"
+task :bump do
+  puts "\e[31mNothing to commit (working directory clean)\e[0m" and return unless `git status -s`.chomp!
+  version  = Bundler.load_gemspec(Dir[File.expand_path('../*.gemspec', __FILE__)].first).version
+  sh "git add .; git commit -a -m \"Bump to version #{version}\""
 end
 
-desc "Installs the gem locally"
-task :install => :package do
-  sudo_sh "gem install pkg/#{gemspec.name}-#{gemspec.version}"
-end
+task :release => :bump
 
-desc "Uninstalls the gem locally"
-task :uninstall do
-  sudo_sh "gem uninstall padrino-contrib -v #{gemspec.version}"
-end
-
-desc "Release the gem"
-task :release => :package do
-  sh "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
-  sh "rm -rf pkg"
-  sh "git add . && git commit -m 'Bump to version #{gemspec.version}' && git push"
-end
-
-# rake package
-begin
-  require 'rake/gempackagetask'
-rescue LoadError
-  task(:gem) { $stderr.puts '`gem install rake` to package gems' }
-else
-  Rake::GemPackageTask.new(gemspec) do |pkg|
-    pkg.gem_spec = gemspec
-  end
-  task :gem => :gemspec
+desc "Run complete application spec suite"
+RSpec::Core::RakeTask.new("spec") do |t|
+  t.skip_bundler = true
+  t.pattern = './spec/**/*_spec.rb'
+  t.rspec_opts = %w(-fs --color --fail-fast)
 end
 
-task :package => :gemspec
-task :default => :install
+task :default => :spec

data/lib/padrino-contrib.rb

@@ -0,0 +1,12 @@
+module Padrino
+  module Contrib
+    autoload :VERSION, 'padrino-contrib/version.rb'
+    autoload :AutoLocale, 'padrino-contrib/auto_locale.rb'
+    autoload :ExceptionNotifier, 'padrino-contrib/exception_notifier.rb'
+    autoload :FlashSession, 'padrino-contrib/flash_session'
+
+    module Helpers
+      autoload :AssetsCompressor, 'padrino-contrib/helpers/assets_compressor.rb'
+    end # Helpers
+  end # Contrib
+end # Padrino

data/lib/padrino-contrib/flash_session.rb

@@ -14,6 +14,11 @@ module Padrino
     #  use Padrino::Contrib::FlashSession, settings.session_id
     #
     class FlashSession
+
+      def self.registered(app)
+        app.use Padrino::Contrib::FlashSession, app.session_id
+      end
+
       def initialize(app, session_key = 'session_id')
         @app = app
         @session_key = session_key.to_s

data/lib/padrino-contrib/helpers/assets_compressor.rb

@@ -9,25 +9,31 @@ module Padrino
       # ==== Usage
       #
       #   # in your app.rb
-      #   use Padrino::Contrib::Helpers::AssetsCompressor
+      #   register Padrino::Contrib::Helpers::AssetsCompressor
       #
       #   # in yours layouts/views
-      #   =stylesheet_link_tag "grid", "base", "fancybox", "gallery", :cache => "bundle/lipsiasample"
-      #   =javascript_include_tag "jquery", "gallery", "fancybox", "base", :cache => "bundle/lipsiasample"
+      #   =stylesheet_link_tag "grid", "base", "fancybox", "gallery", :cache => "bundle/sample"
+      #   =javascript_include_tag "jquery", "gallery", "fancybox", "base", :cache => "bundle/sample"
       #   =stylesheet_link_tag "grid", "base", "fancybox", "gallery", :cache => true
       #   =javascript_include_tag "jquery", "gallery", "fancybox", "base", :cache => true
       #
       module AssetsCompressor
-        def self.registered(app)
+        def self.registered(app, options={})
           raise "You need to add in your Gemfile: gem 'yui-compressor', :require => 'yui/compressor'" unless defined?(YUI)
           app.helpers Padrino::Contrib::Helpers::AssetsCompressor::Helpers unless app.respond_to?(:compressor)
           app.set :compressor, {}
+
+          # Setup YUI Compressor
+          options.reverse_merge!(:line_break => 8000)
+          app.compressor[:css] = YUI::CssCompressor.new(options)
+          app.compressor[:js]  = YUI::JavaScriptCompressor.new(options)
         end
 
         module Helpers
           def self.included(base)
             base.alias_method_chain :javascript_include_tag, :compression
             base.alias_method_chain :stylesheet_link_tag, :compression
+            base.alias_method_chain :asset_path, :compression
           end
 
           def javascript_include_tag_with_compression(*sources)
@@ -38,22 +44,61 @@ module Padrino
             stylesheet_link_tag_without_compression(*assets_compressor(:css, sources))
           end
 
+          def cache_asset(file, options={}, &block)
+            began_at  = Time.now
+            kind      = File.extname(file).sub(/\./, '').to_sym
+            original  = Dir[File.join(settings.views, file).sub(/#{kind}$/, "*")][0]
+            mtime     = File.mtime(original).to_i
+            file      = file.sub(/#{kind}$/, "#{mtime}.#{kind}")
+            path      = Padrino.root("public", uri_root_path(file))
+
+            if !File.exist?(path)
+              source = block.call
+
+              if options[:compress]
+                source = settings.compressor[kind].compress(source)
+              end
+
+              Dir.mkdir(File.dirname(path)) unless File.exist?(File.dirname(path))
+              File.open(path, "w") { |f| f.write(source) }
+              logger.debug "Compressed (%0.2fms) %s" % [Time.now-began_at, path] if defined?(logger)
+            end
+
+            redirect file
+          end
+
           def assets_compressor(kind, sources)
             options = sources.extract_options!.symbolize_keys
             bundle  = options.delete(:cache)
             return sources if bundle.nil?
+
             began_at = Time.now
             asset_folder = case kind
               when :css then 'stylesheets'
               when :js  then 'javascripts'
               else raise "YUI Compressor didn't support yet #{kind} compression"
             end
-            bundle  = settings.app_name if bundle.is_a?(TrueClass)
+
+            bundle  = settings.app_name.downcase if bundle.is_a?(TrueClass)
+            path    = Padrino.root("public", uri_root_path(asset_folder, bundle.to_s))
+
+            # Detect changes
+            stamps = sources.inject(0) do |memo, source|
+              asset_path_without_compression(kind, source) =~ /\?(\d{10})$/
+              memo += $1.to_i
+              memo
+            end
+
+            bundle  = "#{bundle}.#{stamps}" if stamps > 0
             path    = Padrino.root("public", uri_root_path(asset_folder, bundle.to_s))
             path   += ".#{kind}" unless path =~ /\.#{kind}/
+
+            # Back if no changes happens
             return bundle if File.exist?(path)
-            sources.map! do |source|
-              source = asset_path(kind, source).sub(/\?.*/, '') # Removes Timestamp
+
+            # Get source code
+            code = sources.map do |source|
+              source = asset_path(kind, source).sub(/\?\d{10}$/, '') # Removes Timestamp
               source = source =~ /^http/ ? open(source) : File.read(Padrino.root("public", source))
               # Removes extra comments
               if cs = source =~ /\/\*\!/
@@ -62,15 +107,32 @@ module Padrino
                 cr = source.slice(cs, ce+2)
                 source.sub!(cr,'')
               end
-              source
+              source.each_line.reject { |l| l.strip == "" }.join
             end
-            settings.compressor[:css] ||= YUI::CssCompressor.new(:line_break => 8000)
-            settings.compressor[:js]  ||= YUI::JavaScriptCompressor.new(:line_break => 8000)
+
+            # Write the new bundled file
             Dir.mkdir(File.dirname(path)) unless File.exist?(File.dirname(path))
-            File.open(path, "w") { |f| f.write(settings.compressor[kind].compress(sources.join("\n"))) }
+            File.open(path, "w") { |f| f.write(settings.compressor[kind].compress(code.join("\n"))) }
             logger.debug "Compressed (%0.2fms) %s" % [Time.now-began_at, path] if defined?(logger)
+
+            # Return the updated bundle
             bundle
           end
+
+          def asset_path_with_compression(kind, source)
+            file = asset_path_without_compression(kind, source)
+            find_last_modified(file)
+          end
+
+          private
+            def find_last_modified(file)
+              file_was, file = file, file.sub(/\?\d+$/, '')
+              return file unless File.exist?(file)
+              path  = Padrino.root("public", uri_root_path(file))
+              path  = path.sub(/\.\d{10}\./, '').sub(/#{File.extname(file)}$/, '')
+              found = Dir[path+"*"].sort[-1]
+              found ? found.sub(/^.*public/, '') : file_was
+            end
         end # Helpers
       end # AssetsCompressor
     end # Helpers

data/lib/padrino-contrib/orm/{ar → active_record}/permalink.rb

@@ -1,7 +1,7 @@
 module Padrino
   module Contrib
     module Orm
-      module Ar
+      module ActiveRecord
         ##
         # This module extend ActiveRecord.
         #
@@ -42,4 +42,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-ActiveRecord::Base.extend(Padrino::Contrib::Orm::Ar::Permalink::ClassMethods)
+::ActiveRecord::Base.extend(Padrino::Contrib::Orm::ActiveRecord::Permalink::ClassMethods)

data/lib/padrino-contrib/orm/{ar → active_record}/permalink_i18n.rb

@@ -1,7 +1,7 @@
 module Padrino
   module Contrib
     module Orm
-      module Ar
+      module ActiveRecord
         ##
         # This module extend ActiveRecord.
         #
@@ -53,4 +53,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-ActiveRecord::Base.extend(Padrino::Contrib::Orm::Ar::PermalinkI18n::ClassMethods)
+::ActiveRecord::Base.extend(Padrino::Contrib::Orm::ActiveRecord::PermalinkI18n::ClassMethods)

data/lib/padrino-contrib/orm/{ar → active_record}/textile.rb

@@ -3,7 +3,7 @@ require 'RedCloth'
 module Padrino
   module Contrib
     module Orm
-      module Ar
+      module ActiveRecord
         ##
         # This module generate html from textile.
         #
@@ -50,4 +50,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-ActiveRecord::Base.extend(Padrino::Contrib::Orm::Ar::Textile::ClassMethods)
+::ActiveRecord::Base.extend(Padrino::Contrib::Orm::ActiveRecord::Textile::ClassMethods)

data/lib/padrino-contrib/orm/{ar → active_record}/translate.rb

@@ -1,7 +1,7 @@
 module Padrino
   module Contrib
     module Orm
-      module Ar
+      module ActiveRecord
         ##
         # This is an extension for ActiveRecord where if I had:
         #
@@ -40,4 +40,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-ActiveRecord::Base.extend(Padrino::Contrib::Orm::Ar::Translate::ClassMethods)
+::ActiveRecord::Base.extend(Padrino::Contrib::Orm::ActiveRecord::Translate::ClassMethods)

data/lib/padrino-contrib/orm/{mm → mongo_mapper}/permalink.rb

@@ -1,7 +1,7 @@
 module Padrino
   module Contrib
     module Orm
-      module Mm
+      module MongoMapper
         ##
         # This module extend ActiveRecord.
         #
@@ -48,4 +48,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-MongoMapper::Document.send(:include, Padrino::Contrib::Orm::Mm::Permalink)
+::MongoMapper::Document.send(:include, Padrino::Contrib::Orm::MongoMapper::Permalink)

data/lib/padrino-contrib/orm/{mm → mongo_mapper}/search.rb

@@ -1,7 +1,7 @@
 module Padrino
   module Contrib
     module Orm
-      module Mm
+      module MongoMapper
         ##
         # This module provides full text search in specified fileds with pagination support.
         #
@@ -37,4 +37,4 @@ module Padrino
     end # Orm
   end # Contrib
 end # Padrino
-MongoMapper::Document.send(:include, Padrino::Contrib::Orm::Mm::Search)
+::MongoMapper::Document.send(:include, Padrino::Contrib::Orm::MongoMapper::Search)

data/lib/padrino-contrib/version.rb

@@ -1,17 +1,5 @@
-##
-# Manages current Padrino Contrib version for use in gem generation.
-#
-# We put this in a separate file so you can get padrino version
-# without include full padrino contrib.
-#
 module Padrino
   module Contrib
-    VERSION = '0.0.6' unless defined?(Padrino::Contrib::VERSION)
-    ##
-    # Return the current Padrino version
-    #
-    def self.version
-      VERSION
-    end
-  end # Contrib
-end # Padrino
+    VERSION = "0.1.0"
+  end
+end

data/padrino-contrib.gemspec

@@ -1,18 +1,20 @@
-require File.expand_path("../lib/padrino-contrib/version.rb", __FILE__)
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "padrino-contrib/version"
 
 Gem::Specification.new do |s|
-  s.name = "padrino-contrib"
-  s.rubyforge_project = "padrino-contrib"
-  s.authors = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.email = "padrinorb@gmail.com"
-  s.summary = "Contributed plugins and utilities for Padrino Framework"
-  s.homepage = "http://www.padrinorb.com"
+  s.name        = "padrino-contrib"
+  s.version     = Padrino::Contrib::VERSION
+  s.authors     = ["Davide D'Agostino", "Nathan Esquenazi", "Arthur Chiu"]
+  s.email       = "padrinorb@gmail.com"
+  s.summary     = "Contributed plugins and utilities for Padrino Framework"
+  s.homepage    = "http://www.padrinorb.com"
   s.description = "Contributed plugins and utilities for the Padrino Ruby Web Framework"
-  s.required_rubygems_version = ">= 1.3.6"
-  s.version = Padrino::Contrib.version
-  s.date = Time.now.strftime("%Y-%m-%d")
-  s.extra_rdoc_files = Dir["*.rdoc"]
-  s.files = %w(LICENSE README.rdoc Rakefile padrino-contrib.gemspec) + Dir.glob("{bin,lib,test}/**/*")
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_path = "lib"
-end
+
+  s.rubyforge_project = "padrino-contrib"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/spec/autoload_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'Autoload' do
+
+  Dir[File.expand_path('./lib/**/*.rb')].each do |file|
+    next if file =~ /orm/ # orm extensions must be required by hand.
+    next if file =~ /padrino-contrib\.rb$/ # skip main file
+
+    klass = file.gsub(File.expand_path("./lib"), '').
+                 gsub(/^\//, '').
+                 gsub(/\.rb/, '').
+                 gsub(/(^.)/) { $1.upcase }.
+                 gsub(/\/|-/, "::").
+                 gsub(/_(.)/) { $1.upcase }.
+                 gsub(/::(.)/) { "::" + $1.upcase }.
+                 gsub(/version/i, 'VERSION') # this is a constant
+
+    it(klass) { eval("#{klass}").should be_true }
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,3 @@
+require 'rubygems' unless defined?(Gem)
+require 'rspec'    unless defined?(RSpec)
+require 'padrino-contrib'

metadata

@@ -1,24 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-contrib
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 6
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors: 
-- Padrino Team
-- Nathan Esquenazi
 - Davide D'Agostino
+- Nathan Esquenazi
 - Arthur Chiu
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +02:00
+date: 2011-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -28,31 +27,36 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- padrino-contrib.gemspec
+- lib/padrino-contrib.rb
 - lib/padrino-contrib/auto_locale.rb
 - lib/padrino-contrib/exception_notifier.rb
 - lib/padrino-contrib/flash_session.rb
 - lib/padrino-contrib/helpers/assets_compressor.rb
-- lib/padrino-contrib/orm/ar/permalink.rb
-- lib/padrino-contrib/orm/ar/permalink_i18n.rb
-- lib/padrino-contrib/orm/ar/textile.rb
-- lib/padrino-contrib/orm/ar/translate.rb
-- lib/padrino-contrib/orm/mm/permalink.rb
-- lib/padrino-contrib/orm/mm/search.rb
+- lib/padrino-contrib/orm/active_record/permalink.rb
+- lib/padrino-contrib/orm/active_record/permalink_i18n.rb
+- lib/padrino-contrib/orm/active_record/textile.rb
+- lib/padrino-contrib/orm/active_record/translate.rb
+- lib/padrino-contrib/orm/mongo_mapper/permalink.rb
+- lib/padrino-contrib/orm/mongo_mapper/search.rb
 - lib/padrino-contrib/version.rb
+- padrino-contrib.gemspec
+- spec/autoload_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://www.padrinorb.com
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -69,18 +73,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: padrino-contrib
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Contributed plugins and utilities for Padrino Framework
-test_files: []
-
+test_files: 
+- spec/autoload_spec.rb
+- spec/spec_helper.rb