From 6eee32f34d14f01cbfa6c38f0ace1dae9d9f553e Mon Sep 17 00:00:00 2001 From: Keisuke KITA Date: Sun, 25 Aug 2013 14:56:48 +0900 Subject: [PATCH] Supports Rails4 --- fancybox2-rails.gemspec | 6 +++--- lib/fancybox2-rails.rb | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fancybox2-rails.gemspec b/fancybox2-rails.gemspec index 8ec93e1..fb20bce 100644 --- a/fancybox2-rails.gemspec +++ b/fancybox2-rails.gemspec @@ -7,13 +7,13 @@ Gem::Specification.new do |s| s.email = ["mattias@kyparn.se"] s.homepage = "https://github.com/kyparn/fancybox2-rails" - s.summary = "Use FancyBox 2 with Rails 3.1" - s.description = "This gem provides jQuery FancyBox 2 for your Rails 3.1 application. This gem is based on the gem for Fancybox 1.x by Chris Mytton" + s.summary = "Use FancyBox 2 with Rails 3.1/4.0" + s.description = "This gem provides jQuery FancyBox 2 for your Rails 3.1/4.0 application. This gem is based on the gem for Fancybox 1.x by Chris Mytton" s.files = Dir["{lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile", "Gemfile", "README.md"] s.version = Fancybox2::Rails::VERSION s.add_dependency "railties", ">= 3.1.0" - s.add_development_dependency "rails", "~> 3.1" + s.add_development_dependency "rails", ">= 3.1" s.add_development_dependency "jquery-rails" s.add_development_dependency 'coffee-rails' s.add_development_dependency "sqlite3" diff --git a/lib/fancybox2-rails.rb b/lib/fancybox2-rails.rb index 5d4c6e8..fa592df 100644 --- a/lib/fancybox2-rails.rb +++ b/lib/fancybox2-rails.rb @@ -1,3 +1,3 @@ -if defined? Rails && Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1 +if defined? Rails && Rails.application.config.try(:assets).try(:compile) require 'fancybox2/rails' end