merb_sequel 0.9.6 → 0.9.7

Sign up to get free protection for your applications and to get access to all the features.
data/Rakefile CHANGED
@@ -18,7 +18,7 @@ GEM_EMAIL = "wayneeseguin@gmail.com, lancecarlson@gmail.com"
18
18
 
19
19
  GEM_NAME = "merb_sequel"
20
20
  PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
21
- GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.6") + PKG_BUILD
21
+ GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.7") + PKG_BUILD
22
22
 
23
23
  RELEASE_NAME = "REL #{GEM_VERSION}"
24
24
 
@@ -36,7 +36,7 @@ spec = Gem::Specification.new do |s|
36
36
  s.author = GEM_AUTHOR
37
37
  s.email = GEM_EMAIL
38
38
  s.homepage = PROJECT_URL
39
- s.add_dependency("merb-core", ">= 0.9.6")
39
+ s.add_dependency("merb-core", ">= 0.9.7")
40
40
  s.add_dependency("sequel", ">= 1.4.0")
41
41
  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,sequel_generators}/**/*")
42
42
  end
@@ -1,4 +1,4 @@
1
- Merb::Generators::MigrationGenerator.template :migration_sequel, :orm => :sequel do
2
- source(File.dirname(__FILE__), 'templates/migration/schema/migrations/%file_name%.rb')
3
- destination("#{destination_directory}/#{file_name}.rb")
1
+ Merb::Generators::MigrationGenerator.template :migration_sequel, :orm => :sequel do |t|
2
+ t.source = File.dirname(__FILE__) / 'templates/migration/schema/migrations/%file_name%.rb'
3
+ t.destination = "#{destination_directory}/#{file_name}.rb"
4
4
  end
@@ -1,8 +1,8 @@
1
- Merb::Generators::ModelGenerator.template :model_sequel, :orm => :sequel do
2
- source(File.dirname(__FILE__), "templates/model/app/models/%file_name%.rb")
3
- destination("app/models", base_path, "#{file_name}.rb")
1
+ Merb::Generators::ModelGenerator.template :model_sequel, :orm => :sequel do |t|
2
+ t.source = File.dirname(__FILE__) / "templates/model/app/models/%file_name%.rb"
3
+ t.destination = "app/models" / base_path / "#{file_name}.rb"
4
4
  end
5
5
 
6
6
  Merb::Generators::ModelGenerator.invoke :migration, :orm => :sequel do |generator|
7
7
  generator.new(destination_root, options.merge(:model => true), file_name, attributes)
8
- end
8
+ end
@@ -1,12 +1,12 @@
1
- Merb::Generators::ResourceControllerGenerator.template :controller_sequel, :orm => :sequel do
2
- source(File.dirname(__FILE__), "templates/resource_controller/app/controllers/%file_name%.rb")
3
- destination("app/controllers", base_path, "#{file_name}.rb")
1
+ Merb::Generators::ResourceControllerGenerator.template :controller_sequel, :orm => :sequel do |t|
2
+ t.source = File.dirname(__FILE__), "templates/resource_controller/app/controllers/%file_name%.rb"
3
+ t.destination = "app/controllers", base_path, "#{file_name}.rb"
4
4
  end
5
5
 
6
6
  [:index, :show, :edit, :new].each do |view|
7
7
  Merb::Generators::ResourceControllerGenerator.template "view_#{view}_sequel".to_sym,
8
- :orm => :sequel, :template_engine => :erb do
9
- source(File.dirname(__FILE__), "templates/resource_controller/app/views/%file_name%/#{view}.html.erb")
10
- destination("app/views", base_path, "#{file_name}/#{view}.html.erb")
8
+ :orm => :sequel, :template_engine => :erb do |t|
9
+ t.source = File.dirname(__FILE__) / "templates/resource_controller/app/views/%file_name%/#{view}.html.erb"
10
+ t.destination = "app/views" / base_path / "#{file_name}/#{view}.html.erb"
11
11
  end
12
12
  end
@@ -1,4 +1,4 @@
1
- Merb::Generators::SessionMigrationGenerator.template :session_migration_sequel, :orm => :sequel do
2
- source(File.dirname(__FILE__), 'templates/session_migration/schema/migrations/%version%_sessions.rb')
3
- destination("schema/migrations/#{version}_sessions.rb")
1
+ Merb::Generators::SessionMigrationGenerator.template :session_migration_sequel, :orm => :sequel do |t|
2
+ t.source = File.dirname(__FILE__) / 'templates/session_migration/schema/migrations/%version%_sessions.rb'
3
+ t.destination = "schema/migrations/#{version}_sessions.rb"
4
4
  end
@@ -16,7 +16,7 @@ Spec::Runner.configure do |config|
16
16
  end
17
17
 
18
18
  # Load up the shared specs from merb-core
19
- if (gem_spec = Gem.source_index.search('merb-core').last) &&
19
+ if (gem_spec = Gem.source_index.search(Gem::Dependency.new('merb-core', '>=0.9.6')).last) &&
20
20
  gem_spec.files.include?('spec/public/session/controllers/sessions.rb')
21
21
  require gem_spec.full_gem_path / 'spec/public/session/controllers/sessions.rb'
22
22
  require gem_spec.full_gem_path / 'spec/public/session/session_spec.rb'
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merb_sequel
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.6
4
+ version: 0.9.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Wayne E. Seguin, Lance Carlson
@@ -9,7 +9,7 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2008-09-08 00:00:00 +03:00
12
+ date: 2008-09-14 00:00:00 +03:00
13
13
  default_executable:
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
@@ -20,7 +20,7 @@ dependencies:
20
20
  requirements:
21
21
  - - ">="
22
22
  - !ruby/object:Gem::Version
23
- version: 0.9.6
23
+ version: 0.9.7
24
24
  version:
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sequel