nsweb-generators 0.1.0 → 0.2.0

data/Gemfile

@@ -1,8 +1,10 @@
 source 'http://rubygems.org'
+gemspec
 
-gem 'rails', '3.0.3'
-
-group :test, :development do
-  gem 'rspec-rails',    '~> 2.0.1'
-  gem 'cucumber',       '~> 0.9.2'
-end
+#gem 'rails', '3.0.3'
+#gem 'sqlite3-ruby', :require => 'sqlite3'
+#
+#group :test, :development do
+#  gem 'rspec-rails',    '~> 2.0.1'
+#  gem 'cucumber',       '~> 0.9.2'
+#end

data/features/nsweb_controller.feature

@@ -1,29 +1,23 @@
 Feature: Nsweb Controller Generator
-		Inside of the Nsweb application
-		As a rails developer
-		I want to generate a controller for a resource
+	Inside of the Nsweb application
+	As a rails developer
+	I want to generate a controller for a resource
 
-		Scenario: Generate a controller for a simple resource inside the core engine
-				Given a new whizbang app
-				Given a core engine
-				
-				When I run "rails g nsweb:controller core Widget"
-				Then I should see the following files
-						| vendor/whizbang_app/core/app/controllers/widgets_controller.rb	|
-						| vendor/whizbang_app/core/app/helpers/widgets_helper.rb					|
+	Scenario: Generate a controller for a simple resource inside the core engine
+		Given a new rails app
+		Given a core plugin
 
-				And I should see "resources :widgets" in file "vendor/whizbang_app/core/config/routes.rb"
-				When I run "rake db:migrate"
-				Then I should successfully run "rake test"
+		When I run "rails g nsweb:controller core Widget"
+		Then I should see the following files
+			| lib/rails_app/plugins/core/app/controllers/widgets_controller.rb	|
+			| lib/rails_app/plugins/core/app/helpers/widgets_helper.rb			|
 
-		Scenario: Generate controller with rspec tests
-				Given a new whizbang app
-				Given a core engine
+		And I should see "resources :widgets" in file "lib/rails_app/plugins/core/config/routes.rb"
 
-				When I run "rails g nsweb:controller core Widget --rspec"
-				Then I should see the following files
-						| vendor/whizbang_app/core/spec/controllers/widgets_controller_spec.rb	|
-				When I run "rake db:migrate"
-				And I add "gem 'rspec-rails', '>= 2.0.1'" to file "Gemfile"
-				And I run "rails g rspec:install"
-				Then I should successfully run "rake spec"
+	Scenario: Generate controller with rspec tests
+		Given a new rails app
+		Given a core plugin
+
+		When I run "rails g nsweb:controller core Widget --rspec"
+		Then I should see the following files
+			| spec/lib/rails_app/plugins/core/controllers/widgets_controller_spec.rb	|

data/features/nsweb_model.feature

@@ -1,27 +1,27 @@
 Feature: Nsweb Model Generator
-		Inside of the Nsweb application
-		As a rails developer
-		I want to generate a model for a resource
+	Inside of the Nsweb application
+	As a rails developer
+	I want to generate a model for a resource
 
-		Scenario: Generate a model for a simple resource inside the core engine
-				Given a new whizbang app
-				Given a core engine
+	Scenario: Generate a model for a simple resource inside the core engine
+		Given a new rails app
+		Given a core plugin
 
-				When I run "rails g nsweb:model core Widget myvar:string"
-				Then I should see the following files
-						| vendor/whizbang_app/core/app/models/widget.rb		|
-						| db/migrate																			|
-				When I run "rake db:migrate"
-				Then I should successfully run "rake test"
+		When I run "rails g nsweb:model core Widget myvar:string"
+		Then I should see the following files
+			| lib/rails_app/plugins/core/app/models/widget.rb	|
+			| db/migrate										|
 
-		Scenario: Generate a model with rspec tests
-				Given a new whizbang app
-				Given a core engine
+		Then I should successfully run "rake db:migrate"
 
-				When I run "rails g nsweb:model core widget myvar:string --rspec"
-				Then I should see the following files
-					| vendor/whizbang_app/core/spec/models/widget_spec.rb	|
-				When I run "rake db:migrate"
-				And I add "gem 'rspec-rails', '>= 2.0.1'" to file "Gemfile"
-				And I run "rails g rspec:install"
-				Then I should successfully run "rake spec"
+	Scenario: Generate a model with rspec tests
+		Given a new rails app
+		Given a core plugin
+
+		When I run "rails g nsweb:model core widget myvar:string --rspec"
+		Then I should see the following files
+			| spec/lib/rails_app/plugins/core/models/widget_spec.rb	|
+
+		When I run "rake db:migrate"
+		And I add "gem 'rspec-rails', '>= 2.0.1'" to file "Gemfile"
+		Then I should successfully run "rails g rspec:install"

data/features/nsweb_plugin.feature

@@ -0,0 +1,21 @@
+Feature: Nsweb Plugin Generator
+	Inside of a rails application
+	As a rails developer
+	I want to generate a plugin
+
+	Scenario: Generate a core plugin
+		Given a new rails app
+
+		When I run "rails g nsweb:plugin core"
+		Then I should see the following files
+			| lib/rails_app/plugins/core.rb					|
+			| lib/rails_app/plugins/core/lib/engine.rb		|
+			| lib/rails_app/plugins/core/config/routes.rb	|
+
+	Scenario: Generate plugin with rspec tests
+		Given a new rails app
+		Given a core plugin
+
+		When I run "rails g nsweb:plugin core --rspec"
+		Then I should see the following files
+			| spec/lib/rails_app/plugins/core_spec.rb	|

data/features/step_definitions/setup_steps.rb

@@ -1,11 +1,10 @@
 Given /^a new ([a-z_]*) app$/ do |app_name|
   FileUtils.mkdir_p('tmp')
-  system('rm -rf tmp/*')
   system("rails new tmp/#{app_name}_app")
   system("ln -s ../../../lib/generators tmp/#{app_name}_app/lib/generators").should be_true
   @current_directory = File.expand_path("tmp/#{app_name}_app")
 end
 
-Given /^a ([a-z_]*) engine$/ do |engine_name|
-  system("cd #{@current_directory} && rails g nsweb:engine #{engine_name}")
+Given /^a ([a-z_]*) plugin$/ do |plugin_name|
+  system("cd #{@current_directory} && rails g nsweb:plugin #{plugin_name}")
 end

data/features/support/env.rb

@@ -0,0 +1,6 @@
+require 'cucumber'
+require 'rspec'
+
+Before do
+  FileUtils.rm_rf 'tmp/rails_app'
+end

data/features/support/matchers.rb

@@ -0,0 +1,7 @@
+RSpec::Matchers.define :exist do |path|
+  match do
+    File.exist?(path)
+  end
+
+  failure_message_for_should { "Expected #{path} to exist but no file found" }
+end

data/lib/generators/nsweb.rb

@@ -4,9 +4,10 @@ require 'rails/generators/base'
 module Nsweb
   module Generators
     class Base < Rails::Generators::Base #:nodoc:
-      attr_accessor :engine_name
+      attr_accessor :plugin_name
 
-      argument :engine_name, :type => :string, :required => true, :banner => 'EngineName'
+      argument :plugin_name, :type => :string, :required => true, :banner => 'PluginName'
+      class_option :rspec, :desc => 'Use RSpec for test files.', :group => 'Test framework', :type => :boolean
 
       def self.source_root
         @nsweb_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'nsweb', generator_name, 'templates'))
@@ -26,14 +27,18 @@ module Nsweb
         end
       end
 
-      def engine_path
-        @engine_path ||= File.join('vendor', application_name, engine_name.underscore)
+      def plugin_file_name
+        @plugin_file_name ||= plugin_name.underscore
       end
 
-      def engine_route(routing_code)
+      def plugin_path
+        @plugin_path ||= File.join('lib', application_name, 'plugins', plugin_file_name)
+      end
+
+      def plugin_route(routing_code)
         sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
         in_root do
-          inject_into_file File.join(engine_path, 'config/routes.rb' ),
+          inject_into_file File.join(plugin_path, 'config/routes.rb' ),
             "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
         end
       end
@@ -91,7 +96,7 @@ module Nsweb
       end
 
       def table_name
-        @table_name ||= ([application_name] + [plural_name]).join('_')
+        @table_name ||= (class_path + [plural_name]).join('_')
       end
 
       #def migration_class_name

data/lib/generators/nsweb/controller/controller_generator.rb

@@ -7,8 +7,6 @@ module Nsweb
       argument :actions, :type => :array, :default => [],
         :banner => 'action action'
 
-      class_option :rspec, :desc => 'Use RSpec for test files.', :group => 'Test framework', :type => :boolean
-
       def initialize(*args, &block)
         super
 
@@ -24,21 +22,21 @@ module Nsweb
       end
 
       def create_controller
-        template 'controller.rb', File.join(engine_path, 'app/controllers',
+        template 'controller.rb', File.join(plugin_path, 'app/controllers',
                                             "#{plural_file_path}_controller.rb")
         if test_framework == :rspec
-          template 'tests/rspec.rb', File.join(engine_path, 'spec/controllers',
+          template 'tests/rspec.rb', File.join('spec', plugin_path, 'controllers',
                                                "#{plural_file_path}_controller_spec.rb")
         else
         end
         unless options.skip_helper?
-          template 'helper.rb', File.join(engine_path, 'app/helpers',
+          template 'helper.rb', File.join(plugin_path, 'app/helpers',
                                           "#{plural_file_path}_helper.rb")
         end
 
         #controller_actions.each do |action|
         #  if %w[index show new edit].include?(action)
-        #    template "views/#{action}.html.erb", File.join(engine_path,
+        #    template "views/#{action}.html.erb", File.join(plugin_path,
         #                                                   "app/views/#{file_name}/#{action}.html.erb")
 
 
@@ -46,10 +44,10 @@ module Nsweb
         #end
 
         if class_path.length < 0
-          engine_route("resources #{plural_file_name.to_sym.inspect},
+          plugin_route("resources #{plural_file_name.to_sym.inspect},
                        :controller => '#{(class_path + [plural_name]).join('/')}")
         else
-          engine_route("resources #{plural_name.to_sym.inspect}")
+          plugin_route("resources #{plural_name.to_sym.inspect}")
         end
       end
 

data/lib/generators/nsweb/model/model_generator.rb

@@ -9,9 +9,6 @@ module Nsweb
 
       argument :attributes, :type => :array, :default => [], :banner => 'field:type field:type'
 
-      class_option :skip_migration, :desc => 'Don\'t generate a migration file for model.', :type => :boolean
-      class_option :rspec, :desc => 'Use RSpec for test files.', :group => 'Test framework', :type => :boolean
-
       def initialize(*args, &block)
         super
         @model_attributes = []
@@ -21,13 +18,10 @@ module Nsweb
       end
 
       def create_model
-        template 'model.rb', File.join(engine_path, 'app/models', "#{file_path}.rb")
+        template 'model.rb', File.join(plugin_path, 'app/models', "#{file_path}.rb")
         if test_framework == :rspec
-          template 'tests/rspec/model.rb', File.join(engine_path, 'spec/models',
+          template 'tests/rspec/model.rb', File.join('spec', plugin_path, 'models',
                                                      "#{file_path}_spec.rb")
-        else
-          template "tests/#{test_framework}/model.rb", File.join(engine_path, "test/unit/#{singular_name}_test.rb")
-                                                                
         end
       end
 

data/lib/generators/nsweb/plugin/plugin_generator.rb

@@ -0,0 +1,37 @@
+require 'generators/nsweb'
+
+module Nsweb
+  module Generators
+    class PluginGenerator < Base
+
+      def initialize(*args, &block)
+        super
+      end
+
+      def create_plugin
+        template 'plugin.rb', "#{plugin_path}.rb"
+        #File.join(plugin_path, "#{plugin_file_name}.rb")
+        if test_framework == :rspec
+          template 'tests/rspec.rb', File.join('spec', "#{plugin_path}_spec.rb")
+          #, "#{plugin_file_name}_spec.rb")
+        else
+        end
+      end
+
+      def create_engine
+        template 'engine.rb', File.join(plugin_path, 'lib/engine.rb')
+      end
+
+      def create_routes
+        template 'routes.rb', File.join(plugin_path, 'config/routes.rb')
+      end
+
+      protected
+
+      def plugin_class_name
+        @plugin_class_name ||= plugin_file_name.camelize
+      end
+
+    end
+  end
+end

data/lib/generators/nsweb/plugin/templates/engine.rb

@@ -0,0 +1,8 @@
+require 'rails/all'
+
+module <%= application_name %>
+  module <%= plugin_class_name %>
+    class Engine < Rails::Engine
+    end
+  end
+end

data/lib/generators/nsweb/plugin/templates/plugin.rb

@@ -0,0 +1,8 @@
+require '<%= application_name %>/plugin'
+
+module <%= application_name.camelize %>
+  <%= application_name.camelize %>::Plugin.register do |plugin|
+    plugin.name = '<%= plugin_file_name %>'
+    plugin.title = '<%= plugin_class_name %>'
+  end
+end

data/lib/generators/nsweb/plugin/templates/tests/rspec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe <%= application_name %>::<%= plugin_class_name %> do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nsweb-generators
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Josh Williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 -06:00
+date: 2010-12-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,22 @@ dependencies:
         version: 3.0.3
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 1
+        - 3
+        - 1
+        version: 1.3.1
+  type: :runtime
+  version_requirements: *id004
 description: Generators for Nsweb engines/models/controllers
 email: jwilliams@shareone.com
 executables: []
@@ -78,10 +94,12 @@ files:
 - .gitignore
 - Gemfile
 - features/nsweb_controller.feature
-- features/nsweb_engine.feature
 - features/nsweb_model.feature
+- features/nsweb_plugin.feature
 - features/step_definitions/common_steps.rb
 - features/step_definitions/setup_steps.rb
+- features/support/env.rb
+- features/support/matchers.rb
 - lib/generators/nsweb.rb
 - lib/generators/nsweb/controller/controller_generator.rb
 - lib/generators/nsweb/controller/templates/actions/create.rb
@@ -95,16 +113,17 @@ files:
 - lib/generators/nsweb/controller/templates/helper.rb
 - lib/generators/nsweb/controller/templates/tests/rspec.rb
 - lib/generators/nsweb/controller/templates/views/index.html.erb
-- lib/generators/nsweb/engine/USAGE
-- lib/generators/nsweb/engine/engine_generator.rb
-- lib/generators/nsweb/engine/templates/engine.rb
-- lib/generators/nsweb/engine/templates/routes.rb
 - lib/generators/nsweb/model/model_generator.rb
 - lib/generators/nsweb/model/templates/migration.rb
 - lib/generators/nsweb/model/templates/model.rb
 - lib/generators/nsweb/model/templates/tests/rspec/model.rb
 - lib/generators/nsweb/model/templates/tests/testunit/model.rb
-- lib/generators/nsweb/scaffold/scaffold_generator.rb
+- lib/generators/nsweb/plugin/USAGE
+- lib/generators/nsweb/plugin/plugin_generator.rb
+- lib/generators/nsweb/plugin/templates/engine.rb
+- lib/generators/nsweb/plugin/templates/plugin.rb
+- lib/generators/nsweb/plugin/templates/routes.rb
+- lib/generators/nsweb/plugin/templates/tests/rspec.rb
 has_rdoc: true
 homepage: http://projects.hbtesting.org
 licenses: []

data/features/nsweb_engine.feature

@@ -1,12 +0,0 @@
-Feature: Nsweb Engine Generator
-		Inside of a rails application
-		As a rails developer
-		I want to generate an engine
-
-		Scenario: Generate a core engine
-				Given a new rails app
-
-				When I run "rails g nsweb:engine core"
-				Then I should see the following files
-						| vendor/rails_app/core/lib/core.rb				|
-						| vendor/rails_app/core/config/routes.rb	|

data/lib/generators/nsweb/engine/engine_generator.rb

@@ -1,33 +0,0 @@
-require 'generators/nsweb'
-
-module Nsweb
-  module Generators
-    class EngineGenerator < Base
-
-      attr_accessor :engine_name
-
-      def initialize(*args, &block)
-        super
-      end
-
-      def create_engine
-        template 'engine.rb', File.join(engine_path, 'lib', "#{engine_file_name}.rb")
-      end
-
-      def create_routes
-        template 'routes.rb', File.join(engine_path, 'config/routes.rb')
-      end
-
-      protected
-
-      def engine_file_name
-        @engine_file_name ||= engine_name.underscore
-      end
-
-      def engine_class_name
-        @engine_class_name ||= engine_name.camelize
-      end
-
-    end
-  end
-end

data/lib/generators/nsweb/engine/templates/engine.rb

@@ -1,22 +0,0 @@
-require 'rails/all'
-
-module <%= application_name %>
-  module <%= engine_class_name %>
-    class << self
-      def root
-        @root ||= File.dirname(File.expand_path(__FILE__))
-      end
-    end
-
-    class Engine < Rails::Engine
-
-      config.after_initialize do |app|
-        <%= application_name %>::Plugin.register do |plugin|
-          plugin.name = '<%= engine_file_name %>'
-          plugin.title = '<%= engine_class_name %>'
-          plugin.version = %q{0.0.1}
-        end
-      end
-    end
-  end
-end