too_short 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/controller_methods.rb

@@ -1,5 +1,5 @@
 module TooShort
-  
+
   # To be included in the controller that should handle short URLs, i.e
   # class ShortUrlsController < ApplicationController
   #   include TooShort::ControllerMethods
@@ -17,31 +17,34 @@ module TooShort
         respond_to_valid_short_url
       else
         respond_to_invalid_short_url
-      end    
+      end
     end
-    
+
     def respond_to_valid_short_url
       redirect_to @object_from_short_url
     end
-  
+
     def respond_to_invalid_short_url
       respond_to do |wants|
         error_hash = {:error => 'Invalid short url'}
         wants.html  { render :text  => error_hash[:error]}
         wants.xml   { render :xml   => error_hash}
-        wants.json  { render :json  => error_hash}        
+        wants.json  { render :json  => error_hash}
       end
     end
-    
+
     private
-    
+
     def require_all_model_classes
       # Rails only loads classes when they are used
       # To populate our registry we require each file in app/models
-      Dir.entries(Rails.root.to_s + '/app/models/').select{|f| f =~ /^\w/}.each do |f| 
-        f.sub('.rb', '').classify.constantize
-      end if defined?(Rails)
+      if defined?(Rails)
+        files = Dir.glob(Rails.root.to_s + '/app/models/**/*.rb').map { |path| File.basename(path) }
+        files.select{|f| f =~ /^\w/}.each do |f|
+          f.sub('.rb', '').camelize.constantize
+        end 
+      end
     end
-    
+
   end
 end

data/spec/spec_helper.rb

@@ -2,8 +2,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'too_short'
-require 'spec/test_directories/app/models/post'
-require 'spec/test_directories/app/models/post_comment'
+require 'test_directories/app/models/post.rb'
+require 'test_directories/app/models/post_comment.rb'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

data/spec/test_directories/app/models/crazy_rubinius_file.rbc

@@ -0,0 +1,2 @@
+class CrazyRubiniusClass
+end

data/too_short.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{too_short}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Simon Baumgartner"]
-  s.date = %q{2011-02-08}
+  s.date = %q{2011-05-13}
   s.description = %q{TooShort allows you to create persistent short URLs for your resources, without any additional storage.}
   s.email = %q{makesens3@gmail.com}
   s.extra_rdoc_files = [
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "spec/ar_base_extensions_spec.rb",
     "spec/controller_methods_spec.rb",
     "spec/spec_helper.rb",
+    "spec/test_directories/app/models/crazy_rubinius_file.rbc",
     "spec/test_directories/app/models/post.rb",
     "spec/test_directories/app/models/post_comment.rb",
     "spec/too_short_spec.rb",
@@ -38,7 +39,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/sens3/too_short}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{A URL shortener for your resources}
   s.test_files = [
     "spec/ar_base_extensions_spec.rb",
@@ -50,7 +51,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: too_short
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors: 
 - Simon Baumgartner
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +01:00
+date: 2011-05-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,10 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   prerelease: false
@@ -39,10 +31,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   prerelease: false
@@ -54,10 +42,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
         version: 2.3.0
   type: :development
   prerelease: false
@@ -69,10 +53,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   prerelease: false
@@ -84,10 +64,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 2
         version: 1.5.2
   type: :development
   prerelease: false
@@ -99,8 +75,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   prerelease: false
@@ -128,6 +102,7 @@ files:
 - spec/ar_base_extensions_spec.rb
 - spec/controller_methods_spec.rb
 - spec/spec_helper.rb
+- spec/test_directories/app/models/crazy_rubinius_file.rbc
 - spec/test_directories/app/models/post.rb
 - spec/test_directories/app/models/post_comment.rb
 - spec/too_short_spec.rb
@@ -146,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1621248842171919276
+      hash: -4602073981085127268
       segments: 
       - 0
       version: "0"
@@ -155,13 +130,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A URL shortener for your resources