cantango-config 0.1.4 → 0.1.5

data/Gemfile

@@ -6,7 +6,7 @@ group :default do
   gem 'sweetloader',    '~> 0.1.6'
   gem 'hashie',         '~> 0.4.0'
 
-  gem 'cantango-core',  '~> 0.1.5'
+  gem 'cantango-core',  '~> 0.1.6'
 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.5)
+    cantango-core (0.1.6)
       cancan (>= 1.4)
       hashie
       rails (>= 3.0.1)
@@ -139,7 +139,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.1.rc)
-  cantango-core (~> 0.1.5)
+  cantango-core (~> 0.1.6)
   cutter
   database_cleaner
   dkastner-moneta (>= 1.0)

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/cantango-config.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cantango-config}
-  s.version = "0.1.4"
+  s.name = "cantango-config"
+  s.version = "0.1.5"
 
   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.description = %q{Configuration DSL for configuring CanTango}
-  s.email = %q{kmandrup@gmail.com}
+  s.authors = ["Kristian Mandrup"]
+  s.date = "2011-12-06"
+  s.description = "Configuration DSL for configuring CanTango"
+  s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.mdown"
@@ -108,11 +108,11 @@ Gem::Specification.new do |s|
     "spec/migrations/001_create_projects.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/kristianmandrup/cantango-config}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Configuration for Cantango}
+  s.homepage = "http://github.com/kristianmandrup/cantango-config"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Configuration for Cantango"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -122,7 +122,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sugar-high>, [">= 0.6.0"])
       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.5"])
+      s.add_runtime_dependency(%q<cantango-core>, ["~> 0.1.6"])
       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.0"])
       s.add_dependency(%q<sweetloader>, ["~> 0.1.6"])
       s.add_dependency(%q<hashie>, ["~> 0.4.0"])
-      s.add_dependency(%q<cantango-core>, ["~> 0.1.5"])
+      s.add_dependency(%q<cantango-core>, ["~> 0.1.6"])
       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.0"])
     s.add_dependency(%q<sweetloader>, ["~> 0.1.6"])
     s.add_dependency(%q<hashie>, ["~> 0.4.0"])
-    s.add_dependency(%q<cantango-core>, ["~> 0.1.5"])
+    s.add_dependency(%q<cantango-core>, ["~> 0.1.6"])
     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/registry/clazz.rb

@@ -44,11 +44,11 @@ module CanTango
         end
 
         def name_registry
-          NameRegistry.instance
+          @name_registry ||=NameRegistry.new
         end
 
         def class_registry
-          ClassRegistry.instance
+          @class_registry ||= ClassRegistry.new
         end
 
         def value_methods
@@ -60,11 +60,9 @@ module CanTango
         end
 
         class NameRegistry < Registry::Base
-          include Singleton
         end
 
         class ClassRegistry < Registry::Base
-          include Singleton
 
           def types
             [Class]

data/spec/cantango/configuration/users_spec.rb

@@ -7,6 +7,13 @@ end
 class Admin
 end
 
+class UserAccount
+end
+
+class AdminAccount
+end
+
+
 describe CanTango::Configuration::Users do
   subject { CanTango.config.users }
 
@@ -15,4 +22,21 @@ describe CanTango::Configuration::Users do
       {:a => User, :b => Admin}
     end        
   end
+  
+  describe 'no pollution' do
+    let (:config) { CanTango.config }
+    before do
+      config.users.register     :user,  User
+      config.users.register     :admin, Admin
+
+      config.accounts.register  :user,  UserAccount
+      config.accounts.register  :admin, AdminAccount
+
+      config.modes.register :no_cache, CanTango::Ability::Mode::NoCache
+    end
+    
+    specify do
+      CanTango.config.modes.registered.should == [:no_cache]
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-config
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70295097992340 !ruby/object:Gem::Requirement
+  requirement: &905045810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70295097992340
+  version_requirements: *905045810
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70295097991520 !ruby/object:Gem::Requirement
+  requirement: &905045570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70295097991520
+  version_requirements: *905045570
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70295097991000 !ruby/object:Gem::Requirement
+  requirement: &905045330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70295097991000
+  version_requirements: *905045330
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70295097990480 !ruby/object:Gem::Requirement
+  requirement: &905045090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,21 +54,21 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70295097990480
+  version_requirements: *905045090
 - !ruby/object:Gem::Dependency
   name: cantango-core
-  requirement: &70295097989940 !ruby/object:Gem::Requirement
+  requirement: &905044850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70295097989940
+  version_requirements: *905044850
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70295097989420 !ruby/object:Gem::Requirement
+  requirement: &905044610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70295097989420
+  version_requirements: *905044610
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70295097909520 !ruby/object:Gem::Requirement
+  requirement: &905044370 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70295097909520
+  version_requirements: *905044370
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70295097909020 !ruby/object:Gem::Requirement
+  requirement: &905044130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70295097909020
+  version_requirements: *905044130
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70295097908520 !ruby/object:Gem::Requirement
+  requirement: &905043890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70295097908520
+  version_requirements: *905043890
 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: 746087302374666739
+      hash: -481557709
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Configuration for Cantango