schemaker 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/schemaker/models.rb

@@ -45,13 +45,18 @@ module Schemaker
 
     # configure each model in turn
     def configure
+      return quick_join if !join_model
       [subject_model, object_model, join_model].compact.each do |model| 
         model.configure
       end  
     end
 
+    def quick_join
+      subject_model.quick_join
+    end
+
     def logs
-      @logs ||= [subject_model, object_model, join_model].inject([]) do |res, model|
+      @logs ||= [subject_model, object_model, join_model].compact.inject([]) do |res, model|
         res << model.logs
         res
       end.flatten

data/lib/schemaker/models/base_model.rb

@@ -122,10 +122,7 @@ module Schemaker
         opts_str = options.empty? ? '' : options.inspect.insert(0, ', ').gsub(/[{}]/ , '')
         log "#{my_class_name}.#{relationship_name} :#{key_name}#{opts_str}" if log_on?
 
-        puts "keyname: #{key_name}"
-
         return my_class.send(relationship_name, key_name) if options.empty?
-
         my_class.send(relationship_name, key_name, options)
       end
 

data/schemaker.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "schemaker"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

data/spec/schemaker/models_spec.rb

@@ -13,4 +13,19 @@ describe models_class do
       logs_matches(models.logs, 'UserAccount.has_many :troles').should
     end
   end
+end
+
+describe "quick join models" do
+  let(:models) do
+    # subject, object, join
+    models_class.new UserAccount, Role, nil, :subject_key => :troles
+  end
+
+  describe '#quick_join' do
+    it 'should configure all models' do
+      models.quick_join      
+      
+      logs_matches(models.logs, 'UserAccount.has_and_belongs_to_many :role').should
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemaker
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2162469820 !ruby/object:Gem::Requirement
+  requirement: &2157961700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2162469820
+  version_requirements: *2157961700
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2162469100 !ruby/object:Gem::Requirement
+  requirement: &2157958740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *2162469100
+  version_requirements: *2157958740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2162356580 !ruby/object:Gem::Requirement
+  requirement: &2157953560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2162356580
+  version_requirements: *2157953560
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2162355880 !ruby/object:Gem::Requirement
+  requirement: &2157949900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.8
   type: :development
   prerelease: false
-  version_requirements: *2162355880
+  version_requirements: *2157949900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2162355200 !ruby/object:Gem::Requirement
+  requirement: &2157940680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162355200
+  version_requirements: *2157940680
 - !ruby/object:Gem::Dependency
   name: cutter
-  requirement: &2162354540 !ruby/object:Gem::Requirement
+  requirement: &2157936340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162354540
+  version_requirements: *2157936340
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2162353920 !ruby/object:Gem::Requirement
+  requirement: &2157930420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2162353920
+  version_requirements: *2157930420
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2162353220 !ruby/object:Gem::Requirement
+  requirement: &2157927500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2162353220
+  version_requirements: *2157927500
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2162352400 !ruby/object:Gem::Requirement
+  requirement: &2157926400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162352400
+  version_requirements: *2157926400
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2162351700 !ruby/object:Gem::Requirement
+  requirement: &2157924840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162351700
+  version_requirements: *2157924840
 description: Configures relationships between subject, join and object model for a
   given behavior
 email: kmandrup@gmail.com
@@ -169,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1992204561229499507
+      hash: -1046788284345704373
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: