copycopter_client 1.0.0.beta10 → 1.0.0.beta11

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'cucumber/rake/task'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'yard'
 
 desc 'Default: run the specs and features.'
@@ -15,9 +15,9 @@ task :default => :spec do
 end
 
 desc 'Test the copycopter_client plugin.'
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/copycopter_client/**/*_spec.rb']
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ['--color', "--format progress"]
+  t.pattern = 'spec/copycopter_client/**/*_spec.rb'
 end
 
 desc "Run cucumber features"

data/features/rails.feature

@@ -1,4 +1,4 @@
-@disable-bundler @puts @announce
+@disable-bundler
 Feature: Using copycopter in a rails app
 
   Background:
@@ -132,32 +132,6 @@ Feature: Using copycopter in a rails app
       | key                         | draft content |
       | en.users.index.unknown-test | Unknown       |
 
-  Scenario: backwards compatibility
-    Given the "abc123" project has the following blurbs:
-      | key                            | draft content    |
-      | en.users.index.controller-test | Controller blurb |
-      | en.users.index.view-test       | View blurb       |
-    When I write to "app/controllers/users_controller.rb" with:
-    """
-    class UsersController < ActionController::Base
-      def index
-        @text = s('.controller-test')
-        render
-      end
-    end
-    """
-    When I route the "users" resource
-    And I write to "app/views/users/index.html.erb" with:
-    """
-    <%= @text %>
-    <%= s(".view-test", "default") %>
-    """
-    When I start the application
-    And I wait for changes to be synchronized
-    And I visit /users/
-    Then the response should contain "Controller blurb"
-    And the response should contain "View blurb"
-
   Scenario: configure a bad api key
     When I configure the copycopter client with api key "bogus"
     And I start the application

data/features/step_definitions/rails_steps.rb

@@ -19,7 +19,7 @@ When "I generate a rails application" do
 end
 
 When /^I configure the copycopter client with api key "([^"]*)"$/ do |api_key|
-  create_file("config/initializers/copycopter.rb", <<-RUBY)
+  write_file("config/initializers/copycopter.rb", <<-RUBY)
     CopycopterClient.configure do |config|
       config.api_key = "#{api_key}"
       config.polling_delay = 1
@@ -131,7 +131,7 @@ When /^I route the "([^"]+)" resource$/ do |resource|
 
   routes = "#{draw}resources :#{resource}\nend"
 
-  create_file("config/routes.rb", routes, false)
+  overwrite_file("config/routes.rb", routes)
 end
 
 When /^I run a short lived process that sets the key "([^"]*)" to "([^"]*)"$/ do |key, value|

data/features/support/env.rb

@@ -6,3 +6,7 @@ PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 require "copycopter_client/version"
 
+Before do
+  @aruba_timeout_seconds = 15
+end
+

data/features/support/rails_server.rb

@@ -28,6 +28,12 @@ class RailsServer
   end
 
   def self.run(port, silent)
+    if silent
+      require 'stringio'
+      $stdout = StringIO.new
+      $stderr = StringIO.new
+    end
+
     require 'config/environment'
     require 'thin'
 

data/lib/copycopter_client/rails.rb

@@ -1,12 +1,3 @@
-require 'copycopter_client/helper'
-
-if defined?(ActionController::Base)
-  ActionController::Base.send :include, CopycopterClient::Helper
-end
-if defined?(ActionView::Base)
-  ActionView::Base.send :include, CopycopterClient::Helper
-end
-
 module CopycopterClient
   # Responsible for Rails initialization
   module Rails

data/lib/copycopter_client/version.rb

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

data/spec/copycopter_client/configuration_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe CopycopterClient::Configuration do
-  Spec::Matchers.define :have_config_option do |option|
+  RSpec::Matchers.define :have_config_option do |option|
     match do |config|
       config.should respond_to(option)
 
@@ -204,6 +204,7 @@ share_examples_for "applied configuration" do
     CopycopterClient::Client.stubs(:new => client)
     CopycopterClient::Sync.stubs(:new => sync)
     subject.logger = logger
+    apply
   end
 
   it { should be_applied }
@@ -233,51 +234,51 @@ share_examples_for "applied configuration" do
 end
 
 describe CopycopterClient::Configuration, "applied when testing" do
-  it_should_behave_like "applied configuration"
+  it_should_behave_like "applied configuration" do
+    it "doesn't start sync" do
+      sync.should have_received(:start).never
+    end
+  end
 
-  before do
+  def apply
     subject.environment_name = 'test'
     subject.apply
   end
-
-  it "doesn't start sync" do
-    sync.should have_received(:start).never
-  end
 end
 
 describe CopycopterClient::Configuration, "applied when not testing" do
-  it_should_behave_like "applied configuration"
+  it_should_behave_like "applied configuration" do
+    it "starts sync" do
+      sync.should have_received(:start)
+    end
+  end
 
-  before do
+  def apply
     subject.environment_name = 'development'
     subject.apply
   end
-
-  it "starts sync" do
-    sync.should have_received(:start)
-  end
 end
 
 describe CopycopterClient::Configuration, "applied when developing with middleware" do
-  it_should_behave_like "applied configuration"
+  it_should_behave_like "applied configuration" do
+    it "adds the sync middleware" do
+      middleware.should include(CopycopterClient::RequestSync)
+    end
+  end
 
   let(:middleware) { MiddlewareStack.new }
 
-  before do
+  def apply
     subject.middleware = middleware
     subject.environment_name = 'development'
     subject.apply
   end
-
-  it "adds the sync middleware" do
-    middleware.should include(CopycopterClient::RequestSync)
-  end
 end
 
 describe CopycopterClient::Configuration, "applied when developing without middleware" do
   it_should_behave_like "applied configuration"
 
-  before do
+  def apply
     subject.middleware = nil
     subject.environment_name = 'development'
     subject.apply
@@ -289,7 +290,7 @@ describe CopycopterClient::Configuration, "applied with middleware when not deve
 
   let(:middleware) { MiddlewareStack.new }
 
-  before do
+  def apply
     subject.middleware = middleware
     subject.environment_name = 'test'
     subject.apply

data/spec/copycopter_client/sync_spec.rb

@@ -343,7 +343,7 @@ describe CopycopterClient::Sync do
   end
 
   describe "given locked mutex" do
-    Spec::Matchers.define :finish_after_unlocking do |mutex|
+    RSpec::Matchers.define :finish_after_unlocking do |mutex|
       match do |thread|
         sleep(0.1)
 

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 require 'bourne'
 require 'sham_rack'
 require 'webmock/rspec'
@@ -18,7 +17,7 @@ end
 WebMock.disable_net_connect!
 ShamRack.mount(FakeCopycopterApp.new, "copycopter.com", 443)
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include ClientSpecHelpers
   config.include WebMock::API
   config.mock_with :mocha

data/spec/support/fake_logger.rb

@@ -41,7 +41,7 @@ class FakeLogger
   attr_reader :entries
 end
 
-Spec::Matchers.define :have_entry do |severity, entry|
+RSpec::Matchers.define :have_entry do |severity, entry|
   match do |logger|
     @logger = logger
     logger.has_entry?(severity, entry)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: copycopter_client
 version: !ruby/object:Gem::Version 
-  hash: 180128174
+  hash: 180128175
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta10
-  version: 1.0.0.beta10
+  - beta11
+  version: 1.0.0.beta11
 platform: ruby
 authors: 
 - thoughtbot
@@ -65,7 +65,6 @@ files:
 - lib/copycopter_client/client.rb
 - lib/copycopter_client/configuration.rb
 - lib/copycopter_client/errors.rb
-- lib/copycopter_client/helper.rb
 - lib/copycopter_client/i18n_backend.rb
 - lib/copycopter_client/prefixed_logger.rb
 - lib/copycopter_client/rails.rb
@@ -77,12 +76,10 @@ files:
 - lib/tasks/copycopter_client_tasks.rake
 - spec/copycopter_client/client_spec.rb
 - spec/copycopter_client/configuration_spec.rb
-- spec/copycopter_client/helper_spec.rb
 - spec/copycopter_client/i18n_backend_spec.rb
 - spec/copycopter_client/prefixed_logger_spec.rb
 - spec/copycopter_client/request_sync_spec.rb
 - spec/copycopter_client/sync_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/client_spec_helpers.rb
 - spec/support/defines_constants.rb

data/lib/copycopter_client/helper.rb

@@ -1,40 +0,0 @@
-module CopycopterClient
-  # Helper methods for Copycopter
-  # @deprecated use +I81n#translate+ instead.
-  module Helper
-    # Returns copy for the given key in the current locale.
-    # @param key [String] the key you want copy for
-    # @param default [String, Hash] an optional default value, used if this key is missing
-    # @option default [String] :default the default text
-    def copy_for(key, default=nil)
-      default = if default.respond_to?(:to_hash)
-                  default[:default]
-                else
-                  default
-                end
-
-      key = scope_copycopter_key_by_partial(key)
-      warn("WARNING: #s is deprecated; use t(#{key.inspect}, :default => #{default.inspect}) instead.")
-      I18n.translate(key, { :default => default })
-    end
-    alias_method :s, :copy_for
-
-    private
-
-    def scope_copycopter_key_by_partial(key)
-      if respond_to?(:scope_key_by_partial, true)
-        scope_key_by_partial(key)
-      elsif key.to_s[0].chr == "."
-        if respond_to?(:template)
-          "#{template.path_without_format_and_extension.gsub(%r{/_?}, '.')}#{key}"
-        else
-          "#{controller_name}.#{action_name}#{key}"
-        end
-      else
-        key
-      end
-    end
-  end
-
-  extend Helper
-end

data/spec/copycopter_client/helper_spec.rb

@@ -1,86 +0,0 @@
-require 'spec_helper'
-require 'copycopter_client/helper'
-
-describe CopycopterClient::Helper do
-  subject { Object.new }
-
-  before do
-    class << subject
-      include CopycopterClient::Helper
-      def warn(*args); end # these are annoying in test output
-    end
-    I18n.stubs(:translate)
-  end
-
-  Spec::Matchers.define :have_translated do |key, default|
-    match do |ignored_subject|
-      extend Mocha::API
-      I18n.should have_received(:translate).with(key, :default => default)
-    end
-  end
-
-  it "translates keys on CopycopterClient.s" do
-    CopycopterClient.s('test.key', 'default')
-    should have_translated("test.key", 'default')
-  end
-
-  it "translates keys on CopycopterClient.copy_for" do
-    CopycopterClient.copy_for('test.key', 'default')
-    should have_translated("test.key", 'default')
-  end
-
-  it "uses existing scope by partial key when present" do
-    subject.stubs(:scope_key_by_partial => "controller.action.key")
-    class << subject
-      private :scope_key_by_partial
-    end
-
-    subject.s(".key")
-
-    subject.should have_received(:scope_key_by_partial).with(".key")
-    should have_translated("controller.action.key", nil)
-  end
-
-  it "should prepend current partial when key starts with . and inside a view" do
-    template = stub(:path_without_format_and_extension => "controller/action")
-    subject.stubs(:template => template)
-
-    subject.s(".key")
-
-    should have_translated("controller.action.key", nil)
-  end
-
-  it "should prepend controller and action when key starts with . and inside a controller" do
-    subject.stubs(:controller_name => "controller", :action_name => "action")
-
-    subject.s(".key")
-
-    should have_translated("controller.action.key", nil)
-  end
-
-  describe "default assignment" do
-    before do
-      subject.stubs(:scope_copycopter_key_by_partial => '.key')
-    end
-
-    it "should allow a hash with key default" do
-      subject.s(@key, :default => "Default string")
-      should have_translated('.key', "Default string")
-    end
-
-    it "should not allow a hash with stringed key default" do
-      subject.s(@key, "default" => "Default string")
-      should have_translated('.key', nil)
-    end
-
-    it "should not allow a hash with key other than default" do
-      subject.s(@key, :junk => "Default string")
-      should have_translated('.key', nil)
-    end
-
-    it "should allow a string" do
-      subject.s(@key, "Default string")
-      should have_translated('.key', "Default string")
-    end
-  end
-end

data/spec/spec.opts

@@ -1,2 +0,0 @@
---format progress
---color