aktion_test 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.2
+  * More spec helper improvements
+  * Update factory girl to 4.2
+  * Mixin factory girl syntax to rspec
+  * Cleanup some tests
+
 # v0.2.1
   * Improve spec helper
   * Add FactoryGirl, Faker and Timecop

data/aktion_test.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   # even the simplest gem.
   gem.add_dependency 'rspec',        '~> 2.12.0'
   gem.add_dependency 'faker',        '~> 1.1.2'
-  gem.add_dependency 'factory_girl', '~> 4.1.0'
+  gem.add_dependency 'factory_girl', '~> 4.2.0'
   gem.add_dependency 'simplecov',    '~> 0.7.1'
   gem.add_dependency 'timecop',      '~> 0.5.3'
 end

data/lib/aktion_test/module/factory_girl.rb

@@ -5,6 +5,10 @@ module AktionTest
       
       included do |spec_helper|
         require 'factory_girl'
+
+        ::RSpec.configure do |config|
+          config.include ::FactoryGirl::Syntax::Methods
+        end
       end
     end
   end

data/lib/aktion_test/spec_helper.rb

@@ -8,43 +8,20 @@ module AktionTest
 
     class << self
       def load(*names, &block)
-        options = names.extract_options!
-
         if names.any?
-          load_constants(names)
-
-          unless options.nil? || options.empty?
-            names.each do |name|
-              instance.options.merge! name => options
-            end
-          end
-
-          instance.modules.each do |mod|
-            include mod
-          end
+          instance.load(*names)
         end
 
-        self.instance_eval(&block) if block_given?
-      end
+        instance.instance_eval(&block) if block_given?
 
-      def within(scope, &block)
-        instance.scope << scope.to_s
-        yield
-        instance.scope.pop
+        instance.modules.each{|mod| include mod}
       end
 
-    private
+      def add_module(name, options={})
+      end
 
-      def load_constants(modules)
-        modules.each do |mod|
-          module_name = "#{instance.scope.join('::')}::#{mod}"
-          begin
-            module_const = module_name.constantize
-            instance.modules << module_const
-          rescue NameError
-            puts "Unknown module #{mod}."
-          end
-        end
+      def add_modules(*names)
+        names.each{|name| add_module(name)}
       end
     end
 
@@ -61,5 +38,34 @@ module AktionTest
     def loaded?(name)
       eval "defined? AktionTest::Module::#{name}"
     end
+
+    def load(*names)
+      options = names.extract_options!
+
+      names.each do |name|
+        unless options.nil? or options.empty?
+          self.options.merge! name => options
+        end
+        load_constant(name)
+      end
+    end
+
+    def within(scope, &block)
+      self.scope << scope.to_s
+      yield
+      self.scope.pop
+    end
+
+  private
+
+    def load_constant(name)
+      name = "#{self.scope.join('::')}::#{name}"
+      begin
+        const = name.constantize
+        self.modules << const
+      rescue NameError
+        puts "Unknown module #{name}."
+      end
+    end
   end
 end

data/lib/aktion_test/version.rb

@@ -1,3 +1,3 @@
 module AktionTest
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/aktion_test/spec_helper_spec.rb

@@ -11,7 +11,7 @@ describe AktionTest::SpecHelper do
 
   describe '#within' do
     it 'allows a scope to be added' do
-      described_class.within :Test do
+      subject.within :Test do
         subject.scope.should == %w(AktionTest Module Test)
       end
       subject.scope.should == %w(AktionTest Module)
@@ -19,24 +19,16 @@ describe AktionTest::SpecHelper do
   end
 
   describe '#load' do
-    before do
+    it 'initializes the module, adds it to a set of loaded modules, and saves any options' do
       subject.scope.pop(2)
       subject.scope << 'Baz'
-    end
 
-    it 'initializes the module' do
-      Baz.autoload?(:Bar).should == 'support/test_module'
-      described_class.load :Bar
-      Baz.autoload?(:Bar).should be_nil
-    end
+      Baz.autoload?(:Bar).should_not be_nil
 
-    it 'adds the module to a set of loaded modules' do
-      described_class.load :Bar
-      subject.modules.should == [Baz::Bar]
-    end
-
-    it 'saves options for the module loaded' do
       described_class.load :Bar, :test => :option
+
+      subject.modules.should == [Baz::Bar]
+      Baz.autoload?(:Bar).should be_nil
       subject.options.should have_key(:Bar)
       subject.options[:Bar].should == {:test => :option}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aktion_test
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -153,9 +153,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 847893389
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24