schemaker 0.1.0 → 0.1.1

data/Gemfile

@@ -1,11 +1,17 @@
-source "http://rubygems.org"
+source :rubygems
 
-# gem "activerecord", ">= 3.0.1"
+gem 'sugar-high',  '>= 0.6'
+gem 'require_all', '~> 1.2.0'
 
-group :development do
+group :development, :test do
   gem "activerecord", ">= 3.0.1"
   gem "rspec",        ">= 2.6.0"
-  gem "bundler",      "~> 1.0.6"
-  gem "jeweler",      "~> 1.6.2"
+  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.0
+0.1.1

data/lib/schemaker/models/base_model.rb

@@ -13,8 +13,8 @@ module Schemaker
     # @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" if !models.is_a?(Schemaker::Models)
-      raise ArgumentError, "The second argument must be the Class that is to be configured" if !my_class.is_a?(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 
@@ -116,8 +116,8 @@ module Schemaker
     # @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 = {} 
-      key_name = options.delete(:key) || key(clazz)          
-
+      # 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?          
 

data/lib/schemaker/models.rb

@@ -27,6 +27,10 @@ module Schemaker
     # @param join_class [Class]        
     # @param options [Hash] - contains the key to be used for the main field (subject key) and possibly other options to configure the models more precisely as needed 
     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

data/lib/schemaker.rb

@@ -1,3 +1,4 @@
+require 'cutter'
 module Schemaker
   class << self
     attr_accessor :log_on
@@ -11,4 +12,4 @@ module Schemaker
   autoload :JoinModel,    'schemaker/models/join_model'
   autoload :ObjectModel,  'schemaker/models/object_model'
   autoload :SubjectModel, 'schemaker/models/subject_model'  
-end
+end

data/schemaker.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{schemaker}
-  s.version = "0.1.0"
+  s.name = "schemaker"
+  s.version = "0.1.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-06-12}
-  s.description = %q{Configures relationships between subject, join and object model for a given behavior}
-  s.email = %q{kmandrup@gmail.com}
+  s.authors = ["Kristian Mandrup"]
+  s.date = "2011-10-12"
+  s.description = "Configures relationships between subject, join and object model for a given behavior"
+  s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.textile"
@@ -31,6 +31,10 @@ Gem::Specification.new do |s|
     "lib/schemaker/models/object_model.rb",
     "lib/schemaker/models/subject_model.rb",
     "schemaker.gemspec",
+    "spec/active_record/active_record_helper.rb",
+    "spec/active_record/active_record_spec.rb",
+    "spec/active_record/db/database.yml",
+    "spec/active_record/migrations/create_models.rb",
     "spec/models_helper.rb",
     "spec/schemaker/model/join_spec.rb",
     "spec/schemaker/model/object_spec.rb",
@@ -38,34 +42,55 @@ Gem::Specification.new do |s|
     "spec/schemaker/models_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/kristianmandrup/schemaker}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.5}
-  s.summary = %q{Schema maker takes care of configuring your model schemas to map behavior}
+  s.homepage = "http://github.com/kristianmandrup/schemaker"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Schema maker takes care of configuring your model schemas to map behavior"
 
   if s.respond_to? :specification_version then
     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_development_dependency(%q<activerecord>, [">= 3.0.1"])
       s.add_development_dependency(%q<rspec>, [">= 2.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.6"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.2"])
+      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<activerecord>, [">= 3.0.1"])
       s.add_dependency(%q<rspec>, [">= 2.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.6"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+      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<activerecord>, [">= 3.0.1"])
     s.add_dependency(%q<rspec>, [">= 2.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.6"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.2"])
+    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/active_record/active_record_helper.rb

@@ -0,0 +1,32 @@
+require 'active_record'
+require 'yaml'
+require 'logger'
+require 'database_cleaner'
+require 'require_all'
+require 'active_record/migrations/create_models'
+
+dbconfig_path = File.dirname(__FILE__) + '/db/database.yml'
+dbfile = File.open(dbconfig_path)
+dbconfig = YAML::load(dbfile)  
+
+ActiveRecord::Base.establish_connection(dbconfig)
+ActiveRecord::Base.logger = Logger.new(STDERR)
+
+DatabaseCleaner.strategy = :truncation
+
+def migration_folder(name)
+  path = File.dirname(__FILE__) + "/migrations/#{name}"
+end
+
+RSpec.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.drop_tables :user_accounts, :roles, :users_roles
+    CreateModels.up
+  end
+
+  config.before(:each) do    
+  end
+
+  config.after(:each) do
+  end  
+end

data/spec/active_record/active_record_spec.rb

@@ -0,0 +1,47 @@
+require 'active_record/active_record_helper'
+require 'models_helper'
+describe models_class do
+  let(:models) do
+    # subject, object, join
+    models_class.new UserAccount, Role, UsersRoles, :subject_key => :troles
+  end
+
+  describe '#configure' do
+    before(:all) do
+      models.configure      
+    end
+    
+    it 'should configure all models (logs)' do
+      logs_matches(models.logs, 'UserAccount.has_many :troles').should be_true
+      logs_matches(models.logs, 'UsersRoles.belongs_to :role').should be_true
+      logs_matches(models.logs, 'UsersRoles.belongs_to :user_account').should be_true
+      logs_matches(models.logs, 'Role.has_many :user_accounts').should be_true
+    end
+    
+    it 'should configure all models (shoulda)' do
+      UserAccount.create!.should have_many(:troles).through(:user_roles)
+      Role.create!.should have_many(:user_accounts).through(:user_roles) 
+      UsersRoles.create!.should belong_to(:role)
+      UsersRoles.create!.should belong_to(:user_account)
+    end
+
+    describe 'should configure all models (manipulations with associations)' do
+      before(:each) do
+        @user_account = UserAccount.create(:name => "Marixa")
+        @role = Role.create(:name => "admin")
+      end
+        
+      it "should add roles to account" do
+        @user_account.troles << @role
+        @role.save!
+        @user_account.troles.size.should == 1
+      end
+
+      it "should add accounts to role" do
+        @role.user_accounts << @user_account
+        @role.save!
+        @role.user_accounts.first.should == @user_account 
+      end
+    end 
+  end
+end

data/spec/active_record/db/database.yml

@@ -0,0 +1,4 @@
+adapter: sqlite3
+database: development.sqlite3
+pool: 5
+timeout: 5000

data/spec/active_record/migrations/create_models.rb

@@ -0,0 +1,27 @@
+class CreateModels < ActiveRecord::Migration
+  def self.up
+    # down
+
+    create_table :user_accounts do |t|
+      t.string :name
+      t.timestamps
+    end
+
+    create_table :roles do |t|
+      t.string :name
+      t.timestamps
+    end 
+
+    create_table :users_roles do |t|
+      t.integer :user_account_id
+      t.integer :role_id
+    end
+  end
+  
+  def self.down  
+    drop_table :user_accounts
+    drop_table :roles
+    drop_table :users_roles
+  end
+end
+

data/spec/models_helper.rb

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

data/spec/schemaker/model/subject_spec.rb

@@ -1,4 +1,4 @@
-require 'troles/common/config/schema/models_helper'
+require 'models_helper'
 
 def subject_model_class
   Schemaker::SubjectModel

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemaker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-12 00:00:00.000000000Z
+date: 2011-10-12 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sugar-high
+  requirement: &2165519220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  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
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156091260 !ruby/object:Gem::Requirement
+  requirement: &2165518060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +43,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *2156091260
+  version_requirements: *2165518060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156086680 !ruby/object:Gem::Requirement
+  requirement: &2165517560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,32 +54,87 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156086680
+  version_requirements: *2165517560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156085240 !ruby/object:Gem::Requirement
+  requirement: &2165517040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2156085240
+  version_requirements: *2165517040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156084180 !ruby/object:Gem::Requirement
+  requirement: &2165516420 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2156084180
+  version_requirements: *2165516420
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156081880 !ruby/object:Gem::Requirement
+  requirement: &2165515760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2165515760
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2165515140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2165515140
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: &2165514520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.8
+  type: :development
+  prerelease: false
+  version_requirements: *2165514520
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2165513900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2165513900
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &2165513240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2165513240
+- !ruby/object:Gem::Dependency
+  name: cutter
+  requirement: &2165512580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156081880
+  version_requirements: *2165512580
 description: Configures relationships between subject, join and object model for a
   given behavior
 email: kmandrup@gmail.com
@@ -89,6 +166,10 @@ files:
 - lib/schemaker/models/object_model.rb
 - lib/schemaker/models/subject_model.rb
 - schemaker.gemspec
+- spec/active_record/active_record_helper.rb
+- spec/active_record/active_record_spec.rb
+- spec/active_record/db/database.yml
+- spec/active_record/migrations/create_models.rb
 - spec/models_helper.rb
 - spec/schemaker/model/join_spec.rb
 - spec/schemaker/model/object_spec.rb
@@ -110,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -374026981416273501
+      hash: -1246785679827546613
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Schema maker takes care of configuring your model schemas to map behavior