mineral 0.3.0 → 0.3.2

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/
 .loadpath
 .project
+Gemfile.lock

data/README.markdown

@@ -0,0 +1,4 @@
+mineral
+============
+
+![mineral](http://upload.wikimedia.org/wikipedia/commons/d/d9/Biotite-Orthoclase-229808.jpg "Biotite Orthoclase")

data/Rakefile

@@ -1,24 +1,23 @@
 require 'rubygems'
+require 'bundler/setup'
 require 'rake'
+require 'rake/testtask'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "mineral"
-    gem.summary = %Q{Rack metal with a better interface}
-    gem.description = %Q{Rack metal with a better interface}
-    gem.email = "jonbell@spamcop.net"
-    gem.homepage = "http://github.com/jonbell/mineral"
-    gem.authors = ["jonbell"]
-    gem.add_dependency "rack", ">= 1.0.0"
-    gem.add_development_dependency "shoulda", ">= 2.10.0"
-    gem.add_development_dependency "mocha", ">= 0.9.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name = 'mineral'
+  gem.summary = %Q{Rack metal with a better interface}
+  gem.description = %Q{Rack metal with a better interface}
+  gem.email = "jonbell@spamcop.net"
+  gem.homepage = "http://github.com/jonbell/mineral"
+  gem.authors = ["jonbell"]
+  gem.files.include 'lib/**/*.rb'
+  gem.files.exclude '.bundle/*'
+  gem.files.exclude '.rvmrc'
 end
+Jeweler::RubygemsDotOrgTasks.new
+
+task :default => :test
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -27,29 +26,3 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "mineral #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/lib/mineral.rb

@@ -1,6 +1,8 @@
 require 'active_support/ordered_hash'
+require 'active_support/notifications'
 require 'mineral/railtie'
 require 'mineral/response'
+require 'rails'
 
 module Mineral
   module Rack
@@ -28,7 +30,7 @@ module Mineral
 
         load_list.map do |requested_mineral|
           if mineral = all_minerals[requested_mineral]
-            require_dependency "#{Rails.root}/app/mineral/" + mineral
+            require "#{Rails.root}/app/mineral/" + mineral
             requested_mineral.constantize
           end
         end.compact
@@ -41,13 +43,17 @@ module Mineral
       end
 
       def call(env)
+        call_start = Time.now
         request = ::Rack::Request.new(env)
         @minerals.each do |app|
           if app.methods.include?(request.request_method) && matcher = app.regex.match(request.path_info)
             args = []
             1.step(matcher.size - 1){|group| args << matcher[group]}
+            method = request.request_method.downcase
 
-            return call_mineral_endpoint(app, request.request_method.downcase, request, *args)
+            ActiveSupport::Notifications.instrument('call.mineral', {mineral: app, method: method, call_start: call_start}) do
+              return call_mineral_endpoint(app, method, request, *args)
+            end
           end
         end
         @app.call(env)

data/mineral.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mineral}
-  s.version = "0.3.0"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jonbell"]
-  s.date = %q{2012-03-30}
+  s.date = %q{2010-11-04}
   s.description = %q{Rack metal with a better interface}
   s.email = %q{jonbell@spamcop.net}
   s.extra_rdoc_files = [
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/mineral.rb",
-     "lib/mineral/railtie.rb",
      "lib/mineral/response.rb",
      "mineral.gemspec",
      "test/app/mineral/handler.rb",
@@ -32,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jonbell/mineral}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rack metal with a better interface}
   s.test_files = [
     "test/app/mineral/handler.rb",
@@ -44,7 +43,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.0"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.0"])

data/test/helper.rb

@@ -1,18 +1,19 @@
 require 'rubygems'
-require 'active_support'
-require 'rack'
-require 'active_support/test_case'
+require 'bundler'
+Bundler.setup(:default, :development)
+require 'test/unit'
 require 'shoulda'
-require 'mocha'
+require 'active_support/test_case'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
+
+require 'mineral'
+
 module Rails
   def self.root
     File.dirname(__FILE__)
   end
 end
 
-
-require 'mineral'

data/test/test_mineral.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestMineral < ActiveSupport::TestCase
+class TestMineral < Test::Unit::TestCase
   context "on GET to /handler/123" do
     setup do
       @response = Mineral::Rack::Mineral.new(stub).call({"REQUEST_METHOD" => "GET", "PATH_INFO" => "/handler/123"})

metadata

@@ -1,116 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mineral
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.3.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - jonbell
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-30 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2010-11-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+  requirement: &70343346770120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 10
-        - 0
+  version_requirements: *70343346770120
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70343346769320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.10.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 0
+  version_requirements: *70343346769320
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70343346768840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70343346768840
 description: Rack metal with a better interface
 email: jonbell@spamcop.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gitignore
 - MIT-LICENSE
 - README.markdown
 - Rakefile
 - VERSION
 - lib/mineral.rb
-- lib/mineral/railtie.rb
 - lib/mineral/response.rb
 - mineral.gemspec
 - test/app/mineral/handler.rb
 - test/helper.rb
 - test/test_mineral.rb
-has_rdoc: true
 homepage: http://github.com/jonbell/mineral
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Rack metal with a better interface
-test_files: 
+test_files:
 - test/app/mineral/handler.rb
 - test/helper.rb
 - test/test_mineral.rb

data/lib/mineral/railtie.rb

@@ -1,9 +0,0 @@
-require 'mineral'
-
-module Mineral
-  class Railtie < Rails::Railtie
-    initializer 'mineral.register_middleware' do |app|
-      app.config.middleware.insert_before ::ActionDispatch::Flash, Mineral::Rack::Mineral
-    end
-  end
-end