attribute_cartographer 0.0.2 → 0.0.4

data/README

@@ -4,7 +4,7 @@
 
 == DESCRIPTION
 
-Attribute Cartographer allows you to map an attributes hash into similarly or differently named methods, using an optional block to map the values as well.
+Attribute Cartographer allows you to map an attributes hash into similarly or differently named methods, using an optional lambda to map the values as well.
 
 == INSTALL
 
@@ -22,6 +22,7 @@ Then run:
 
     map :a
     map :b, ->(v) { v.downcase }
+    map :O, ->(k,v) { [k.downcase, v.downcase] } # You must return a 2-arg array
 
     map :c, :d
     map :e, :f, ->(v) { v.downcase }
@@ -29,10 +30,19 @@ Then run:
 
     map [:i, :j, :k]
     map [:l, :m, :n], ->(v) { v.upcase }
+    map [:P, :Q, :R], ->(k,v) { [k.downcase, v.downcase] } # You must return a 2-arg array
   end
 
-  mapper = Mapper.new attributes
-  mapper.original_attributes # => {:a=>123, :c=>"Mapper", :e=>"Eee!", :f=>"F.", :g=>"Gee!"}
+  Mapper.new(a: 2, b: "STRING")
+
+  For each mapping defined, an instance method is created that returns the mapped
+  value. This can be mapped directly, with a lambda to map the value or key and
+  value, with an explicit key mapping and lambda value mapping (with an optional
+  reverse-value map lambda), with a directly-mapped array, a directly-mapped array
+  with value mapping, or with an array with keys and values mapped with lambdas.
+
+  Mapper#original_attributes is the original hash passed in
+  Mapper#mapped_attributes is a hash representing the mapped keys and their mapped values
 
 == REQUIREMENTS
 

data/attribute_cartographer.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["krishicks@gmail.com"]
   s.homepage    = "https://github.com/krishicks/attribute-cartographer"
   s.summary     = %q{Map an attributes hash to methods on Ruby object while transforming the values to suit.}
-  s.description = %q{AttributeCartographer allows you to map an attributes hash into similarly or differently named methods, using an optional block to map the values as well.}
+  s.description = %q{AttributeCartographer allows you to map an attributes hash into similarly or differently named methods, using an optional lambda to map the values as well.}
 
   s.add_development_dependency('rspec', '>= 2.5')
 

data/lib/attribute_cartographer/VERSION.rb

@@ -1,3 +1,3 @@
 module AttributeCartographer
-  VERSION = "0.0.2" unless defined?(::AttributeCartographer::VERSION)
+  VERSION = "0.0.4" unless defined?(::AttributeCartographer::VERSION)
 end

data/lib/attribute_cartographer.rb

@@ -14,16 +14,20 @@ module AttributeCartographer
 
       (from, to), (f1, f2) = args.partition { |a| !(Proc === a) }
 
-      raise AttributeCartographer::InvalidArgumentError if [f1,f2].compact.any? { |f| f.arity > 1 }
-
       f1 ||= ->(v) { v }
-      to ||= from
 
       if Array === from
-        from.each { |key| @mapper.merge! key => [key, f1] }
+        if f1.arity == 1
+          from.each { |k| @mapper[k] = [k, f1] }
+        else
+          from.each { |k| @mapper[k] = f1 }
+        end
       else
-        @mapper.merge! from => [to, f1]
-        @mapper.merge! to => [from, f2] if f2
+        raise AttributeCartographer::InvalidArgumentError if to && f1.arity == 2
+
+        to ||= from
+        @mapper[from] = (f1.arity == 1 ? [to, f1] : f1)
+        @mapper[to] = [from, f2] if f2
       end
     end
   end
@@ -50,13 +54,21 @@ module AttributeCartographer
 
     def map_attributes! attributes
       mapper = self.class.instance_variable_get(:@mapper)
+      return unless mapper
 
-      mapper.each { |original_key, (mapped_key, block)|
-        value = attributes.has_key?(original_key) ? block.call(attributes[original_key]) : nil
-        self.send :define_singleton_method, mapped_key, ->{ value }
+      (mapper.keys & attributes.keys).each do |key|
+        mapping = mapper[key]
 
-        @_mapped_attributes.merge! mapped_key => value
-      } if mapper
+        if Array === mapping
+          mapped_key, f = mapping
+          value = f.call(attributes[key])
+        else
+          mapped_key, value = mapping.call(key, attributes[key])
+        end
+
+        self.send :define_singleton_method, mapped_key, ->{ value }
+        @_mapped_attributes[mapped_key] = value
+      end
     end
   end
 end

data/spec/attribute_cartographer_spec.rb

@@ -21,8 +21,8 @@ describe AttributeCartographer do
     context "with attributes that don't match mapped values" do
       before { klass.map :a, :b, ->(v) { v + 1 } }
 
-      it "maps attributes to nil when no mappable attribute was passed in" do
-        klass.new(c: :d).b.should be_nil
+      it "doesn't map attributes when no mappable attribute was passed in" do
+        lambda { klass.new(c: :d).b }.should raise_error(NoMethodError)
       end
     end
   end
@@ -51,13 +51,25 @@ describe AttributeCartographer do
         end
       end
 
-      context "and a lambda" do
+      context "and a 1-arity lambda" do
         before { klass.map :a, ->(v) { v.downcase } }
 
         it "creates an instance method matching the key name, mapping the value with the lambda" do
           klass.new(:a => "STRING").a.should == "string"
         end
       end
+
+      context "and a 2-arity lambda" do
+        before { klass.map :A, ->(k,v) { [k.downcase, v.downcase] } }
+
+        it "maps the key and value using the lambda and creates an instance method accordingly" do
+          klass.new(A: "STRING").a.should == "string"
+        end
+
+        it "doesn't raise an error when the attributes hash is missing a mapped key" do
+          lambda { klass.new(c: 2) }.should_not raise_error
+        end
+      end
     end
 
     context "with two arguments" do
@@ -106,13 +118,12 @@ describe AttributeCartographer do
           instance.b.should == :b_value
         end
 
-        it "makes nil methods for mapped keys which had no attributes passed in for them" do
-          instance = klass.new(a: :a_value)
-          instance.b.should == nil
+        it "doesn't raise an error when the attributes hash is missing a mapped key" do
+          lambda { klass.new(a: :a_value).b }.should raise_error(NoMethodError)
         end
       end
 
-      context "and a lambda" do
+      context "and a 1-arity lambda" do
         before { klass.map [:a, :b], ->(v) { v.downcase } }
 
         it "creates a method named for each key using the lambda to map the values" do
@@ -121,6 +132,16 @@ describe AttributeCartographer do
           instance.b.should == "string2"
         end
       end
+
+      context "and a 2-arity lambda" do
+        before { klass.map [:A, :B], ->(k,v) { [k.downcase, v.downcase] } }
+
+        it "maps the key and value using the lambda and creates an instance method accordingly" do
+          instance = klass.new(A: "ASTRING", B: "BSTRING")
+          instance.a.should == "astring"
+          instance.b.should == "bstring"
+        end
+      end
     end
   end
 end

metadata

@@ -1,39 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: attribute_cartographer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Kris Hicks
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-10 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-05-13 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160682200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2.5"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.5'
   type: :development
-  version_requirements: *id001
-description: AttributeCartographer allows you to map an attributes hash into similarly or differently named methods, using an optional block to map the values as well.
-email: 
+  prerelease: false
+  version_requirements: *2160682200
+description: AttributeCartographer allows you to map an attributes hash into similarly
+  or differently named methods, using an optional lambda to map the values as well.
+email:
 - krishicks@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -46,34 +42,31 @@ files:
 - lib/attribute_cartographer/VERSION.rb
 - spec/attribute_cartographer_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/krishicks/attribute-cartographer
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
-summary: Map an attributes hash to methods on Ruby object while transforming the values to suit.
-test_files: 
+summary: Map an attributes hash to methods on Ruby object while transforming the values
+  to suit.
+test_files:
 - spec/attribute_cartographer_spec.rb
 - spec/spec_helper.rb