Merge pull request #2 from Adman65/master

Remove Rails Dependency

Rakefile

@@ -9,3 +9,5 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
+
+task :default => :test

active_model_serializers.gemspec

@@ -13,5 +13,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = "0.0.1"
 
-  gem.add_dependency "rails", "~> 3.0"
+  gem.add_dependency 'activemodel', '~> 3.0'
+
+  gem.add_development_dependency "rails", "~> 3.0"
 end

lib/active_model_serializers.rb

@@ -23,12 +23,13 @@ ActiveModel::Serialization.class_eval do
   end
 end
 
-require "action_controller"
-
-module ActionController
-  autoload :Serialization, "action_controller/serialization"
-end
+begin
+  require 'action_controller'
+  require 'action_controller/serialization'
 
   ActiveSupport.on_load(:action_controller) do
     include ::ActionController::Serialization
   end
+rescue LoadError => ex
+  # rails on installed, continuing
+end

test/generators_test.rb

@@ -1,4 +1,4 @@
-require 'rails'
+require 'test_helper'
 
 class Foo < Rails::Application
 end

test/test_helper.rb

@@ -7,6 +7,8 @@ require "active_model_serializers"
 require "active_support/json"
 require "test/unit"
 
+require 'rails'
+
 module TestHelper
   Routes = ActionDispatch::Routing::RouteSet.new
   Routes.draw do