cantango-config 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/cantango-config.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-config}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   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-12}
+  s.date = %q{2011-12-20}
   s.description = %q{Configuration DSL for configuring CanTango}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [

data/lib/cantango/config/categories.rb

@@ -5,7 +5,8 @@ module CanTango
 
       def [] label
         models = super
-        raise "Category '#{label}' either not exists or invalid!" if !models.kind_of?(Array)
+        return [] unless models.kind_of?(Array)
+        # raise "Category '#{label}' either not exists or invalid!" if !models.kind_of?(Array)
         models
       end
 

data/lib/cantango/config/models.rb

@@ -52,7 +52,7 @@ module CanTango
       def all
         CanTango.config.orms.registered.compact.inject([]) do |result, orm|
           adapter = adapter_for(orm)
-          result << (adapter.models.map(&:name) if adapter)
+          result << (adapter.available_models if adapter)
           result
         end.flatten.compact
       end
@@ -68,13 +68,18 @@ module CanTango
       end
 
       def try_model model_string
-        model = find_first_class(model_string.singularize, model_string) 
-        raise "No model #{model_string} defined!" if !model
+        model = find_first_class(models_to_finds model_string) 
+        raise "No model: #{models_to_finds model_string} defined!" if !model
         model
       end
 
+      def models_to_finds model_string
+        (model_string.singularize == model_string) ? model_string : [model_string.singularize, model_string]
+      end
+      
+      # from adapter
       def grep reg_exp
-        available_models.grep reg_exp
+        available.grep reg_exp
       end
 
       def categories

data/spec/cantango/config/categories_spec.rb

@@ -13,16 +13,16 @@ describe CanTango::Config::Categories do
     end
 
     describe 'get index []' do
-      specify {
+      before do
         subject.register(:w => 'something non-array!')
-        lambda { subject.category('w') }.should raise_error
-      }
+      end
+
+      specify { subject.category(:w).should_not be_empty }
+      specify { subject.category('w').should be_empty }
     end
 
     describe 'category_has_subject?' do
-      specify {
-        subject.category('a').has_any?('B').should be_true 
-      }
+      specify { subject.category('a').has_any?('B').should be_true }
     end
 
     describe 'has_subject?' do

data/spec/cantango/config/models_spec.rb

@@ -6,6 +6,13 @@ CanTango.debug!
 connect_db
 migrate
 
+class Wheat
+end
+
+class Barley
+end
+
+
 describe CanTango::Configuration::Models do
   let(:models) { CanTango.config.models }
   let(:orms) { CanTango.config.orms }
@@ -24,7 +31,10 @@ describe CanTango::Configuration::Models do
   
   subject { models } 
     
-  describe 'available_models' do
+  describe '#actions' do
+  end
+    
+  describe '#available' do
     before do
       orms.register :active_record
     end
@@ -33,22 +43,46 @@ describe CanTango::Configuration::Models do
     specify { subject.available.should include('Project') }
   end
 
-  describe 'use :guest_user' do
+  describe '#use :guest_user' do
     before do
       subject.use :guest_user
     end
     specify { defined?(CanTango::Model::Guest).should be_true }
   end
   
-  describe 'by_reg_exp' do
+  describe '#by_reg_exp' do
+    it 'should get matching models' do
+      pending
+      # subject.by_regexp(/Item$/).should include('Item', 'ProductItem')
+    end
   end
 
-  describe 'by_category' do
-  end
+  describe '#by_category' do
+    context 'Category grains wit Wheat and Barley are registered' do
+      before do
+        CanTango.config.categories.register :grains => ['Wheat', 'Barley']
+      end
+      
+      it 'should find models of :grains' do
+        subject.by_category(:grains).should include(Wheat, Barley)
+      end
 
-  describe 'exclude' do
+      it 'should not find models of unknown' do
+        subject.by_category(:unknown).should be_empty
+      end
+    end
   end
 
-  describe 'excluded' do
+  describe '#exclude' do
+    before do
+      subject.exclude 'Item'
+    end
+    it 'should have Item in excluded list' do
+      subject.excluded.should include('Item')
+    end
+
+    it 'should exclude Item from available' do
+      subject.available.include?('Item').should be_false
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-config
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-12 00:00:00.000000000Z
+date: 2011-12-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70360657089040 !ruby/object:Gem::Requirement
+  requirement: &70140253600760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70360657089040
+  version_requirements: *70140253600760
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70360657088280 !ruby/object:Gem::Requirement
+  requirement: &70140253599200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70360657088280
+  version_requirements: *70140253599200
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70360657087400 !ruby/object:Gem::Requirement
+  requirement: &70140253597980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70360657087400
+  version_requirements: *70140253597980
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70360657086900 !ruby/object:Gem::Requirement
+  requirement: &70140253590020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70360657086900
+  version_requirements: *70140253590020
 - !ruby/object:Gem::Dependency
   name: cantango-core
-  requirement: &70360657034900 !ruby/object:Gem::Requirement
+  requirement: &70140253589180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.9
   type: :runtime
   prerelease: false
-  version_requirements: *70360657034900
+  version_requirements: *70140253589180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70360657034380 !ruby/object:Gem::Requirement
+  requirement: &70140253588080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70360657034380
+  version_requirements: *70140253588080
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70360657033860 !ruby/object:Gem::Requirement
+  requirement: &70140253587180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70360657033860
+  version_requirements: *70140253587180
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70360657033300 !ruby/object:Gem::Requirement
+  requirement: &70140253586440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360657033300
+  version_requirements: *70140253586440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70360657032760 !ruby/object:Gem::Requirement
+  requirement: &70140253585440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70360657032760
+  version_requirements: *70140253585440
 description: Configuration DSL for configuring CanTango
 email: kmandrup@gmail.com
 executables: []
@@ -229,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3106832740323077134
+      hash: 2466227934103881117
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: