cantango-config 0.1.7 → 0.1.8

data/Gemfile

@@ -6,7 +6,7 @@ group :default do
   gem 'sweetloader',    '~> 0.1.6'
   gem 'hashie',         '~> 0.4.0'
 
-  gem 'cantango-core',  '~> 0.1.7'
+  gem 'cantango-core',  '~> 0.1.9'
 end
 
 group :development do

data/Gemfile.lock

@@ -32,7 +32,7 @@ GEM
     arel (2.2.1)
     builder (3.0.0)
     cancan (1.6.7)
-    cantango-core (0.1.7)
+    cantango-core (0.1.9)
       cancan (>= 1.4)
       hashie
       rails (>= 3.0.1)
@@ -121,7 +121,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
-    sugar-high (0.6.1)
+    sugar-high (0.6.2.1)
       activesupport (>= 3.0.1)
     sweetloader (0.1.6)
       activesupport (>= 3.0.1)
@@ -139,7 +139,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.1.rc)
-  cantango-core (~> 0.1.7)
+  cantango-core (~> 0.1.9)
   cutter
   database_cleaner
   dkastner-moneta (>= 1.0)

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/cantango-config.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-config}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
-  s.date = %q{2011-12-06}
+  s.date = %q{2011-12-08}
   s.description = %q{Configuration DSL for configuring CanTango}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -122,7 +122,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sugar-high>, [">= 0.6.1"])
       s.add_runtime_dependency(%q<sweetloader>, ["~> 0.1.6"])
       s.add_runtime_dependency(%q<hashie>, ["~> 0.4.0"])
-      s.add_runtime_dependency(%q<cantango-core>, ["~> 0.1.7"])
+      s.add_runtime_dependency(%q<cantango-core>, ["~> 0.1.9"])
       s.add_development_dependency(%q<bundler>, [">= 1.1.rc"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -132,7 +132,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sugar-high>, [">= 0.6.1"])
       s.add_dependency(%q<sweetloader>, ["~> 0.1.6"])
       s.add_dependency(%q<hashie>, ["~> 0.4.0"])
-      s.add_dependency(%q<cantango-core>, ["~> 0.1.7"])
+      s.add_dependency(%q<cantango-core>, ["~> 0.1.9"])
       s.add_dependency(%q<bundler>, [">= 1.1.rc"])
       s.add_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -143,7 +143,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sugar-high>, [">= 0.6.1"])
     s.add_dependency(%q<sweetloader>, ["~> 0.1.6"])
     s.add_dependency(%q<hashie>, ["~> 0.4.0"])
-    s.add_dependency(%q<cantango-core>, ["~> 0.1.7"])
+    s.add_dependency(%q<cantango-core>, ["~> 0.1.9"])
     s.add_dependency(%q<bundler>, [">= 1.1.rc"])
     s.add_dependency(%q<jeweler>, [">= 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

data/lib/cantango/configuration/ability.rb

@@ -7,8 +7,21 @@ module CanTango
       include CanTango::Configuration::Factory
       include CanTango::Configuration::ExecutionModes
       
+      def default_executor_class
+        @default_executor_class ||= CanTango::Ability::Executor::Modal
+      end
+
+      def default_executor_class= clazz
+        raise ArgumentError, "default must be a Class" if !is_class? clazz
+        @default_executor_class = clazz
+      end
+
       def default_class
-        @default_class ||= CanTango::Ability::Executor::Modal
+        @default_class ||= CanTango::Ability::Base
+      end
+      
+      def factor_class_method
+        :default_executor_class
       end
     end
   end

data/lib/cantango/configuration/accounts.rb

@@ -5,14 +5,15 @@ module CanTango
 
       def register_account clazz
         register account_name(clazz), clazz
+        self
       end
+      alias_method :register_class, :register_account
 
       protected
       
       def account_name clazz
-        clazz.name.demodulize.gsub(/(.+)Account$/, '\1')..underscore
-      end
-      
+        clazz.name.demodulize.gsub(/(.+)Account$/, '\1').to_s.underscore
+      end      
     end
   end
 end

data/lib/cantango/configuration/factory.rb

@@ -1,13 +1,17 @@
 module CanTango
   class Configuration
     module Factory
-      def clear!
+      def clear_factory!
         @factory = nil
       end
 
-      def factory factory = nil
-        raise ArgumentError, "Factory must be a callable (lambda or Proc), was: #{proc}" if !callable? factory
-        @factory = factory
+      def factory proc = nil
+        raise ArgumentError, "Factory must be a callable (lambda or Proc), was: #{proc}" unless callable? proc
+        @factory = proc
+      end
+
+      def get_factory
+        @factory
       end
 
       alias_method :factory=, :factory
@@ -22,8 +26,10 @@ module CanTango
       end
 
       def default_factory obj = nil, opts = {}
-        raise "Default factory must be defined" if !default_class
-        default_class.new obj, options.merge(opts)
+        clazz_meth = send(:factory_class_method) if respond_to? :factory_class_method
+        clazz_meth = :default_class unless clazz_meth && respond_to?(clazz_meth)
+        raise "Default factory must be defined via call to ##{clazz_meth}" unless send(clazz_meth)
+        send(clazz_meth).new obj, options.merge(opts)
       end
 
       attr_reader :default_class

data/lib/cantango/configuration/users.rb

@@ -6,11 +6,12 @@ module CanTango
       def register_user clazz
         register user_name(clazz), clazz
       end
-        
+      alias_method :register_class, :register_user
+              
       protected
       
       def user_name clazz
-        clazz.name.demodulize.gsub(/(.+)User$/, '\1')..underscore
+        clazz.name.demodulize.gsub(/(.+)User$/, '\1').to_s.underscore
       end      
     end
   end

data/spec/cantango/configuration/ability_spec.rb

@@ -2,12 +2,43 @@ require 'spec_helper'
 require 'cantango/configuration/shared/factory_ex'
 require 'cantango/configuration/shared/execution_modes_ex'
 
+class MyExecutor
+end
+
 describe CanTango::Configuration::Ability do
   subject { CanTango.config.ability }
     
   it_should_behave_like 'Factory'
 
   it_should_behave_like 'Execution Modes'
+
+  describe 'default_executor_class' do
+    specify { subject.default_executor_class.should == CanTango::Ability::Executor::Modal }
+  end
+
+  describe 'default_executor_class' do
+    specify { subject.default_executor_class.should == CanTango::Ability::Executor::Modal }
+  end
+
+  describe 'default_executor_class=' do
+    specify do
+      lambda { subject.default_executor_class = 's' }.should raise_error
+    end
+
+    specify do
+      subject.default_executor_class = MyExecutor
+      subject.default_executor_class.should ==  MyExecutor
+    end
+  end
+
+  describe 'default_class' do
+    specify { subject.default_class.should == CanTango::Ability::Base }
+  end
+
+  describe 'factor_class_method' do
+    specify { subject.factor_class_method.should == :default_executor_class }
+  end
+
 end
 
 

data/spec/cantango/configuration/accounts_spec.rb

@@ -15,4 +15,8 @@ describe CanTango::Configuration::Accounts do
       {:a => UserAccount, :b => AdminAccount}
     end    
   end
+  
+  describe 'register_account' do
+    specify { subject.register_class(AdminAccount).registered.should include(:admin) }
+  end
 end

data/spec/cantango/configuration/factory_spec.rb

@@ -1,17 +1,63 @@
 require 'spec_helper'
 require 'cantango/configuration/shared/factory_ex'
 
+AliasedCustomFactory = CustomFactory
+
 class MyFactory
   include CanTango::Configuration::Factory 
   include Singleton
+  
+  def default_class
+    AliasedCustomFactory
+  end
+
+  def default_executor_class
+    CustomFactory
+  end
+
+  attr_writer :factory_class_method
+
+  def factory_class_method
+    @factory_class_method ||= :default_executor_class
+  end
 end
 
 describe CanTango::Configuration::Factory do
   subject { MyFactory.instance }
 
-  specify { lambda { subject.default_factory}.should raise_error }
+  it_should_behave_like 'Factory'
+  
+  describe 'using factor_class_method to point to default_class' do
+    before :each do
+      subject.clear_factory!
+    end
+
+    it 'should set it' do
+      subject.factory_build('hello', :works => true).name.should == 'hello'
+    end
+  end  
+  
+  describe 'using default_class as fallback' do
+    before do
+      subject.clear_factory!
+      subject.factory_class_method = ''
+    end
+    
+    specify { subject.factory_class_method.should be_blank }
 
-  it_should_behave_like 'Factory' do
+    it 'should set it' do
+      subject.factory_build('hello', :works => true).name.should == 'hello'
+    end
+    
+    describe 'no factory defined' do
+      before do
+        AliasedCustomFactory = nil
+      end
+      
+      specify do
+        lambda { subject.factory_build('hello', :works => true) }.should raise_error
+      end
+    end
   end
 end
 

data/spec/cantango/configuration/shared/factory_ex.rb

@@ -3,7 +3,7 @@ class CustomFactory
 
   def initialize name, options = {}
     @name, @options = [name, options]
-  end
+  end  
 end
 
 shared_examples_for 'Factory' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-config
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-06 00:00:00.000000000Z
+date: 2011-12-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70211063520080 !ruby/object:Gem::Requirement
+  requirement: &70260051165800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70211063520080
+  version_requirements: *70260051165800
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70211056931460 !ruby/object:Gem::Requirement
+  requirement: &70260051161180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70211056931460
+  version_requirements: *70260051161180
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70211056930700 !ruby/object:Gem::Requirement
+  requirement: &70260051155060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70211056930700
+  version_requirements: *70260051155060
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70211056929760 !ruby/object:Gem::Requirement
+  requirement: &70260051153740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,21 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70211056929760
+  version_requirements: *70260051153740
 - !ruby/object:Gem::Dependency
   name: cantango-core
-  requirement: &70211056928620 !ruby/object:Gem::Requirement
+  requirement: &70260051151740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 0.1.9
   type: :runtime
   prerelease: false
-  version_requirements: *70211056928620
+  version_requirements: *70260051151740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70211056927460 !ruby/object:Gem::Requirement
+  requirement: &70260051147580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70211056927460
+  version_requirements: *70260051147580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70211056925920 !ruby/object:Gem::Requirement
+  requirement: &70260051135740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70211056925920
+  version_requirements: *70260051135740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70211056924960 !ruby/object:Gem::Requirement
+  requirement: &70260051132200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70211056924960
+  version_requirements: *70260051132200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70211056924080 !ruby/object:Gem::Requirement
+  requirement: &70260051129140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70211056924080
+  version_requirements: *70260051129140
 description: Configuration DSL for configuring CanTango
 email: kmandrup@gmail.com
 executables: []
@@ -223,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2383410179498340252
+      hash: 4402605893604119598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: