merb_datamapper 0.9.3 → 0.9.4

data/spec/generators/spec_helper.rb

@@ -0,0 +1,279 @@
+# require merb-gen and the spec helpers
+require 'merb-gen'
+require 'merb-gen/spec_helper'
+
+# require our other spec helpers
+require File.join(File.dirname(__FILE__), '..', 'spec_helper')
+
+# require the generators
+require 'generators/data_mapper_migration'
+require 'generators/data_mapper_model'
+require 'generators/data_mapper_resource_controller'
+
+# include the helpers
+Spec::Runner.configure do |config|
+  config.include Merb::Test::GeneratorHelper
+end
+
+# copied from merb-more/merb-gen/spec/spec_helpers.rb
+# 07/08/2008
+
+shared_examples_for "named generator" do
+
+  describe '#file_name' do
+
+    it "should convert the name to snake case" do
+      @generator.name = 'SomeMoreStuff'
+      @generator.file_name.should == 'some_more_stuff'
+    end
+
+    it "should preserve dashes" do
+      @generator.name = "project-pictures"
+      @generator.file_name.should == "project-pictures"
+    end
+
+  end
+
+  describe '#base_name' do
+
+    it "should convert the name to snake case" do
+      @generator.name = 'SomeMoreStuff'
+      @generator.base_name.should == 'some_more_stuff'
+    end
+
+    it "should preserve dashes" do
+      @generator.name = "project-pictures"
+      @generator.base_name.should == "project-pictures"
+    end
+
+  end
+
+  describe "#symbol_name" do
+
+    it "should snakify the name" do
+      @generator.name = "ProjectPictures"
+      @generator.symbol_name.should == "project_pictures"
+    end
+
+    it "should replace dashes with underscores" do
+      @generator.name = "project-pictures"
+      @generator.symbol_name.should == "project_pictures"
+    end
+
+  end
+
+  describe '#class_name' do
+
+    it "should convert the name to camel case" do
+      @generator.name = 'some_more_stuff'
+      @generator.class_name.should == 'SomeMoreStuff'
+    end
+
+    it "should convert a name with dashes to camel case" do
+      @generator.name = 'some-more-stuff'
+      @generator.class_name.should == 'SomeMoreStuff'
+    end
+
+  end
+
+  describe '#module_name' do
+
+    it "should convert the name to camel case" do
+      @generator.name = 'some_more_stuff'
+      @generator.module_name.should == 'SomeMoreStuff'
+    end
+
+    it "should convert a name with dashes to camel case" do
+      @generator.name = 'some-more-stuff'
+      @generator.module_name.should == 'SomeMoreStuff'
+    end
+
+  end
+
+  describe '#test_class_name' do
+
+    it "should convert the name to camel case and append 'test'" do
+      @generator.name = 'some_more_stuff'
+      @generator.test_class_name.should == 'SomeMoreStuffTest'
+    end
+
+  end
+
+end
+
+shared_examples_for "namespaced generator" do
+
+  describe "#class_name" do
+    it "should camelize the name" do
+      @generator.name = "project_pictures"
+      @generator.class_name.should == "ProjectPictures"
+    end
+
+    it "should split off the last double colon separated chunk" do
+      @generator.name = "Test::Monkey::ProjectPictures"
+      @generator.class_name.should == "ProjectPictures"
+    end
+
+    it "should split off the last slash separated chunk" do
+      @generator.name = "test/monkey/project_pictures"
+      @generator.class_name.should == "ProjectPictures"
+    end
+
+    it "should convert a name with dashes to camel case" do
+      @generator.name = 'some-more-stuff'
+      @generator.class_name.should == 'SomeMoreStuff'
+    end
+  end
+
+  describe "#module_name" do
+    it "should camelize the name" do
+      @generator.name = "project_pictures"
+      @generator.module_name.should == "ProjectPictures"
+    end
+
+    it "should split off the last double colon separated chunk" do
+      @generator.name = "Test::Monkey::ProjectPictures"
+      @generator.module_name.should == "ProjectPictures"
+    end
+
+    it "should split off the last slash separated chunk" do
+      @generator.name = "test/monkey/project_pictures"
+      @generator.module_name.should == "ProjectPictures"
+    end
+
+    it "should convert a name with dashes to camel case" do
+      @generator.name = 'some-more-stuff'
+      @generator.module_name.should == 'SomeMoreStuff'
+    end
+  end
+
+  describe "#modules" do
+    it "should be empty if no modules are passed to the name" do
+      @generator.name = "project_pictures"
+      @generator.modules.should == []
+    end
+
+    it "should split off all but the last double colon separated chunks" do
+      @generator.name = "Test::Monkey::ProjectPictures"
+      @generator.modules.should == ["Test", "Monkey"]
+    end
+
+    it "should split off all but the last slash separated chunk" do
+      @generator.name = "test/monkey/project_pictures"
+      @generator.modules.should == ["Test", "Monkey"]
+    end
+  end
+
+  describe "#file_name" do
+    it "should snakify the name" do
+      @generator.name = "ProjectPictures"
+      @generator.file_name.should == "project_pictures"
+    end
+
+    it "should preserve dashes" do
+      @generator.name = "project-pictures"
+      @generator.file_name.should == "project-pictures"
+    end
+
+    it "should split off the last double colon separated chunk and snakify it" do
+      @generator.name = "Test::Monkey::ProjectPictures"
+      @generator.file_name.should == "project_pictures"
+    end
+
+    it "should split off the last slash separated chunk and snakify it" do
+      @generator.name = "test/monkey/project_pictures"
+      @generator.file_name.should == "project_pictures"
+    end
+  end
+
+  describe "#base_name" do
+    it "should snakify the name" do
+      @generator.name = "ProjectPictures"
+      @generator.base_name.should == "project_pictures"
+    end
+
+    it "should preserve dashes" do
+      @generator.name = "project-pictures"
+      @generator.base_name.should == "project-pictures"
+    end
+
+    it "should split off the last double colon separated chunk and snakify it" do
+      @generator.name = "Test::Monkey::ProjectPictures"
+      @generator.base_name.should == "project_pictures"
+    end
+
+    it "should split off the last slash separated chunk and snakify it" do
+      @generator.name = "test/monkey/project_pictures"
+      @generator.base_name.should == "project_pictures"
+    end
+  end
+
+  describe "#symbol_name" do
+    it "should snakify the name and replace dashes with underscores" do
+      @generator.name = "project-pictures"
+      @generator.symbol_name.should == "project_pictures"
+    end
+
+    it "should split off the last slash separated chunk, snakify it and replace dashes with underscores" do
+      @generator.name = "test/monkey/project-pictures"
+      @generator.symbol_name.should == "project_pictures"
+    end
+  end
+
+  describe "#test_class_name" do
+    it "should camelize the name and append 'Test'" do
+      @generator.name = "project_pictures"
+      @generator.test_class_name.should == "ProjectPicturesTest"
+    end
+
+    it "should split off the last double colon separated chunk" do
+      @generator.name = "Test::Monkey::ProjectPictures"
+      @generator.test_class_name.should == "ProjectPicturesTest"
+    end
+
+    it "should split off the last slash separated chunk" do
+      @generator.name = "test/monkey/project_pictures"
+      @generator.test_class_name.should == "ProjectPicturesTest"
+    end
+  end
+
+  describe "#full_class_name" do
+    it "should camelize the name" do
+      @generator.name = "project_pictures"
+      @generator.full_class_name.should == "ProjectPictures"
+    end
+
+    it "should camelize a name with dashes" do
+      @generator.name = "project-pictures"
+      @generator.full_class_name.should == "ProjectPictures"
+    end
+
+    it "should leave double colon separated chunks" do
+      @generator.name = "Test::Monkey::ProjectPictures"
+      @generator.full_class_name.should == "Test::Monkey::ProjectPictures"
+    end
+
+    it "should convert slashes to double colons and camel case" do
+      @generator.name = "test/monkey/project_pictures"
+      @generator.full_class_name.should == "Test::Monkey::ProjectPictures"
+    end
+  end
+
+  describe "#base_path" do
+    it "should be blank for no namespaces" do
+      @generator.name = "project_pictures"
+      @generator.base_path.should == ""
+    end
+
+    it "should snakify and join namespace for double colon separated chunk" do
+      @generator.name = "Test::Monkey::ProjectPictures"
+      @generator.base_path.should == "test/monkey"
+    end
+
+    it "should leave slashes but only use the namespace part" do
+      @generator.name = "test/monkey/project_pictures"
+      @generator.base_path.should == "test/monkey"
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $:.push File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'rubygems'
 
-gem 'dm-core', '=0.9.3'
+gem 'dm-core', '=0.9.4'
 require 'dm-core'
 
 module Merb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Jason Toy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-29 00:00:00 -05:00
+date: 2008-08-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: dm-migrations
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
@@ -40,17 +40,27 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.3
+        version: 0.9.4
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: templater
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.0
+        version: 0.1.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
     version: 
 description: DataMapper plugin providing DataMapper support for Merb
 email: 
@@ -70,23 +80,17 @@ files:
 - README.txt
 - Rakefile
 - TODO
-- datamapper_generators/migration/USAGE
-- datamapper_generators/migration/migration_generator.rb
-- datamapper_generators/migration/templates/new_migration.erb
-- datamapper_generators/model/USAGE
-- datamapper_generators/model/model_generator.rb
-- datamapper_generators/model/templates/app/models/%model_file_name%.rb
-- datamapper_generators/resource_controller/USAGE
-- datamapper_generators/resource_controller/resource_controller_generator.rb
-- datamapper_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb
-- datamapper_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb
-- datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb
-- datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb
-- datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb
-- datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb
-- datamapper_generators/resource_migration/USAGE
-- datamapper_generators/resource_migration/resource_migration_generator.rb
-- datamapper_generators/resource_migration/templates/class_migration.erb
+- lib/generators/data_mapper_migration.rb
+- lib/generators/data_mapper_model.rb
+- lib/generators/data_mapper_resource_controller.rb
+- lib/generators/templates/migration.rb
+- lib/generators/templates/model.rb
+- lib/generators/templates/model_migration.rb
+- lib/generators/templates/resource_controller.rb
+- lib/generators/templates/views/edit.html.erb
+- lib/generators/templates/views/index.html.erb
+- lib/generators/templates/views/new.html.erb
+- lib/generators/templates/views/show.html.erb
 - lib/merb/orms/data_mapper/connection.rb
 - lib/merb/orms/data_mapper/database.yml.sample
 - lib/merb/orms/data_mapper/resource.rb
@@ -95,6 +99,10 @@ files:
 - lib/merb_datamapper/merbtasks.rb
 - lib/merb_datamapper/version.rb
 - spec/connection_spec.rb
+- spec/generators/data_mapper_migration_spec.rb
+- spec/generators/data_mapper_model_spec.rb
+- spec/generators/data_mapper_resource_controller_spec.rb
+- spec/generators/spec_helper.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -119,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: datamapper
+rubyforge_project: merb
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2

data/datamapper_generators/migration/USAGE

@@ -1,4 +0,0 @@
-Description:
-
-
-Usage:

data/datamapper_generators/migration/migration_generator.rb

@@ -1,64 +0,0 @@
-# require 'merb'
-class MigrationGenerator < RubiGen::Base
-
-  default_options :author => nil
-
-  attr_reader :name
-
-  def initialize(runtime_args, runtime_options = {})
-    super
-    usage if args.empty?
-    @name = args.shift
-    extract_options
-  end
-
-  def manifest
-    unless @name
-      puts banner
-      exit 1
-    end
-    record do |m|
-      # Ensure appropriate folder(s) exists
-      m.directory 'schema/migrations'
-
-      # Create stubs
-      highest_migration = Dir[Dir.pwd+'/schema/migrations/*'].map{|f| File.basename(f) =~ /^(\d+)/; $1}.max
-      filename = format("%03d_%s", (highest_migration.to_i+1), @name.snake_case)
-      m.template "new_migration.erb", "schema/migrations/#{filename}.rb", :assigns => { :class_name => @name , :number => (highest_migration.to_i+1) }
-
-    end
-  end
-
-  protected
-    def banner
-      <<-EOS
-Creates a new migration for merb using DataMapper
-
-USAGE: #{$0} #{spec.name} NameOfMigration
-
-Example:
-  #{$0} #{spec.name} AddPeople
-
-  If you already have 3 migrations, this will create the AddPeople migration in
-  schema/migration/004_add_people.rb
-EOS
-    end
-
-    def add_options!(opts)
-      # opts.separator ''
-      # opts.separator 'Options:'
-      # For each option below, place the default
-      # at the top of the file next to "default_options"
-      # opts.on("-a", "--author=\"Your Name\"", String,
-      #         "Some comment about this option",
-      #         "Default: none") { |options[:author]| }
-      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
-    end
-
-    def extract_options
-      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
-      # Templates can access these value via the attr_reader-generated methods, but not the
-      # raw instance variable value.
-      # @author = options[:author]
-    end
-end