copycopter_client 1.1.2 → 2.0.0

data/spec/copycopter_client/client_spec.rb

@@ -18,7 +18,7 @@ describe CopycopterClient do
     build_client(config)
   end
 
-  describe "opening a connection" do
+  describe 'opening a connection' do
     let(:config) { CopycopterClient::Configuration.new }
     let(:http) { Net::HTTP.new(config.host, config.port) }
 
@@ -26,37 +26,36 @@ describe CopycopterClient do
       Net::HTTP.stubs(:new => http)
     end
 
-    it "should timeout when connecting" do
+    it 'should timeout when connecting' do
       project = add_project
       client = build_client(:api_key => project.api_key, :http_open_timeout => 4)
       client.download { |ignore| }
       http.open_timeout.should == 4
     end
 
-    it "should timeout when reading" do
+    it 'should timeout when reading' do
       project = add_project
       client = build_client(:api_key => project.api_key, :http_read_timeout => 4)
       client.download { |ignore| }
       http.read_timeout.should == 4
     end
 
-    it "uses verified ssl when secure" do
+    it 'uses verified ssl when secure' do
       project = add_project
       client = build_client(:api_key => project.api_key, :secure => true)
       client.download { |ignore| }
       http.use_ssl?.should == true
       http.verify_mode.should == OpenSSL::SSL::VERIFY_PEER
-      http.ca_file.should == CopycopterClient::Configuration::CA_FILE
     end
 
-    it "doesn't use ssl when insecure" do
+    it 'does not use ssl when insecure' do
       project = add_project
       client = build_client(:api_key => project.api_key, :secure => false)
       client.download { |ignore| }
       http.use_ssl?.should == false
     end
 
-    it "wraps HTTP errors with ConnectionError" do
+    it 'wraps HTTP errors with ConnectionError' do
       errors = [
         Timeout::Error.new,
         Errno::EINVAL.new,
@@ -81,39 +80,39 @@ describe CopycopterClient do
       end
     end
 
-    it "handles 500 errors from downloads with ConnectionError" do
+    it 'handles 500 errors from downloads with ConnectionError' do
       client = build_client(:api_key => 'raise_error')
       expect { client.download { |ignore| } }.
         to raise_error(CopycopterClient::ConnectionError)
     end
 
-    it "handles 500 errors from uploads with ConnectionError" do
+    it 'handles 500 errors from uploads with ConnectionError' do
       client = build_client(:api_key => 'raise_error')
       expect { client.upload({}) }.to raise_error(CopycopterClient::ConnectionError)
     end
 
-    it "handles 404 errors from downloads with ConnectionError" do
+    it 'handles 404 errors from downloads with ConnectionError' do
       client = build_client(:api_key => 'bogus')
       expect { client.download { |ignore| } }.
         to raise_error(CopycopterClient::InvalidApiKey)
     end
 
-    it "handles 404 errors from uploads with ConnectionError" do
+    it 'handles 404 errors from uploads with ConnectionError' do
       client = build_client(:api_key => 'bogus')
       expect { client.upload({}) }.to raise_error(CopycopterClient::InvalidApiKey)
     end
   end
 
-  it "downloads published blurbs for an existing project" do
+  it 'downloads published blurbs for an existing project' do
     project = add_project
     project.update({
       'draft' => {
-        'key.one'   => "unexpected one",
-        'key.three' => "unexpected three"
+        'key.one'   => 'unexpected one',
+        'key.three' => 'unexpected three'
       },
       'published' => {
-        'key.one' => "expected one",
-        'key.two' => "expected two"
+        'key.one' => 'expected one',
+        'key.two' => 'expected two'
       }
     })
     client = build_client(:api_key => project.api_key, :public => true)
@@ -127,23 +126,23 @@ describe CopycopterClient do
     }
   end
 
-  it "logs that it performed a download" do
+  it 'logs that it performed a download' do
     logger = FakeLogger.new
     client = build_client_with_project(:logger => logger)
     client.download { |ignore| }
-    logger.should have_entry(:info, "Downloaded translations")
+    logger.should have_entry(:info, 'Downloaded translations')
   end
 
-  it "downloads draft blurbs for an existing project" do
+  it 'downloads draft blurbs for an existing project' do
     project = add_project
     project.update({
       'draft' => {
-        'key.one' => "expected one",
-        'key.two' => "expected two"
+        'key.one' => 'expected one',
+        'key.two' => 'expected two'
       },
       'published' => {
-        'key.one'   => "unexpected one",
-        'key.three' => "unexpected three"
+        'key.one'   => 'unexpected one',
+        'key.three' => 'unexpected three'
       }
     })
     client = build_client(:api_key => project.api_key, :public => false)

data/spec/copycopter_client/configuration_spec.rb

@@ -25,48 +25,42 @@ describe CopycopterClient::Configuration do
     end
   end
 
-  it { should have_config_option(:proxy_host).              overridable.default(nil) }
-  it { should have_config_option(:proxy_port).              overridable.default(nil) }
-  it { should have_config_option(:proxy_user).              overridable.default(nil) }
-  it { should have_config_option(:proxy_pass).              overridable.default(nil) }
-  it { should have_config_option(:environment_name).        overridable.default(nil) }
-  it { should have_config_option(:client_version).          overridable.default(CopycopterClient::VERSION) }
-  it { should have_config_option(:client_name).             overridable.default('Copycopter Client') }
-  it { should have_config_option(:client_url).              overridable.default('http://copycopter.com') }
-  it { should have_config_option(:secure).                  overridable.default(true) }
-  it { should have_config_option(:host).                    overridable.default('copycopter.com') }
-  it { should have_config_option(:http_open_timeout).       overridable.default(2) }
-  it { should have_config_option(:http_read_timeout).       overridable.default(5) }
-  it { should have_config_option(:port).                    overridable }
+  it { should have_config_option(:proxy_host).overridable.default(nil) }
+  it { should have_config_option(:proxy_port).overridable.default(nil) }
+  it { should have_config_option(:proxy_user).overridable.default(nil) }
+  it { should have_config_option(:proxy_pass).overridable.default(nil) }
+  it { should have_config_option(:environment_name).overridable.default(nil) }
+  it { should have_config_option(:client_version).overridable.default(CopycopterClient::VERSION) }
+  it { should have_config_option(:client_name).overridable.default('Copycopter Client') }
+  it { should have_config_option(:client_url).overridable.default('http://copycopter.com') }
+  it { should have_config_option(:secure).overridable.default(true) }
+  it { should have_config_option(:host).overridable.default('copycopter.com') }
+  it { should have_config_option(:http_open_timeout).overridable.default(2) }
+  it { should have_config_option(:http_read_timeout).overridable.default(5) }
+  it { should have_config_option(:port).overridable }
   it { should have_config_option(:development_environments).overridable }
-  it { should have_config_option(:api_key).                 overridable }
-  it { should have_config_option(:polling_delay).           overridable.default(300) }
-  it { should have_config_option(:framework).               overridable }
-  it { should have_config_option(:middleware).              overridable }
-  it { should have_config_option(:client).                  overridable }
-  it { should have_config_option(:cache).                   overridable }
-
-  it "provides the root ssl certificate" do
-    should have_config_option(:ca_file).
-      overridable.
-      default(File.join(PROJECT_ROOT, "AddTrustExternalCARoot.crt"))
-  end
-
-  it "should provide default values for secure connections" do
+  it { should have_config_option(:api_key).overridable }
+  it { should have_config_option(:polling_delay).overridable.default(300) }
+  it { should have_config_option(:framework).overridable }
+  it { should have_config_option(:middleware).overridable }
+  it { should have_config_option(:client).overridable }
+  it { should have_config_option(:cache).overridable }
+
+  it 'should provide default values for secure connections' do
     config = CopycopterClient::Configuration.new
     config.secure = true
     config.port.should == 443
     config.protocol.should == 'https'
   end
 
-  it "should provide default values for insecure connections" do
+  it 'should provide default values for insecure connections' do
     config = CopycopterClient::Configuration.new
     config.secure = false
     config.port.should == 80
     config.protocol.should == 'http'
   end
 
-  it "should not cache inferred ports" do
+  it 'should not cache inferred ports' do
     config = CopycopterClient::Configuration.new
     config.secure = false
     config.port
@@ -74,42 +68,44 @@ describe CopycopterClient::Configuration do
     config.port.should == 443
   end
 
-  it "should act like a hash" do
+  it 'should act like a hash' do
     config = CopycopterClient::Configuration.new
     hash = config.to_hash
+
     [:api_key, :environment_name, :host, :http_open_timeout,
       :http_read_timeout, :client_name, :client_url, :client_version, :port,
       :protocol, :proxy_host, :proxy_pass, :proxy_port, :proxy_user, :secure,
       :development_environments, :logger, :framework, :ca_file].each do |option|
       hash[option].should == config[option]
     end
+
     hash[:public].should == config.public?
   end
 
-  it "should be mergable" do
+  it 'should be mergable' do
     config = CopycopterClient::Configuration.new
     hash = config.to_hash
     config.merge(:key => 'value').should == hash.merge(:key => 'value')
   end
 
-  it "should use development and staging as development environments by default" do
+  it 'should use development and staging as development environments by default' do
     config = CopycopterClient::Configuration.new
     config.development_environments.should =~ %w(development staging)
   end
 
-  it "should use test and cucumber as test environments by default" do
+  it 'should use test and cucumber as test environments by default' do
     config = CopycopterClient::Configuration.new
     config.test_environments.should =~ %w(test cucumber)
   end
 
-  it "should be test in a test environment" do
+  it 'should be test in a test environment' do
     config = CopycopterClient::Configuration.new
     config.test_environments = %w(test)
     config.environment_name = 'test'
     config.should be_test
   end
 
-  it "should be public in a public environment" do
+  it 'should be public in a public environment' do
     config = CopycopterClient::Configuration.new
     config.development_environments = %w(development)
     config.environment_name = 'production'
@@ -117,7 +113,7 @@ describe CopycopterClient::Configuration do
     config.should_not be_development
   end
 
-  it "should be development in a development environment" do
+  it 'should be development in a development environment' do
     config = CopycopterClient::Configuration.new
     config.development_environments = %w(staging)
     config.environment_name = 'staging'
@@ -125,13 +121,14 @@ describe CopycopterClient::Configuration do
     config.should_not be_public
   end
 
-  it "should be public without an environment name" do
+  it 'should be public without an environment name' do
     config = CopycopterClient::Configuration.new
     config.should be_public
   end
 
-  it "should yield and save a configuration when configuring" do
+  it 'should yield and save a configuration when configuring' do
     yielded_configuration = nil
+
     CopycopterClient.configure(false) do |config|
       yielded_configuration = config
     end
@@ -140,49 +137,50 @@ describe CopycopterClient::Configuration do
     CopycopterClient.configuration.should == yielded_configuration
   end
 
-  it "doesn't apply the configuration when asked not to" do
+  it 'does not apply the configuration when asked not to' do
     logger = FakeLogger.new
     CopycopterClient.configure(false) { |config| config.logger = logger }
     CopycopterClient.configuration.should_not be_applied
     logger.entries[:info].should be_empty
   end
 
-  it "should not remove existing config options when configuring twice" do
+  it 'should not remove existing config options when configuring twice' do
     first_config = nil
+
     CopycopterClient.configure(false) do |config|
       first_config = config
     end
+
     CopycopterClient.configure(false) do |config|
       config.should == first_config
     end
   end
 
-  it "starts out unapplied" do
+  it 'starts out unapplied' do
     CopycopterClient::Configuration.new.should_not be_applied
   end
 
-  it "logs to $stdout by default" do
+  it 'logs to $stdout by default' do
     logger = FakeLogger.new
-    Logger.stubs(:new => logger)
-
+    Logger.stubs :new => logger
     config = CopycopterClient::Configuration.new
     Logger.should have_received(:new).with($stdout)
     config.logger.original_logger.should == logger
   end
 
-  it "generates environment info without a framework" do
+  it 'generates environment info without a framework' do
     subject.environment_name = 'production'
     subject.environment_info.should == "[Ruby: #{RUBY_VERSION}] [Env: production]"
   end
 
-  it "generates environment info with a framework" do
+  it 'generates environment info with a framework' do
     subject.environment_name = 'production'
     subject.framework = 'Sinatra: 1.0.0'
     subject.environment_info.
       should == "[Ruby: #{RUBY_VERSION}] [Sinatra: 1.0.0] [Env: production]"
   end
 
-  it "prefixes log entries" do
+  it 'prefixes log entries' do
     logger = FakeLogger.new
     config = CopycopterClient::Configuration.new
 
@@ -194,53 +192,53 @@ describe CopycopterClient::Configuration do
   end
 end
 
-share_examples_for "applied configuration" do
+share_examples_for 'applied configuration' do
+  subject { CopycopterClient::Configuration.new }
   let(:backend) { stub('i18n-backend') }
-  let(:cache)   { stub('cache') }
-  let(:client)  { stub('client') }
-  let(:poller)  { stub('poller') }
+  let(:cache) { stub('cache') }
+  let(:client) { stub('client') }
+  let(:logger) { FakeLogger.new }
+  let(:poller) { stub('poller') }
   let(:process_guard) { stub('process_guard', :start => nil) }
-  let(:logger)  { FakeLogger.new }
-  subject { CopycopterClient::Configuration.new }
 
   before do
-    CopycopterClient::I18nBackend.stubs(:new => backend)
-    CopycopterClient::Client.stubs(:new => client)
-    CopycopterClient::Cache.stubs(:new => cache)
-    CopycopterClient::Poller.stubs(:new => poller)
-    CopycopterClient::ProcessGuard.stubs(:new => process_guard)
+    CopycopterClient::I18nBackend.stubs :new => backend
+    CopycopterClient::Client.stubs :new => client
+    CopycopterClient::Cache.stubs :new => cache
+    CopycopterClient::Poller.stubs :new => poller
+    CopycopterClient::ProcessGuard.stubs :new => process_guard
     subject.logger = logger
     apply
   end
 
   it { should be_applied }
 
-  it "builds and assigns an I18n backend" do
+  it 'builds and assigns an I18n backend' do
     CopycopterClient::I18nBackend.should have_received(:new).with(cache)
     I18n.backend.should == backend
   end
 
-  it "builds and assigns a poller" do
+  it 'builds and assigns a poller' do
     CopycopterClient::Poller.should have_received(:new).with(cache, subject.to_hash)
   end
 
-  it "builds a process guard" do
+  it 'builds a process guard' do
     CopycopterClient::ProcessGuard.should have_received(:new).
       with(cache, poller, subject.to_hash)
   end
 
-  it "logs that it's ready" do
+  it 'logs that it is ready' do
     logger.should have_entry(:info, "Client #{CopycopterClient::VERSION} ready")
   end
 
-  it "logs environment info" do
+  it 'logs environment info' do
     logger.should have_entry(:info, "Environment Info: #{subject.environment_info}")
   end
 end
 
-describe CopycopterClient::Configuration, "applied when testing" do
-  it_should_behave_like "applied configuration" do
-    it "doesn't start the process guard" do
+describe CopycopterClient::Configuration, 'applied when testing' do
+  it_should_behave_like 'applied configuration' do
+    it 'does not start the process guard' do
       process_guard.should have_received(:start).never
     end
   end
@@ -251,9 +249,9 @@ describe CopycopterClient::Configuration, "applied when testing" do
   end
 end
 
-describe CopycopterClient::Configuration, "applied when not testing" do
-  it_should_behave_like "applied configuration" do
-    it "starts the process guard" do
+describe CopycopterClient::Configuration, 'applied when not testing' do
+  it_should_behave_like 'applied configuration' do
+    it 'starts the process guard' do
       process_guard.should have_received(:start)
     end
   end
@@ -264,9 +262,9 @@ describe CopycopterClient::Configuration, "applied when not testing" do
   end
 end
 
-describe CopycopterClient::Configuration, "applied when developing with middleware" do
-  it_should_behave_like "applied configuration" do
-    it "adds the sync middleware" do
+describe CopycopterClient::Configuration, 'applied when developing with middleware' do
+  it_should_behave_like 'applied configuration' do
+    it 'adds the sync middleware' do
       middleware.should include(CopycopterClient::RequestSync)
     end
   end
@@ -280,8 +278,8 @@ describe CopycopterClient::Configuration, "applied when developing with middlewa
   end
 end
 
-describe CopycopterClient::Configuration, "applied when developing without middleware" do
-  it_should_behave_like "applied configuration"
+describe CopycopterClient::Configuration, 'applied when developing without middleware' do
+  it_should_behave_like 'applied configuration'
 
   def apply
     subject.middleware = nil
@@ -290,8 +288,8 @@ describe CopycopterClient::Configuration, "applied when developing without middl
   end
 end
 
-describe CopycopterClient::Configuration, "applied with middleware when not developing" do
-  it_should_behave_like "applied configuration"
+describe CopycopterClient::Configuration, 'applied with middleware when not developing' do
+  it_should_behave_like 'applied configuration'
 
   let(:middleware) { MiddlewareStack.new }
 
@@ -301,7 +299,7 @@ describe CopycopterClient::Configuration, "applied with middleware when not deve
     subject.apply
   end
 
-  it "doesn't add the sync middleware" do
+  it 'does not add the sync middleware' do
     middleware.should_not include(CopycopterClient::RequestSync)
   end
 end