helix 0.0.4.6.pre → 0.0.4.7.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTJhYjFjMGM1MDlhMzM2MjlkOThhYjg1ZWZjM2NlYzE4YThiNGZhMg==
+    OGNmMmI1MWM4NzhjNWM5YjAyOTkzNGJhZjA1YjIzMTUyYThkMDQxNA==
   data.tar.gz: !binary |-
-    YzhiYTFkNmFlMDNjZTBlODEyOWJmMTA3MDNmZjJlMDhiY2M3ZGM4NA==
+    YmM3MWJlYmIwMmI1ZDdlMjQyZjhkNzQ0YmMxMGFhMmZlNjMxNDhkZQ==
 SHA512:
   metadata.gz: !binary |-
-    YTk4NjJlZGI5OGVjMzYwMzY1MGY0NWQ2NjkzYzE1NjU4MTgxZjc2ZGY3NDI5
-    YTY3NzFmMTgzYTgxZmZiNmM1OWI4MGE0NWQxNjU1NTcwZWE4MmU0ZDFiYTEy
-    OTQ0YjY2MTA4YzhlZTU5YWEwOTQ3NjliM2E3OGM0NTYyOGYyNGU=
+    MDhiM2ZkYTcyZTRlNTVjODkyZWI1NGY3YTY4MGM5ODA5MWUyNmRkNmM3MGEz
+    Mzg0ZjNiOWZlYjkxMjVlMjUxYTY4MTdmZjgzOGMxYjU0OTQxZTkzYWE5N2Nk
+    NWY3MTdiMmMxMGZkODkzYzc5ZmNmZjYwZWJhMjY5MGY2Mjc1MTc=
   data.tar.gz: !binary |-
-    ZTBjZTIzN2RjMjgzN2JkYzE4ODI4MzBmNjM1ZDBjMmQ0MjkwYTk1OWE3YWFl
-    ODcxYWFjYTAyZGM3Y2JiOGU5NGIxNGZkMzNiNjFhNWFhNzk3NTMwMWE5YzM5
-    YzA0YjliYzhkODkzZTdhZDdmYzJhMDQwYzZhNjgxYjU5NDcwMjQ=
+    MDgyMWEzN2QxZDljZGQ2MDViMzNmZWJmZmQ4NDRkZGM1NWFlYzkxOGIyNmRk
+    ODk0MTFlYzhjY2RkN2ZjNzA0MmZmZTcxNjkxMWRlMGNlYWQwN2M4NjM5ZDU1
+    MjkyNGY4MzRiNjk4OGYwYjZjMWQxYjNlMjE1ODYyNjdlZTlmNDE=

data/lib/helix/base.rb

@@ -163,6 +163,13 @@ module Helix
       end
     end
 
+    # Raw response should return the response from the config.
+    #
+    # @return [String] A response from the server in form of JSON or XML
+    def raw_response
+      self.config.response
+    end
+
     private
 
     def massage_raw_attrs(raw_attrs)

data/lib/helix/config.rb

@@ -24,25 +24,50 @@ module Helix
     attr_reader   :response                                 # in Paginates
     attr_reader   :signature_for, :signature_expiration_for # in HasSignatures
 
+    # Creates a singleton of itself, setting the config based on the
+    # provided Hash argument.
+    #
+    # @example
+    #   Helix::Config.load_from_hash(
+    #     company: 'my-co-nickname',
+    #     site:    'http://service-staging.twistage.com'
+    #   )
+    #   video = Helix::Video.find("8e0701c142ab1") #Uses my_yaml.yml
+    #
+    # @param [Hash] desired_credentials the k/v pairs used for config
+    # @return [Helix::Config] config returns singleton of Helix::Config
+    def self.load_from_hash(desired_credentials)
+      config = self.instance
+      config.instance_variable_set(:@credentials, desired_credentials)
+      RestClient.proxy = config.proxy
+      config
+    end
+
+    def self.from_hash(desired_credentials)
+      load_from_hash(desired_credentials)
+    end
+
     # Creates a singleton of itself, setting the config
     # to a specified YAML file. If no file is specified the default
     # helix.yml file is used.
     #
     # @example
-    #   Helix::Config.load("/some/path/my_yaml.yml")
+    #   Helix::Config.load_yaml_file("/some/path/my_yaml.yml")
     #   video = Helix::Video.find("8e0701c142ab1") #Uses my_yaml.yml
     #
     # @param [String] yaml_file_location the yaml file used for config
     # @return [Helix::Config] config returns singleton of Helix::Config
-    def self.load(yaml_file_location = DEFAULT_FILENAME)
-      config = self.instance
+    def self.load_yaml_file(yaml_file_location = DEFAULT_FILENAME)
+      creds  = YAML.load(File.open(yaml_file_location)).symbolize_keys
+      config = load_from_hash(creds)
       config.instance_variable_set(:@filename, yaml_file_location)
-      creds = YAML.load(File.open(yaml_file_location)).symbolize_keys
-      config.instance_variable_set(:@credentials, creds)
-      RestClient.proxy = config.proxy
       config
     end
 
+    def self.load(yaml_file_location = DEFAULT_FILENAME)
+      load_yaml_file(yaml_file_location)
+    end
+
     def proxy
       if @credentials[:proxy_uri]
         protocol, uri = @credentials[:proxy_uri].split "://"

data/spec/base_spec.rb

@@ -419,6 +419,16 @@ describe Helix::Base do
         end
       end
 
+      describe "#raw_response" do
+        let(:meth)  { :raw_response }
+        subject     { obj.method(meth) }
+        its(:arity) { should eq(0) }
+        it "should return the response from config" do
+          obj.config.stub!(:response).and_return :some_response
+          expect(obj.send(meth)).to eq(obj.config.response)
+        end
+      end
+
     end
 
   end

data/spec/config_spec.rb

@@ -49,8 +49,29 @@ describe Helix::Config do
     end
   end
 
-  describe ".load" do
-    let(:meth)      { :load }
+  describe ".load_from_hash & from_hash alias" do
+    meths = [ :load_from_hash, :from_hash ]
+    let(:mock_obj)  { double(klass, proxy: :stubbed_proxy) }
+    let(:mock_file) { double(File)  }
+    let(:mock_cred) { {key1: 'value1', 'key2' => 'value2'} }
+    let(:symbolized_cred) { {key1: 'value1', key2: 'value2'} }
+    before(:each) do
+      klass.stub(:instance) { mock_obj  }
+      File.stub(:open)      { mock_file }
+      YAML.stub(:load)      { mock_cred }
+    end
+    meths.each do |meth|
+      context "when given a Hash" do
+        it "should set the instance's credentials to that Hash arg" do
+          mock_obj.should_receive(:instance_variable_set).with(:@credentials, :the_hash_arg)
+          klass.send(meth, :the_hash_arg)
+        end
+      end
+    end
+  end
+
+  describe ".load_yaml_file & load alias" do
+    meths = [ :load_yaml_file, :load ]
     let(:mock_obj)  { double(klass, proxy: :stubbed_proxy) }
     let(:mock_file) { double(File)  }
     let(:mock_cred) { {key1: 'value1', 'key2' => 'value2'} }
@@ -61,65 +82,67 @@ describe Helix::Config do
       YAML.stub(:load)      { mock_cred }
       mock_obj.stub(:instance_variable_set).with(:@credentials, anything)
     end
-    context "when given no arg" do
-      before(:each) do mock_obj.stub(:instance_variable_set).with(:@filename, klass::DEFAULT_FILENAME) end
-      it "should get the instance" do
-        klass.should_receive(:instance) { mock_obj }
-        klass.send(meth)
-      end
-      it "should set @filename to DEFAULT_FILENAME" do
-        mock_obj.should_receive(:instance_variable_set).with(:@filename, klass::DEFAULT_FILENAME)
-        klass.send(meth)
-      end
-      it "should File.open(@filename) -> f" do
-        File.should_receive(:open).with(klass::DEFAULT_FILENAME) { mock_file }
-        klass.send(meth)
-      end
-      it "should YAML.load(f) -> cred" do
-        YAML.should_receive(:load).with(mock_file) { mock_cred }
-        klass.send(meth)
-      end
-      it "should set @credentials to cred with symbol keys" do
-        File.stub(:open).with(klass::DEFAULT_FILENAME) { mock_file }
-        YAML.stub(:load).with(mock_file) { mock_cred }
-        mock_obj.should_receive(:instance_variable_set).with(:@credentials, symbolized_cred)
-        klass.send(meth)
-      end
-      it "should set the proxy" do
-        mock_obj.should_receive(:proxy) { :mock_proxy }
-        klass.send(meth)
-      end
-      it "should return the instance" do
-        expect(klass.send(meth)).to be(mock_obj)
-      end
-    end
-    context "when given the arg 'some_file.yml'" do
-      let(:yaml_arg) { 'some_file.yml' }
-      before(:each) do mock_obj.stub(:instance_variable_set).with(:@filename, yaml_arg) end
-      it "should get the instance" do
-        klass.should_receive(:instance) { mock_obj }
-        klass.send(meth, yaml_arg)
-      end
-      it "should set @filename to DEFAULT_FILENAME" do
-        mock_obj.should_receive(:instance_variable_set).with(:@filename, yaml_arg)
-        klass.send(meth, yaml_arg)
-      end
-      it "should File.open(@filename) -> f" do
-        File.should_receive(:open).with(yaml_arg) { mock_file }
-        klass.send(meth, yaml_arg)
-      end
-      it "should YAML.load(f) -> cred" do
-        YAML.should_receive(:load).with(mock_file) { mock_cred }
-        klass.send(meth, yaml_arg)
-      end
-      it "should set @credentials to cred with symbol keys" do
-        File.stub(:open).with(klass::DEFAULT_FILENAME) { mock_file }
-        YAML.stub(:load).with(mock_file) { mock_cred }
-        mock_obj.should_receive(:instance_variable_set).with(:@credentials, symbolized_cred)
-        klass.send(meth, yaml_arg)
-      end
-      it "should return the instance" do
-        expect(klass.send(meth, yaml_arg)).to be(mock_obj)
+    meths.each do |meth|
+      context "when given no arg" do
+        before(:each) do mock_obj.stub(:instance_variable_set).with(:@filename, klass::DEFAULT_FILENAME) end
+        it "should get the instance" do
+          klass.should_receive(:instance) { mock_obj }
+          klass.send(meth)
+        end
+        it "should set @filename to DEFAULT_FILENAME" do
+          mock_obj.should_receive(:instance_variable_set).with(:@filename, klass::DEFAULT_FILENAME)
+          klass.send(meth)
+        end
+        it "should File.open(@filename) -> f" do
+          File.should_receive(:open).with(klass::DEFAULT_FILENAME) { mock_file }
+          klass.send(meth)
+        end
+        it "should YAML.load(f) -> cred" do
+          YAML.should_receive(:load).with(mock_file) { mock_cred }
+          klass.send(meth)
+        end
+        it "should set @credentials to cred with symbol keys" do
+          File.stub(:open).with(klass::DEFAULT_FILENAME) { mock_file }
+          YAML.stub(:load).with(mock_file) { mock_cred }
+          mock_obj.should_receive(:instance_variable_set).with(:@credentials, symbolized_cred)
+          klass.send(meth)
+        end
+        it "should set the proxy" do
+          mock_obj.should_receive(:proxy) { :mock_proxy }
+          klass.send(meth)
+        end
+        it "should return the instance" do
+          expect(klass.send(meth)).to be(mock_obj)
+        end
+      end
+      context "when given the arg 'some_file.yml'" do
+        let(:yaml_arg) { 'some_file.yml' }
+        before(:each) do mock_obj.stub(:instance_variable_set).with(:@filename, yaml_arg) end
+        it "should get the instance" do
+          klass.should_receive(:instance) { mock_obj }
+          klass.send(meth, yaml_arg)
+        end
+        it "should set @filename to DEFAULT_FILENAME" do
+          mock_obj.should_receive(:instance_variable_set).with(:@filename, yaml_arg)
+          klass.send(meth, yaml_arg)
+        end
+        it "should File.open(@filename) -> f" do
+          File.should_receive(:open).with(yaml_arg) { mock_file }
+          klass.send(meth, yaml_arg)
+        end
+        it "should YAML.load(f) -> cred" do
+          YAML.should_receive(:load).with(mock_file) { mock_cred }
+          klass.send(meth, yaml_arg)
+        end
+        it "should set @credentials to cred with symbol keys" do
+          File.stub(:open).with(klass::DEFAULT_FILENAME) { mock_file }
+          YAML.stub(:load).with(mock_file) { mock_cred }
+          mock_obj.should_receive(:instance_variable_set).with(:@credentials, symbolized_cred)
+          klass.send(meth, yaml_arg)
+        end
+        it "should return the instance" do
+          expect(klass.send(meth, yaml_arg)).to be(mock_obj)
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helix
 version: !ruby/object:Gem::Version
-  version: 0.0.4.6.pre
+  version: 0.0.4.7.pre
 platform: ruby
 authors:
 - Twistage, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json