fluentd-ui 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b0f1b68a4e226bf802f55f575819573167d0a07
-  data.tar.gz: 2dc75b1106dc8043fd4e6f90ca2e464265fecdff
+  metadata.gz: f2bd1ea18819e32b9455400f25a12171bbac521d
+  data.tar.gz: b1bce06af9405bdaf2ec28da59633a09306bc4b2
 SHA512:
-  metadata.gz: b3a5a339fbed830c5ece5f51c624673dac914cb7989769ba717a55b8695efec0acb59411746be05f78c4fe18d4e5861cb7e86d8dc822b94f0cf40f75c2e85a7c
-  data.tar.gz: 20799f4df412c8e75568a727ebdbe5fd6c3ee410f9ee896ea1b311ea3d3b3c3bcbcb657a5b2f57d5e27d3fd17e1ec410b0f3023b3cb5cac72758b95c5dcc44ee
+  metadata.gz: 9f55f9200efb1ae1144ccce419169d3984e649526280928f4d1ab999494eed28078b33acbbac0a2680b542d4ca0dc95d4ff5f1a7b7a4eae664e03bf2066ab6f4
+  data.tar.gz: aee4e40d091ac025b15bb6cecdfd3b9d323977c6b4cb605591930a03c2e1f3ead755a8708f43076f855bf847526379f02526348c71b20712d13990c765d50ec0

data/ChangeLog

@@ -1,3 +1,7 @@
+Release 0.3.20 - 2015/04/10
+* [fixed] #175 Fix the bug password can be changed without match between new password and password confirmation.
+* [fixed] #177 Use '0.0.0.0' as host not 'localhost' (If you want to change host, you can use `--host` option with `start` command)
+
 Release 0.3.19 - 2015/04/08
 * [maintenance] #170 Update some gems
 * [maintenance] #171 Update Rails to 4.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluentd-ui (0.3.19)
+    fluentd-ui (0.3.20)
       addressable
       bundler
       diff-lcs

data/app/controllers/users_controller.rb

@@ -1,5 +1,5 @@
 class UsersController < ApplicationController
-  before_action :find_user
+  before_action :set_user
 
   def show
   end
@@ -14,7 +14,7 @@ class UsersController < ApplicationController
 
   private
 
-  def find_user
+  def set_user
     @user = User.new(name: session[:user_name])
   end
 

data/app/models/user.rb

@@ -57,7 +57,9 @@ class User
   end
 
   def valid_password_confirmation
-    password == password_confirmation
+    if password != password_confirmation
+      errors.add(:password, :confirmation, attribute: User.human_attribute_name(:password_confirmation))
+    end
   end
 
   def stretching_cost

data/lib/fluentd-ui/command.rb

@@ -10,13 +10,14 @@ module FluentdUI
     option :port, type: :numeric, default: 9292
     option :pidfile, type: :string, default: File.expand_path('tmp/fluentd-ui.pid', ROOT)
     option :daemonize, type: :boolean, default: false
+    option :host, type: :string, default: '0.0.0.0'
     def start
       trap(:INT) { puts "\nStopping..." }
       # NOTE: on Debian based distributions, td-agent uses start-stop-daemon with --exec option for stopping process
       #       then fluentd-ui will be killed by them because given --exec option matches.
       #       FLUENTD_UI_EXEC_COMMAND is used for workaround it.
       cmd = ENV['FLUENTD_UI_EXEC_COMMAND'].presence || "rackup"
-      system(* %w(bundle exec) + cmd.split(" ") + %W(#{options[:daemonize] ? "-D" : ""} --pid #{options[:pidfile]} -p #{options[:port]} -E production #{ROOT}/config.ru))
+      system(* %w(bundle exec) + cmd.split(" ") + %W(#{options[:daemonize] ? "-D" : ""} --pid #{options[:pidfile]} -p #{options[:port]} --host #{options[:host]} -E production #{ROOT}/config.ru))
     end
 
 

data/lib/fluentd-ui/version.rb

@@ -1,3 +1,3 @@
 module FluentdUI
-  VERSION = "0.3.19"
+  VERSION = "0.3.20"
 end

data/spec/features/sessions_spec.rb

@@ -43,7 +43,7 @@ describe "sessions" do
 
     after do
       # reset password to the default
-      FileUtils.rm_rf(User::ENCRYPTED_PASSWORD_FILE)
+      FileUtils.rm_f(User::ENCRYPTED_PASSWORD_FILE)
     end
 
     context "correct password" do

data/spec/features/users_spec.rb

@@ -1,9 +1,53 @@
 require "spec_helper"
 
 describe "users" do
-  describe "edit" do
+  describe "visit edit page before login" do
     let(:url) { user_path }
     it_should_behave_like "login required"
   end
 
+  describe "edit" do
+    let!(:user) { build(:user) }
+
+    before do
+      login_with user
+    end
+
+    after do
+      # reset password to the default
+      FileUtils.rm_f(User::ENCRYPTED_PASSWORD_FILE)
+    end
+
+    describe 'to change password' do
+      let(:current_password) { user.password }
+      let(:password) { 'new_password' }
+
+      before do
+        visit user_path
+        fill_in 'user[current_password]', with: current_password
+
+        fill_in 'user[password]', with: password
+        fill_in 'user[password_confirmation]', with: password_confirmation
+        click_button I18n.t("terms.update_password")
+      end
+
+      context 'when valid new password/confirmation is input' do
+        let(:password_confirmation) { password }
+
+        it 'should update users password with new password' do
+          expect(page).to have_css('.alert-success')
+          expect(user.stored_digest).to eq user.digest(password)
+        end
+      end
+
+      context 'when invalid new password/confirmation is input' do
+        let(:password_confirmation) { 'invalid_password' }
+
+        it 'should not update users password with new password' do
+          expect(page).to have_css('.alert-danger')
+          expect(user.stored_digest).to eq user.digest(current_password)
+        end
+      end
+    end
+  end
 end

data/spec/models/user_spec.rb

@@ -4,11 +4,55 @@ describe User do
   let(:user) { build(:user) }
 
   describe "#valid?" do
+    subject { user.valid? }
+
     describe "password" do
-      it "password != password_confirmation is invalid" do
-        user.password = "a"
-        user.password_confirmation = "b"
-        user.should_not be_valid
+      before do
+        user.current_password = current_password
+        user.password = password
+        user.password_confirmation = password_confirmation
+      end
+
+      context 'when current_password is correct' do
+        let(:current_password) { user.password }
+
+        context 'when password/confirmation is 8 characters' do
+          let(:password) { 'a' * 8 }
+          let(:password_confirmation) { password }
+
+          it { should be_truthy }
+        end
+
+        context 'when password is 7 characters' do
+          let(:password) { 'a' * 7 }
+          let(:password_confirmation) { password }
+
+          it 'should return false' do
+            should be_falsey
+            user.errors.keys.should == [:password]
+          end
+        end
+
+        context 'when password != password_confirmation' do
+          let(:password) { 'a' * 8 }
+          let(:password_confirmation) { 'b' * 8 }
+
+          it 'should return false' do
+            should be_falsey
+            user.errors.keys.should == [:password]
+          end
+        end
+      end
+
+      context 'when current_password is wrong' do
+        let(:current_password) { 'invalid_password' }
+        let(:password) { 'a' * 8 }
+        let(:password_confirmation) { password }
+
+        it 'should return false' do
+          should be_falsey
+          user.errors.keys.should == [:current_password]
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluentd-ui
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
 platform: ruby
 authors:
 - Masahiro Nakagawa
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd