dozuki-mapper 0.1.1 → 0.1.2

data/lib/dozuki-mapper.rb

@@ -5,9 +5,6 @@ module Dozuki
     def self.included(base)
       base.extend(ClassMethods)
     end
-    def map_from(node)
-      self.class.mapper.call Proxy.new(self, node)
-    end
     module ClassMethods
       def map_with(&blk)
         @mapper = blk
@@ -17,7 +14,7 @@ module Dozuki
       end
       def from_node(node)
         new.tap do |instance|
-          instance.map_from(node)
+          mapper.call Proxy.new(instance, node)
         end
       end
     end

data/lib/dozuki-mapper/version.rb

@@ -1,5 +1,5 @@
 module Dozuki
   module Mapper
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/dozuki-mapper_spec.rb

@@ -7,16 +7,24 @@ module Dozuki
     before do
       klass.send(:include, Mapper)
     end
-    describe "mappings" do
-      let(:instance) { klass.new }
+    describe "from_node" do
+      let(:node) { mock :node }
+      let(:instance) { mock :klass }
       let(:proxy) { mock :proxy }
-      before { Mapper::Proxy.stub(:new).and_return(proxy) }
+      before do
+        Mapper::Proxy.stub(:new).and_return(proxy)
+        klass.stub(:new).and_return(instance)
+      end
       subject {
         klass.map_with do |arg|
           @called_with = arg
         end
-        instance.map_from(node)
+        klass.from_node(node)
       }
+      it "should create a new instance of the class" do
+        klass.should_receive(:new).and_return(instance)
+        subject
+      end
       it "should create a new proxy with the node and the mapper" do
         Mapper::Proxy.should_receive(:new).with(instance, node).and_return(proxy)
         subject
@@ -25,23 +33,6 @@ module Dozuki
         subject
         @called_with.should == proxy
       end
-    end
-    describe "from_node" do
-      let(:node) { mock :node }
-      let(:instance) { mock :klass }
-      before do
-        klass.stub(:new).and_return(instance)
-        instance.stub(:map_from)
-      end
-      subject { klass.from_node(node) }
-      it "should create a new instance of the class" do
-        klass.should_receive(:new).and_return(instance)
-        subject
-      end
-      it "should map the instance from the node" do
-        instance.should_receive(:map_from).with(node)
-        subject
-      end
       it "should return the instance of the class" do
         subject.should == instance
       end

metadata

@@ -2,7 +2,7 @@
 name: dozuki-mapper
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - James Almond
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 +01:00
+date: 2011-06-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency