gluer 0.0.2 → 0.0.3

data/.rspec

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

data/gluer.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Gluer::VERSION
   spec.authors       = ["rcabralc"]
   spec.email         = ["rcabralc@gmail.com"]
-  spec.description   = %q{Configuration reloader}
-  spec.summary       = %q{Reloads configuration code in a per-file basis}
+  spec.description   = %q{Reloads configuration code in a per-file basis}
+  spec.summary       = %q{Configuration reloader}
   spec.homepage      = ""
   spec.license       = "MIT"
 

data/lib/gluer/registration.rb

@@ -10,31 +10,39 @@ module Gluer
       @args = args
       @block = block
       @committed = false
+      @rolled_back = false
     end
 
     def commit
-      registry.tap do |registry|
-        commit_hook.call(registry, context, *args, &block)
-        committed_on(registry)
-      end
+      raise RuntimeError, 'already committed' if committed?
+      commit_hook.call(registry, context, *args, &block)
+      mark_committed
     end
 
     def rollback
-      if committed?
-        rollback_hook.call(registry_when_committed, context, *args, &block)
-      end
+      raise RuntimeError, 'not committed' unless committed?
+      raise RuntimeError, 'already rolled back' if rolled_back?
+      rollback_hook.call(registry, context, *args, &block)
+      mark_rolled_back
+    end
+
+    def committed?
+      @committed
+    end
+
+    def rolled_back?
+      @rolled_back
     end
 
   private
-    attr_reader :definition, :context, :args, :block, :registry_when_committed
+    attr_reader :definition, :context, :args, :block
 
-    def committed_on(registry)
-      @registry_when_committed = registry
+    def mark_committed
       @committed = true
     end
 
-    def committed?
-      @committed
+    def mark_rolled_back
+      @rolled_back = true
     end
 
     def commit_hook
@@ -46,7 +54,7 @@ module Gluer
     end
 
     def registry
-      definition.registry_factory.call
+      @registry ||= definition.registry_factory.call
     end
   end
 end

data/lib/gluer/version.rb

@@ -1,3 +1,3 @@
 module Gluer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/registration_spec.rb

@@ -0,0 +1,110 @@
+require 'gluer/registration'
+
+describe Gluer::Registration do
+  # The lifecycle of a Registration:
+  #
+  #      instantiation
+  #            |
+  #            v
+  #          commit (commit hook is called with registry factored out from
+  #            |     definition)
+  #            |
+  #            v
+  #         rollback (rollback hook is called with the same registry)
+  #            |
+  #            v
+  #     garbage collected
+  #
+  # And if the same registration is committed more than once or rolled back
+  # before being committed, errors raise.
+
+  let(:context) { stub('a context') }
+  let(:args)    { [stub('argument')] }
+  let(:block)   { lambda { block_called } }
+
+  let(:commit_hook)   { stub('the commit hook',  :call => nil) }
+  let(:rollback_hook) { stub('the rollback hook',:call => nil) }
+  let(:registry)      { stub('registry') }
+
+  let(:definition) do
+    stub(
+      :registry_factory => lambda { registry },
+      :commit_hook      => commit_hook,
+      :rollback_hook    => rollback_hook,
+    )
+  end
+
+  subject do
+    Gluer::Registration.new(definition, context, args, block)
+  end
+
+  before do
+    stub(:block_called)
+  end
+
+  it "starts as uncommitted" do
+    expect(subject).to_not be_committed
+  end
+
+  it "starts as not rolled back" do
+    expect(subject).to_not be_rolled_back
+  end
+
+  describe "#commit" do
+    it "calls the commit hook with right arguments" do
+      commit_hook.should_receive(:call).with(registry, context, *args)
+      subject.commit
+    end
+
+    it "passes the block as the block argument to the hook" do
+      should_receive(:block_called)
+      commit_hook.stub(:call) do |*, &given_block|
+        given_block.call if given_block
+      end
+      subject.commit
+    end
+
+    it "reports as committed" do
+      subject.commit
+      expect(subject).to be_committed
+    end
+
+    it "rejects further commits" do
+      subject.commit
+      expect { subject.commit }.to raise_error
+    end
+  end
+
+  describe "#rollback" do
+    before { subject.commit }
+
+    it "calls the rollback hook with right arguments, using same registry" do
+      definition.registry_factory.should_not_receive(:call)
+      rollback_hook.should_receive(:call).with(registry, context, *args)
+      subject.rollback
+    end
+
+    it "passes the block as the block argument to the hook" do
+      should_receive(:block_called)
+      rollback_hook.stub(:call) do |*, &given_block|
+        given_block.call if given_block
+      end
+      subject.rollback
+    end
+
+    it "reports as rolled back" do
+      subject.rollback
+      expect(subject).to be_rolled_back
+    end
+
+    it "rejects further rollbacks" do
+      subject.rollback
+      expect { subject.rollback }.to raise_error
+    end
+
+    it "rejects further commits" do
+      subject.rollback
+      expect { subject.commit }.to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,2 +1,22 @@
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gluer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -91,7 +91,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Configuration reloader
+description: Reloads configuration code in a per-file basis
 email:
 - rcabralc@gmail.com
 executables: []
@@ -99,6 +99,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .ruby-version
 - Gemfile
 - LICENSE.txt
@@ -118,7 +119,8 @@ files:
 - lib/gluer/registration_hook.rb
 - lib/gluer/registration_pool.rb
 - lib/gluer/version.rb
-- spec/integration/registration_spec.rb
+- spec/integration/default_usage_spec.rb
+- spec/registration_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -135,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 778545071681117987
+      hash: -643542908819081747
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,13 +146,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 778545071681117987
+      hash: -643542908819081747
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Reloads configuration code in a per-file basis
+summary: Configuration reloader
 test_files:
-- spec/integration/registration_spec.rb
+- spec/integration/default_usage_spec.rb
+- spec/registration_spec.rb
 - spec/spec_helper.rb

data/spec/integration/{registration_spec.rb → default_usage_spec.rb}

@@ -1,5 +1,5 @@
-require 'gluer'
 require 'spec_helper'
+require 'gluer'
 
 describe "Default usage" do
   before(:all) do