add EnjuUser

Conflicts:
	spec/dummy/app/models/user.rb

app/models/concerns/enju_purchase_request/enju_user.rb

@@ -0,0 +1,10 @@
+module EnjuPurchaseRequest
+  module EnjuUser
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :purchase_requests
+      has_many :order_lists
+    end
+  end
+end

lib/enju_purchase_request.rb

@@ -1,6 +1,5 @@
 require "enju_purchase_request/engine"
 require "enju_purchase_request/bookmark_url"
-require "enju_purchase_request/user"
 
 module EnjuPurchaseRequest
   def self.included(base)
@@ -27,4 +26,3 @@ def get_purchase_request
 end
 
 ActionController::Base.send(:include, EnjuPurchaseRequest)
-ActiveRecord::Base.send :include, EnjuPurchaseRequest::PurchaseRequestUser

spec/dummy/app/models/user.rb

@@ -1,9 +1,8 @@
-# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
   enju_leaf_user_model
-  enju_purchase_request_user_model
+  include EnjuPurchaseRequest::EnjuUser
 end