casino_core 1.4.3 → 1.4.4

data/.gitignore

@@ -11,6 +11,8 @@ doc
 
 # bundler
 .bundle
+vendor
+Gemfile.lock
 
 # jeweler generated
 pkg

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p194
+1.9.3-p194

data/config/database.yml

@@ -13,6 +13,7 @@ development:
 
 test:
   adapter: sqlite3
-  database: db/test.sqlite3
+  database: ':memory:'
   pool: 5
   timeout: 5000
+  verbosity: quiet

data/lib/casino_core.rb

@@ -1,4 +1,5 @@
 require 'active_support/inflector'
+require 'active_record'
 
 module CASinoCore
   autoload :Authenticator, 'casino_core/authenticator.rb'
@@ -14,9 +15,8 @@ module CASinoCore
     def setup(environment = nil, options = {})
       @environment = environment || 'development'
       root_path = options[:application_root] || '.'
-      require 'active_record'
-      require 'yaml'
-      ActiveRecord::Base.establish_connection YAML.load_file(File.join(root_path, 'config/database.yml'))[@environment]
+
+      establish_connection(@environment, root_path) unless active_record_connected?
 
       config = YAML.load_file(File.join(root_path, 'config/cas.yml'))[@environment].symbolize_keys
       recursive_symbolize_keys!(config)
@@ -31,6 +31,19 @@ module CASinoCore
       hash.values.select{|v| v.is_a? Hash}.each{|h| recursive_symbolize_keys!(h)}
       hash.values.select{|v| v.is_a? Array}.each{|a| a.select{|v| v.is_a? Hash}.each{|h| recursive_symbolize_keys!(h)}}
     end
+
+    def active_record_connected?
+      ActiveRecord::Base.connection
+    rescue ActiveRecord::ConnectionNotEstablished
+      false
+    end
+
+    def establish_connection(env, root_path)
+      require 'yaml'
+
+      db_cfg = YAML::load(ERB.new(IO.read(File.join(root_path, 'config/database.yml'))).result)[env]
+      ActiveRecord::Base.establish_connection db_cfg
+    end
   end
 end
 

data/lib/casino_core/tasks/database.rake

@@ -1,3 +1,4 @@
+require 'erb'
 require 'yaml'
 require 'logger'
 require 'active_record'
@@ -16,17 +17,12 @@ namespace :casino_core do
     end
 
     task :configuration => :environment do
-      @config = YAML.load_file('config/database.yml')[DATABASE_ENV]
       CASinoCore.setup DATABASE_ENV
-    end
-
-    task :configure_connection => :configuration do
-      ActiveRecord::Base.establish_connection @config
-      ActiveRecord::Base.logger = Logger.new STDOUT if @config['logger']
+      ActiveRecord::Base.logger = CASinoCore::Settings.logger
     end
 
     desc 'Migrate the database (options: VERSION=x, VERBOSE=false)'
-    task :migrate => :configure_connection do
+    task :migrate => :configuration do
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
       ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil) do |migration|
         ENV["SCOPE"].blank? || (ENV["SCOPE"] == migration.scope)
@@ -34,14 +30,14 @@ namespace :casino_core do
     end
 
     desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'
-    task :rollback => :configure_connection do
+    task :rollback => :configuration do
       step = ENV['STEP'] ? ENV['STEP'].to_i : 1
       ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
     end
 
     namespace :schema do
       desc 'Create a db/schema.rb file that can be portably used against any DB supported by AR'
-      task :dump => :configure_connection do
+      task :dump => :configuration do
         require 'active_record/schema_dumper'
         File.open(SCHEMA_PATH, "w:utf-8") do |file|
           ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
@@ -49,7 +45,7 @@ namespace :casino_core do
       end
 
       desc 'Load a schema.rb file into the database'
-      task :load => :configure_connection do
+      task :load => :configuration do
         if File.exists?(SCHEMA_PATH)
           load(SCHEMA_PATH)
         else

data/lib/casino_core/version.rb

@@ -1,3 +1,3 @@
 module CASinoCore
-  VERSION = '1.4.3'
+  VERSION = '1.4.4'
 end

data/spec/model/service_ticket_spec.rb

@@ -114,4 +114,11 @@ describe CASinoCore::Model::ServiceTicket do
       end
     end
   end
+
+  describe '#service_with_ticket_url' do
+    it 'does not escape the url from the database' do
+      unconsumed_ticket.service = 'https://host.example.org/test.php?t=other&other=testing'
+      unconsumed_ticket.service_with_ticket_url.should eq('https://host.example.org/test.php?t=other&other=testing&ticket=ST-12345')
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+ENV['RAILS_ENV'] ||= ENV['DATABASE_ENV'] || 'test'
+
 require 'active_support/core_ext'
 require 'simplecov'
 require 'coveralls'
@@ -31,29 +33,3 @@ require 'casino_core'
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
-
-
-  config.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-  end
-
-  config.before(:each) do
-    CASinoCore.setup 'test'
-    CASinoCore::Settings.logger.level = ::Logger::Severity::UNKNOWN
-    DatabaseCleaner.clean_with(:truncation)
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
-end

data/spec/support/casino_core.rb

@@ -0,0 +1,6 @@
+RSpec.configure do |config|
+  config.before(:each) do
+    CASinoCore.setup ENV['RAILS_ENV']
+    CASinoCore::Settings.logger.level = ::Logger::Severity::UNKNOWN
+  end
+end

data/spec/support/database_cleaner.rb

@@ -0,0 +1,14 @@
+RSpec.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/spec/support/rspec.rb

@@ -0,0 +1,6 @@
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run focus: true
+  config.order = 'random'
+end

data/spec/support/sqlite3.rb

@@ -0,0 +1,5 @@
+root_path   = File.join(File.dirname(__FILE__),'..','..')
+schema_path = File.join(root_path, 'db')
+
+CASinoCore.send(:establish_connection, ENV['RAILS_ENV'], root_path)
+load File.join(schema_path, 'schema.rb')

metadata

@@ -1,42 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: casino_core
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors:
 - Nils Caspar
 autorequire: 
 bindir: bin
-cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLakNDQWhLZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE3TVEwd0N3WURWUVFEREFScGJt
-  WnYKTVJVd0V3WUtDWkltaVpQeUxHUUJHUllGY21KallYTXhFekFSQmdvSmtp
-  YUprL0lzWkFFWkZnTmpiMjB3SGhjTgpNVE13TWpBeU1qSXlOakkyV2hjTk1U
-  UXdNakF5TWpJeU5qSTJXakE3TVEwd0N3WURWUVFEREFScGJtWnZNUlV3CkV3
-  WUtDWkltaVpQeUxHUUJHUllGY21KallYTXhFekFSQmdvSmtpYUprL0lzWkFF
-  WkZnTmpiMjB3Z2dFaU1BMEcKQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dF
-  S0FvSUJBUURiZG1OeTRoZU5SZUc4TFhCMm5ha3JwQXJrcVd2dwpqVm54WE1M
-  UzZUNXFlYmZMV2FsMVBSb1BIemJoUkdtQTN1Q1lZWXVWdVh2NlYxVm1DdG5N
-  MG1qM1lnTjZoNjFECkQrV25oMUtUOHNVWWhSQjM2TU50bWllclMxRWNNeXZS
-  dWpYUkxrNngwNkFiejliSmFkeUVXN0RTNFZrcEN6OW4KZjlNRW5IcUlseVFC
-  UFAzekhzRHlNclRySUJ1dkRXUHIrYUFNS3FJWExqcVdlcDFFYmQvL3BwTmNT
-  aVZGODdzKwplMEphRmU3LzFhbHhJUEdPYWsvY0dFdm9tNDJUTEdkUEt5dTBY
-  amsybi9jV1RBbEJzaEZQT1FTM2hrczZSaDhzClZ6d2owTFF2VTByaFhKV0hO
-  YjZXdWpLaml3c3Z6U1RsR3lkTndJRU5wckpJQVFKc2FJWDNSUUluQWdNQkFB
-  R2oKT1RBM01Ba0dBMVVkRXdRQ01BQXdIUVlEVlIwT0JCWUVGS3lML1V6R1U4
-  SVpuZU9qcjczWFBDTFpKN1F1TUFzRwpBMVVkRHdRRUF3SUVzREFOQmdrcWhr
-  aUc5dzBCQVFVRkFBT0NBUUVBVUsrZnVraS9nVWhJbEpxTTI0TkNzL3kzClNv
-  cUNHUDB6K2M1ZytCTXUzc2MzeElOL21IK0hZbFBhRWE2V2o0YndtU1ZnVGhh
-  WjU0T3NtUnlaSUsxVm9BeW0KVDR6T3FDd3QwdHdUMmF6MVA2WFRoVk1FZWJM
-  alpEYnVRL29RelUvZkE2RFlxam5mbVlOdGdwNXFZWDZDS05Kegp3M1lSS3JL
-  Mlg2cVlZSGNISS9LTDV3YzFET24rVU5VNGVmbVAwVlZkNVVOZlI0MElCTE50
-  eFg5Nlg5WVRYT0hFCndRc0xpK0xqbnorVWFPUmsxZHhabGNYWUdjMzR3Rmcx
-  b1VSdnUwRzgvWXlIVUFtSVUvV0tyanIxYmdjZjFWUnYKUjRLRDFNblVWL3Y1
-  MDJwaU1sWG1qeE9XZGJLOHl2UUVIa3N1L3pqYkNqU3UrTTJrd0ZtV0dzeDVu
-  eCtWZHc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-04-21 00:00:00.000000000 Z
+cert_chain: []
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -309,7 +282,6 @@ files:
 - .ruby-version
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -427,6 +399,8 @@ files:
 - spec/processor/two_factor_authenticator_registrator_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
+- spec/support/casino_core.rb
+- spec/support/database_cleaner.rb
 - spec/support/factories/login_ticket_factory.rb
 - spec/support/factories/proxy_granting_ticket_factory.rb
 - spec/support/factories/proxy_ticket_factory.rb
@@ -435,6 +409,8 @@ files:
 - spec/support/factories/ticket_granting_ticket_factory.rb
 - spec/support/factories/two_factor_authenticator_factory.rb
 - spec/support/factories/user_factory.rb
+- spec/support/rspec.rb
+- spec/support/sqlite3.rb
 homepage: http://rbcas.org/
 licenses:
 - MIT
@@ -448,21 +424,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3956376216012117413
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3956376216012117413
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A CAS server core library.
@@ -496,6 +466,8 @@ test_files:
 - spec/processor/two_factor_authenticator_registrator_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
+- spec/support/casino_core.rb
+- spec/support/database_cleaner.rb
 - spec/support/factories/login_ticket_factory.rb
 - spec/support/factories/proxy_granting_ticket_factory.rb
 - spec/support/factories/proxy_ticket_factory.rb
@@ -504,4 +476,6 @@ test_files:
 - spec/support/factories/ticket_granting_ticket_factory.rb
 - spec/support/factories/two_factor_authenticator_factory.rb
 - spec/support/factories/user_factory.rb
+- spec/support/rspec.rb
+- spec/support/sqlite3.rb
 has_rdoc: 

data/Gemfile.lock

@@ -1,88 +0,0 @@
-PATH
-  remote: .
-  specs:
-    casino_core (1.4.3)
-      activerecord (~> 3.2.9)
-      addressable (~> 2.3)
-      faraday (~> 0.8)
-      rotp (~> 1.4)
-      terminal-table (~> 1.4)
-      useragent (~> 0.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
-      builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.3.2)
-    arel (3.0.2)
-    builder (3.0.4)
-    colorize (0.5.8)
-    coveralls (0.6.2)
-      colorize
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      thor
-    crack (0.3.2)
-    database_cleaner (0.9.1)
-    diff-lcs (1.1.3)
-    factory_girl (4.2.0)
-      activesupport (>= 3.0.0)
-    faraday (0.8.5)
-      multipart-post (~> 1.1)
-    i18n (0.6.1)
-    mime-types (1.21)
-    multi_json (1.6.1)
-    multipart-post (1.1.5)
-    nokogiri (1.5.6)
-    rake (10.0.3)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rotp (1.4.1)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    sqlite3 (1.3.7)
-    terminal-table (1.4.5)
-    thor (0.17.0)
-    tzinfo (0.3.35)
-    useragent (0.4.16)
-    webmock (1.9.0)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yard (0.8.4.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  casino_core!
-  coveralls
-  database_cleaner (~> 0.9)
-  factory_girl (~> 4.1)
-  nokogiri (~> 1.5)
-  rake (~> 10.0)
-  rspec (~> 2.12)
-  simplecov (~> 0.7)
-  sqlite3 (~> 1.3)
-  webmock (~> 1.9)
-  yard (~> 0.8)