liaison 0.0.3 → 0.0.4

data/ChangeLog

@@ -1,3 +1,13 @@
+2011-11-07  Mike Burns  <mburns@thoughtbot.com>
+
+	* presenter.rb, presenter_spec.rb: Define the model_name per-instance
+	instead of per-class. Suggestion by Peter Suschlik.
+
+2011-11-07  Peter Suschlik
+
+	* presenter.rb, presenter_spec.rb: Define the field accessors per-instance
+	instead of per-class.
+
 2011-10-20  Mike Burns  <mburns@thoughtbot.com>
 
 	* presenter.rb, presenter_spec.rc: Don't name the struct so that we can

data/NEWS

@@ -1,3 +1,8 @@
+New in 0.0.4:
+
+* Field accessors and model_name now work per-instance instead of per-class, so
+  you can have more than one presenter in your system without it causing issues.
+
 New in 0.0.3:
 
 * Take care of a warning based on using a struct for the model_name.

data/lib/liaison/presenter.rb

@@ -17,19 +17,28 @@ class Presenter
   #                 :fields => [:account_name, :email, :password],
   #                 :validator => SignUpValidator)
   def initialize(model_name, opts = {})
-    @@model_name = model_name
+    @model_name = model_name
 
     @validator = opts[:validator]
     @fields   = opts[:fields]
 
-    self.class.send(:attr_accessor,*@fields) unless @fields.nil? || @fields.empty?
+    if @fields && !@fields.empty?
+      (class << self; self; end).send(:attr_accessor, *@fields)
+    end
   end
 
   # This only exists for ActiveModel::Naming
-  def self.model_name # :nodoc:
-    model_namer = Struct.new(:name).new(@@model_name)
-    ActiveModel::Name.new(model_namer)
+  def class_with_model_name # :nodoc:
+    self.class_without_model_name.tap do |c|
+      c.instance_variable_set('@_model_name', @model_name)
+      (class << c; self; end).send(:define_method,:model_name) do
+        model_namer = Struct.new(:name).new(self.instance_variable_get('@_model_name'))
+        ActiveModel::Name.new(model_namer)
+      end
+    end
   end
+  alias class_without_model_name class
+  alias class class_with_model_name
 
   # This only exists for ActiveModel::Constructs
   def persisted? # :nodoc:

data/lib/liaison/version.rb

@@ -1,3 +1,3 @@
 module Liaison
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/presenter_spec.rb

@@ -20,6 +20,22 @@ describe Presenter do
     Presenter.new("another_model_name").class.model_name
     # The result is that this should have no warning in the test output
   end
+
+  it "sets attributes accessor per instance" do
+    foo = Presenter.new("foo", :fields => [:foo])
+    bar = Presenter.new("bar", :fields => [:bar])
+    foo.should respond_to(:foo)
+    bar.should respond_to(:bar)
+    foo.should_not respond_to(:bar)
+    bar.should_not respond_to(:foo)
+  end
+
+  it "sets model name per instance" do
+    foo = Presenter.new("foo")
+    bar = Presenter.new("bar")
+    foo.class.model_name.should == "foo"
+    bar.class.model_name.should == "bar"
+  end
 end
 
 describe Presenter, 'validations' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: liaison
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mike Burns
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 Z
+date: 2011-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Rails presenter class.