cistern 0.3.0 → 0.3.1

data/lib/cistern/attributes.rb

@@ -6,18 +6,7 @@ module Cistern::Attributes
       :integer => lambda{|v,opts| v && v.to_i},
       :float   => lambda{|v,opts| v && v.to_f},
       :array   => lambda{|v,opts| [*v]},
-      :boolean => Proc.new do |v, opts|
-        {
-          true    => true,
-          "true"  => true,
-          "1"     => true,
-          1       => true,
-          false   => false,
-          "false" => false,
-          "0"     => false,
-          0       => false,
-        }[v]
-      end,
+      :boolean => lambda{|v,opts| ['true', '1'].include?(v.to_s.downcase)}
     }
   end
 
@@ -76,8 +65,9 @@ module Cistern::Attributes
       @attributes ||= []
       @attributes |= [name]
 
-      for new_alias in [*options[:aliases]]
-        aliases[new_alias] = name
+      Array(options[:aliases]).each do |new_alias|
+        aliases[new_alias] ||= []
+        aliases[new_alias] << name
       end
     end
 
@@ -125,8 +115,10 @@ module Cistern::Attributes
     def merge_attributes(new_attributes = {})
       for key, value in new_attributes
         unless self.class.ignored_attributes.include?(key)
-          if aliased_key = self.class.aliases[key]
-            send("#{aliased_key}=", value)
+          if self.class.aliases.has_key?(key)
+            self.class.aliases[key].each do |aliased_key|
+              send("#{aliased_key}=", value)
+            end
           elsif self.respond_to?("#{key}=", true)
             send("#{key}=", value)
           else

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/model_spec.rb

@@ -31,6 +31,13 @@ describe "Cistern::Model" do
       attribute :butternut, type: :integer, aliases: "squash", squash: "id"
       attribute :custom, parser: lambda{|v, opts| "X!#{v}"}
 
+      attribute :same_alias_1, aliases: "nested"
+      attribute :same_alias_2, aliases: "nested"
+
+      attribute :same_alias_squashed_1, aliases: "nested", squash: "attr_1"
+      attribute :same_alias_squashed_2, aliases: "nested", squash: "attr_2"
+      attribute :same_alias_squashed_3, aliases: "nested", squash: "attr_2"
+
       def save
         requires :flag
       end
@@ -76,6 +83,21 @@ describe "Cistern::Model" do
       TypeSpec.new({"squash" => {"id" => "12"}}).butternut.should == 12
     end
 
+    context "allowing the same alias for multiple attributes" do
+      it "should do so when not squashing" do
+        type_spec = TypeSpec.new({"nested" => "bamboo"})
+        type_spec.same_alias_1.should == "bamboo"
+        type_spec.same_alias_2.should == "bamboo"
+      end
+
+      it "should do so when squashing" do
+        type_spec = TypeSpec.new({"nested" => {"attr_1" => "bamboo", "attr_2" => "panda"}})
+        type_spec.same_alias_squashed_1.should == "bamboo"
+        type_spec.same_alias_squashed_2.should == "panda"
+        type_spec.same_alias_squashed_3.should == "panda"
+      end
+    end
+
     it "should slice out unaccounted for attributes" do
       TypeSpec.new({"something" => {"id" => "12"}}).attributes.keys.should_not include("something")
     end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: 0.3.0
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email: