merb-gen 1.0.8.1 → 1.0.9

data/lib/generators/merb/merb_stack.rb

@@ -98,6 +98,10 @@ module Merb
         Merb::DM_VERSION
       end
       
+      def do_gems_version
+        Merb::DO_VERSION
+      end
+      
       # empty array means all files are considered to be just
       # files, not templates
       glob! "app"

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

@@ -12,7 +12,7 @@ Merb::Config.use do |c|
   c[:session_store] = 'cookie'  # can also be 'memory', 'memcache', 'container', 'datamapper
   
   # cookie session store configuration
-  c[:session_secret_key]  = '<%= SHA1.new(rand(100000000000).to_s).to_s %>'  # required for cookie session store
+  c[:session_secret_key]  = '<%= Digest::SHA1.hexdigest(rand(100000000000).to_s).to_s %>'  # required for cookie session store
   c[:session_id_key] = '_<%= base_name  %>_session_id' # cookie session id key, defaults to "_session_id"
 end
  

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

@@ -32,7 +32,7 @@ Merb::Config.use { |c|
   c[:use_mutex]           = false,
   c[:session_store]       = 'cookie',
   c[:session_id_key]      = '_<%= base_name  %>_session_id',
-  c[:session_secret_key]  = '<%= SHA1.new(rand(100000000000).to_s).to_s %>',
+  c[:session_secret_key]  = '<%= Digest::SHA1.hexdigest(rand(100000000000).to_s).to_s %>',
   c[:exception_details]   = true,
   c[:reload_classes]      = true,
   c[:reload_templates]    = true,

data/lib/generators/templates/application/merb_stack/config/dependencies.rb

@@ -1,7 +1,7 @@
 # dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
 merb_gems_version = "<%= merb_gems_version %>"
 dm_gems_version   = "<%= dm_gems_version %>"
-do_gems_version   = "0.9.10.1"
+do_gems_version   = "<%= do_gems_version %>"
 
 # For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
 dependency "merb-core", merb_gems_version 
@@ -9,7 +9,7 @@ dependency "merb-action-args", merb_gems_version
 dependency "merb-assets", merb_gems_version  
 dependency("merb-cache", merb_gems_version) do
   Merb::Cache.setup do
-    register(Merb::Cache::FileStore)
+    register(Merb::Cache::FileStore) unless Merb.cache
   end
 end
 dependency "merb-helpers", merb_gems_version 

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

@@ -11,7 +11,7 @@ Merb::Config.use do |c|
   c[:session_store] = 'cookie'  # can also be 'memory', 'memcache', 'container', 'datamapper
   
   # cookie session store configuration
-  c[:session_secret_key]  = '<%= SHA1.new(rand(100000000000).to_s).to_s %>'  # required for cookie session store
+  c[:session_secret_key]  = '<%= Digest::SHA1.hexdigest(rand(100000000000).to_s).to_s %>'  # required for cookie session store
   c[:session_id_key] = '_<%= base_name  %>_session_id' # cookie session id key, defaults to "_session_id"
 end
  

data/lib/generators/templates/component/resource_controller/spec/requests/%file_name%_spec.rb

@@ -113,7 +113,7 @@ describe "resource(@<%= singular_model %>)", :given => "a <%= singular_model %>
         :params => { :<%= singular_model %> => {:id => @<%= singular_model %>.id} })
     end
   
-    it "redirect to the article show action" do
+    it "redirect to the <%= singular_model %> show action" do
       @response.should redirect_to(resource(@<%= singular_model %>))
     end
   end

data/lib/merb-gen.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'merb-core'
-require 'sha1'
+require 'digest/sha1'
 gem 'templater', '>= 0.3.2'
 require 'templater'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-gen
 version: !ruby/object:Gem::Version 
-  version: 1.0.8.1
+  version: 1.0.9
 platform: ruby
 authors: 
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-19 00:00:00 -07:00
+date: 2009-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.8.1
+        version: 1.0.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: templater