merb-gen 0.9.4 → 0.9.5

data/Rakefile

@@ -17,7 +17,7 @@ GEM_EMAIL  = "jonas.nicklas@gmail.com"
 
 GEM_NAME    = "merb-gen"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.4") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.5") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -38,8 +38,8 @@ spec = Gem::Specification.new do |s|
   s.bindir = "bin"
   s.executables = %w( merb-gen )
 
-  s.add_dependency "merb-core", ">= 0.9.4"
-  s.add_dependency "templater", ">= 0.1.4"
+  s.add_dependency "merb-core", ">= 0.9.5"
+  s.add_dependency "templater", ">= 0.1.5"
 
   s.require_path = 'lib'
   s.autorequire = GEM_NAME

data/lib/generators/controller.rb

@@ -10,8 +10,8 @@ module Merb::Generators
       Generates a new controller.
     DESC
     
-    option :testing_framework, :desc => 'Testing framework to use (one of: spec, test_unit)'
-    option :template_engine, :default => :erb, :desc => 'Template engine to use (one of: erb, haml, markaby, etc...)'
+    option :testing_framework, :desc => 'Testing framework to use (one of: rspec, test_unit)'
+    option :template_engine, :desc => 'Template engine to use (one of: erb, haml, markaby, etc...)'
     
     first_argument :name, :required => true, :desc => "controller name"
     

data/lib/generators/helper.rb

@@ -10,7 +10,7 @@ module Merb::Generators
       Generates a new helper.
     DESC
     
-    option :testing_framework, :desc => 'Testing framework to use (one of: spec, test_unit)'
+    option :testing_framework, :desc => 'Testing framework to use (one of: rspec, test_unit)'
     
     first_argument :name, :required => true, :desc => "helper name"
     

data/lib/generators/layout.rb

@@ -11,7 +11,7 @@ module Merb::Generators
     DESC
     
     #option :testing_framework, :desc => 'Testing framework to use (one of: rspec, test_unit)'
-    option :template_engine, :default => :erb, :desc => 'Specify what template engine should be used (one of: erb, haml...)'
+    option :template_engine, :desc => 'Specify what template engine should be used (one of: erb, haml...)'
     
     first_argument :name, :required => true, :desc => "layout name"
     

data/lib/generators/merb/merb_full.rb

@@ -7,9 +7,11 @@ module Merb::Generators
     end
     
     option :testing_framework, :default => :rspec, 
-                               :desc => 'Testing framework to use (one of: spec, test_unit).'                               
+                               :desc => 'Testing framework to use (one of: rspec, test_unit).'                               
     option :orm, :default => :none, 
                  :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel).'
+    option :template_engine, :default => :erb,
+                :desc => 'Template engine to prefer for this application (one of: erb, haml).'
     
     desc <<-DESC
       This generates a Merb application with Ruby on Rails like structure.

data/lib/generators/merb/merb_very_flat.rb

@@ -17,6 +17,8 @@ module Merb::Generators
       source('application.rbt')
       destination("#{base_name}.rb")
     end
+
+    file :spec_helper, 'spec/spec_helper.rb', 'spec/spec_helper.rb'
     
     def class_name
       self.name.camel_case
@@ -26,4 +28,4 @@ module Merb::Generators
   
   add_private :app_very_flat, MerbVeryFlatGenerator
   
-end
+end

data/lib/generators/merb.rb

@@ -2,7 +2,7 @@ module Merb::Generators
   
   class MerbGenerator < Generator
 
-    option :testing_framework, :default => :rspec, :desc => 'Testing framework to use (one of: spec, test_unit)'
+    option :testing_framework, :default => :rspec, :desc => 'Testing framework to use (one of: rspec, test_unit)'
     option :orm, :default => :none, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
     option :flat, :as => :boolean, :desc => "Generate a flat application: one file + configs + templates directory."
     option :very_flat, :as => :boolean, :desc => "Generate a very flat, Sinatra-like one file application."

data/lib/generators/merb_plugin.rb

@@ -6,7 +6,7 @@ module Merb::Generators
       File.join(super, 'application', 'merb_plugin')
     end
     
-    option :testing_framework, :default => :rspec, :desc => 'Testing framework to use (one of: spec, test_unit)'
+    option :testing_framework, :default => :rspec, :desc => 'Testing framework to use (one of: rspec, test_unit)'
     option :orm, :default => :none, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
     option :bin, :as => :boolean # TODO: explain this
     

data/lib/generators/model.rb

@@ -11,7 +11,7 @@ module Merb::Generators
       of the application uses.
     DESC
     
-    option :testing_framework, :desc => 'Testing framework to use (one of: spec, test_unit)'
+    option :testing_framework, :desc => 'Testing framework to use (one of: rspec, test_unit)'
     option :orm, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
     
     first_argument :name, :required => true, :desc => "model name"

data/lib/generators/resource.rb

@@ -6,7 +6,7 @@ module Merb::Generators
       Generates a new resource.
     DESC
     
-    first_argument :name, :required => true, :desc => "resource name"
+    first_argument :name, :required => true, :desc => "resource name (singular)"
     second_argument :attributes, :as => :hash, :default => {}, :desc => "space separated resource model properties in form of name:type. Example: state:string"
     
     invoke :model do |generator|
@@ -22,7 +22,7 @@ module Merb::Generators
     end
     
     def model_name
-      name.singularize
+      name
     end
     
   end

data/lib/generators/resource_controller.rb

@@ -10,9 +10,9 @@ module Merb::Generators
       Generates a new resource controller.
     DESC
     
-    option :testing_framework, :desc => 'Testing framework to use (one of: spec, test_unit)'
+    option :testing_framework, :desc => 'Testing framework to use (one of: rspec, test_unit)'
     option :orm, :desc => 'Object-Relation Mapper to use (one of: none, activerecord, datamapper, sequel)'
-    option :template_engine, :default => :erb, :desc => 'Template Engine to use (one of: erb, haml, markaby, etc...)'
+    option :template_engine, :desc => 'Template Engine to use (one of: erb, haml, markaby, etc...)'
     
     first_argument :name, :required => true,
                           :desc     => "model name"
@@ -61,6 +61,10 @@ module Merb::Generators
       plural_model.singularize
     end
     
+    def resource_path
+      chunks.map{ |c| c.snake_case }.join('/')
+    end
+    
     # TODO: fix this for Datamapper, so that it returns the primary keys for the model
     def params_for_get
       "params[:id]"

data/lib/generators/templates/application/merb/autotest/merb_rspec.rb

@@ -14,8 +14,7 @@ class Autotest::MerbRspec < Autotest
     super
 
     # Ignore any happenings in these directories
-    add_exception %r%^\./(?:doc|log|public|tmp)%
-
+    add_exception %r%^\./(?:doc|log|public|tmp|\.git|\.hg|\.svn|framework|gems|schema|\.DS_Store|autotest|bin|.*\.sqlite3)% 
     # Ignore SCM directories and custom Autotest mappings
     %w[.svn .hg .git .autotest].each { |exception| add_exception(exception) }
 

data/lib/generators/templates/application/merb/config/environments/development.rb

@@ -4,4 +4,5 @@ Merb::Config.use { |c|
   c[:reload_classes] = true
   c[:reload_time] = 0.5
   c[:log_auto_flush ] = true
-}
+  c[:log_level] = :debug
+}

data/lib/generators/templates/application/merb/config/init.rb

@@ -92,6 +92,17 @@ end
 <%= "# " unless testing_framework == :test_unit %>use_test :test_unit
 <%= "# " unless testing_framework == :rspec %>use_test :rspec
 
+
+#
+# ==== Choose which template engine to use by default
+#
+
+# Merb can generate views for different template engines, choose your favourite as the default.
+
+<%= "# " unless template_engine == :erb %>use_template_engine :erb
+<%= "# " unless template_engine == :haml %>use_template_engine :haml
+
+
 #
 # ==== Set up your basic configuration
 #

data/lib/generators/templates/application/merb_flat/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+require "rubygems"
+require "spec"
+require "merb-core"
+
+Merb::Config.use do |c|
+  c[:session_store] = "memory"
+end
+
+Merb.start_environment(:testing => true,
+                       :adapter => 'runner',
+                       :environment => ENV['MERB_ENV'] || 'test')
+
+Spec::Runner.configure do |config|
+  config.include(Merb::Test::ViewHelper)
+  config.include(Merb::Test::RouteHelper)
+  config.include(Merb::Test::ControllerHelper)
+end

data/lib/generators/templates/application/merb_very_flat/spec/spec_helper.rb

@@ -0,0 +1,17 @@
+require "rubygems"
+require "spec"
+require "merb-core"
+
+Merb::Config.use do |c|
+  c[:session_store] = "memory"
+end
+
+Merb.start_environment(:testing => true,
+                       :adapter => 'runner',
+                       :environment => ENV['MERB_ENV'] || 'test')
+
+Spec::Runner.configure do |config|
+  config.include(Merb::Test::ViewHelper)
+  config.include(Merb::Test::RouteHelper)
+  config.include(Merb::Test::ControllerHelper)
+end

data/lib/generators/templates/component/resource_controller/app/controllers/%file_name%.rb

@@ -1,42 +1,42 @@
 <% with_modules(modules) do -%>
 class <%= class_name %> < Application
   
-  # GET /<%= symbol_name %>
+  # GET /<%= resource_path %>
   def index
     render
   end
 
-  # GET /<%= symbol_name %>/:id
+  # GET /<%= resource_path %>/:id
   def show
     render
   end
 
-  # GET /<%= symbol_name %>/new
+  # GET /<%= resource_path %>/new
   def new
     render
   end
 
-  # GET /<%= symbol_name %>/:id/edit
+  # GET /<%= resource_path %>/:id/edit
   def edit
     render
   end
 
-  # GET /<%= symbol_name %>/:id/delete
+  # GET /<%= resource_path %>/:id/delete
   def delete
     render
   end
 
-  # POST /<%= symbol_name %>
+  # POST /<%= resource_path %>
   def create
     render
   end
 
-  # PUT /<%= symbol_name %>/:id
+  # PUT /<%= resource_path %>/:id
   def update
     render
   end
 
-  # DELETE /<%= symbol_name %>/:id
+  # DELETE /<%= resource_path %>/:id
   def destroy
     render
   end

data/lib/merb-gen/generator.rb

@@ -12,10 +12,9 @@ module Merb
       
       def initialize(*args)
         super
-        options[:orm] ||= Merb.orm_generator_scope
-        options[:testing_framework] ||= Merb.test_framework_generator_scope
-        
-        options[:orm] = :none if options[:orm] == :merb_default # FIXME: temporary until this is fixed in merb-core 
+        options[:orm] ||= Merb.orm
+        options[:testing_framework] ||= Merb.test_framework
+        options[:template_engine] ||= Merb.template_engine
       end
     
       # Inside a template, wraps a block of code properly in modules, keeping the indentation correct

data/lib/merb-gen.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'merb-core'
 require 'sha1'
-gem 'templater', '>= 0.1.4'
+gem 'templater', '>= 0.1.5'
 require 'templater'
 
 path = File.join(File.dirname(__FILE__))
@@ -9,7 +9,6 @@ path = File.join(File.dirname(__FILE__))
 require path / "merb-gen" / "generator"
 require path / "merb-gen" / "named_generator"
 require path / "merb-gen" / "namespaced_generator"
-require path / "merb-gen" / "spec_helper"
 require path / "generators" / "merb"
 require path / "generators" / "merb" / "merb_full"
 require path / "generators" / "merb" / "merb_flat"

data/spec/resource_controller_spec.rb

@@ -29,6 +29,13 @@ describe Merb::Generators::ResourceControllerGenerator do
     end
   end
   
+  describe "#resource_path" do
+    it "should snake case and slash separate the full controller name" do
+      @generator.name = "Monkey::BlahWorld::ProjectPictures"
+      @generator.singular_model == "monkey/blah_world/project_picture"
+    end
+  end
+  
   it "should create a controller" do
     @generator.should create('/tmp/app/controllers/stuff.rb')
   end

data/spec/spec_helper.rb

@@ -5,9 +5,10 @@ require 'rubygems'
 require 'spec'
 require 'merb-core'
 require 'merb-gen'
+require 'templater/spec/helpers'
 
 Spec::Runner.configure do |config|
-  config.include Merb::Test::GeneratorHelper
+  config.include Templater::Spec::Helpers
 end
 
 shared_examples_for "named generator" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire: merb-gen
 bindir: bin
 cert_chain: []
 
-date: 2008-08-13 00:00:00 +03:00
+date: 2008-08-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
+        version: 0.9.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.4
+        version: 0.1.5
     version: 
 description: Generators suite for Merb.
 email: jonas.nicklas@gmail.com
@@ -109,6 +109,8 @@ files:
 - lib/generators/templates/application/merb_flat/config/framework.rb
 - lib/generators/templates/application/merb_flat/config/init.rb
 - lib/generators/templates/application/merb_flat/README.txt
+- lib/generators/templates/application/merb_flat/spec
+- lib/generators/templates/application/merb_flat/spec/spec_helper.rb
 - lib/generators/templates/application/merb_flat/views
 - lib/generators/templates/application/merb_flat/views/foo.html.erb
 - lib/generators/templates/application/merb_plugin
@@ -128,6 +130,8 @@ files:
 - lib/generators/templates/application/merb_plugin/TODO
 - lib/generators/templates/application/merb_very_flat
 - lib/generators/templates/application/merb_very_flat/application.rbt
+- lib/generators/templates/application/merb_very_flat/spec
+- lib/generators/templates/application/merb_very_flat/spec/spec_helper.rb
 - lib/generators/templates/component
 - lib/generators/templates/component/controller
 - lib/generators/templates/component/controller/app
@@ -253,7 +257,6 @@ files:
 - lib/merb-gen/generator.rb
 - lib/merb-gen/named_generator.rb
 - lib/merb-gen/namespaced_generator.rb
-- lib/merb-gen/spec_helper.rb
 - lib/merb-gen.rb
 - bin/merb-gen
 - spec/controller_spec.rb

data/lib/merb-gen/spec_helper.rb

@@ -1,65 +0,0 @@
-module Merb
-  module Test
-    module GeneratorHelper
-      class InvokeMatcher
-        def initialize(expected)
-          @expected = expected
-        end
-
-        def matches?(actual)
-          @actual = actual
-          # Satisfy expectation here. Return false or raise an error if it's not met.
-          found = nil
-          @actual.invocations.each { |i| found = i if i.class == @expected }
-
-          if @with
-            return found && (@with == found.arguments)
-          else
-            return found
-          end
-        end
-
-        def with(*arguments)
-          @with = arguments
-          return self
-        end
-
-        def failure_message
-          "expected #{@actual.inspect} to invoke #{@expected.inspect} with #{@with}, but it didn't"
-        end
-
-        def negative_failure_message
-          "expected #{@actual.inspect} not to invoke #{@expected.inspect} with #{@with}, but it did"
-        end
-      end
-
-      def invoke(expected)
-        InvokeMatcher.new(expected)
-      end
-
-      class CreateMatcher
-        def initialize(expected)
-          @expected = expected
-        end
-
-        def matches?(actual)
-          @actual = actual
-          # Satisfy expectation here. Return false or raise an error if it's not met.
-          @actual.actions.map{|t| t.destination }.include?(@expected)
-        end
-
-        def failure_message
-          "expected #{@actual.inspect} to create #{@expected.inspect}, but it didn't"
-        end
-
-        def negative_failure_message
-          "expected #{@actual.inspect} not to create #{@expected.inspect}, but it did"
-        end
-      end
-
-      def create(expected)
-        CreateMatcher.new(expected)
-      end
-    end
-  end
-end