helix 0.0.4.9.pre → 0.0.5.0.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWY5OTNjMjY3NTE4ZWVhMTk0MWRjYTRmNTY2NGQwYzRiNjk2MWJjYQ==
+    NTNmNDllNjZiNjY1OWRkZTE3OWEzNTZjN2I5ZjUwNzZmZDYyZjk4Zg==
   data.tar.gz: !binary |-
-    NmZkNGU3NDhlY2IxNjI2ODc1ZmU3YTJkODNmODdhYWFjMmM3Y2IyZA==
+    ZmUyOGZhY2UxYTMyYzU1MzU1YWEzYzRhMmViOWJmYTgzNjY0MWYxMw==
 SHA512:
   metadata.gz: !binary |-
-    NzU4M2RmYzY2MDc5ZTk2NWY4OTFkMGRhNmM4MDA2ZDE3ZTRmNTVlNDE5YTBm
-    MzE3OWNjMzljNWVhYTg3NjU0NTlmMWE5YjhiYTRjOTMyMjM2NGUzNzdhYzA3
-    ZDNmYWJkMDYwYmY4MWE3ZTA0ODYyMWIxMzU5OGU5M2EwNGFlOGY=
+    MTk3ZGI1YjQyMDg4Y2EwOWFlNWZmNjljOTYxMDg4ZWQ1MjJjNDI4NTQ5MWM4
+    ZTgwNDU5ZDAzMWZjOWZkNzY5OGZkMmI2ZTUzNTU1YzhiYzFiYTgyYzMzNWE2
+    NTU0ZGZmNDY5ZGQ3M2ZiZDkxMzhhNTAxZTMyZjk2YTBjMmM3MmU=
   data.tar.gz: !binary |-
-    NzI2NTFkMzk0NjBhYjA4NzE5NTBlOGJjYTI0OWE1ZmNjZDljYjZjNzU0NzQ1
-    OTU2YjE4NGU0MTA2ZjVjZmJhOThiMTZjYzQ3NmJhMGExYjRiYmY3NTNlZmI4
-    NzliOWUzYzY5M2VkN2ExMWM1N2FlYjk4MmIzMTVlNTcxNzczNjM=
+    OTcxMGEwYTFjN2RkMDE3MjhlMjQ1YTg0YzQzNjYxYmE5NjhlZTYxYWNhY2Q3
+    MjQ5ZTU0YjY3ZGJlYmE0M2JkMzA2YWI2OWM4YmQwNmQxYWUxNWQ5YmE3ZGEz
+    YWYwNWY5YzZjZWRlMWQwMzVjNjFhMjJhMTc1NGRmYTk0ZDE3N2U=

data/lib/helix/base.rb

@@ -174,6 +174,7 @@ module Helix
 
     def massage_raw_attrs(raw_attrs)
       return raw_attrs['site'] if raw_attrs.respond_to?(:has_key?) && raw_attrs.has_key?('site')
+      return raw_attrs['library'] if raw_attrs.respond_to?(:has_key?) && raw_attrs.has_key?('library')
       # FIXME: Albums JSON output is embedded as the only member of an Array.
       proper_hash = raw_attrs.respond_to?(:has_key?) && raw_attrs.has_key?(guid_name)
       proper_hash ? raw_attrs : raw_attrs.first

data/lib/helix/library.rb

@@ -10,7 +10,8 @@ module Helix
     def self.create(attrs={}); super; end
 
     def self.find(nickname, opts={})
-      super(nickname, opts.merge(content_type: :xml))
+      default_opts = process_opts(opts) 
+      super(nickname, opts.merge(default_opts))
     end
 
     # Creates a string that associates to the class id.
@@ -22,6 +23,10 @@ module Helix
     def self.guid_name
       "name"
     end
+    
+    def self.process_opts(opts)
+      {content_type: :xml}.merge(opts)
+    end
 
     # The class name, to be used by supporting classes. Such as Config which uses
     # this method as a way to build URLs.

data/spec/base_spec.rb

@@ -294,6 +294,11 @@ describe Helix::Base do
           subject { obj.send(meth, raw_attrs) }
           it { should eq(:site_contents) }
         end
+        context "when given {'library' => :library_contents}" do
+          let(:raw_attrs) { {'library' => :library_contents} }
+          subject { obj.send(meth, raw_attrs) }
+          it { should eq(:library_contents) }
+        end
         context "when given { guid_name => :the_val }" do
           let(:raw_attrs) { { guid_name => :the_val } }
           subject { obj.send(meth, raw_attrs) }

data/spec/library_spec.rb

@@ -26,6 +26,16 @@ describe Helix::Library do
     [:destroy, :update].each do |crud_call|
       it { should respond_to(crud_call) }
     end
+    
+    describe "#process_opts" do
+      context "opts has a key of content_type" do
+        it { subject.process_opts({content_type: :json}).should == {content_type: :json } }
+      end
+      context"when opts does not have a key of content type" do
+        it { subject.process_opts({}).should == {content_type: :xml } }       
+      end
+    end
+    
   end
 
 end

data/spec/media_spec.rb

@@ -121,8 +121,9 @@ describe Helix::Media do
             klass.stub(:attributes) { mock_attrs }
             klass.stub(:guid_name)  { guid_name  }
             klass.stub(:new)        { mock_obj   }
+            klass.stub(:process_opts) { {content_type: :xml} } if klass_sym[klass] == :library
           end
-          context "and the guid is nil" do
+          context "and the guid is nil" do 
             it "should raise an ArgumentError complaining about a nil guid" do
               msg = 'find requires a non-nil guid argument - received a nil argument.'
               lambda { klass.send(meth, nil) }.should raise_error(ArgumentError, msg)
@@ -145,6 +146,7 @@ describe Helix::Media do
             klass.stub(:attributes) { mock_attrs }
             klass.stub(:guid_name)  { guid_name  }
             klass.stub(:new)        { mock_obj }
+            klass.stub(:process_opts) { {content_type: :xml} } if klass_sym[klass] == :library
           end
           context "and the guid is nil" do
             it "should raise an ArgumentError complaining about a nil guid" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helix
 version: !ruby/object:Gem::Version
-  version: 0.0.4.9.pre
+  version: 0.0.5.0.pre
 platform: ruby
 authors:
 - Twistage, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json