setsumei 0.0.4 → 0.0.5

data/lib/setsumei/describable/boolean_attribute.rb

@@ -6,12 +6,12 @@ module Setsumei
         options = options.dup
         new.tap do |attribute|
           attribute.name = name
-          options.delete(:as_a)
-          attribute.options = options
+          attribute.lookup_key = options.delete(:from_within)
+          attribute.options = options.tap { |o| o.delete :as_a }
         end
       end
 
-      attr_accessor :name, :options
+      attr_accessor :name, :options, :lookup_key
 
       def is_an_attribute_of_type?(type)
         type == :boolean || type == self.class
@@ -30,7 +30,10 @@ module Setsumei
           :"#{name}="
         end
         def value_from_hash(hash)
-          value_for hash[ Build::Key.for name, given: hash.keys ]
+          value_for hash[ key_for(hash)]
+        end
+        def key_for(hash)
+          lookup_key || Build::Key.for(name, given: hash.keys)
         end
     end
   end

data/lib/setsumei/describable/float_attribute.rb

@@ -3,13 +3,15 @@ module Setsumei
     class FloatAttribute
 
       def FloatAttribute.named(name, options = {})
+        options = options.dup
         new.tap do |attribute|
           attribute.name = name
-          attribute.options = options.dup.tap { |o| o.delete :as_a }
+          attribute.lookup_key = options.delete(:from_within)
+          attribute.options = options.tap { |o| o.delete :as_a }
         end
       end
 
-      attr_accessor :name, :options
+      attr_accessor :name, :options, :lookup_key
 
       def is_an_attribute_of_type?(type)
         type == :float || type == self.class
@@ -28,7 +30,10 @@ module Setsumei
           :"#{name}="
         end
         def value_from_hash(hash)
-          value_for hash[ Build::Key.for name, given: hash.keys ]
+          value_for hash[ key_for(hash)]
+        end
+        def key_for(hash)
+          lookup_key || Build::Key.for(name, given: hash.keys)
         end
     end
   end

data/lib/setsumei/describable/int_attribute.rb

@@ -5,12 +5,12 @@ module Setsumei
         options = options.dup
         new.tap do |attribute|
           attribute.name = name
-          options.delete(:as_a)
-          attribute.options = options
+          attribute.lookup_key = options.delete(:from_within)
+          attribute.options = options.tap { |o| o.delete :as_a }
         end
       end
 
-      attr_accessor :name, :options
+      attr_accessor :name, :options, :lookup_key
 
       def is_an_attribute_of_type?(type)
         type == :int || type == self.class
@@ -29,7 +29,10 @@ module Setsumei
           :"#{name}="
         end
         def value_from_hash(hash)
-          value_for hash[ Build::Key.for name, given: hash.keys ]
+          value_for hash[ key_for(hash)]
+        end
+        def key_for(hash)
+          lookup_key || Build::Key.for(name, given: hash.keys)
         end
     end
   end

data/lib/setsumei/describable/object_attribute.rb

@@ -8,11 +8,12 @@ module Setsumei
         new.tap do |attribute|
           attribute.name = name
           attribute.klass = options.delete(:as_a)
+          attribute.lookup_key = options.delete(:from_within)
           attribute.options = options
         end
       end
 
-      attr_accessor :name, :klass, :options
+      attr_accessor :name, :klass, :options, :lookup_key
 
       def initialize
         self.klass = Object
@@ -41,7 +42,10 @@ module Setsumei
           :"#{name}="
         end
         def value_from_hash(hash)
-          value_for hash[ Build::Key.for name, given: hash.keys ]
+          value_for hash[ key_for(hash)]
+        end
+        def key_for(hash)
+          lookup_key || Build::Key.for(name, given: hash.keys)
         end
     end
   end

data/lib/setsumei/describable/string_attribute.rb

@@ -2,13 +2,15 @@ module Setsumei
   module Describable
     class StringAttribute
       def StringAttribute.named(name,options = {})
+        options = options.dup
         new.tap do |attribute|
           attribute.name = name
-          attribute.options = options.dup.tap { |o| o.delete :as_a }
+          attribute.lookup_key = options.delete(:from_within)
+          attribute.options = options.tap { |o| o.delete :as_a }
         end
       end
 
-      attr_accessor :name, :options
+      attr_accessor :name, :options, :lookup_key
 
       def is_an_attribute_of_type?(type)
         type == :string || type == self.class
@@ -27,7 +29,10 @@ module Setsumei
           :"#{name}="
         end
         def value_from_hash(hash)
-          value_for hash[ Build::Key.for name, given: hash.keys ]
+          value_for hash[ key_for(hash)]
+        end
+        def key_for(hash)
+          lookup_key || Build::Key.for(name, given: hash.keys)
         end
     end
   end

data/lib/setsumei/version.rb

@@ -1,3 +1,3 @@
 module Setsumei
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/setsumei/describable/boolean_attribute_spec.rb

@@ -84,6 +84,7 @@ module Setsumei
           object.should_receive(:my_boolean_attribute=).with(converted_value)
           subject
         end
+        it_should_behave_like "it handles lookup keys properly"
       end
     end
   end

data/spec/setsumei/describable/float_attribute_spec.rb

@@ -82,6 +82,7 @@ module Setsumei
           object.should_receive(:my_float_attribute=).with(converted_value)
           subject
         end
+        it_should_behave_like "it handles lookup keys properly"
       end
     end
   end

data/spec/setsumei/describable/int_attribute_spec.rb

@@ -83,6 +83,7 @@ module Setsumei
           object.should_receive(:my_int_attribute=).with(converted_value)
           subject
         end
+        it_should_behave_like "it handles lookup keys properly"
       end
     end
   end

data/spec/setsumei/describable/object_attribute_spec.rb

@@ -117,6 +117,7 @@ module Setsumei
           object.should_receive(:my_object_attribute=).with(converted_value)
           subject
         end
+        it_should_behave_like "it handles lookup keys properly"
       end
     end
   end

data/spec/setsumei/describable/string_attribute_spec.rb

@@ -88,6 +88,7 @@ module Setsumei
           object.should_receive(:my_string_attribute=).with(converted_value)
           subject
         end
+        it_should_behave_like "it handles lookup keys properly"
       end
     end
   end

data/spec/support/shared_examples/attribute_lookup_key_support.rb

@@ -0,0 +1,15 @@
+shared_examples_for "it handles lookup keys properly" do
+  let(:attribute) { send described_class.to_s.slice(/::([^:]*)$/,1).gsub(/[a-z][A-Z]/) { |s| s[0]+'_'+s[1] }.downcase }
+  context "where a specific key has been specified" do
+    before do
+      hash["MySpecialKey"] = hash.delete key
+      attribute.lookup_key = "MySpecialKey"
+    end
+
+    it "should use this key for the hash lookup instead" do
+      Setsumei::Build::Key.should_not_receive(:for)
+      attribute.should_receive(:value_for).with(value_in_hash).and_return(converted_value)
+      subject
+    end
+  end
+end

data/spec/support/shared_examples/attribute_options.rb

@@ -1,7 +1,24 @@
 shared_examples_for "it handles options properly" do
+  its(:lookup_key) { should be_nil }
   its(:options) { should == {} }
+
   context "when options are specified" do
     subject { described_class.named name, as_a: described_class.to_s.downcase.gsub(/(.*::|attribute)/,'').to_sym, with_additional: :options }
     its(:options) { should == { with_additional: :options } }
   end
+
+  context "when from_within: is specified" do
+    let(:key) { "specialKey" }
+
+    subject { described_class.named name, as_a: described_class.to_s.downcase.gsub(/(.*::|attribute)/,'').to_sym, from_within: key }
+
+    its(:lookup_key) { should == key }
+
+    context "with addition options" do
+      subject { described_class.named name, as_a: described_class.to_s.downcase.gsub(/(.*::|attribute)/,'').to_sym, from_within: key, with_additional: :options }
+
+      its(:lookup_key) { should == key }
+      its(:options) { should == { with_additional: :options } }
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: setsumei
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Jon Rowe
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 +01:00
+date: 2011-05-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -95,6 +95,7 @@ files:
 - spec/setsumei/describable_spec.rb
 - spec/spec_helper.rb
 - spec/support/be_an_attribute_of_type_matcher.rb
+- spec/support/shared_examples/attribute_lookup_key_support.rb
 - spec/support/shared_examples/attribute_options.rb
 - spec/support/shared_examples/attribute_type_creation.rb
 has_rdoc: true
@@ -137,5 +138,6 @@ test_files:
 - spec/setsumei/describable_spec.rb
 - spec/spec_helper.rb
 - spec/support/be_an_attribute_of_type_matcher.rb
+- spec/support/shared_examples/attribute_lookup_key_support.rb
 - spec/support/shared_examples/attribute_options.rb
 - spec/support/shared_examples/attribute_type_creation.rb