lyre 0.1.1 → 0.1.2

data/lib/lyre/app.rb

@@ -1,12 +1,12 @@
-require 'lyre/registry'
-require 'sinatra'
+require 'sinatra/base'
+require 'capybara'
 
 module Lyre
 
   #NOTE: Not sure this is the right name for this class
   class App < Sinatra::Base
 
-    attr_accessor :host, :port
+    attr_accessor :endpoint
 
     class << self
       attr_accessor :setup_block, :teardown_block
@@ -19,37 +19,25 @@ module Lyre
         self.teardown_block = block
       end
 
-      alias_method :create, :new! #Sinatra redefines new as new!, so make it easy to access
-    end
+      def boot
+        instance = self.new! #maybe just new
 
-    def start
-      return if started?
-      Lyre::Registry.register_and_run self
-      self.class.setup_block.call(self) if self.class.setup_block
-      self.started = true
-      self
-    end
+        Capybara::Server.new(instance).tap do |server|
+          server.boot
 
-    def stop
-      return unless started?
-      Lyre::Registry.stop_and_deregister self
-      self.class.teardown_block.call(self) if self.class.teardown_block
-      self.started = false
-      self
-    end
+          instance.endpoint = "http://#{server.host}:#{server.port}"
+          
+          setup_block.call(instance) if setup_block
+        end
 
-    def endpoint
-      "http://#{host}:#{port}" #may want to make http/https configurable
+        instance
+      end
     end
 
-    def started?
-      started
+    def shutdown
+      self.class.teardown_block.call(self) if self.class.teardown_block
     end
 
-    private
-
-    attr_accessor :started
-    
   end
 
 end

data/lib/lyre/version.rb

@@ -1,3 +1,3 @@
 module Lyre
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/end_to_end_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe 'End to end test - Refactor later' do
   
   before(:all) do
-    @lyre = FakeServiceLyre.create.start
+    @lyre = FakeServiceLyre.boot
   end
 
   after(:all) do
-    @lyre.stop
+    @lyre.shutdown
   end
 
   it "should mock the endpoint that FakeService tries to access" do

data/spec/lifecycle_spec.rb

@@ -3,45 +3,28 @@ require 'spec_helper'
 describe "Lifecycle Tests" do
 
   describe "setup and teardown are called" do
-    before(:each) { @lyre = LifeCycleLyre.create.start }
-    after(:each) { @lyre.stop }
+    before(:each) { @lyre = LifeCycleLyre.boot }
+    after(:each) { @lyre.shutdown }
 
     it "should call setup block when the lyre is started" do
       LifeCycleLyre.setup_called.should be_true
     end
 
     it "should call teardown block when the lyre is stopped" do
-      @lyre.stop
+      @lyre.shutdown
 
       LifeCycleLyre.setup_called.should be_true   
     end
   end
 
   describe "setup and teardown are optional" do
-    before(:each) { @lyre = NoLifeCycleLyre.create }
-    after(:each) { @lyre.stop }
-
     it "should not fail if the lyre has no setup" do
-      @lyre.start
+      NoLifeCycleLyre.boot
     end
 
     it "should not fail of the lyre has no teardown" do
-      @lyre.stop
-    end
-  end
-
-  describe "start and stop are idempotent" do
-    before(:each) { @lyre = NoLifeCycleLyre.create }
-    after(:each) { @lyre.stop }
-
-    it "should allow start to be called twice" do
-      @lyre.start.start
-    end
-
-    it "should allow stop to be called twice" do
-      @lyre.start.stop.stop
+      NoLifeCycleLyre.boot.shutdown
     end
-
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lyre
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-17 00:00:00.000000000 Z
+date: 2013-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -123,13 +123,11 @@ files:
 - lib/lyre.rb
 - lib/lyre/app.rb
 - lib/lyre/constants.rb
-- lib/lyre/registry.rb
 - lib/lyre/version.rb
 - lyre.gemspec
 - spec/end_to_end_spec.rb
 - spec/fake_service_spec.rb
 - spec/lifecycle_spec.rb
-- spec/registration_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_service.rb
 - spec/support/fake_service_lyre.rb
@@ -163,7 +161,6 @@ test_files:
 - spec/end_to_end_spec.rb
 - spec/fake_service_spec.rb
 - spec/lifecycle_spec.rb
-- spec/registration_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_service.rb
 - spec/support/fake_service_lyre.rb

data/lib/lyre/registry.rb

@@ -1,27 +0,0 @@
-require 'capybara'
-
-module Lyre
-  module Registry
-
-    @@registry = {}
-
-    def self.register_and_run(lyre)
-      raise "Lyre already registered" if @@registry.has_key? lyre.class
-
-      @@registry[lyre.class] = Capybara::Server.new(lyre).tap do |server|
-        server.boot
-
-        lyre.host = server.host
-        lyre.port = server.port
-      end
-    end
-
-    def self.stop_and_deregister(lyre)
-      raise "Lyre not registered" unless @@registry.has_key? lyre.class
-
-      #server cannot be stopped
-
-      @@registry.delete(lyre.class)
-    end
-  end
-end

data/spec/registration_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe "Lyre registration" do
-
-  before(:each) do
-    @lyre_one = FakeServiceLyre.create
-    @lyre_two = FakeServiceLyre.create
-  end
-
-  after(:each) do
-    @lyre_one.stop
-    @lyre_two.stop
-  end
-
-  it "should not allow two instances of the same lyre to run simultaneously" do
-    @lyre_one.start
-    expect { @lyre_two.start }.to raise_error('Lyre already registered')
-  end
-
-end