enju_resource_merge 0.0.9 → 0.0.10

data/lib/enju_resource_merge.rb

@@ -2,4 +2,27 @@ require "enju_resource_merge/engine"
 require "will_paginate/array"
 
 module EnjuResourceMerge
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+  module ClassMethods
+    def enju_resource_merge
+      include EnjuResourceMerge::InstanceMethods
+    end
+  end
+
+  module InstanceMethods
+    private
+
+    def get_patron_merge_list
+      @patron_merge_list = PatronMergeList.find(params[:patron_merge_list_id]) if params[:patron_merge_list_id]
+    end
+
+    def get_series_statement_merge_list
+      @series_statement_merge_list = SeriesStatementMergeList.find(params[:series_statement_merge_list_id]) if params[:series_statement_merge_list_id]
+    end
+  end
 end
+
+ActionController::Base.send(:include, EnjuResourceMerge)

data/lib/enju_resource_merge/version.rb

@@ -1,3 +1,3 @@
 module EnjuResourceMerge
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -5,6 +5,8 @@ class ApplicationController < ActionController::Base
   rescue_from ActiveRecord::RecordNotFound, :with => :render_404
 
   before_filter :set_locale
+
+  enju_resource_merge
   
   private
   def render_403
@@ -65,14 +67,6 @@ class ApplicationController < ActionController::Base
     @patron = Patron.find(params[:patron_id]) if params[:patron_id]
     authorize! :show, @patron if @patron
   end
-
-  def get_patron_merge_list
-    @patron_merge_list = PatronMergeList.find(params[:patron_merge_list_id]) if params[:patron_merge_list_id]
-  end
-
-  def get_series_statement_merge_list
-    @series_statement_merge_list = SeriesStatementMergeList.find(params[:series_statement_merge_list_id]) if params[:series_statement_merge_list_id]
-  end
 end
 
 class InvalidLocaleError < StandardError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_resource_merge
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails