merb-auth-core 1.0.15 → 1.1.0.pre

data/Rakefile

@@ -1,60 +1,53 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "rake_helpers"))
-
-RUBY_FORGE_PROJECT = "merb-auth"
-GEM_NAME = "merb-auth-core"
-PKG_BUILD   = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
-GEM_VERSION = Merb::VERSION + PKG_BUILD
-
-AUTHOR = "Adam French, Daniel Neighman"
-EMAIL = "has.sox@gmail.com"
-HOMEPAGE = "http://merbivore.com/"
-SUMMARY = "An Authentication framework for Merb"
-
-spec = Gem::Specification.new do |s|
-  s.rubyforge_project = 'merb'
-  s.name = GEM_NAME
-  s.version = GEM_VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.textile", "LICENSE", "TODO"]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', "~> #{Merb::VERSION}")
-  s.add_dependency('extlib')
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
-  
-end
+require 'rubygems'
+require 'rake'
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
-end
+# Assume a typical dev checkout to fetch the current merb-core version
+require File.expand_path('../../../merb/merb-core/lib/merb-core/version', __FILE__)
 
-desc "install the plugin as a gem"
-task :install do
-  Merb::RakeHelper.install(GEM_NAME, :version => GEM_VERSION)
-end
+# Load this library's version information
+require File.expand_path('../lib/merb-auth-core/version', __FILE__)
 
-desc "Uninstall the gem"
-task :uninstall do
-  Merb::RakeHelper.uninstall(GEM_NAME, :version => GEM_VERSION)
-end
+begin
+
+  require 'jeweler'
+
+  Jeweler::Tasks.new do |gemspec|
+
+    gemspec.version     = Merb::Auth::Core::VERSION
+
+    gemspec.name        = "merb-auth-core"
+    gemspec.description = "An Authentication framework for Merb"
+    gemspec.summary     = "Merb plugin that provides basic authentication support"
+
+    gemspec.authors     = [ "Adam French", "Daniel Neighman" ]
+    gemspec.email       = "has.sox@gmail.com"
+    gemspec.homepage    = "http://merbivore.com/"
+
+    gemspec.files       = %w(LICENSE Rakefile README.textile TODO) + Dir['{lib,spec}/**/*']
+
+    # Runtime dependencies
+    gemspec.add_dependency 'merb-core', "~> #{Merb::VERSION}"
+
+    # Development dependencies              
+    gemspec.add_development_dependency 'rspec', ">= 1.2.9"
 
-desc "Create a gemspec file"
-task :gemspec do
-  File.open("#{GEM_NAME}.gemspec", "w") do |file|
-    file.puts spec.to_ruby
   end
+
+  Jeweler::GemcutterTasks.new
+
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-desc "Run all specs"
-Spec::Rake::SpecTask.new("spec") do |t|
-  t.spec_opts = ["--format", "specdoc", "--colour"]
-  t.spec_files = Dir["spec/**/*_spec.rb"].sort
-  t.rcov = false
-  t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-  t.rcov_opts << '--only-uncovered'
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end

data/lib/merb-auth-core/errors.rb

@@ -33,6 +33,17 @@ module Merb
         end
       end
 
+      # Return validation errors for a particular field name or an empty array
+      #
+      # This method is a necessary requirement for active_model compatibility.
+      #
+      # @param [Symbol] field_name the name of the field you want an error for
+      # @return [Array<Array<String>>]
+      #   array of validation errors or empty array, if there are no errors on given field
+      def [](field_name)
+        errors[field_name] ||= []
+      end
+
       # Return authentication errors for a particular field_name.
       #
       # @param <Symbol> field_name the name of the field you want an error for

data/lib/merb-auth-core/version.rb

@@ -0,0 +1,7 @@
+module Merb
+  module Auth
+    module Core
+      VERSION = '1.1.0.pre'.freeze
+    end
+  end
+end

data/spec/helpers/authentication_helper_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb')
+require 'spec_helper'
 
 describe "Merb::AuthenticationHelper" do
   

data/spec/merb-auth-core/authentication_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb')
+require 'spec_helper'
 
 describe "Merb::Authentication Session" do
     

data/spec/merb-auth-core/callbacks_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb')
+require 'spec_helper'
 
 describe "Authentication callbacks" do
   

data/spec/merb-auth-core/customizations_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb')
+require 'spec_helper'
 
 describe "Merb::Authentication.customizations" do
   

data/spec/merb-auth-core/errors_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb')
+require 'spec_helper'
 
 describe Merb::Authentication::Errors do
  

data/spec/merb-auth-core/failed_login_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb')
+require 'spec_helper'
 
 describe "Failed Login" do
   

data/spec/merb-auth-core/merb-auth-core_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "merb-auth-core" do
   it "should ensure_authentication" do

data/spec/merb-auth-core/router_helper_spec.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb')
-require 'ruby-debug'
+require 'spec_helper'
 
 describe "router protection" do
 

data/spec/merb-auth-core/strategy_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", 'spec_helper.rb')
+require 'spec_helper'
 
 describe "Merb::Authentication::Strategy" do
     

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -1,12 +1,18 @@
-$TESTING=true
-$:.push File.join(File.dirname(__FILE__), '..', 'lib')
+require "rubygems"
 
-require 'rubygems'
+# Use current merb-core sources if running from a typical dev checkout.
+lib = File.expand_path('../../../../merb/merb-core/lib', __FILE__)
+$LOAD_PATH.unshift(lib) if File.directory?(lib)
 require 'merb-core'
 require 'merb-core/test'
 require 'merb-core/dispatch/session'
-require 'spec' # Satisfies Autotest and anyone else not using the Rake tasks
-require 'merb-auth-core'
+
+# The lib under test
+require "merb-auth-core"
+
+# Satisfies Autotest and anyone else not using the Rake tasks
+require 'spec'
+
 
 Merb.start  :environment    => "test", 
             :adapter        => "runner", 

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: merb-auth-core
 version: !ruby/object:Gem::Version 
-  version: 1.0.15
+  version: 1.1.0.pre
 platform: ruby
 authors: 
-- Adam French, Daniel Neighman
+- Adam French
+- Daniel Neighman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +00:00
+date: 2009-11-17 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,17 +21,17 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.15
+        version: 1.1.0.pre
     version: 
 - !ruby/object:Gem::Dependency 
-  name: extlib
-  type: :runtime
+  name: rspec
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.2.9
     version: 
 description: An Authentication framework for Merb
 email: has.sox@gmail.com
@@ -39,14 +40,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.textile
 - LICENSE
-- TODO
+- README.textile
 files: 
 - LICENSE
 - README.textile
 - Rakefile
 - TODO
+- lib/merb-auth-core.rb
 - lib/merb-auth-core/authenticated_helper.rb
 - lib/merb-auth-core/authentication.rb
 - lib/merb-auth-core/bootloader.rb
@@ -58,7 +59,7 @@ files:
 - lib/merb-auth-core/router_helper.rb
 - lib/merb-auth-core/session_mixin.rb
 - lib/merb-auth-core/strategy.rb
-- lib/merb-auth-core.rb
+- lib/merb-auth-core/version.rb
 - spec/helpers/authentication_helper_spec.rb
 - spec/merb-auth-core/activation_fixture.rb
 - spec/merb-auth-core/authentication_spec.rb
@@ -69,14 +70,15 @@ files:
 - spec/merb-auth-core/merb-auth-core_spec.rb
 - spec/merb-auth-core/router_helper_spec.rb
 - spec/merb-auth-core/strategy_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://merbivore.com/
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -87,16 +89,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
   version: 
 requirements: []
 
-rubyforge_project: merb
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: An Authentication framework for Merb
+summary: Merb plugin that provides basic authentication support
 test_files: []