cistern 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e00bac7d299cc0636b1ac4b5ca42958de6f96f41
-  data.tar.gz: 0f83891e9e0bc7f9cdcbdb8ad9c0280dfb969ae3
+  metadata.gz: b042d8632a8caf3a3b22b917105d96a08c5a589d
+  data.tar.gz: d83e62f2b43df0cc5d8043065679e41f5372d7a5
 SHA512:
-  metadata.gz: d8e0baa62cd55e6f8cafc7ef6401d1c8a6f8a8bcfafd4fb19cb850ae6e06ba76eacdc55912c6780eddc53729b162db855db6d8986ae7ac25463937eac96c7fb3
-  data.tar.gz: 4ec77508143ddad1788aff2159711eaa49301bafb765eecdfda0c498d02c0e4969449646eb6990daf1b6e7f899374043dd176869261867f4105302238242a1f5
+  metadata.gz: df23a5684addc4f8c446ec88b9b983e4d288b9bd1a09421478658c93f5fd67e88793f6b16ad7fb3191c69216702ce3b20536af7b3565d3db20b64183d9d34234
+  data.tar.gz: 6cebf42a5df2dfa6602c89d763f5c1d1a07b1b277bb4da34ed5ce682e6d64434815478e7e12a3cee2dc75d7b70ccb4b6cc944b52299e5b158bf01de596e87959

data/Guardfile

@@ -4,7 +4,7 @@ guard :bundler do
   watch(/^.+\.gemspec/)
 end
 
-guard 'rspec', all_on_start: true, all_after_pass: true, cmd: 'bundle exec rspec' do
+guard 'rspec', all_on_start: true, all_after_pass: true, cmd: 'bundle exec rspec', failed_mode: :focus do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { "spec" }
   watch('spec/spec_helper.rb')  { "spec" }

data/lib/cistern/attributes.rb

@@ -12,13 +12,14 @@ module Cistern::Attributes
 
   def self.transforms
     @transforms ||= {
-      :squash  => Proc.new do |k, v, options|
+      :squash  => Proc.new do |k, _v, options|
+        v      = Cistern::Hash.stringify_keys(_v)
         squash = options[:squash]
+
         if v.is_a?(::Hash) && squash.is_a?(Array)
           travel = lambda do |tree, path|
             if tree.is_a?(::Hash)
-              subtree = tree[path.shift]
-              travel.call(subtree, path)
+              travel.call(tree[path.shift], path)
             else tree
             end
           end
@@ -49,7 +50,7 @@ module Cistern::Attributes
     end
 
     def aliases
-      @aliases ||= {}
+      @aliases ||= Hash.new { |h,k| h[k] = [] }
     end
 
     def attributes
@@ -85,12 +86,16 @@ module Cistern::Attributes
       if self.attributes[name]
         raise(ArgumentError, "#{self.name} attribute[#{_name}] specified more than once")
       else
+        if options[:squash]
+          options[:squash] = Array(options[:squash]).map(&:to_s)
+        end
         self.attributes[name] = options
       end
 
-      Array(options[:aliases]).each do |new_alias|
-        aliases[new_alias] ||= []
-        aliases[new_alias] << name
+      options[:aliases] = Array(options[:aliases]).map { |a| a.to_s.to_sym }
+
+      options[:aliases].each do |new_alias|
+        aliases[new_alias] << name.to_s.to_sym
       end
     end
 
@@ -168,13 +173,15 @@ module Cistern::Attributes
     end
 
     def merge_attributes(new_attributes = {})
-      new_attributes.each do |key, value|
+      new_attributes.each do |_key, value|
+        key = _key.to_s.to_sym
         # find nested paths
         value.is_a?(::Hash) && self.class.attributes.each do |name, options|
-          if (options[:squash] || []).first == key
+          if (options[:squash] || []).first == key.to_s
             send("#{name}=", {key => value})
           end
         end
+
         unless self.class.ignored_attributes.include?(key)
           if self.class.aliases.has_key?(key)
             self.class.aliases[key].each do |aliased_key|
@@ -182,7 +189,9 @@ module Cistern::Attributes
             end
           end
 
-          if self.respond_to?("#{key}=", true)
+          protected_methods = Cistern::Model.instance_methods - [:connection, :identity, :collection]
+
+          if !protected_methods.include?(key) && self.respond_to?("#{key}=", true)
             send("#{key}=", value)
           end
         end

data/lib/cistern/version.rb

@@ -1,3 +1,3 @@
 module Cistern
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/spec/model_spec.rb

@@ -59,6 +59,7 @@ describe "Cistern::Model" do
       attribute :same_alias_squashed_1, squash: ["nested", "attr_1"]
       attribute :same_alias_squashed_2, squash: ["nested", "attr_2"]
       attribute :same_alias_squashed_3, squash: ["nested", "attr_2"]
+      attribute :adam_attributes, aliases: "attributes"
 
       def save
         requires :flag
@@ -69,6 +70,10 @@ describe "Cistern::Model" do
       expect(TypeSpec.new(name: 1).name).to eq("1")
     end
 
+    it "should handle a 'attributes' aliased attribute" do
+      expect(TypeSpec.new(attributes: "x").adam_attributes).to eq("x")
+    end
+
     it "should parse time" do
       time = Time.now
       created_at = TypeSpec.new(created_at: time.to_s).created_at

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cistern
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies: []
 description: API client framework extracted from Fog
 email:
@@ -87,3 +87,4 @@ test_files:
 - spec/singular_spec.rb
 - spec/spec_helper.rb
 - spec/wait_for_spec.rb
+has_rdoc: