stage 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,6 @@
+== 0.4.1 2008-05-26
+  *Fixed: Namespacing bugs with model
+
 == 0.4.0 2008-05-25
   *Fixed: Support for namespacing in Rails. 
 

data/lib/stage/version.rb

@@ -2,7 +2,7 @@ module Stage #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 4
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rails_generators/stage/stage_generator.rb

@@ -10,22 +10,28 @@ class StageGenerator < Rails::Generator::NamedBase
               :singular_route_method,
               :plural_route_method
 
+  attr_reader :controller_file_path,
+              :controller_class_nesting,
+              :controller_nesting_depth,
+              :controller_singular_name,
+              :controller_plural_name
+
   alias_method  :controller_file_name,  :controller_underscore_name
   alias_method  :controller_table_name, :controller_plural_name
 
   def initialize(runtime_args, runtime_options = {})
     super
-    base_name, @controller_class_path, controller_file_path, controller_class_nesting, controller_class_nesting_depth = extract_modules(@name.pluralize)
-    @controller_class_name_without_nesting, @controller_underscore_name, controller_plural_name = inflect_names(base_name)
-    controller_singular_name= base_name.singularize
-    if controller_class_nesting.empty?
+    base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@name.pluralize)
+    @controller_class_name_without_nesting, @controller_underscore_name, @controller_plural_name = inflect_names(base_name)
+    @controller_singular_name= base_name.singularize
+    if @controller_class_nesting.empty?
       @controller_class_name = @controller_class_name_without_nesting
     else
-      @controller_class_name = "#{controller_class_nesting}::#{@controller_class_name_without_nesting}"
+      @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
     end
 
-    @singular_title_name = controller_singular_name.humanize
-    @plural_title_name = controller_plural_name.humanize
+    @singular_title_name = @controller_singular_name.humanize
+    @plural_title_name = @controller_plural_name.humanize
     @singular_route_method = "#{@name.gsub("::", "_")}_path"
     @plural_route_method = "#{@name.gsub("::", "_").pluralize}_path"
   end
@@ -37,7 +43,7 @@ class StageGenerator < Rails::Generator::NamedBase
       m.class_collisions(class_path, "#{class_name}")
 
       # Controller, helper, views
-      m.directory(File.join("app","models", class_path))
+      m.directory(File.join("app","models"))
       m.directory(File.join("app","controllers", controller_class_path))
       m.directory(File.join("app","helpers", controller_class_path))
       m.directory(File.join("app","views", controller_class_path, controller_file_name))
@@ -54,11 +60,11 @@ class StageGenerator < Rails::Generator::NamedBase
 
       m.template("data_partial.html.erb", File.join("app","views",controller_class_path, controller_file_name, "_data.html.erb"))
 
-			m.template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
+			m.template 'model.rb', File.join('app/models', "", "#{file_name}.rb")
 
       m.template("controller.rb", File.join("app","controllers", controller_class_path, "#{controller_file_name}_controller.rb"))
 
-      m.template("helper.rb", File.join("app","helpers",     controller_class_path, "#{controller_file_name}_helper.rb"))
+      m.template("helper.rb", File.join("app","helpers", controller_class_path, "#{controller_file_name}_helper.rb"))
 
 			unless options[:skip_migration]
         m.migration_template 'migration.rb', 'db/migrate', :assigns => {

data/rails_generators/stage/templates/model.rb

@@ -1,2 +1,2 @@
-class <%= class_name %> < ActiveRecord::Base
+class <%= singular_title_name %> < ActiveRecord::Base
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>stage</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/stage"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/stage" class="numbers">0.4.0</a>
+      <a href="http://rubyforge.org/projects/stage" class="numbers">0.4.1</a>
     </div>
     <h1>&#x2192; &#8216;stage&#8217;</h1>
 

data/website/merb.html

@@ -33,7 +33,7 @@
     <h1>stage</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/stage"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/stage" class="numbers">0.4.0</a>
+      <a href="http://rubyforge.org/projects/stage" class="numbers">0.4.1</a>
     </div>
     <h1>&#x2192; &#8216;stage&#8217;</h1>
 

data/website/rails.html

@@ -33,7 +33,7 @@
     <h1>stage</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/stage"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/stage" class="numbers">0.4.0</a>
+      <a href="http://rubyforge.org/projects/stage" class="numbers">0.4.1</a>
     </div>
     <h1>&#x2192; &#8216;stage&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stage
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-25 00:00:00 -04:00
+date: 2008-05-26 00:00:00 -04:00
 default_executable: 
 dependencies: []