expose_model 0.0.1 → 0.0.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.2 2009-02-05
+
+* Move some stuff around
+
 == 0.0.1 2009-02-05
 
 * 1 major enhancement:

data/lib/expose_model.rb

@@ -1,17 +1,6 @@
 $:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'action_controller'
-require 'action_view'
+  $:.include?(File.dirname(__FILE__)) ||
+    $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'expose_model/expose_model'
 require 'expose_model/action_view'
-
-# Stop sharing so much!
-ActionController::Base.class_eval { def add_instance_variables_to_assigns; end }
-# Stop caring so much!
-ActionView::Base.class_eval { def assign_variables_from_controller; end }
-
-module ExposeModel
-  VERSION = '0.0.1'
-end

data/lib/expose_model/action_view.rb

@@ -1,3 +1,5 @@
+require 'action_view'
+
 # raise a 404, not a 500 if we first access the exposed method in a view
 class ActionView::Template
   def render_template(view, local_assigns = {})
@@ -7,3 +9,5 @@ class ActionView::Template
     raise e
   end
 end
+
+ActionView::Base.class_eval { def assign_variables_from_controller; end }

data/lib/expose_model/expose_model.rb

@@ -1,5 +1,13 @@
-class ApplicationController < ActionController::Base
-  class << self
+require 'action_controller'
+
+module ExposeModel
+  VERSION = '0.0.2'
+
+  def self.included(base) #:nodoc:
+    base.extend(ClassMethods)
+  end
+
+  module ClassMethods
     def expose_model(model = nil)
       raise ArgumentError.new('expose_model requires a model name') if model.nil?
       model = model.to_s
@@ -27,4 +35,9 @@ class ApplicationController < ActionController::Base
       )
     end
   end
-end
+end
+
+ActionController::Base.class_eval {
+  def add_instance_variables_to_assigns; end
+  include ExposeModel
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: expose_model
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Michael Moen