change-ruby 1.0.1 → 1.0.2

data/lib/requests/client.rb

@@ -17,12 +17,16 @@ module Change
 
         params[:api_key] = @api_key
 
-        if resource.needs_authorization?(method)
+        if resource.needs_request_signature?(method)
           params[:endpoint] = endpoint
           params[:timestamp] = Time.now.utc.iso8601
 
-          auth_key_to_use = params.delete(:auth_key_to_use)
-          params[:rsig] = generate_rsig(params, auth_key_to_use['auth_key'])
+          if resource.needs_authorization?(action_or_collection)
+            auth_key_to_use = params.delete(:auth_key_to_use) || resource.auth_key
+            params[:rsig] = generate_rsig(params, auth_key_to_use['auth_key'])
+          else
+            params[:rsig] = generate_rsig(params)
+          end
         end
 
         response = send(method.to_s, final_url(endpoint), params)
@@ -57,7 +61,7 @@ module Change
         HTTParty.post(url, { :body => params })
       end
 
-      def generate_rsig(params, auth_key)
+      def generate_rsig(params, auth_key = nil)
         body_to_digest = "#{post_body(params)}#{@secret_token}#{auth_key}"
         Digest::SHA2.hexdigest(body_to_digest)
       end

data/lib/resources/collection_resource.rb

@@ -22,7 +22,7 @@ module Change
         super(@parent_resource.client, properties)
       end
 
-      def load(params)
+      def load(params = {})
         @parent_resource.load_collection(self.class.collection_name.to_sym, params)
       end
 

data/lib/resources/resource.rb

@@ -23,10 +23,14 @@ module Change
         path.prepend('/')
       end
 
-      def needs_authorization?(method)
+      def needs_request_signature?(method)
         method != :get
       end
 
+      def needs_authorization?(action = nil)
+        action != :auth_keys
+      end
+
       def auth_key(key_number = 0)
         @auth_keys[key_number]
       end

data/test/member_resource_test.rb

@@ -33,16 +33,28 @@ describe 'MemberResource' do
       @resource = TesterResource.new(@client)
     end
 
-    describe '#needs_authorization?' do
+    describe '#needs_request_signature?' do
 
       it "should return true for :get" do
-        @resource.needs_authorization?(:get).must_equal false
+        @resource.needs_request_signature?(:get).must_equal false
       end
 
       it "should return false for :post, :put, and :delete" do
-        @resource.needs_authorization?(:post).must_equal true
-        @resource.needs_authorization?(:put).must_equal true
-        @resource.needs_authorization?(:delete).must_equal true
+        @resource.needs_request_signature?(:post).must_equal true
+        @resource.needs_request_signature?(:put).must_equal true
+        @resource.needs_request_signature?(:delete).must_equal true
+      end
+
+    end
+
+    describe '#needs_authorization?' do
+
+      it "should return false for :auth_keys" do
+        @resource.needs_authorization?(:auth_keys).must_equal false
+      end
+
+      it "should return true for no action" do
+        @resource.needs_authorization?.must_equal true
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: change-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors: