kf5 0.2.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a37d016acb7b368be42ddba7b061c5a7b60ef871
-  data.tar.gz: bd1a96be69ea75a75893dcd5dca8f4e5a5ce6c40
+  metadata.gz: 29dc0e29988f56fa9b40dc51e8c6401d3742bc8e
+  data.tar.gz: 81c05d4b48dfb389319fc2be05b326878004e9ca
 SHA512:
-  metadata.gz: 89fd394684e5e7866c227ce912193b7d8aa4432ed98a535121bd7df0332e02ad2fd23c99f2dde6238fcdcd526dc3f9d5c18a0d4acfc5c6a43e93887dd89fde2e
-  data.tar.gz: 39d42976e766e536374ea9cdeb2b1ebd821c1722fea8569b60e04ef47106262520aded37e8ffc5820355569fb969dee1b114b3e95671cb5ce67163f330e07eef
+  metadata.gz: 37b2772be1712255bd61b193f33d95c048f308bcc43bb4a64ce0007b312947bce02cffe6ef58c8adca114453dc72b7c1deb44603727adc0dacff67d6ec93f08f
+  data.tar.gz: b7d2b348205228468bee86c05b7cd0bc7aab4b0c664e70bc98d8b8bcb2222a317444b116d4eee6f4d2b8179c9d516ceb88878bdc4de4f432bcaa50899ce4a0c8

data/.travis.yml

@@ -2,3 +2,8 @@ language: ruby
 rvm:
   - 2.2.2
 before_install: gem install bundler
+branches:
+  only:
+    - master
+env:
+  - COVERALLS=1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# v0.3.2 / 2015-10-30
+
+* Fixed wrong namespace.
+
+# v0.3.0 / 2015-10-19
+
+* Add sso option with redirect.
+* Add remember_me configuration.
+* Add photo property.
+
 # v0.2.1 / 2015-09-22
 
 * update kf5.js

data/README.md

@@ -26,9 +26,11 @@ For rails, create config `config/initializers/kf5.rb`
 KF5.configure do |config|
   config.key = "your key of KF5 service"
   config.domain = "your domain of KF5 service"
+  # 1: login for 30 days, 0: login for 30 minutes
+  # config.remember_me = 1
 
   # if you use devise, it will fetch following information from current_user if exsit
-  # default is :username, this is identification
+  # default is :username, this is identification with email format
   config.properties.username = :your_username_column
 
   # default is :name, optional
@@ -36,6 +38,9 @@ KF5.configure do |config|
 
   # default is :phone, optional
   config.properties.phone = :your_phone_column
+
+  # default is :photo, optional
+  config.properties.photo = :your_photo_column
 end
 ```
 
@@ -52,6 +57,10 @@ Or you can assaign arguments manaully
 ```ruby
 redirect_to_kf5 :username => 'username' # others....
 ```
+Or you do not want to sso
+```ruby
+redirect_to_kf5 :sso => false
+```
 
 In view, you can use `kf5_tag` to include javascript plugin.
 ```ruby

data/kf5.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "actionview"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rspec-its"
 end

data/lib/kf5.rb

@@ -6,8 +6,12 @@ require "kf5/configuration"
 require "kf5/properties"
 require "kf5/helper"
 require "kf5/view_helper"
+require "kf5/controller_helper"
+require "kf5/engine"
 
 module KF5
+  Columns = [:username, :name, :phone, :photo]
+
   def self.configure(&block)
     yield configuration
   end
@@ -15,18 +19,4 @@ module KF5
   def self.configuration
     @configuration ||= Configuration.new
   end
-
-  if defined?(::Rails::Engine)
-    class Engine < ::Rails::Engine
-      initializer "kf5" do
-        ActiveSupport.on_load :action_controller do
-          include KF5::Helper
-        end
-        ActiveSupport.on_load :action_view do
-          include KF5::ViewHelper
-        end
-        Rails.application.config.assets.precompile += %w( kf5.js )
-      end
-    end
-  end
 end

data/lib/kf5/configuration.rb

@@ -1,7 +1,7 @@
 module KF5
   class Configuration
     attr_reader :properties
-    attr_accessor :key, :domain
+    attr_accessor :key, :domain, :remember_me
 
     def initialize(options = {})
       options.each { |key, value| 

data/lib/kf5/controller_helper.rb

@@ -0,0 +1,49 @@
+module KF5
+  module ControllerHelper
+    def kf5_url(options = {})
+      username = Helper.indifferent_access(options, :username)
+      time = Time.now.to_i
+      token = Digest::MD5.hexdigest "#{username}#{time}#{KF5.configuration.key}"
+
+      params = {
+        :username => username,
+        :time => time,
+        :token => token
+      }
+      options[:rememberMe] = Helper.indifferent_access(options, :remember_me) || KF5.configuration.remember_me
+      options[:rememberMe] = KF5.configuration.remember_me unless 
+      [:name, :phone, :return_to, :photo, :rememberMe].each do |key|
+        Helper.copy_if_exist(options, params, key)
+      end
+
+      query = URI.encode_www_form(params)
+      "https://#{KF5.configuration.domain}.kf5.com/user/remote?#{query}"
+    end
+
+    def redirect_to_kf5(options = {})
+      if Helper.indifferent_access(options, :sso) == false
+        redirect_to "https://#{KF5.configuration.domain}.kf5.com/"
+      else
+        redirect_to current_user_kf5_url(options)
+      end
+    end
+
+    private
+
+    def current_user_kf5_url(options = {})
+      kf5_url(current_user_kf5_options.merge(options))
+    end
+
+    def current_user_kf5_options
+      options = {}
+      return options unless respond_to? :current_user
+      [:username, :name, :phone, :photo].each { |key| 
+        property = KF5.configuration.properties.send(key)
+        next if property.nil? || !current_user.respond_to?(property)
+        value = current_user.send(property)
+        options[key] = value unless value.nil?
+      }
+      options
+    end
+  end
+end

data/lib/kf5/engine.rb

@@ -0,0 +1,15 @@
+if defined?(::Rails::Engine)
+  module KF5
+    class Engine < ::Rails::Engine
+      initializer "kf5" do
+        ActiveSupport.on_load :action_controller do
+          include KF5::ControllerHelper
+        end
+        ActiveSupport.on_load :action_view do
+          include KF5::ViewHelper
+        end
+        Rails.application.config.assets.precompile += %w( kf5.js )
+      end
+    end
+  end
+end

data/lib/kf5/helper.rb

@@ -1,45 +1,5 @@
 module KF5
   module Helper
-    def kf5_url(options)
-      username = Helper.indifferent_access(options, :username)
-      time = Time.now.to_i
-      token = Digest::MD5.hexdigest "#{username}#{time}#{KF5.configuration.key}"
-
-      params = {
-        :username => username,
-        :time => time,
-        :token => token
-      }
-      Helper.copy_if_exist(options, params, :name)
-      Helper.copy_if_exist(options, params, :phone)
-      Helper.copy_if_exist(options, params, :return_to)
-
-      query = URI.encode_www_form(params)
-      "https://#{KF5.configuration.domain}.kf5.com/user/remote?#{query}"
-    end
-
-    def redirect_to_kf5(options = {})
-      redirect_to current_user_kf5_url(options)
-    end
-
-    private
-
-    def current_user_kf5_url(options = {})
-      kf5_url(current_user_kf5_options.merge(options))
-    end
-
-    def current_user_kf5_options
-      options = {}
-      return options unless respond_to? :current_user
-      [:username, :name, :phone].each { |key| 
-        property = KF5.configuration.properties.send(key)
-        next if property.nil? || !current_user.respond_to?(property)
-        value = current_user.send(property)
-        options[key] = value unless value.nil?
-      }
-      options
-    end
-
     def self.indifferent_access(hash, key)
       hash[key.to_s] || hash[key.to_sym]
     end

data/lib/kf5/properties.rb

@@ -1,6 +1,6 @@
 module KF5
   class Properties
-    attr_accessor :username, :name, :phone
+    attr_accessor :username, :name, :phone, :photo
 
     def initialize(options = {})
       @username = :username

data/lib/kf5/version.rb

@@ -1,3 +1,3 @@
 module KF5
-  VERSION = "0.2.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kf5
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Chen Yi-Cyuan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -78,7 +92,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -86,6 +99,8 @@ files:
 - kf5.gemspec
 - lib/kf5.rb
 - lib/kf5/configuration.rb
+- lib/kf5/controller_helper.rb
+- lib/kf5/engine.rb
 - lib/kf5/helper.rb
 - lib/kf5/properties.rb
 - lib/kf5/version.rb