merb-slices 0.9.5 → 0.9.6

data/Rakefile

@@ -17,7 +17,7 @@ GEM_EMAIL  = "info@fabien.be"
 
 GEM_NAME    = "merb-slices"
 PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.5") + PKG_BUILD
+GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.6") + PKG_BUILD
 
 RELEASE_NAME    = "REL #{GEM_VERSION}"
 
@@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s|
   s.author = GEM_AUTHOR
   s.email = GEM_EMAIL
   s.homepage = PROJECT_URL
-  s.add_dependency('merb-core', '>= 0.9.5')
+  s.add_dependency('merb-core', '>= 0.9.6')
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile Generators TODO) + Dir.glob("{lib,spec}/**/*")
 end
@@ -46,14 +46,14 @@ end
 
 desc "Install the gem"
 task :install => [:package] do
-  sh %{#{sudo} gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}
+  sh install_command(GEM_NAME, GEM_VERSION)
 end
 
 namespace :jruby do
 
   desc "Run :package and install the resulting .gem with jruby"
   task :install => :package do
-    sh %{#{sudo} jruby -S gem install #{install_home} pkg/#{GEM_NAME}-#{GEM_VERSION}.gem --no-rdoc --no-ri}
+    sh jinstall_command(GEM_NAME, GEM_VERSION)
   end
 
 end

data/TODO

@@ -0,0 +1,2 @@
+Leverage new routing features:
+- better name_prefix handling .name(..., prefix)

data/lib/generators/base.rb

@@ -19,10 +19,11 @@ module Merb::Generators
   
   class BaseSliceGenerator < NamedGenerator
     
-    def self.common_template(name, source)
-      template name do 
-        source File.dirname(__FILE__), 'templates', 'common', source
-        destination source
+    def self.common_template(name, template_source)
+      common_base_dir = File.expand_path(File.dirname(__FILE__))
+      template name do |t|
+        t.source = File.join(common_base_dir, 'templates', 'common', template_source)
+        t.destination = template_source
       end
     end
     
@@ -30,4 +31,4 @@ module Merb::Generators
   
   add :slice, SliceGenerator
   
-end
+end

data/lib/generators/templates/common/lib/%base_name%/merbtasks.rb

@@ -52,13 +52,10 @@ namespace :slices do
 
     namespace :freeze do
       
-      desc "Freezes <%= module_name %> by installing the gem into application/gems using merb-freezer"
+      desc "Freezes <%= module_name %> by installing the gem into application/gems"
       task :gem do
-        begin
-          Object.const_get(:Freezer).freeze(ENV["GEM"] || "<%= base_name %>", ENV["UPDATE"], ENV["MODE"] || 'rubygems')
-        rescue NameError
-          puts "! dependency 'merb-freezer' missing"
-        end
+        ENV["GEM"] ||= "<%= base_name %>"
+        Rake::Task['slices:install_as_gem'].invoke
       end
       
       desc "Freezes <%= module_name %> by copying all files from <%= base_name %>/app to your application"

data/lib/merb-slices/merbtasks.rb

@@ -1,3 +1,5 @@
+require "rubygems/dependency_installer"
+
 desc "Show information on application slices"
 task :slices => [ "slices:list" ]
 
@@ -16,4 +18,46 @@ namespace :slices do
     end    
   end
   
+  desc "Install a slice into the local gems dir (GEM=your-slice)"
+  task :install_as_gem do
+    if ENV['GEM']
+      ENV['GEM_DIR'] ||= File.join(Merb.root, 'gems')
+      puts "Installing #{ENV["GEM"]} as a local gem"
+      install_gem(ENV['GEM_DIR'], ENV['GEM'], ENV['VERSION'])
+    else
+      puts "No slice GEM specified"
+    end
+  end
+  
+  # Install a gem - looks remotely and locally; won't process rdoc or ri options.
+  def install_gem(install_dir, gem, version = nil)
+    Gem.configuration.update_sources = false
+    Gem.clear_paths # default to plain rubygems path
+    installer = Gem::DependencyInstaller.new(:install_dir => install_dir)
+    exception = nil
+    begin
+        installer.install gem, version
+      rescue Gem::InstallError => e
+        exception = e
+      rescue Gem::GemNotFoundException => e
+      puts "Locating #{gem} in local gem path cache..."
+      spec = if version
+        Gem.source_index.find_name(gem, "= #{version}").first
+      else
+        Gem.source_index.find_name(gem).sort_by { |g| g.version }.last
+      end
+      if spec && File.exists?(gem_file = 
+        File.join(spec.installation_path, 'cache', "#{spec.full_name}.gem"))
+        installer.install gem_file
+      end
+      exception = e
+    end
+    if installer.installed_gems.empty? && e
+      puts "Failed to install gem '#{gem}' (#{e.message})"
+    end
+    installer.installed_gems.each do |spec|
+      puts "Successfully installed #{spec.full_name}"
+    end
+  end
+  
 end

data/lib/merb-slices/module.rb

@@ -188,7 +188,12 @@ module Merb
       def config
         @config ||= begin
           empty_hash = Hash.new { |h,k| h[k] = {} }
-          File.exists?(Merb.root / "config" / "slices.yml") ? YAML.load(File.read(Merb.root / "config" / "slices.yml")) || empty_hash : empty_hash
+          if File.exists?(Merb.root / "config" / "slices.yml")
+            require "yaml"
+            YAML.load(File.read(Merb.root / "config" / "slices.yml")) || empty_hash
+          else
+            empty_hash
+          end
         end
       end
     
@@ -212,7 +217,8 @@ module Merb
       # 
       # @param <#to_s> The slice module to check for.
       def exists?(module_name)
-        slice_names.include?(module_name.to_s) && Object.const_defined?(module_name.to_s)
+        const_name = module_name.to_s.camel_case
+        slice_names.include?(const_name) && Object.const_defined?(const_name)
       end
     
       # A lookup for finding a Slice module's path

data/lib/merb-slices/router_ext.rb

@@ -40,7 +40,7 @@ module Merb
       def add_slice(slice_module, options = {}, &block)
         if Merb::Slices.exists?(slice_module)
           options = { :path => options } if options.is_a?(String)
-          slice_module = Object.full_const_get(slice_module.to_s) if slice_module.class.in?(String, Symbol)
+          slice_module = Object.full_const_get(slice_module.to_s.camel_case) if slice_module.class.in?(String, Symbol)
           namespace = options[:namespace] || slice_module.to_s.snake_case
           options[:path] ||= slice_module[:path_prefix] || options[:namespace] || slice_module.identifier
           options[:default_routes] = true unless options.key?(:default_routes)

data/spec/full_slice_generator_spec.rb

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Merb::Generators::FullSliceGenerator do
   
-  include Merb::Test::GeneratorHelper
-  
   describe "templates" do
     
     before do

data/spec/slice_generator_spec.rb

@@ -2,21 +2,10 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Merb::Generators::SliceGenerator do
   
-  include Merb::Test::GeneratorHelper
+  it "should invoke the full generator by default"
   
-  it "should invoke the full generator by default" do
-    @generator = Merb::Generators::SliceGenerator.new('/tmp', {}, 'testing')
-    @generator.should invoke(Merb::Generators::FullSliceGenerator).with('testing')
-  end
+  it "should invoke the flat generator if flat is true"
   
-  it "should invoke the flat generator if flat is true" do
-    @generator = Merb::Generators::SliceGenerator.new('/tmp', { :thin => true }, 'testing')
-    @generator.should invoke(Merb::Generators::ThinSliceGenerator).with('testing')
-  end
-  
-  it "should invoke the very flat generator if very flat is true" do
-    @generator = Merb::Generators::SliceGenerator.new('/tmp', { :very_thin => true }, 'testing')
-    @generator.should invoke(Merb::Generators::VeryThinSliceGenerator).with('testing')
-  end
+  it "should invoke the very flat generator if very flat is true"
   
 end

data/spec/thin_slice_generator_spec.rb

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Merb::Generators::ThinSliceGenerator do
   
-  include Merb::Test::GeneratorHelper
-  
   describe "templates" do
     
     before do

data/spec/very_thin_slice_generator_spec.rb

@@ -2,8 +2,6 @@ require File.dirname(__FILE__) + '/spec_helper'
 
 describe Merb::Generators::VeryThinSliceGenerator do
   
-  include Merb::Test::GeneratorHelper
-  
   describe "templates" do
     
     before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-slices
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Fabien Franzen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 +03:00
+date: 2008-09-09 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.5
+        version: 0.9.6
     version: 
 description: Merb-Slices is a Merb plugin for using and creating application 'slices' which help you modularize your application.
 email: info@fabien.be