schemaker 0.1.1 → 0.1.2

data/Gemfile

@@ -1,17 +1,21 @@
 source :rubygems
 
-gem 'sugar-high',  '>= 0.6'
-gem 'require_all', '~> 1.2.0'
+gem 'sweetloader',  '>= 0.1.1'
 
 group :development, :test do
   gem "activerecord", ">= 3.0.1"
   gem "rspec",        ">= 2.6.0"
+  gem 'database_cleaner', '~> 0.6.8', :git => "git://github.com/kristianmandrup/database_cleaner.git" 
+
+  gem 'sqlite3'
+  gem 'cutter' # for inspection!
+
+  # gem 'require_all', '~> 1.2.0'
+end
+
+group :development do
   gem "bundler",      ">= 1"
   gem "jeweler",      ">= 1.6"
   gem "rcov",         ">= 0"
   gem 'yard'
-  gem 'database_cleaner', '~> 0.6.8', :git => "git://github.com/kristianmandrup/database_cleaner.git" 
-  gem 'sqlite3'
-  gem 'shoulda'
-  gem 'cutter'
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/schemaker/models/base_model.rb

@@ -6,199 +6,201 @@
 # Each type of model to be configured shares some common functionality and state, that is encapsulated here for reuse
 #
 module Schemaker
-  class BaseModel
-    attr_accessor :models, :my_class
-    attr_reader :logs # can be used to later check which relationships were set up        
-
-    # @param [Schema::Models] each model needs to have access to the collection of models it may need to create relations with
-    # @param [Class] each model must have a reference to the Class it aims to configure!
-    def initialize models, my_class
-      raise ArgumentError, "The first argument must be a Schema::Models instance, was #{models}" if !models.is_a?(Schemaker::Models)
-      raise ArgumentError, "The second argument must be the Class that is to be configured, was #{my_class}" if !my_class.is_a?(Class)
-
-      @models   = models     
-      @my_class = my_class 
-      @logs = []         
+  class Models
+    class BaseModel
+      attr_accessor :models, :my_class
+      attr_reader :logs # can be used to later check which relationships were set up
+
+      # @param [Schema::Models] each model needs to have access to the collection of models it may need to create relations with
+      # @param [Class] each model must have a reference to the Class it aims to configure!
+      def initialize models, my_class
+        raise ArgumentError, "The first argument must be a Schema::Models instance, was #{models}" if !models.is_a?(Schemaker::Models)
+        raise ArgumentError, "The second argument must be the Class that is to be configured, was #{my_class}" if !my_class.is_a?(Class)
+
+        @models   = models
+        @my_class = my_class
+        @logs = []
+      end
+
+      # The models :subject and :object must both be configured 
+      # with a has_many relationship to the join model which the has_many :through references
+      def configure
+        create_has_many :join, class_name_option(join_class)
+      end
+
+      # The class name of the Class to be configured
+      # @return [String] class name
+      def clazz_name
+        my_class.to_s
+      end
+      alias_method :my_class_name, :clazz_name
+
+      def self.model_types
+        [:object, :subject, :join]
+      end
+
+      # Generate convenience methods for: :object, :subject, :join
+      # - object_model
+      # - object_class
+      # - object_class_name
+
+      model_types.each do |model_type|
+        class_eval %{
+          def #{model_type}_model
+            models.#{model_type}_model
+          end
+
+          def #{model_type}_class
+            models.#{model_type}_class
+          end
+
+          def #{model_type}_class_name
+            #{model_type}_class.clazz_name
+          end
+        }
+      end
+
+      protected
+
+      # Is global logging turned on 
+      def log_on?
+        Schemaker.log_on?
+      end
+
+      # Create a 'belongs_to' relationship on the model (Class)
+      # Example:
+      #   Role.belongs_to :user, :class_name => 'User'
+      def create_belongs_to clazz, options = {}
+        make_relationship :belongs_to, clazz, options.merge(:key => singular_key(clazz))
+      end
+
+      # Create a 'has_many' relationship on the model (Class)
+      # Example:
+      #   User.has_many :roles, :class_name => 'Role'
+      def create_has_many clazz, options = {} 
+        make_relationship :has_many, clazz, options
+      end
+
+      # Create a 'has_many' relationship on the model (Class)
+      # Example:
+      #   User.has_one :roles, :class_name => 'Role'
+      def create_has_one clazz, options = {} 
+        make_relationship :has_one, clazz, options.merge(:key => singular_key(clazz))
+      end
+
+      # Create a 'has_many :through' relationship on the model (Class)
+      # Example:
+      #   User.has_many :roles, :class_name => 'Role', :through => 'UsersRoles'
+      def create_has_many_through clazz, options = {}
+        create_has_many clazz, through_options(options)
+      end
+
+      # To setup symmetrical has_and_belongs_to_many relationship:
+      #
+      # Example:
+      #
+      #   class UserAccount < ActiveRecord::Base
+      #     has_and_belongs_to_many :troles, :class_name => 'Role'
+      #   end
+      #
+      #   class Role < ActiveRecord::Base
+      #     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]
+      end
+
+      # Creates a given type of relationship
+      # @param [Symbol] the type of relationship, fx :has_many
+      # @param [Class, Symbol] the Class that is the object of the relationship, fx Role for a User.has_many relationship
+      # @param [Hash] any extra relationship options, fx for a :through relationship, or to indicate :class_name etc.
+      def make_relationship relationship_name, clazz, options = {} 
+        # inspect!(binding)
+        key_name = (options.delete(:key) || key(clazz)).to_sym # first must be a sym too
+        opts_str = options.empty? ? '' : options.inspect.insert(0, ', ').gsub(/[{}]/ , '')
+        log "#{my_class_name}.#{relationship_name} :#{key_name}#{opts_str}" if log_on?
+
+        return my_class.send(relationship_name, key_name) if options.empty?
+
+        my_class.send(relationship_name, key_name, options)
+      end
+
+      # creates a key for a given type
+      # @param type [Symbol] - either :object, :subject or :join
+      def key type
+        models.key type
+      end
+
+      def get_class type
+        models.get_class type
+      end
+
+      def singular_key cls_name
+        model = get_class(cls_name)
+        model.to_s.singularize.underscore
+      end
+
+      def make_key cls_name
+        models.make_key cls_name
+      end
+
+      # log the relationship being added
+      # - to STDOUT via puts
+      # - to a logs list
+      def log msg
+        puts msg
+        logs << msg
+      end
+
+      # sets up the :source relationship option, typically for a has_many through relationship
+      def source_option cls_name
+        model = get_class(cls_name)
+        {:source => source(model) }
+      end
+
+      # sets up the :class_name relationship option for a given class (model
+      # @param [Class, String] the class to point to
+      def class_name_option cls_name
+        model = get_class(cls_name)
+        {:class_name => model.to_s }
+      end
+
+      # sets up the :through relationship option, always points to the join model 
+      def through_option 
+        {:through => join_model.through_key }
+      end
+
+      # sets up the :foreign_key relationship option
+      # the foreign key name should always correspond to 'my own' class name
+      def foreign_key_option cls_name
+        model = get_class(cls_name)
+        {:foreign_key => foreign_key(model) }
+      end
+
+      # sets up the full :through relationship options
+      # Example:
+      #   :class_name => 'Role', :through => 'UsersRoles', :source => :role, :foreign_key => :user_id)
+      def through_options cls_name
+        model = get_class(cls_name)
+        through_option.merge(source_option model).merge(class_name_option model)
+      end
+
+      # creates the source
+      # Role becomes :role
+      def source cls_name
+        model = get_class(cls_name)
+        model.to_s.underscore.singularize.to_sym
+      end
+
+      # creates the foreign key
+      # RefManyAccount becomes :account_id
+      def foreign_key cls_name
+        model = get_class(cls_name)
+        name = model.to_s.underscore.split('_').last.singularize
+        :"#{name}_id"
+      end
     end
-
-    # The models :subject and :object must both be configured 
-    # with a has_many relationship to the join model which the has_many :through references
-    def configure
-      create_has_many :join, class_name_option(join_class)
-    end
-
-    # The class name of the Class to be configured
-    # @return [String] class name
-    def clazz_name
-      my_class.to_s
-    end
-    alias_method :my_class_name, :clazz_name
-
-    def self.model_types
-      [:object, :subject, :join]
-    end
-
-    # Generate convenience methods for: :object, :subject, :join
-    # - object_model
-    # - object_class
-    # - object_class_name
-
-    model_types.each do |model_type|
-      class_eval %{
-        def #{model_type}_model
-          models.#{model_type}_model
-        end
-
-        def #{model_type}_class
-          models.#{model_type}_class
-        end
-
-        def #{model_type}_class_name
-          #{model_type}_class.clazz_name
-        end            
-      }
-    end
-    
-    protected
-
-    # Is global logging turned on 
-    def log_on?
-      Schemaker.log_on?
-    end
-
-    # Create a 'belongs_to' relationship on the model (Class)
-    # Example:
-    #   Role.belongs_to :user, :class_name => 'User'
-    def create_belongs_to clazz, options = {}
-      make_relationship :belongs_to, clazz, options.merge(:key => singular_key(clazz))
-    end
-
-    # Create a 'has_many' relationship on the model (Class)
-    # Example:
-    #   User.has_many :roles, :class_name => 'Role'
-    def create_has_many clazz, options = {} 
-      make_relationship :has_many, clazz, options
-    end        
-
-    # Create a 'has_many' relationship on the model (Class)
-    # Example:
-    #   User.has_one :roles, :class_name => 'Role'
-    def create_has_one clazz, options = {} 
-      make_relationship :has_one, clazz, options.merge(:key => singular_key(clazz))
-    end        
-
-    # Create a 'has_many :through' relationship on the model (Class)
-    # Example:
-    #   User.has_many :roles, :class_name => 'Role', :through => 'UsersRoles'
-    def create_has_many_through clazz, options = {}
-      create_has_many clazz, through_options(options)
-    end
-
-    # To setup symmetrical has_and_belongs_to_many relationship:
-    #
-    # Example:
-    #
-    #   class UserAccount < ActiveRecord::Base    
-    #     has_and_belongs_to_many :troles, :class_name => 'Role'
-    #   end
-    #   
-    #   class Role < ActiveRecord::Base    
-    #     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]
-    end
-
-    # Creates a given type of relationship
-    # @param [Symbol] the type of relationship, fx :has_many
-    # @param [Class, Symbol] the Class that is the object of the relationship, fx Role for a User.has_many relationship
-    # @param [Hash] any extra relationship options, fx for a :through relationship, or to indicate :class_name etc.        
-    def make_relationship relationship_name, clazz, options = {} 
-      # inspect!(binding)
-      key_name = (options.delete(:key) || key(clazz)).to_sym # first must be a sym too          
-      opts_str = options.empty? ? '' : options.inspect.insert(0, ', ').gsub(/[{}]/ , '')
-      log "#{my_class_name}.#{relationship_name} :#{key_name}#{opts_str}" if log_on?          
-
-      return my_class.send(relationship_name, key_name) if options.empty?
-
-      my_class.send(relationship_name, key_name, options)
-    end              
-
-    # creates a key for a given type
-    # @param type [Symbol] - either :object, :subject or :join
-    def key type
-      models.key type
-    end                
-
-    def get_class type
-      models.get_class type          
-    end
-
-    def singular_key cls_name
-      model = get_class(cls_name)
-      model.to_s.singularize.underscore
-    end
-
-    def make_key cls_name
-      models.make_key cls_name
-    end
-
-    # log the relationship being added
-    # - to STDOUT via puts
-    # - to a logs list
-    def log msg
-      puts msg
-      logs << msg          
-    end        
-
-    # sets up the :source relationship option, typically for a has_many through relationship
-    def source_option cls_name
-      model = get_class(cls_name)
-      {:source => source(model) }
-    end
-
-    # sets up the :class_name relationship option for a given class (model
-    # @param [Class, String] the class to point to
-    def class_name_option cls_name
-      model = get_class(cls_name)
-      {:class_name => model.to_s }
-    end
-
-    # sets up the :through relationship option, always points to the join model 
-    def through_option 
-      {:through => join_model.through_key }
-    end
-
-    # sets up the :foreign_key relationship option
-    # the foreign key name should always correspond to 'my own' class name
-    def foreign_key_option cls_name
-      model = get_class(cls_name)
-      {:foreign_key => foreign_key(model) }
-    end
-
-    # sets up the full :through relationship options
-    # Example:
-    #   :class_name => 'Role', :through => 'UsersRoles', :source => :role, :foreign_key => :user_id)
-    def through_options cls_name
-      model = get_class(cls_name)
-      through_option.merge(source_option model).merge(class_name_option model)
-    end
-
-    # creates the source
-    # Role becomes :role
-    def source cls_name
-      model = get_class(cls_name)
-      model.to_s.underscore.singularize.to_sym
-    end                        
-
-    # creates the foreign key
-    # RefManyAccount becomes :account_id
-    def foreign_key cls_name
-      model = get_class(cls_name)
-      name = model.to_s.underscore.split('_').last.singularize
-      :"#{name}_id"
-    end                           
   end
 end

data/lib/schemaker/models/join_model.rb

@@ -6,35 +6,37 @@
 # Knows how to configure the Join model between a subject model (the main target of the behavior fx UserAccount) and the object model (the behavior to be added, fx Role) 
 #
 module Schemaker
-  class JoinModel < BaseModel
+  class Models
+    class JoinModel < BaseModel
 
-    # @param [Schema::Models] each model needs to have access to the collection of models it may need to create relations with
-    # @param [Class] reference to the Class it aims to configure!
-    def initialize models, clazz
-      super
-    end
+      # @param [Schema::Models] each model needs to have access to the collection of models it may need to create relations with
+      # @param [Class] reference to the Class it aims to configure!
+      def initialize models, clazz
+        super
+      end
 
-    def simple_key
-      clazz_name.to_s.underscore
-    end
+      def simple_key
+        clazz_name.to_s.underscore
+      end
 
-    def through_key
-      make_key clazz_name
-    end
+      def through_key
+        make_key clazz_name
+      end
 
-    # The join model always belongs to both the object and subject model
-    # the subject and object model can then each have a has_many relationship to the join model
-    # thus creating a Many-to-Many relationship via the join model
-    
-    # Example:
-    #   UsersRoles
-    #     belongs_to :user, :class_name => 'UserAccount' (subject)             
-    #     belongs_to :role, :class_name => 'Role' (object)
-    #
-    # @note Do not call super here! 
-    def configure          
-      create_belongs_to :subject, class_name_option(:subject)
-      create_belongs_to :object, class_name_option(:object)
-    end                
+      # The join model always belongs to both the object and subject model
+      # the subject and object model can then each have a has_many relationship to the join model
+      # thus creating a Many-to-Many relationship via the join model
+
+      # Example:
+      #   UsersRoles
+      #     belongs_to :user, :class_name => 'UserAccount' (subject)
+      #     belongs_to :role, :class_name => 'Role' (object)
+      #
+      # @note Do not call super here!
+      def configure
+        create_belongs_to :subject, class_name_option(:subject)
+        create_belongs_to :object, class_name_option(:object)
+      end
+    end
   end
-end
+end

data/lib/schemaker/models/object_model.rb

@@ -6,28 +6,30 @@
 # Knows how to configure the relationship fro the Object model to the subject model via the Join model
 #
 module Schemaker
-  class ObjectModel < BaseModel
+  class Models
+    class ObjectModel < BaseModel
 
-    # @param [Schema::Models] each model needs to have access to the collection of models it may need to create relations with
-    # @param [Class] reference to the Class it aims to configure!
-    def initialize models, clazz
-      super          
-    end
+      # @param [Schema::Models] each model needs to have access to the collection of models it may need to create relations with
+      # @param [Class] reference to the Class it aims to configure!
+      def initialize models, clazz
+        super
+      end
 
-    # Configures has_many through relationship via Join model for the object model (fx Role)
-    #
-    # Example:
-    #   Role (object)
-    #     has_many :accounts,   :class_name => 'RefManyAccount', :through => :accounts_roles (subject)
-    #     has_many :user_roles, :class_name => 'UserRole' (join)
-    def configure         
-      super
-      create_has_many_through :subject
-    end
+      # Configures has_many through relationship via Join model for the object model (fx Role)
+      #
+      # Example:
+      #   Role (object)
+      #     has_many :accounts,   :class_name => 'RefManyAccount', :through => :accounts_roles (subject)
+      #     has_many :user_roles, :class_name => 'UserRole' (join)
+      def configure
+        super
+        create_has_many_through :subject
+      end
 
-    # @note important to use super to avoid recursive stack overflow!
-    def through_options options = {}
-      options.merge super(:subject)
-    end           
+      # @note important to use super to avoid recursive stack overflow!
+      def through_options options = {}
+        options.merge super(:subject)
+      end
+    end
   end
 end

data/lib/schemaker/models/subject_model.rb

@@ -6,36 +6,38 @@
 # Knows how to configure the relationship fro the Object model to the subject model via the Join model
 #
 module Schemaker
-  class SubjectModel < BaseModel
+  class Models
+    class SubjectModel < BaseModel
 
-    # the main field for the behavior to add, fx :troles for adding roles behavior
-    attr_accessor :main_field
+      # the main field for the behavior to add, fx :troles for adding roles behavior
+      attr_accessor :main_field
 
-    # @param [Schema::Models] each model needs to have access to the collection of models it may need to create relations with
-    # @param [Class] reference to the Class it aims to configure!
-    # @param [Symbol] the name of the main field for the behavior to add, fx :troles for adding roles behavior
-    def initialize models, clazz, main_field
-      super models, clazz
-      @main_field = main_field
-    end
+      # @param [Schema::Models] each model needs to have access to the collection of models it may need to create relations with
+      # @param [Class] reference to the Class it aims to configure!
+      # @param [Symbol] the name of the main field for the behavior to add, fx :troles for adding roles behavior
+      def initialize models, clazz, main_field
+        super models, clazz
+        @main_field = main_field
+      end
 
-    # Used to set up a 'quick join' using Rails conventions and 'has_and_belongs_to_many' on the subject and object 
-    def quick_join options = {}
-      create_has_and_belongs_to_many :object
-    end
+      # Used to set up a 'quick join' using Rails conventions and 'has_and_belongs_to_many' on the subject and object 
+      def quick_join options = {}
+        create_has_and_belongs_to_many :object
+      end
 
-    # Example:
-    #   UserAccount (subject)        
-    #     has_many :user_roles, :class_name => 'UserRole' (join)
-    #     has_many :roles,      :class_name => 'Role', :through => :users_roles (subject)        
-    def configure 
-      super
-      create_has_many_through :object, :key => main_field          
-    end  
+      # Example:
+      #   UserAccount (subject)
+      #     has_many :user_roles, :class_name => 'UserRole' (join)
+      #     has_many :roles,      :class_name => 'Role', :through => :users_roles (subject)
+      def configure
+        super
+        create_has_many_through :object, :key => main_field
+      end
 
-    # @note important to use super to avoid recursive stack overflow!                
-    def through_options options = {}
-      options.merge super(:object).merge(foreign_key_option :subject)
-    end                       
+      # @note important to use super to avoid recursive stack overflow!
+      def through_options options = {}
+        options.merge super(:object).merge(foreign_key_option :subject)
+      end
+    end
   end
 end

data/lib/schemaker/models.rb

@@ -19,6 +19,8 @@
 
 module Schemaker  
   class Models
+    autoload_modules :BaseModel, :JoinModel, :ObjectModel, :SubjectModel
+
     attr_accessor :subject_model, :object_model, :join_model
 
     # Sets up the models that take part in the model relationship to be configured

data/lib/schemaker.rb

@@ -1,15 +1,10 @@
-require 'cutter'
+require 'sweetloader'
+
 module Schemaker
+  autoload_modules :Models
+
   class << self
-    attr_accessor :log_on
-    
+    attr_accessor :log_on    
     alias_method :log_on?, :log_on
-  end
-    
-  autoload :Models, 'schemaker/models'
-  
-  autoload :BaseModel,    'schemaker/models/base_model'
-  autoload :JoinModel,    'schemaker/models/join_model'
-  autoload :ObjectModel,  'schemaker/models/object_model'
-  autoload :SubjectModel, 'schemaker/models/subject_model'  
+  end    
 end

data/schemaker.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "schemaker"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -52,45 +52,39 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sugar-high>, [">= 0.6"])
-      s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
+      s.add_runtime_dependency(%q<sweetloader>, [">= 0.1.1"])
       s.add_development_dependency(%q<activerecord>, [">= 3.0.1"])
       s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
+      s.add_development_dependency(%q<database_cleaner>, ["~> 0.6.8"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<cutter>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 1"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<database_cleaner>, ["~> 0.6.8"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<cutter>, [">= 0"])
     else
-      s.add_dependency(%q<sugar-high>, [">= 0.6"])
-      s.add_dependency(%q<require_all>, ["~> 1.2.0"])
+      s.add_dependency(%q<sweetloader>, [">= 0.1.1"])
       s.add_dependency(%q<activerecord>, [">= 3.0.1"])
       s.add_dependency(%q<rspec>, [">= 2.6.0"])
+      s.add_dependency(%q<database_cleaner>, ["~> 0.6.8"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<cutter>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 1"])
       s.add_dependency(%q<jeweler>, [">= 1.6"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<database_cleaner>, ["~> 0.6.8"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<cutter>, [">= 0"])
     end
   else
-    s.add_dependency(%q<sugar-high>, [">= 0.6"])
-    s.add_dependency(%q<require_all>, ["~> 1.2.0"])
+    s.add_dependency(%q<sweetloader>, [">= 0.1.1"])
     s.add_dependency(%q<activerecord>, [">= 3.0.1"])
     s.add_dependency(%q<rspec>, [">= 2.6.0"])
+    s.add_dependency(%q<database_cleaner>, ["~> 0.6.8"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<cutter>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 1"])
     s.add_dependency(%q<jeweler>, [">= 1.6"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<database_cleaner>, ["~> 0.6.8"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<cutter>, [">= 0"])
   end
 end
 

data/spec/models_helper.rb

@@ -1,4 +1,3 @@
-require 'shoulda' # must be required before rspec
 require 'rspec'
 require 'active_record'
 require 'schemaker'

data/spec/schemaker/model/join_spec.rb

@@ -1,10 +1,10 @@
 require 'models_helper'
 
-class UsersRoles < ActiveRecord::Base  
+class UsersRoles < ActiveRecord::Base
 end
 
 def join_model_class
-  Schemaker::JoinModel
+  Schemaker::Models::JoinModel
 end
 
 describe join_model_class do
@@ -24,4 +24,4 @@ describe join_model_class do
       matches_all last_log, 'belongs_to :role', ':class_name=>"Role"'
     end
   end
-end
+end

data/spec/schemaker/model/object_spec.rb

@@ -1,14 +1,14 @@
 require 'models_helper'
 
 def object_model_class
-  Schemaker::ObjectModel
+  Schemaker::Models::ObjectModel
 end
 
 describe object_model_class do
   let(:object_model) do
     object_model_class.new models, Role
   end
-  
+
   describe '#configure' do
     it 'should configure object model' do
       object_model.configure
@@ -19,6 +19,6 @@ describe object_model_class do
 
       matches_all first_log, 'has_many :user_roles', ':class_name=>"UsersRoles"'
       matches_all last_log, 'Role.has_many :user_accounts', ':through=>:user_roles', ':source=>:user_account', ':class_name=>"UserAccount"'
-    end        
+    end
   end
-end
+end

data/spec/schemaker/model/subject_spec.rb

@@ -1,14 +1,14 @@
 require 'models_helper'
 
 def subject_model_class
-  Schemaker::SubjectModel
+  Schemaker::Models::SubjectModel
 end
 
 describe subject_model_class do
   let(:subject_model) do
     subject_model_class.new models, UserAccount, :troles
   end
-  
+
   describe '#configure' do
     it 'should configure subject model' do
       subject_model.configure
@@ -20,6 +20,6 @@ describe subject_model_class do
       matches_all first_log, 'has_many :user_roles', ':class_name=>"UsersRoles"'
       # has_many :roles, {:through=>:user_roles, :source=>:role, :class_name=>"Role", :foreign_key=>:account_id}
       matches_all last_log, 'UserAccount.has_many :troles', ':through=>:user_roles', ':source=>:role', ':class_name=>"Role"', ':foreign_key=>:account_id'
-    end        
+    end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'cutter'
 require 'schemaker'
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemaker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,30 +12,19 @@ cert_chain: []
 date: 2011-10-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sugar-high
-  requirement: &2165519220 !ruby/object:Gem::Requirement
+  name: sweetloader
+  requirement: &2157347720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2165519220
-- !ruby/object:Gem::Dependency
-  name: require_all
-  requirement: &2165518620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2165518620
+  version_requirements: *2157347720
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2165518060 !ruby/object:Gem::Requirement
+  requirement: &2157346060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *2165518060
+  version_requirements: *2157346060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165517560 !ruby/object:Gem::Requirement
+  requirement: &2157342600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,32 +43,21 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2165517560
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2165517040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: *2165517040
+  version_requirements: *2157342600
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2165516420 !ruby/object:Gem::Requirement
+  name: database_cleaner
+  requirement: &2157340920 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 0.6.8
   type: :development
   prerelease: false
-  version_requirements: *2165516420
+  version_requirements: *2157340920
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2165515760 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &2157338840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165515760
+  version_requirements: *2157338840
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2165515140 !ruby/object:Gem::Requirement
+  name: cutter
+  requirement: &2157337240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,32 +76,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165515140
+  version_requirements: *2157337240
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: &2165514520 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: &2157336480 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2165514520
+  version_requirements: *2157336480
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2165513900 !ruby/object:Gem::Requirement
+  name: jeweler
+  requirement: &2157334900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2165513900
+  version_requirements: *2157334900
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &2165513240 !ruby/object:Gem::Requirement
+  name: rcov
+  requirement: &2157333940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165513240
+  version_requirements: *2157333940
 - !ruby/object:Gem::Dependency
-  name: cutter
-  requirement: &2165512580 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &2157332720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165512580
+  version_requirements: *2157332720
 description: Configures relationships between subject, join and object model for a
   given behavior
 email: kmandrup@gmail.com
@@ -191,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1246785679827546613
+      hash: 2528253751213112279
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: