habtm_generator 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 420c26808e6ee7e74fbbe012b2417f175e9ebbec
-  data.tar.gz: d3b660d302464614a81e83e8ca01f224874f6c9a
+  metadata.gz: 227358fd36cbff8dd8e618c8269c375f5cd2e088
+  data.tar.gz: f08386cfa1740cb7ab9613894663db93861ab900
 SHA512:
-  metadata.gz: 040bc699b38ca84bf5185517c5e4bfc587672f8b1685ec95846564bcb9df3d611d9e056e2f429a70a15ee9bff4d11c204a7be990041543eeb05e5ed89f020bc7
-  data.tar.gz: 03b950881d178c8542db3f1bae4b585ac99a9f1d8af72f99e89e98179e60082341c4db052a17fd7ee70b8a45ee8c2ebf0d2945773f3700ca4cd03260e05c1914
+  metadata.gz: 4c23b1fe43ac247ced6e0fed325239aefc7e4ec470541fed22190eb5bdaefe125713cd257de1ee67c6fcbb3947b2db42444b8aff0f91a84910012d62834f2a57
+  data.tar.gz: b03756091567bceaac45f0de10e6c1c769132352f0c04c896809780b13903f8c50dff37eeb53e81773adaf612c73459d1c7488c1522a7c5e76e329af1563a93f

data/.gitignore

@@ -16,3 +16,4 @@ test/version_tmp
 tmp
 spec/dummy
 gemfiles/*.lock
+Gemfile.lock

data/.travis.yml

@@ -1,12 +1,16 @@
 language: ruby
+sudo: false
+cache: bundler
+
 gemfile:
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
 
 rvm:
-- 2.1.1
-before_install:
-- bundle install --jobs=3 --retry=3
+- 2.2.3
+- ruby-head
+
 script:
 - bundle exec rake test

data/Appraisals

@@ -5,5 +5,8 @@ appraise "rails-4.1" do
   gem "rails", "~> 4.1.0"
 end
 appraise "rails-4.2" do
-  gem "rails", "~> 4.2.0.beta1"
+  gem "rails", "~> 4.2.0"
+end
+appraise "rails-5.0" do
+  gem "rails", "~> 5.0.0.beta1"
 end

data/README.md

@@ -1,6 +1,7 @@
 # HabtmGenerator
 
 [![Build Status](https://travis-ci.org/zealot128/ruby-habtm-generator.svg?branch=master)](https://travis-ci.org/zealot128/ruby-habtm-generator)
+[![Gem Version](https://badge.fury.io/rb/habtm_generator.svg)](https://badge.fury.io/rb/habtm_generator)
 
 ## Installation
 

data/Rakefile

@@ -3,6 +3,13 @@ require "bundler/gem_tasks"
 require 'rails/dummy/tasks'
 
 
+class Rails::Dummy::Generator
+  def original_name
+    'habtm_generator'
+  end
+end
+
+
 task :clear do
   rm_rf 'spec/dummy'
 end

data/gemfiles/rails_4.2.gemfile

@@ -4,6 +4,6 @@ source "https://rubygems.org"
 
 gem "sqlite3"
 gem "rake"
-gem "rails", "~> 4.2.0.beta1"
+gem "rails", "~> 4.2.0"
 
 gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

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

data/habtm_generator.gemspec

@@ -12,10 +12,9 @@ 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.3"
+  gem.version       = "0.4"
   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

@@ -1,9 +1,11 @@
+
 require 'rails/generators/migration'
 require 'rails/generators/active_record'
 class HabtmGenerator < ActiveRecord::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
   argument :other_model, required: true,
     type: :string, desc: "List both part of the habtm migration to generate the table"
+  class_option :convention, :type => :string, :aliases => "-c", :desc => "Table names convention. Available options are 'rails' and 'mysql_workbench'.", :default => "rails"
 
   def create_migration_file
     models.map!{|i|i.singularize}
@@ -24,10 +26,8 @@ class HabtmGenerator < ActiveRecord::Generators::Base
                  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"
-
+    inject_into_class "app/models/#{model}.rb", model.camelcase,
+      "  has_and_belongs_to_many :#{no_ns other.pluralize}#{extra}\n"
   end
 
   def no_ns(m)
@@ -37,8 +37,21 @@ class HabtmGenerator < ActiveRecord::Generators::Base
   def join_table(model)
   end
 
+  def coding_convention
+    options[:convention].to_s
+  end
+
   def table_name
-    sorted_models.map{|i| no_ns i.tableize}.join("_")
+    junction_string = ''
+
+    case coding_convention
+    when 'mysql_workbench'
+      junction_string = '_has_'
+    else
+      junction_string = '_'
+    end
+
+    sorted_models.map{|i| no_ns i.tableize}.join(junction_string)
   end
 
   def models
@@ -46,11 +59,18 @@ class HabtmGenerator < ActiveRecord::Generators::Base
   end
 
   def sorted_models
-    models.map(&:singularize).map(&:underscore).sort
+    ret = models.map(&:singularize).map(&:underscore)
+
+    case coding_convention
+    when 'mysql_workbench'
+      ret
+    else
+      ret.sort
+    end
   end
 
   def references
-    sorted_models.map{|i| ":#{no_ns i.singularize}"}.join(", ")
+    sorted_models.map{|i| ":#{no_ns i.singularize}"}
   end
 
   def id_columns

data/lib/generators/habtm/templates/habtm_migration.rb.erb

@@ -1,7 +1,8 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_table :<%= table_name %>, :id => false do |t|
-      t.references <%= references %>
+      t.references <%= references[0] %>
+      t.references <%= references[1] %>
     end
 
     add_index :<%= table_name %>, [<%=id_columns %>],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: habtm_generator
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Stefan Wienert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !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
@@ -98,6 +84,7 @@ files:
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
 - habtm_generator.gemspec
 - lib/generators/habtm/USAGE
 - lib/generators/habtm/habtm_generator.rb
@@ -124,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Generates has-and-belongs-to-many migrations. Use rails generate habtm model1