challah 1.1.0 → 1.1.1

data/test/test_helper.rb

@@ -0,0 +1,47 @@
+# Coverage reporting, needs to be loaded first to capture all code coverage stats
+require 'simplecov'
+
+# Configure Rails Environment
+ENV["RAILS_ENV"] ||= "test"
+
+require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+
+# Some other dependencies for testing w/ shoulda and factory girl
+require 'shoulda'
+require 'mocha/setup'
+require 'factory_girl'
+require 'factories'
+require 'rails/test_help'
+
+Rails.backtrace_cleaner.remove_silencers!
+
+# Load the challah libraries
+require 'challah'
+require 'challah/test'
+
+db_files = Dir["#{ Rails.root.join("db") }/**/*challah*.rb"]
+
+# Allow repeat tests to run, dropping the db after each suite run
+# (*not called on CI server)
+if db_files.size > 0
+  `rake --rakefile #{ File.expand_path("../dummy/Rakefile",  __FILE__) } db:test:purge`
+
+  FileUtils.rm_rf(db_files)
+  FileUtils.rm_rf(Rails.root.join("db", "schema.rb"))
+end
+
+`rake --rakefile #{ File.expand_path("../dummy/Rakefile",  __FILE__) } challah_engine:install:migrations`
+`rake --rakefile #{ File.expand_path("../dummy/Rakefile",  __FILE__) } db:migrate`
+
+Dir["#{ File.dirname(__FILE__) }/support/**/*.rb"].each { |f| require f }
+
+class ActiveSupport::TestCase
+  ActiveRecord::Migration.check_pending!
+
+  fixtures :all
+
+  include FactoryGirl::Syntax::Methods
+
+  self.use_transactional_fixtures = true
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: challah
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - John Tornow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -28,44 +28,44 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: A simple gem for authorization and session management in Rails.
 email:
 - john@johntornow.com
@@ -73,7 +73,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/controllers/challah/test/restrictions_controller.rb
 - app/controllers/sessions_controller.rb
 - app/models/authorization.rb
 - app/models/user.rb
@@ -82,23 +81,70 @@ files:
 - config/locales/en.yml
 - db/migrate/20120127150433_create_users.rb
 - db/migrate/20121116210759_create_authorizations.rb
-- test/audit_test.rb
-- test/authorization_test.rb
-- test/controller_test.rb
-- test/cookie_store_test.rb
-- test/edge_helper.rb
-- test/encrypter_test.rb
+- test/controllers/controller_test.rb
+- test/controllers/restrictions_controller_test.rb
+- test/controllers/sessions_controller_test.rb
+- test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/restrictions_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/user.rb
+- test/dummy/app/models/widget.rb
+- test/dummy/app/views/bakery/templates/layouts/sample.erb
+- test/dummy/app/views/bakery/templates/partials/sample.html.haml
+- test/dummy/app/views/bakery/templates/themes/sample.haml
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/i18n.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/wrap_parameters.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/config.ru
+- test/dummy/db/migrate/20140114212939_create_widgets.rb
+- test/dummy/db/migrate/20140307205735_create_users.challah_engine.rb
+- test/dummy/db/migrate/20140307205736_create_authorizations.challah_engine.rb
+- test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
+- test/dummy/log/test.log
+- test/dummy/public/404.html
+- test/dummy/public/422.html
+- test/dummy/public/500.html
+- test/dummy/public/favicon.ico
+- test/dummy/Rakefile
+- test/dummy/README.rdoc
+- test/dummy/tmp/cache/assets/test/sprockets/13fe41fee1fe35b49d145bcc06610705
+- test/dummy/tmp/cache/assets/test/sprockets/2f5173deea6c795b8fdde723bb4b63af
+- test/dummy/tmp/cache/assets/test/sprockets/357970feca3ac29060c1e3861e2c0953
+- test/dummy/tmp/cache/assets/test/sprockets/cffd775d018f68ce5dba1ee0d951a994
+- test/dummy/tmp/cache/assets/test/sprockets/d771ace226fc8215a3572e0aa35bb0d6
+- test/dummy/tmp/cache/assets/test/sprockets/f7cbd26ba1d28d48de824f0e94586655
 - test/factories.rb
-- test/helper.rb
-- test/plugins_test.rb
-- test/random_test.rb
-- test/restrictions_controller_test.rb
-- test/routes_test.rb
-- test/session_test.rb
-- test/sessions_controller_test.rb
-- test/signup_test.rb
-- test/simple_cookie_store_test.rb
-- test/user_test.rb
+- test/models/authorization_test.rb
+- test/models/user_test.rb
+- test/services/audit_test.rb
+- test/services/cookie_store_test.rb
+- test/services/encrypter_test.rb
+- test/services/plugins_test.rb
+- test/services/random_test.rb
+- test/services/routes_test.rb
+- test/services/session_test.rb
+- test/services/signup_test.rb
+- test/services/simple_cookie_store_test.rb
+- test/support/stubs.rb
+- test/test_helper.rb
 - lib/challah/audit.rb
 - lib/challah/authenticators/api_key.rb
 - lib/challah/authenticators/password.rb

data/test/edge_helper.rb

@@ -1,57 +0,0 @@
-class ActiveSupport::TestCase
-  ActiveRecord::Migration.check_pending!
-
-  fixtures :all
-
-  include FactoryGirl::Syntax::Methods
-
-  # Get shoulda-context working in Rails 4
-  include Shoulda::Context::Assertions
-  include Shoulda::Context::InstanceMethods
-  extend Shoulda::Context::ClassMethods
-
-  # Get shoulda-matchers (for AR) working in Rails 4
-  include Shoulda::Matchers::ActiveRecord
-  extend Shoulda::Matchers::ActiveRecord
-  include Shoulda::Matchers::ActiveModel
-  extend Shoulda::Matchers::ActiveModel
-
-  # Override shoulda-context
-  #
-  # Should be fixed by time Rails 4 actually comes out
-  def assert_accepts(matcher, target, options = {})
-    if matcher.respond_to?(:in_context)
-      matcher.in_context(self)
-    end
-
-    if matcher.matches?(target)
-      assert true
-      if options[:message]
-        assert_match options[:message], matcher.negative_failure_message
-      end
-    else
-      assert false, matcher.failure_message
-    end
-  end
-
-  # Override shoulda-context
-  #
-  # Should be fixed by time Rails 4 actually comes out
-  def assert_rejects(matcher, target, options = {})
-    if matcher.respond_to?(:in_context)
-      matcher.in_context(self)
-    end
-
-    not_match = matcher.respond_to?(:does_not_match?) ? matcher.does_not_match?(target) : !matcher.matches?(target)
-
-    if not_match
-      assert true
-
-      if options[:message]
-        assert_match options[:message], matcher.failure_message
-      end
-    else
-      assert false, matcher.failure_message
-    end
-  end
-end

data/test/helper.rb

@@ -1,148 +0,0 @@
-# Coverage reporting, needs to be loaded first to capture all code coverage stats
-require 'simplecov'
-
-# Setup a sample rails app for testing rails modules
-sample_root = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp', 'sampleapp'))
-FileUtils.rm_rf(sample_root) if File.exists?(sample_root)
-`./bin/rails new #{sample_root} --skip-bundle --skip-sprockets`
-
-# Setup environment variables for the Rails instance
-ENV['RAILS_ENV'] = 'test'
-ENV['BUNDLE_GEMFILE'] ||= File.join(sample_root, 'Gemfile')
-
-# Load the newly created rails instance environment
-require "#{sample_root}/config/environment"
-
-# Some other dependencies for testing w/ shoulda and factory girl
-require 'shoulda'
-require 'mocha/setup'
-require 'factory_girl'
-require 'factories'
-require 'rails/test_help'
-
-# Load the challah libraries
-require 'challah'
-require 'challah/test'
-
-# Setup the challah app, including running migrations within the rails app
-# TODO - this causes some annoying output in 1.9.3, still works, but would like to suppress
-`rake --rakefile #{File.join(sample_root, 'Rakefile')} challah:setup:migrations`
-
-# Run migrations for the sample app, hiding output
-ActiveRecord::Migration.verbose = false
-ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
-
-# Use ActiveSupport::TestCase for any tests using factories and database saving,
-# so we can have a transactional rollback after each test.
-class ActiveSupport::TestCase
-  include FactoryGirl::Syntax::Methods
-
-  self.use_transactional_fixtures = true
-end
-
-if Rails::VERSION::MAJOR >= 4
-  require 'edge_helper'
-end
-
-class MockController
-  include Challah::Controller
-
-  attr_accessor :request, :session, :params
-
-  def initialize()
-    @request = MockRequest.new
-    @session ||= {}
-    @params ||= {}
-  end
-
-  def redirect_to(*args)
-    # do nothing
-  end
-
-  def login_path
-    "/login"
-  end
-
-  def logout_path
-    "/logout"
-  end
-
-  def signin_path
-    "/sign-in"
-  end
-
-  def signout_path
-    "/sign-out"
-  end
-end
-
-class MockRequest
-  attr_accessor :cookie_jar, :session_options, :url
-
-  class MockCookieJar < Hash
-    def delete(key, options = {})
-      super(key)
-    end
-  end
-
-  def initialize
-    @cookie_jar = MockCookieJar.new
-    @session_options = { :domain => 'test.dev' }
-    @url = "http://example.com/"
-  end
-
-  def cookies
-    @cookie_jar
-  end
-
-  def cookies=(value)
-    @cookie_jar = value
-  end
-
-  def remote_ip
-    "8.8.8.8"
-  end
-
-  def user_agent
-    "Some Cool Browser"
-  end
-end
-
-class FakeProvider
-  def self.save(record)
-    set(record.fake_provider.merge(user_id: record.id))
-  end
-
-  def self.set(options = {})
-    user_id = options.fetch(:user_id)
-    uid     = options.fetch(:uid, '')
-    token   = options.fetch(:token, '')
-
-    Authorization.set({
-      provider: :fake,
-      user_id:  user_id,
-      uid:      uid,
-      token:    token
-    })
-  end
-
-  def self.valid?(record)
-    record.fake_provider? and record.fake_provider.fetch(:token) == 'me'
-  end
-end
-
-Challah.register_provider :fake, FakeProvider
-
-# Monkey patch fix for shoulda and Rails 3.1+.
-module Shoulda
-  module ActiveRecord
-    module Matchers
-      class AssociationMatcher
-        protected
-          def foreign_key
-            reflection.foreign_key
-          end
-      end
-    end
-  end
-end