pusher-fake 0.13.0 → 0.14.0

data/spec/lib/pusher_fake_spec.rb

@@ -26,35 +26,66 @@ describe PusherFake, ".configuration" do
 
   it "initializes a configuration object" do
     subject.configuration
-    PusherFake::Configuration.should have_received(:new)
+
+    expect(PusherFake::Configuration).to have_received(:new)
   end
 
   it "memoizes the configuration" do
-    subject.configuration
-    subject.configuration
-    PusherFake::Configuration.should have_received(:new).once
+    2.times { subject.configuration }
+
+    expect(PusherFake::Configuration).to have_received(:new).once
   end
 
   it "returns the configuration" do
-    subject.configuration.should == configuration
+    expect(subject.configuration).to eq(configuration)
   end
 end
 
 describe PusherFake, ".javascript" do
-  let(:options)       { { custom: "option" } }
   let(:configuration) { subject.configuration }
 
   subject { PusherFake }
 
   it "returns JavaScript setting the host and port to the configured options" do
-    arguments = [configuration.key, configuration.to_options].map(&:to_json).join(",")
+    arguments  = [configuration.key, configuration.to_options].map(&:to_json).join(",")
+    javascript = subject.javascript
 
-    subject.javascript.should == "new Pusher(#{arguments})"
+    expect(javascript).to eq("new Pusher(#{arguments})")
   end
 
   it "supports passing custom options" do
-    arguments = [configuration.key, configuration.to_options(options)].map(&:to_json).join(",")
+    options    = { custom: "option" }
+    arguments  = [configuration.key, configuration.to_options(options)].map(&:to_json).join(",")
+    javascript = subject.javascript(options)
+
+    expect(javascript).to eq("new Pusher(#{arguments})")
+  end
+end
+
+describe PusherFake, ".log" do
+  let(:logger)        { stub(:<< => "") }
+  let(:message)       { "Hello world." }
+  let(:configuration) { subject.configuration }
+
+  subject { PusherFake }
+
+  before do
+    configuration.logger = logger
+  end
+
+  it "forwards message to logger when verbose" do
+    configuration.verbose = true
+
+    subject.log(message)
+
+    expect(logger).to have_received(:<<).with(message + "\n").once
+  end
+
+  it "does not forward message when not verbose" do
+    configuration.verbose = false
+
+    subject.log(message)
 
-    subject.javascript(options).should == "new Pusher(#{arguments})"
+    expect(logger).to have_received(:<<).never
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,8 @@ Dir[File.expand_path("../support/**/*.rb", __FILE__)].each do |file|
 end
 
 RSpec.configure do |config|
-  config.mock_with :mocha
-  config.include(ConfigurationHelper)
+  config.mock_with   :mocha
+  config.expect_with :rspec do |rspec|
+    rspec.syntax = :expect
+  end
 end

data/spec/support/have_configuration_option_matcher.rb

@@ -1,44 +1,17 @@
-module ConfigurationHelper
-  class ConfigurationOption
-    def initialize(option)
-      @option = option
-    end
-
-    def matches?(configuration)
-      @configuration = configuration
-      @configuration.respond_to?(@option).should == true
-
-      if instance_variables.include?(:@default)
-        actual = @configuration.__send__(@option)
-
-        if @default.is_a?(Hash)
-          @default.each do |key, value|
-            actual[key].should == value
-          end
-        else
-          actual.should == @default
-        end
-      end
-
-      @configuration.__send__(:"#{@option}=", "value")
-      @configuration.__send__(@option).should == "value"
-    end
-
-    def with_default(default)
-      @default = default
-
-      self
-    end
+RSpec::Matchers.define :have_configuration_option do |option|
+  match do |configuration|
+    configuration.respond_to?(option) &&
+      configuration.respond_to?("#{option}=") &&
+      (@default.nil? || configuration.public_send(option) == @default)
+  end
 
-    def failure_message
-      description  = "expected #{@configuration} to have"
-      description << " configuration option #{@option.inspect}"
-      description << " with a default of #{@default.inspect}" if instance_variables.include?("@default")
-      description
-    end
+  chain :with_default do |default|
+    @default = default
   end
 
-  def have_configuration_option(option)
-    ConfigurationOption.new(option)
+  failure_message_for_should do |configuration|
+    description  = "expected configuration to have #{option.inspect} option"
+    description << " with a default of #{@default.inspect}" unless @default.nil?
+    description
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pusher-fake
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Tristan Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
@@ -100,20 +100,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.1
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +148,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement