habtm_generator 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b240c06d0c86b72373164647ed1f125292dc675b
-  data.tar.gz: be957e436140cf06fef5e29db763307e5527abc6
+  metadata.gz: 420c26808e6ee7e74fbbe012b2417f175e9ebbec
+  data.tar.gz: d3b660d302464614a81e83e8ca01f224874f6c9a
 SHA512:
-  metadata.gz: b9e5479263091f96842468b8e7907c641493336db1f9fee8a6df79833bb341dc6c539c2aa6e5009608a08eacfa3b25fff0f0a4b9b4bbcab68b9f39c956b91429
-  data.tar.gz: 09d051d3361acacf75a6f9d4eafb6864ebada17abd0c98f4dec3da11a45bf49762f69cf3681481a9a004538f8ac53cf7844bab6e9f6e735e0198b8c116ca2630
+  metadata.gz: 040bc699b38ca84bf5185517c5e4bfc587672f8b1685ec95846564bcb9df3d611d9e056e2f429a70a15ee9bff4d11c204a7be990041543eeb05e5ed89f020bc7
+  data.tar.gz: 03b950881d178c8542db3f1bae4b585ac99a9f1d8af72f99e89e98179e60082341c4db052a17fd7ee70b8a45ee8c2ebf0d2945773f3700ca4cd03260e05c1914

data/.gitignore

@@ -3,7 +3,6 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
@@ -15,3 +14,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+spec/dummy
+gemfiles/*.lock

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+gemfile:
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
+
+rvm:
+- 2.1.1
+before_install:
+- bundle install --jobs=3 --retry=3
+script:
+- bundle exec rake test

data/Appraisals

@@ -0,0 +1,9 @@
+appraise "rails-4.0" do
+  gem "rails", "~> 4.0.0"
+end
+appraise "rails-4.1" do
+  gem "rails", "~> 4.1.0"
+end
+appraise "rails-4.2" do
+  gem "rails", "~> 4.2.0.beta1"
+end

data/Gemfile

@@ -2,3 +2,6 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in habtm_generator.gemspec
 gemspec
+
+gem 'sqlite3'
+gem 'rake'

data/README.md

@@ -1,5 +1,6 @@
 # HabtmGenerator
 
+[![Build Status](https://travis-ci.org/zealot128/ruby-habtm-generator.svg?branch=master)](https://travis-ci.org/zealot128/ruby-habtm-generator)
 
 ## Installation
 
@@ -29,5 +30,6 @@ This process is reversible (with ``rails destroy habtm model1 model2``).
 
 ## Potential Caveats
 
-* Namespaced models will not work
-* unique-constraint on index. I find this most useful for most situations. Just remove that from the generated migration before rake db:migrate
+* Namespaced models should work (tested in form ``admin/post``). This will generate more verbose habtm lines in the model, with explicit table names and key names
+* Default: adds unique-constraint on index. I find this most useful for most situations. Just remove that from the generated migration before rake db:migrate.
+

data/Rakefile

@@ -1,2 +1,18 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rails/dummy/tasks'
+
+
+task :clear do
+  rm_rf 'spec/dummy'
+end
+task :test => [:clear, 'dummy:app'] do
+  system 'rails g model user'
+  system 'rails g model post'
+  system 'rails g model admin/process'
+  system 'rails g habtm user post'
+  system 'rails g habtm user admin/process'
+  system 'rake db:migrate'
+  system 'pwd'
+  system 'rails r ../../test.rb'
+end

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3"
+gem "rake"
+gem "rails", "~> 4.0.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3"
+gem "rake"
+gem "rails", "~> 4.1.0"
+
+gemspec :path => "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3"
+gem "rake"
+gem "rails", "~> 4.2.0.beta1"
+
+gemspec :path => "../"

data/habtm_generator.gemspec

@@ -12,6 +12,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "habtm_generator"
   gem.require_paths = ["lib"]
-  gem.version       = "0.2"
-  gem.add_dependency "activerecord", "~> 4.1.0.rc1"
+  gem.version       = "0.3"
+  gem.add_dependency "activerecord"
+  gem.add_development_dependency 'appraisal'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'rails-dummy'
 end

data/lib/generators/habtm/habtm_generator.rb

@@ -10,18 +10,35 @@ class HabtmGenerator < ActiveRecord::Generators::Base
     migration_template "habtm_migration.rb.erb",
       "db/migrate/#{migration_name}.rb"
 
-    insert_into_file "app/models/#{models[0]}.rb",
-      "  has_and_belongs_to_many :#{models[1].pluralize}\n",
-      after: "class #{models[0].camelize} < ActiveRecord::Base\n"
-    insert_into_file "app/models/#{models[1]}.rb",
-      "  has_and_belongs_to_many :#{models[0].pluralize}\n",
-      after: "class #{models[1].camelize} < ActiveRecord::Base\n"
+    add_migration_line model: models[0],  other: models[1]
+    add_migration_line model: models[1],  other: models[0]
   end
 
   private
 
+  def add_migration_line(hash)
+    other = hash[:other]
+    model = hash[:model]
+    extra = if other.include?('/') || model.include?('/')
+                   ", :join_table => '#{table_name}', :class_name => '#{other.camelcase}', :foreign_key => '#{no_ns(model.foreign_key)}', :association_foreign_key => '#{no_ns(other.foreign_key)}'"
+                 else
+                   ""
+                 end
+    insert_into_file "app/models/#{model}.rb",
+      "  has_and_belongs_to_many :#{no_ns other.pluralize}#{extra}\n",
+      after: "class #{model.camelize} < ActiveRecord::Base\n"
+
+  end
+
+  def no_ns(m)
+    m.gsub('/','_')
+  end
+
+  def join_table(model)
+  end
+
   def table_name
-    sorted_models.map(&:pluralize).join("_")
+    sorted_models.map{|i| no_ns i.tableize}.join("_")
   end
 
   def models
@@ -33,11 +50,11 @@ class HabtmGenerator < ActiveRecord::Generators::Base
   end
 
   def references
-    sorted_models.map{|i| ":#{i}"}.join(", ")
+    sorted_models.map{|i| ":#{no_ns i.singularize}"}.join(", ")
   end
 
   def id_columns
-    sorted_models.map{|i| ":#{i}_id"}.join(", ")
+    sorted_models.map{|i| ":#{no_ns i.foreign_key}"}.join(", ")
   end
 
   def migration_name

data/lib/ruby-habtm-generator.rb

@@ -0,0 +1 @@
+# dummy

data/test.rb

@@ -0,0 +1,12 @@
+puts "Running test for #{Rails.version}"
+user = User.create!
+post = Post.create!
+user.posts << post
+post.reload.users.include?(user) || (raise StandardError.new('User not loaded'))
+user.reload.posts.include?(post) || (raise StandardError.new('Post not loaded'))
+
+process = Admin::Process.create!
+
+user.admin_processes << process
+
+process.reload.users.include?(user) || (raise StandardError.new('Admin/Process not loaded'))

metadata

@@ -1,29 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: habtm_generator
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Stefan Wienert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0.rc1
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails-dummy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generates has-and-belongs-to-many migrations. Use rails generate habtm
   model1 model2
 email:
@@ -32,15 +88,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
 - habtm_generator.gemspec
 - lib/generators/habtm/USAGE
 - lib/generators/habtm/habtm_generator.rb
 - lib/generators/habtm/templates/habtm_migration.rb.erb
+- lib/habtm_generator.rb
+- lib/ruby-habtm-generator.rb
+- test.rb
 homepage: https://github.com/zealot128/ruby-habtm-generator
 licenses: []
 metadata: {}
@@ -50,17 +114,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Generates has-and-belongs-to-many migrations. Use rails generate habtm model1