imagine_cms 3.0.0.beta5 → 3.0.0.beta6

data/imagine_cms.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "rails",               "~> 3.2.5"
+  s.add_dependency "rails",               "~> 3.2.8"
   s.add_dependency "mini_magick",         "~> 3.4"
-  s.add_dependency "net-dns",             "~> 0.6.1"
+  s.add_dependency "net-dns",             "~> 0.7.1"
 end

data/lib/extensions/action_controller.rb

@@ -77,7 +77,10 @@ module ActionControllerExtensions
     # Determines whether the input string is a valid email address per RFC specification
     def valid_email_address?(addr, perform_mx_lookup = false)
       valid = true
-      valid = valid && addr.to_s =~ /\A([\w\d]+(?:[\w\d\!\#\$\%\&\*\+\-\/\=\?\^\`\{\|\}\~\.]*[\w\d]+)*)@((?:[\w\d]+\.)+[\w]{2,})\z/
+      
+      # simplified regex for speed... the original can basically lock up the system on longish addresses
+      # valid = valid && addr.to_s =~ /\A([\w\d]+(?:[\w\d\!\#\$\%\&\*\+\-\/\=\?\^\`\{\|\}\~\.]*[\w\d]+)*)@((?:[\w\d]+(?:[-]*[\w\d]+)*\.)+[\w]{2,})\z/
+      valid = valid && addr.to_s =~ /\A([\w\d\!\#\$\%\&\*\+\-\/\=\?\^\`\{\|\}\~\.]+)@((?:[\w\d]+(?:[-]*[\w\d]+)*\.)+[\w]{2,})\z/
       user, host = $1, $2
       
       # blacklist
@@ -106,7 +109,8 @@ module ActionControllerExtensions
     def template_exists?(template, extension = nil)
       # ignore extension
       logger.debug("DEPRECATION WARNING: template_exists? called")
-      lookup_context.find_all(template).any?
+      partial = File.join(File.dirname(template), '_' + File.basename(template))
+      lookup_context.find_all(template).any? || lookup_context.find_all(partial).any?
     end
     
     ### COMPAT - template_exists?

data/lib/imagine_cms/version.rb

@@ -1,3 +1,3 @@
 module ImagineCms
-  VERSION = "3.0.0.beta5"
+  VERSION = "3.0.0.beta6"
 end

metadata

@@ -1,81 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: imagine_cms
-version: !ruby/object:Gem::Version 
-  hash: 2653956547
+version: !ruby/object:Gem::Version
+  version: 3.0.0.beta6
   prerelease: 6
-  segments: 
-  - 3
-  - 0
-  - 0
-  - beta
-  - 5
-  version: 3.0.0.beta5
 platform: ruby
-authors: 
+authors:
 - Aaron Namba
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 2
-        - 5
-        version: 3.2.5
+      - !ruby/object:Gem::Version
+        version: 3.2.8
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mini_magick
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.8
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 4
-        version: "3.4"
+      - !ruby/object:Gem::Version
+        version: '3.4'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: net-dns
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: net-dns
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 description: Don't use this for now. See README for details.
-email: 
+email:
 - aaron@biggerbird.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -224,40 +214,29 @@ files:
 - vendor/gems/acts_as_versioned/test/versioned_test.rb
 homepage: https://github.com/anamba/imagine_cms
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: imagine_cms
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Imagine Content Management System for Rails
-test_files: 
+test_files:
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js