carter 0.6.0 → 0.6.1

data/lib/carter.rb

@@ -6,4 +6,4 @@ require 'carter/controller_resource'
 require 'carter/state_machine'
 require 'carter/errors'
 require 'carter/active_record/extensions'
-require 'rails/init'
+require 'carter/rails/init'

data/lib/carter/rails/init.rb

@@ -0,0 +1,10 @@
+if defined?(Rails)
+  ActiveRecord::Base.extend Carter::ActiveRecord::Cartable if defined?(ActiveRecord)
+  if Rails::VERSION::MAJOR == 3
+    require 'carter/engine'
+  else
+    require 'carter/routing'
+    ActionController::Routing::RouteSet::Mapper.send :include, Carter::Routing::MapperExtensions 
+  end 
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: carter
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Louis Gillies
@@ -160,7 +160,6 @@ files:
 - generators/carter_generator.rb
 - generators/carter_install_generator.rb
 - generators/templates/migration.rb
-- init.rb
 - lib/carter.rb
 - lib/carter/active_record/extensions.rb
 - lib/carter/cart.rb
@@ -172,10 +171,10 @@ files:
 - lib/carter/errors/multiple_cart_items_not_allowed.rb
 - lib/carter/errors/setup_error.rb
 - lib/carter/initializer.rb
+- lib/carter/rails/init.rb
 - lib/carter/routing.rb
 - lib/carter/state_machine.rb
 - lib/tasks/carter.rake
-- rails/init.rb
 - LICENSE.txt
 - README.md
 - spec/active_record/cart_item_spec.rb

data/init.rb

@@ -1 +0,0 @@
-require 'rails/init.rb'

data/rails/init.rb

@@ -1,7 +0,0 @@
-if defined?(Rails)
-  require 'carter/engine' if Rails::VERSION::MAJOR == 3
-  ActiveRecord::Base.extend Carter::ActiveRecord::Cartable if defined?(ActiveRecord)
-  require 'carter/routing'
-  ActionController::Routing::RouteSet::Mapper.send :include, Carter::Routing::MapperExtensions
-end
-