merb-admin 0.8.5 → 0.8.6

data/spec/spec_helper.rb

@@ -1,113 +1,111 @@
-require 'rubygems'
-require 'merb-core'
-require 'merb-slices'
-require 'merb-helpers'
-require 'merb-assets'
-require 'spec'
-
-# Add merb-admin.rb to the search path
-Merb::Plugins.config[:merb_slices][:auto_register] = true
-Merb::Plugins.config[:merb_slices][:search_path]   = File.join(File.dirname(__FILE__), '..', 'lib', 'merb-admin.rb')
-
-# Require merb-admin.rb explicitly so any dependencies are loaded
-require Merb::Plugins.config[:merb_slices][:search_path]
-
-# Using Merb.root below makes sure that the correct root is set for
-# - testing standalone, without being installed as a gem and no host application
-# - testing from within the host application; its root will be used
-Merb.start_environment(
-  :testing => true,
-  :adapter => 'runner',
-  :environment => ENV['MERB_ENV'] || 'test',
-  :merb_root => Merb.root,
-  :session_store => 'memory'
-)
-
-module Merb
-  module Test
-    module SliceHelper
-
-      # The absolute path to the current slice
-      def current_slice_root
-        @current_slice_root ||= File.expand_path(File.join(File.dirname(__FILE__), '..'))
-      end
-
-      # Whether the specs are being run from a host application or standalone
-      def standalone?
-        Merb.root == ::MerbAdmin.root
-      end
-
-      def setup_orm(orm = nil)
-        orm = set_orm(orm)
-        orm = orm.to_s.downcase.to_sym
-        case orm
-        when :activerecord
-          require 'active_record'
-          require_models(orm)
-          unless ActiveRecord::Base.connected?
-            ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-            ActiveRecord::Migration.verbose = false
-            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 1)
-            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 2)
-            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 3)
-            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 4)
-            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 5)
-          end
-        when :datamapper
-          require 'dm-core'
-          require 'dm-aggregates'
-          require 'dm-migrations'
-          require 'dm-validations'
-          require_models(orm)
-          unless DataMapper::Repository.adapters.key?(:default)
-            DataMapper.setup(:default, 'sqlite3::memory:')
-            DataMapper.auto_migrate!
-          end
-        when :sequel
-          require 'sequel'
-          require 'sequel/extensions/migration'
-          Sequel::Migrator.apply(Sequel.sqlite, File.join(File.dirname(__FILE__), "migrations", "sequel"))
-          require_models(orm)
-        else
-          raise "MerbAdmin does not support the #{orm} ORM"
-        end
-        Merb.orm = orm
-      end
-
-      private
-
-      def require_models(orm = nil)
-        orm ||= set_orm
-        Dir.glob(File.dirname(__FILE__) / "models" / orm.to_s.downcase / Merb.glob_for(:model)).each do |model_filename|
-          require model_filename
-        end
-      end
-
-      def set_orm(orm = nil)
-        orm || ENV['MERB_ORM'] || (Merb.orm != :none ? Merb.orm : nil) || :activerecord
-      end
-
-    end
-  end
-end
-
-Spec::Runner.configure do |config|
-  config.include(Merb::Test::ViewHelper)
-  config.include(Merb::Test::RouteHelper)
-  config.include(Merb::Test::ControllerHelper)
-  config.include(Merb::Test::SliceHelper)
-  config.before(:each) do
-    setup_orm
-  end
-end
-
-# You can add your own helpers here
-#
-Merb::Test.add_helpers do
-  def mount_slice
-    if standalone?
-      Merb::Router.reset!
-      Merb::Router.prepare{add_slice(:merb_admin, :path_prefix => "admin")}
-    end
-  end
-end
+require 'rubygems'
+require 'merb-core'
+require 'merb-slices'
+require 'spec'
+
+# Add merb-admin.rb to the search path
+Merb::Plugins.config[:merb_slices][:auto_register] = true
+Merb::Plugins.config[:merb_slices][:search_path]   = File.join(File.dirname(__FILE__), '..', 'lib', 'merb-admin.rb')
+
+# Require merb-admin.rb explicitly so any dependencies are loaded
+require Merb::Plugins.config[:merb_slices][:search_path]
+
+# Using Merb.root below makes sure that the correct root is set for
+# - testing standalone, without being installed as a gem and no host application
+# - testing from within the host application; its root will be used
+Merb.start_environment(
+  :testing => true,
+  :adapter => 'runner',
+  :environment => ENV['MERB_ENV'] || 'test',
+  :merb_root => Merb.root,
+  :session_store => 'memory'
+)
+
+module Merb
+  module Test
+    module SliceHelper
+
+      # The absolute path to the current slice
+      def current_slice_root
+        @current_slice_root ||= File.expand_path(File.join(File.dirname(__FILE__), '..'))
+      end
+
+      # Whether the specs are being run from a host application or standalone
+      def standalone?
+        Merb.root == ::MerbAdmin.root
+      end
+
+      def setup_orm(orm = nil)
+        orm = set_orm(orm)
+        orm = orm.to_s.downcase.to_sym
+        case orm
+        when :activerecord
+          require 'active_record'
+          require_models(orm)
+          unless ActiveRecord::Base.connected?
+            ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+            ActiveRecord::Migration.verbose = false
+            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 1)
+            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 2)
+            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 3)
+            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 4)
+            ActiveRecord::Migrator.run(:up, File.join(File.dirname(__FILE__), "migrations", "activerecord"), 5)
+          end
+        when :datamapper
+          require 'dm-core'
+          require 'dm-aggregates'
+          require 'dm-migrations'
+          require 'dm-validations'
+          require_models(orm)
+          unless DataMapper::Repository.adapters.key?(:default)
+            DataMapper.setup(:default, 'sqlite3::memory:')
+            DataMapper.auto_migrate!
+          end
+        when :sequel
+          require 'sequel'
+          require 'sequel/extensions/migration'
+          Sequel::Migrator.apply(Sequel.sqlite, File.join(File.dirname(__FILE__), "migrations", "sequel"))
+          require_models(orm)
+        else
+          raise "MerbAdmin does not support the #{orm} ORM"
+        end
+        Merb.orm = orm
+      end
+
+      private
+
+      def require_models(orm = nil)
+        orm ||= set_orm
+        Dir.glob(File.dirname(__FILE__) / "models" / orm.to_s.downcase / Merb.glob_for(:model)).each do |model_filename|
+          require model_filename
+        end
+      end
+
+      def set_orm(orm = nil)
+        orm || ENV['MERB_ORM'] || (Merb.orm != :none ? Merb.orm : nil) || :activerecord
+      end
+
+    end
+  end
+end
+
+Spec::Runner.configure do |config|
+  config.include(Merb::Test::ViewHelper)
+  config.include(Merb::Test::RouteHelper)
+  config.include(Merb::Test::ControllerHelper)
+  config.include(Merb::Test::SliceHelper)
+  config.before(:each) do
+    setup_orm
+  end
+end
+
+# You can add your own helpers here
+#
+Merb::Test.add_helpers do
+  def mount_slice
+    if standalone?
+      Merb::Router.reset!
+      Merb::Router.prepare{add_slice(:merb_admin, :path_prefix => "admin")}
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: merb-admin
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: ruby
 authors: 
 - Erik Michaels-Ober
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-12 00:00:00 -07:00
+date: 2010-10-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -124,9 +124,24 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: thin
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -137,27 +152,26 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: sequel
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 39
         segments: 
         - 3
-        - 6
-        - 0
-        version: 3.6.0
+        - 16
+        version: "3.16"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -168,11 +182,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: webrat
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -183,11 +197,11 @@ dependencies:
         - 7
         version: "0.7"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -198,11 +212,11 @@ dependencies:
         - 1
         version: "2.1"
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -213,11 +227,11 @@ dependencies:
         - 4
         version: "1.4"
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: merb-assets
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -228,11 +242,11 @@ dependencies:
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: merb-helpers
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -243,11 +257,11 @@ dependencies:
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: merb-slices
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -258,7 +272,7 @@ dependencies:
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id017
 description: MerbAdmin is a Merb plugin that provides an easy-to-use interface for managing your data
 email: sferik@gmail.com
 executables: []