model_mill 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/generators/model_mill/models/models_generator.rb

@@ -3,33 +3,33 @@ module ModelMill
     class ModelsGenerator < Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
 
-      argument :namespace, :type => :string, :required => false, :default => nil
-      argument :excludes, :type => :array, :required => false, :default => []
+      class_option :namespace, :type => :string, :required => false, :default => nil
+      #argument :excludes, :type => :array, :required => false, :default => []
 
       def generate_models
-        if namespace
-          empty_directory("app/models/#{namespace.downcase}")
+        if options[:namespace]
+          empty_directory("app/models/#{options[:namespace].downcase}")
           generate_base_namespaced_model
         end
         discovered_tables.each do |table_name|
           @model_name = model_name_from_table_name table_name
           @model_file_name = model_file_name_from_table_name table_name
-          template 'model.rb', "app/models/#{namespace ? namespace+'/' : ''}#{@model_file_name}.rb"
+          template 'model.rb', "app/models/#{options[:namespace] ? options[:namespace]+'/' : ''}#{@model_file_name}.rb"
         end
-        puts %Q(config.autoload_paths += %W(\#{config.root}/app/models/#{namespace.downcase})) if namespace
+        puts %Q(config.autoload_paths += %W(\#{config.root}/app/models/#{options[:namespace].downcase})) if options[:namespace]
       end
 
       private
       def connection
-        @conn ||= namespace ? Kernel.const_get(namespace.camelize)::Base.connection : ActiveRecord::Base.connection
+        @conn ||= options[:namespace] ? Kernel.const_get(options[:namespace].camelize)::Base.connection : ActiveRecord::Base.connection
       end
 
       def connection_info
-        YAML.load(ERB.new(File.read(File.expand_path(File.join("config","database.yml")))))[namespace.downcase]
+        YAML.load(ERB.new(File.read(File.expand_path(File.join("config","database.yml")))))[options[:namespace].downcase]
       end
 
       def generate_base_namespaced_model
-        template 'base.rb', "app/models/#{namespace}/base.rb"
+        template 'base.rb', "app/models/#{options[:namespace]}/base.rb"
       end
 
       def discovered_tables

data/lib/generators/model_mill/models/templates/base.rb

@@ -1,5 +1,5 @@
-class <%= namespace.camelize %>::Base < ActiveRecord::Base
+class <%= options[:namespace].camelize %>::Base < ActiveRecord::Base
   self.abstract_class = true
-  establish_connection "<%= namespace %>"
+  establish_connection "<%= options[:namespace] %>"
 end
 

data/lib/generators/model_mill/models/templates/model.rb

@@ -1,3 +1,3 @@
-class <%= namespace ? namespace.camelize + '::' : '' %><%= @model_name %> < <%= namespace ? namespace.camelize : 'ActiveRecord' %>::Base
+class <%= options[:namespace] ? options[:namespace].camelize + '::' : '' %><%= @model_name %> < <%= options[:namespace] ? options[:namespace].camelize : 'ActiveRecord' %>::Base
 end
 

data/model_mill.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{model_mill}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joe Martinez"]

data/spec/generators/model_generator_spec.rb

@@ -42,7 +42,7 @@ describe 'models_generator' do
 
     it "generates a base model for the namespace" do
       GeneratorSpec.with_generator do |g|
-        g.run_generator @namespace
+        g.run_generator [ "--namespace=#{@namespace}" ]
         g.should generate_file("app/models/#{@namespace}")
         g.should generate_file("app/models/#{@namespace}/base.rb")
         file_contents("app/models/#{@namespace}/base.rb").should match(/class #{@namespace.camelize}::Base < ActiveRecord::Base/)
@@ -51,7 +51,7 @@ describe 'models_generator' do
 
     it "generates a model for each table" do
       GeneratorSpec.with_generator do |g|
-        g.run_generator @namespace
+        g.run_generator [ "--namespace=#{@namespace}" ]
         @tables.each do |tn|
           g.should generate_file("app/models/#{@namespace}/#{tn.singularize.underscore}.rb")
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: model_mill
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Joe Martinez