singularity 0.1.0 → 0.1.1

data/lib/singularity.rb

@@ -1,29 +1,25 @@
 require 'rubygems'
 require 'redis'
 require 'securerandom'
+require 'forwardable'
+require 'singularity/configuration'
 
 module Singularity
-  def self.cattr_accessor(attribute, default = nil)
-    class_variable_set("@@#{attribute}", default)
-    class_eval <<-EOS
-      def self.#{attribute}=(value)
-        @@#{attribute} = value
-      end
+  @config = Configuration.new
 
-      def self.#{attribute}
-        @@#{attribute}
-      end
-    EOS
-  end
+  class << self
+    extend Forwardable
 
-  cattr_accessor :auth_path, "http://authmaster.local:9292/api"
-  cattr_accessor :master, false
-  cattr_accessor :session_prefix, "rack_session"
-  cattr_accessor :profile_prefix, "profile"
-  cattr_accessor :token_prefix, "singularity_session_token"
-  cattr_accessor :warden_user_key, "warden.user.default.key"
+    def configure
+      if block_given?
+        yield @config
+      else
+        @config
+      end
+    end
 
-  class << self
+    def_delegators :@config, :auth_path, :session_prefix, :profile_prefix, :token_prefix, :warden_user_key
+    def_delegators :@config, :auth_path=, :session_prefix=, :profile_prefix=, :token_prefix=, :warden_user_key=
 
     def generate_session_token(session_id, session, options = {})
       if session.key?("_token_expires") && session["_token_expires"].to_i > Time.now.to_i

data/lib/singularity/configuration.rb

@@ -0,0 +1,17 @@
+module Singularity
+  class Configuration
+    attr_accessor :auth_path, :session_prefix, :profile_prefix, :token_prefix, :warden_user_key
+
+    def initialize
+      reset
+    end
+
+    def reset
+      @auth_path       = 'http://localhost:9292'
+      @session_prefix  = 'rack_session'
+      @profile_prefix  = 'profile'
+      @token_prefix    = 'singularity_session_token'
+      @warden_user_key = 'warden.user.default.key'
+    end
+  end
+end

data/lib/singularity/profile.rb

@@ -1,5 +1,6 @@
 require 'redis/hash_key'
 require 'forwardable'
+require 'securerandom'
 require 'singularity/password_hash'
 
 module Singularity
@@ -19,7 +20,7 @@ module Singularity
     def_delegators :profile, :[], :[]=
     def_delegators :profile, :all, :bulk_get, :bulk_set, :each, :empty?, :fetch
     def_delegators :profile, :has_key?, :include?, :incr, :incrby, :key, :key?
-    def_delegators :profile, :keys, :member?, :vals, :values, :clear
+    def_delegators :profile, :keys, :member?, :vals, :values, :clear, :delete
 
     def password_hash
       self['password_hash']

data/lib/singularity/version.rb

@@ -1,3 +1,3 @@
 module Singularity
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/singularity/configuration_spec.rb

@@ -0,0 +1,84 @@
+require 'spec_helper'
+require 'singularity'
+
+describe Singularity do
+  after(:each) { Singularity.configure.reset }
+
+  context 'auth_path' do
+    it "defaults to localhost:9292" do
+      expect( subject.auth_path ).to eq 'http://localhost:9292'
+    end
+
+    it "is writeable" do
+      subject.auth_path = 'http://authmaster.local:8080'
+
+      expect( subject.auth_path ).to eq 'http://authmaster.local:8080'
+    end
+  end
+
+  context 'session_prefix' do
+    it "defaults to rack_session" do
+      expect( subject.session_prefix ).to eq 'rack_session'
+    end
+
+    it "is writeable" do
+      subject.session_prefix = 'foo'
+      expect( subject.session_prefix ).to eq 'foo'
+    end
+  end
+
+  context 'profile_prefix' do
+    it "defaults to profile" do
+      expect( subject.profile_prefix ).to eq 'profile'
+    end
+
+    it "is writeable" do
+      subject.profile_prefix = 'user'
+      expect( subject.profile_prefix ).to eq 'user'
+    end
+  end
+
+  context 'token_prefix' do
+    it "defaults to singularity_session_token" do
+      expect( subject.token_prefix ).to eq 'singularity_session_token'
+    end
+
+    it "is writeable" do
+      subject.token_prefix = 'token'
+      expect( subject.token_prefix ).to eq 'token'
+    end
+  end
+
+  context 'warden_user_key' do
+    it "defaults to warden.user.default.key" do
+      expect( subject.warden_user_key ).to eq 'warden.user.default.key'
+    end
+
+    it "is writeable" do
+      subject.warden_user_key = 'singularity.user'
+      expect( subject.warden_user_key ).to eq 'singularity.user'
+    end
+  end
+
+  context 'configure' do
+    it "returns config object if not given a block" do
+      expect( subject.configure ).to be_a Singularity::Configuration
+    end
+
+    it "accepts a block to set configuration" do
+      subject.configure do |config|
+        config.auth_path       = 'http://foobar.local:8088'
+        config.session_prefix  = 'foo_session'
+        config.profile_prefix  = 'foo_user'
+        config.token_prefix    = 'foo_token'
+        config.warden_user_key = 'foo.user.key'
+      end
+
+      expect( subject.auth_path ).to       eq 'http://foobar.local:8088'
+      expect( subject.session_prefix ).to  eq 'foo_session'
+      expect( subject.profile_prefix ).to  eq 'foo_user'
+      expect( subject.token_prefix ).to    eq 'foo_token'
+      expect( subject.warden_user_key ).to eq 'foo.user.key'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: singularity
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-objects
@@ -100,10 +100,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- lib/singularity/configuration.rb
 - lib/singularity/password_hash.rb
 - lib/singularity/profile.rb
 - lib/singularity/version.rb
 - lib/singularity.rb
+- spec/singularity/configuration_spec.rb
 - spec/singularity/profile_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/lyconic/singularity