schemaker 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/schemaker/models/base_model.rb

@@ -107,9 +107,9 @@ module Schemaker
       #     has_and_belongs_to_many :user_accounts, :class_name => 'User'
       #   end
       #
-      def has_and_belongs_many to_clazz, options = {}
-        make_relationship :has_and_belongs_to_many, to_clazz, options[:from]
-        to_clazz.make_relationship :has_and_belongs_to_many, my_class, options[:to]
+      def create_has_and_belongs_to_many to_clazz, options = {}
+        make_relationship :has_and_belongs_to_many, to_clazz, options.merge(:key => singular_key(to_clazz))
+        models.object_model.make_relationship :has_and_belongs_to_many, my_class, options.merge(:key => singular_key(my_class))
       end
 
       # Creates a given type of relationship
@@ -122,6 +122,8 @@ 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)

data/lib/schemaker/models.rb

@@ -31,11 +31,10 @@ module Schemaker
     def initialize subject_class, object_class, join_class, options = {}
       raise ArgumentError, "subject class not given" if !subject_class
       raise ArgumentError, "object class not given" if !object_class
-      raise ArgumentError, "join class not given" if !join_class
 
       @subject_model  = SubjectModel.new self, subject_class, options[:subject_key]
       @object_model   = ObjectModel.new self, object_class
-      @join_model     = JoinModel.new self, join_class
+      @join_model     = JoinModel.new(self, join_class) if join_class
     end
 
     # creates a key for a given type
@@ -46,8 +45,8 @@ module Schemaker
 
     # configure each model in turn
     def configure
-      [subject_model, object_model, join_model].each do
-        |model| model.configure
+      [subject_model, object_model, join_model].compact.each do |model| 
+        model.configure
       end  
     end
 

data/schemaker.gemspec

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

data/spec/schemaker/model/subject_spec.rb

@@ -22,4 +22,15 @@ describe subject_model_class do
       matches_all last_log, 'UserAccount.has_many :troles', ':through=>:user_roles', ':source=>:role', ':class_name=>"Role"', ':foreign_key=>:account_id'
     end
   end
+
+  describe '#quick_join' do
+    it 'should configure subject model using a quick join :has_and_belongs_to_many' do
+      subject_model.quick_join
+
+      # check the logs!
+      first_log = subject_model.logs.first 
+
+      matches_all first_log, 'has_and_belongs_to_many :roles'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemaker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2157347720 !ruby/object:Gem::Requirement
+  requirement: &2162469820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157347720
+  version_requirements: *2162469820
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2157346060 !ruby/object:Gem::Requirement
+  requirement: &2162469100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *2157346060
+  version_requirements: *2162469100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157342600 !ruby/object:Gem::Requirement
+  requirement: &2162356580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2157342600
+  version_requirements: *2162356580
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2157340920 !ruby/object:Gem::Requirement
+  requirement: &2162355880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.8
   type: :development
   prerelease: false
-  version_requirements: *2157340920
+  version_requirements: *2162355880
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2157338840 !ruby/object:Gem::Requirement
+  requirement: &2162355200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157338840
+  version_requirements: *2162355200
 - !ruby/object:Gem::Dependency
   name: cutter
-  requirement: &2157337240 !ruby/object:Gem::Requirement
+  requirement: &2162354540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157337240
+  version_requirements: *2162354540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157336480 !ruby/object:Gem::Requirement
+  requirement: &2162353920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2157336480
+  version_requirements: *2162353920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157334900 !ruby/object:Gem::Requirement
+  requirement: &2162353220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2157334900
+  version_requirements: *2162353220
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2157333940 !ruby/object:Gem::Requirement
+  requirement: &2162352400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157333940
+  version_requirements: *2162352400
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2157332720 !ruby/object:Gem::Requirement
+  requirement: &2162351700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2157332720
+  version_requirements: *2162351700
 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: 2528253751213112279
+      hash: -1992204561229499507
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: