copycopter_client 1.0.0.beta2 → 1.0.0.beta3

data/features/rails.feature

@@ -106,13 +106,15 @@ Feature: Using copycopter in a rails app
 
   Scenario: copycopter in production
     Given the "abc123" project has the following blurbs:
-      | key                            | published content | draft content |
-      | en.users.index.controller-test | This is a test    | Extra extra   |
+      | key                             | published content | draft content |
+      | en.users.index.controller-test  | This is a test    | Extra extra   |
+      | en.users.index.unpublished-test |                   | Extra extra   |
     When I write to "app/controllers/users_controller.rb" with:
     """
     class UsersController < ActionController::Base
       def index
         @text = t("users.index.controller-test", :default => "default")
+        @unpublished = t("users.index.unpublished-test", :default => "Unpublished")
       end
     end
     """
@@ -120,12 +122,14 @@ Feature: Using copycopter in a rails app
     And I write to "app/views/users/index.html.erb" with:
     """
     <%= @text %>
+    <%= @unpublished %>
     """
     When I configure the copycopter client to use published data
     And I start the application
     And I wait for changes to be synchronized
     And I visit /users/
     Then the response should contain "This is a test"
+    And the response should contain "Unpublished"
 
   Scenario: backwards compatibility
     Given the "abc123" project has the following blurbs:

data/lib/copycopter_client/prefixed_logger.rb

@@ -27,6 +27,10 @@ module CopycopterClient
       log(:fatal, message, &block)
     end
 
+    def flush
+      original_logger.flush if original_logger.respond_to?(:flush)
+    end
+
     private
 
     def log(severity, message, &block)

data/lib/copycopter_client/sync.rb

@@ -94,6 +94,7 @@ module CopycopterClient
     def poll
       until @stop
         sync
+        logger.flush if logger.respond_to?(:flush)
         sleep(polling_delay)
       end
     rescue InvalidApiKey => error
@@ -102,8 +103,7 @@ module CopycopterClient
 
     def sync
       begin
-        downloaded_blurbs = client.download
-        lock { @blurbs = downloaded_blurbs }
+        download
         flush
       rescue ConnectionError => error
         logger.error(error.message)
@@ -123,6 +123,12 @@ module CopycopterClient
       yield(changes_to_push) if changes_to_push
     end
 
+    def download
+      downloaded_blurbs = client.download
+      downloaded_blurbs.reject! { |key, value| value == "" }
+      lock { @blurbs = downloaded_blurbs }
+    end
+
     def lock(&block)
       @mutex.synchronize(&block)
     end

data/lib/copycopter_client/version.rb

@@ -1,6 +1,6 @@
 module CopycopterClient
   # Client version
-  VERSION = "1.0.0.beta2"
+  VERSION = "1.0.0.beta3"
 
   # API version being used to communicate with the server
   API_VERSION = "2.0"

data/spec/copycopter_client/prefixed_logger_spec.rb

@@ -22,4 +22,16 @@ describe CopycopterClient::PrefixedLogger do
       output_logger.should have_entry(level, "#{prefix} #{thread_info} #{message}")
     end
   end
+
+  it "calls flush for a logger that responds to flush" do
+    output_logger.stubs(:flush)
+
+    subject.flush
+
+    output_logger.should have_received(:flush)
+  end
+
+  it "doesn't call flush for a logger that doesn't respond to flush" do
+    lambda { subject.flush }.should_not raise_error
+  end
 end

data/spec/copycopter_client/sync_spec.rb

@@ -176,6 +176,7 @@ describe CopycopterClient::Sync do
     default_config = CopycopterClient::Configuration.new.to_hash.update(config)
     real_client = CopycopterClient::Client.new(default_config)
     sync = CopycopterClient::Sync.new(real_client, default_config)
+    sync.stubs(:at_exit)
     CopycopterClient.sync = sync
     job.sync = sync
 
@@ -194,7 +195,6 @@ describe CopycopterClient::Sync do
 
     project = FakeCopycopterApp.project(api_key)
     project.draft['test.key'].should == 'all your base'
-
   end
 
   it "starts after spawning when using unicorn" do
@@ -285,6 +285,27 @@ describe CopycopterClient::Sync do
     logger.should have_entry(:error, "Couldn't start poller thread")
   end
 
+  it "flushes the log when polling" do
+    logger = FakeLogger.new
+    logger.stubs(:flush)
+    sync = build_sync(:polling_delay => 1, :logger =>  logger)
+
+    sync.start
+    sleep(2)
+
+    logger.should have_received(:flush).at_least_once
+  end
+
+  it "doesn't return blank copy" do
+    client['en.test.key'] = ''
+    sync = build_sync(:polling_delay => 1)
+
+    sync.start
+    sleep(2)
+
+    sync['en.test.key'].should be_nil
+  end
+
   describe "given locked mutex" do
     Spec::Matchers.define :finish_after_unlocking do |mutex|
       match do |thread|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: copycopter_client
 version: !ruby/object:Gem::Version 
-  hash: 299253594
+  hash: 299253595
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta2
-  version: 1.0.0.beta2
+  - beta3
+  version: 1.0.0.beta3
 platform: ruby
 authors: 
 - thoughtbot