copycopter_client 1.0.3 → 1.0.4

data/README.md

@@ -66,6 +66,11 @@ Blurbs start out as draft copy, and won't be displayed in production environment
 
     rake copycopter:deploy
 
+Contributing
+------------
+
+Please see CONTRIBUTING.md for details.
+
 Credits
 -------
 

data/lib/copycopter_client.rb

@@ -8,19 +8,11 @@ require 'copycopter_client/configuration'
 # appropriate.
 module CopycopterClient
   class << self
-    # @return [Client] instance used to communicate with the Copycopter server.
-    # This is set when {.configure} is called.
-    attr_accessor :client
-
     # @return [Configuration] current client configuration
     # Must act like a hash and return sensible values for all Copycopter
     # configuration options. Usually set when {.configure} is called.
     attr_accessor :configuration
 
-    # @return [Cache] instance used to synchronize changes.
-    # This is set when {.configure} is called.
-    attr_accessor :cache
-
     # @return [Poller] instance used to poll for changes.
     # This is set when {.configure} is called.
     attr_accessor :poller
@@ -42,6 +34,14 @@ module CopycopterClient
     cache.flush
   end
 
+  def self.cache
+    CopycopterClient.configuration.cache
+  end
+
+  def self.client
+    CopycopterClient.configuration.client
+  end
+
   # Call this method to modify defaults in your initializers.
   #
   # @example

data/lib/copycopter_client/configuration.rb

@@ -84,6 +84,12 @@ module CopycopterClient
     # @return [String] the path to a root certificate file used to verify ssl sessions. Default's to the root certificate file for copycopter.com.
     attr_accessor :ca_file
 
+    # @return [Cache] instance used internally to synchronize changes.
+    attr_accessor :cache
+
+    # @return [Client] instance used to communicate with the Copycopter server.
+    attr_accessor :client
+
     alias_method :secure?, :secure
 
     # Instantiated from {CopycopterClient.configure}. Sets defaults.
@@ -100,7 +106,6 @@ module CopycopterClient
       self.polling_delay            = 300
       self.logger                   = Logger.new($stdout)
       self.ca_file                  = CA_FILE
-
       @applied = false
     end
 
@@ -158,17 +163,15 @@ module CopycopterClient
     #
     # Called automatically when {CopycopterClient.configure} is called in the application.
     #
-    # This creates the {Client}, {Cache}, and {I18nBackend} and puts them together.
+    # This creates the {I18nBackend} and puts them together.
     #
     # When {#test?} returns +false+, the poller will be started.
     def apply
-      client = Client.new(to_hash)
-      cache = Cache.new(client, to_hash)
-      poller = Poller.new(cache, to_hash)
+      self.client ||= Client.new(to_hash)
+      self.cache  ||= Cache.new(client, to_hash)
+      poller        = Poller.new(cache, to_hash)
       process_guard = ProcessGuard.new(cache, poller, to_hash)
-      I18n.backend = I18nBackend.new(cache)
-      CopycopterClient.client = client
-      CopycopterClient.cache = cache
+      I18n.backend  = I18nBackend.new(cache)
       middleware.use(RequestSync, :cache => cache) if middleware && development?
       @applied = true
       logger.info("Client #{VERSION} ready")

data/lib/copycopter_client/version.rb

@@ -1,8 +1,8 @@
 module CopycopterClient
   # Client version
-  VERSION = "1.0.3"
+  VERSION = "1.0.4".freeze
 
   # API version being used to communicate with the server
-  API_VERSION = "2.0"
+  API_VERSION = "2.0".freeze
 end
 

data/spec/copycopter_client/cache_spec.rb

@@ -196,7 +196,9 @@ describe CopycopterClient::Cache do
 
   it "flushes from the top level" do
     cache = build_cache
-    CopycopterClient.cache = cache
+    CopycopterClient.configure do |config|
+      config.cache = cache
+    end
     cache.stubs(:flush)
 
     CopycopterClient.flush

data/spec/copycopter_client/client_spec.rb

@@ -195,7 +195,9 @@ describe CopycopterClient do
 
   it "deploys from the top-level constant" do
     client = build_client
-    CopycopterClient.client = client
+    CopycopterClient.configure do |config|
+      config.client = client
+    end
     client.stubs(:deploy)
 
     CopycopterClient.deploy

data/spec/copycopter_client/configuration_spec.rb

@@ -43,6 +43,8 @@ describe CopycopterClient::Configuration do
   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).
@@ -194,7 +196,7 @@ end
 
 share_examples_for "applied configuration" do
   let(:backend) { stub('i18n-backend') }
-  let(:cache)    { stub('cache') }
+  let(:cache)   { stub('cache') }
   let(:client)  { stub('client') }
   let(:poller)  { stub('poller') }
   let(:process_guard) { stub('process_guard', :start => nil) }
@@ -214,8 +216,6 @@ share_examples_for "applied configuration" do
   it { should be_applied }
 
   it "builds and assigns an I18n backend" do
-    CopycopterClient::Client.should have_received(:new).with(subject.to_hash)
-    CopycopterClient::Cache.should have_received(:new).with(client, subject.to_hash)
     CopycopterClient::I18nBackend.should have_received(:new).with(cache)
     I18n.backend.should == backend
   end
@@ -236,14 +236,6 @@ share_examples_for "applied configuration" do
   it "logs environment info" do
     logger.should have_entry(:info, "Environment Info: #{subject.environment_info}")
   end
-
-  it "stores the client" do
-    CopycopterClient.client.should == client
-  end
-
-  it "stores the cache" do
-    CopycopterClient.cache.should == cache
-  end
 end
 
 describe CopycopterClient::Configuration, "applied when testing" do

data/spec/copycopter_client/process_guard_spec.rb

@@ -16,7 +16,7 @@ describe CopycopterClient::ProcessGuard do
 
   def build_process_guard(options = {})
     options[:logger] ||= FakeLogger.new
-    options[:cache] ||= cache
+    options[:cache]  ||= cache
     CopycopterClient::ProcessGuard.new(options[:cache], poller, options)
   end
 

data/spec/copycopter_client_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe CopycopterClient do
+
+  before do
+    CopycopterClient.configuration.stubs(:cache  => 'cache',
+                                         :client => 'client')
+  end
+
+  it 'delegates cache to the configuration object' do
+    CopycopterClient.cache.should == 'cache'
+    CopycopterClient.configuration.should have_received(:cache).once
+  end
+
+  it 'delegates client to the configuration object' do
+    CopycopterClient.client.should == 'client'
+    CopycopterClient.configuration.should have_received(:client).once
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: copycopter_client
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - thoughtbot
@@ -15,12 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-21 00:00:00 -04:00
-default_executable: 
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +29,11 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
+  name: i18n
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,8 +43,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   version_requirements: *id002
+  name: json
+  prerelease: false
+  type: :runtime
 description: 
 email: support@thoughtbot.com
 executables: []
@@ -84,6 +83,7 @@ files:
 - spec/copycopter_client/prefixed_logger_spec.rb
 - spec/copycopter_client/process_guard_spec.rb
 - spec/copycopter_client/request_sync_spec.rb
+- spec/copycopter_client_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_spec_helpers.rb
 - spec/support/defines_constants.rb
@@ -101,7 +101,6 @@ files:
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
 - features/support/rails_server.rb
-has_rdoc: true
 homepage: http://github.com/thoughtbot/copycopter_client
 licenses: []
 
@@ -131,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: copycopter_client
-rubygems_version: 1.4.1
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Client for the Copycopter content management service