mappy 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f61f54bcd4b19eae357e8b121765aae2437f0db6
-  data.tar.gz: 690d5a86cae5781ff21024436a42037093918776
+  metadata.gz: 81a2df0e93a30d9dc7301a2dc43b437e71288edc
+  data.tar.gz: 68ae080d16ea598b40dc21cb77f9d35b7990ca92
 SHA512:
-  metadata.gz: 6a366fa8161a24d3eec2da41bf226ad55bd83b47b1e32fc2295a18aef024121b110f4c38156711ee9ea4c5c0e42c8ff61b9652280e0c6c7e055b8aa7c071c9f2
-  data.tar.gz: dd9e93aa43fcc49d43d9be06c831783b912537bf63d0c3a1fc321028ef9f6f55c337c4f795f92a4641dbbc74f97654a72ccfcc2bf09b539955d9fc993d2e3f43
+  metadata.gz: 09b819564c909b535c0358f18ecfc25493c10b913f79c1cfc9d6421a98fe8f67841bee0de5f19fe677cc1bb5ed73988d16a4dd96461959207413b7b40d74287a
+  data.tar.gz: 05dcd31687345b91f2963781ae8f79a257689bbb7289868fd31d316debb49284860958132eb0c47481ed569ece7e8f6b1bda9d701752632c28084b1bf9c81d7d

data/lib/mappy.rb

@@ -25,14 +25,14 @@ module Mappy
     # The Rails load sequence means that some of the configured Targets may
     # not be loaded; As such I am not calling configure! instead relying on
     # Mappy::Railtie to handle the configure! call
-    configure! unless defined?(Rails)
+    finalize! unless defined?(Rails)
   end
 
   def map(source, options = {})
     configuration.map(source, options)
   end
 
-  def configure!
+  def finalize!
     if @configuration_block.respond_to?(:call)
       self.configuration ||= Configuration.new
       @configuration_block.call(configuration)

data/lib/mappy/configuration.rb

@@ -19,15 +19,17 @@ module Mappy
     end
 
     def map(source_instance, options = {})
-      source = source_instance.to_mappy_type
       target = options.fetch(:target)
       target_builder_finder = options.fetch(:target_builder_finder) { Mappy::TargetBuilderFactory }
-      legend = map_store.fetch(target).fetch(source)
 
+      source = source_instance.to_mappy_type
+      legend = map_store.fetch(target).fetch(source)
       target_builder = target_builder_finder.call(target)
 
-      # @Todo: The returned value should not be an OpenStruct, but should
-      # be an instance of the target (as per some Mappy resolver).
+      resolve(source_instance, target_builder, legend)
+    end
+    protected
+    def resolve(source_instance, target_builder, legend)
       Resolver.new(
         target_builder: target_builder,
         legend: legend

data/lib/mappy/resolver.rb

@@ -9,15 +9,23 @@ module Mappy
     end
 
     def call(source)
-      attributes = {}
-      legend.each_with_object(attributes) do |(source_method, target_attribute), m|
+      return source if source.is_a?(target_builder)
+      attributes = extract_target_attributes_from(source)
+      instantiate_target(attributes)
+    end
+
+    protected
+
+    def extract_target_attributes_from(source)
+      legend.each_with_object({}) do |(source_method, target_attribute), m|
         m[target_attribute] = extract_attribute_for(source, source_method)
         m
       end
-      target_builder.new(attributes)
     end
 
-    protected
+    def instantiate_target(attributes)
+      target_builder.new(attributes)
+    end
 
     def extract_attribute_for(source, method_name_or_proc)
       if method_name_or_proc.respond_to?(:call)

data/lib/mappy/version.rb

@@ -1,3 +1,3 @@
 module Mappy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/mappy/resolver_spec.rb

@@ -3,8 +3,6 @@ require 'ostruct'
 
 module Mappy
   describe Resolver do
-    let(:source_publisher) { lambda {|source| source.publishers.join("; ")}}
-    let(:source) { double('Source', title: 'A Title', publishers: ["John", "Ringo"]) }
     let(:target_builder) { OpenStruct }
     let(:legend) {
       [
@@ -12,13 +10,31 @@ module Mappy
         [source_publisher, :publisher]
       ]
     }
+    let(:source_publisher) { lambda {|source| source.publishers.join("; ")}}
+    subject { described_class.new(target_builder: target_builder, legend: legend).call(source) }
 
     context '#call' do
-      let(:resolved_publisher) { source_publisher.call(source) }
-      subject { described_class.new(target_builder: target_builder, legend: legend).call(source) }
+      context 'source is not an instance of the target builder' do
+        let(:source) { double('Source', title: 'A Title', publishers: ["John", "Ringo"]) }
+        let(:resolved_publisher) { source_publisher.call(source) }
+
+        it 'should return an instance of the target_builder' do
+          expect(subject).to be_an_instance_of(target_builder)
+        end
+
+        its(:publisher) { should eq resolved_publisher }
+        its(:title) { should eq source.title }
+      end
+
+      context 'source is an instance of the target builder' do
+        let(:source) { target_builder.new(publisher: 'Hello', title: 'World') }
 
-      its(:publisher) { should eq resolved_publisher }
-      its(:title) { should eq source.title }
+        it 'should return the unaltered source' do
+          expect(subject).to eq source
+        end
+        its(:publisher) { should eq source.publisher }
+        its(:title) { should eq source.title }
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mappy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeremy Friesen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport