jinda 0.2.9 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 264d754d95e434a661ea84d40f5ae63d511c453f6958afe01ac14416ef5f6f81
-  data.tar.gz: 3098a7c6899272c64732071ef9f7a14c701239d50a050655147af2357be7e8f6
+  metadata.gz: 567b8dc24404ca3a968b2d10b839c3a963262f0a8ac1d3467e4c7e26d5bef3dd
+  data.tar.gz: aabeee85f5f36c04842249aba34e28527523dfa1342be37812c2a8cfe1adff25
 SHA512:
-  metadata.gz: e8d576d94a972b908ef23d88a7f615cdf1bdd26a96445c6ff4cebee74c3a00f4ae25521a3d2437eef975b4a4c521aaae96d141052e8a462af3f46a3ec3af0a91
-  data.tar.gz: 0110ece7db8830e11ff8e9105c1744e7bed7a079db2ee2678db42e300b89ef2748229b80dbd588b21c8db37aa74cc28ed019142d98f12cede7945c6c0f7c7c1e
+  metadata.gz: 23f83eec02e541752afc67c5749907621f1987c93f29e442ca89e37154d7bffe6793b15286a7cc0882166ea19e50786e56ae2263587a2d220d2af8bd8f3ccaef
+  data.tar.gz: 55dc1154aeb252884d8291d9e3a214a1b330bbfa28b91e500bf64c48351e64f8c4cdb94307f5967efc0fc6514cf53e31da021c2f33c0e7f08084aa0d052cd4f6

data/README.md

@@ -36,7 +36,7 @@ app without ActiveRecord
 
 ## Add jinda to your Gemfile:
 
-    gem 'jinda', '~> 0.2.9'
+    gem 'jinda', '~> 0.3.0'
 
 For Development (most updated)
 

data/lib/generators/jinda/config_generator.rb

@@ -84,6 +84,7 @@ end
         puts "      To config rspect run:"
         puts "-----------------------------------------\n"
         puts "rails g jinda:rspec\n"
+        puts "run $chromediver for Capybara & Chrome\n"
         puts "-----------------------------------------\n"
         puts "      To config minitest run:"
         puts "-----------------------------------------\n"
@@ -93,7 +94,7 @@ end
         puts "-----------------------------------------\n"
 				puts "Please config. in .env or restore from .env-bak \n"
         puts "-----------------------------------------\n"
-			end
+      end
     end
   end
 end

data/lib/generators/jinda/install_generator.rb

@@ -47,6 +47,7 @@ module Jinda
           gem 'capybara'
 					gem 'selenium-webdriver'
           gem 'rb-fsevent'
+					gem 'valid_attribute'
         end
       end
 

data/lib/generators/jinda/templates/app/models/jinda/user.rb

@@ -1,5 +1,7 @@
 class Jinda::User
   include Mongoid::Document
+	# https://docs.mongodb.com/mongoid/master/tutorials/mongoid-indexes/
+  index({ code: 1 }, { unique: true, name: "code_index" })
   before_create {generate_token(:auth_token)}
   field :provider, :type => String
   field :uid, :type => String
@@ -14,6 +16,9 @@ class Jinda::User
 
   belongs_to :identity, :polymorphic => true, :optional => true
   has_many :xmains, :class_name => "Jinda::Xmain"
+  validates :code,
+		presence: true,
+		uniqueness: true
 
   ## Add to create forgot password
   def generate_token(column)

data/lib/generators/jinda/templates/app/views/jinda/index.html.haml

@@ -20,7 +20,7 @@
 
 %h2 Installation
 %ul
-  %li add gem 'jinda', '0.2.9'
+  %li add gem 'jinda', '0.3.0'
   %li bundle
   %li rails generate jinda:install
   %li bundle

data/lib/generators/jinda/templates/spec/controllers/sessions_controller_spec.rb

@@ -1,22 +1,21 @@
-# essions_controller_spec.rb
-require 'spec_helper'
-
+# sessions_controller_spec.rb
+# 1. Set up the mock
+# 2. Make the request
+# 3. Test whatever code is attached to the callback
+# require 'spec_helper'
+require 'rails_helper'
 describe SessionsController do
 
 	describe "Google" do
 
 		before do
+	
 			request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:google_oauth2]
+			visit '/auth/google_oauth2'
 		end
 
 		describe "#create" do
 
-			it "should successfully create a user" do
-				expect {
-					post :create, params: {provider: :google_oauth2}
-				}.to change{ Jinda::User.count }.by(1)
-			end
-
 			it "should successfully create a session" do
 				session[:user_id].should be_nil
 				post :create, params: {provider: :google_oauth2}
@@ -54,16 +53,11 @@ describe SessionsController do
 
 		before do
 			request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:facebook]
+			visit '/auth/facebook'
 		end
 
 		describe "#create" do
 
-			it "should successfully create a user" do
-				expect {
-					post :create, params: {provider: :facebook}
-				}.to change{ Jinda::User.count }.by(1)
-			end
-
 			it "should successfully create a session" do
 				session[:user_id].should be_nil
 				post :create, params: {provider: :facebook}

data/lib/generators/jinda/templates/spec/features/userlogins_spec.rb

@@ -5,7 +5,7 @@ RSpec.feature "Userlogins", type: :feature do
     visit "/sessions/new"
 
     fill_in "User name", :with => "admin"
-    fill_in "Password", :with => "secret"
+    fill_in "Password", :with => "secret1"
     click_button "Sign In"
 
     expect(page).to have_text("My Articles")

data/lib/generators/jinda/templates/spec/models/user_spec.rb

@@ -0,0 +1,12 @@
+require 'rails_helper'
+
+RSpec.describe "Jinda::User", :type => :model do
+  it "prevents duplicates " do
+		user1 = create(:user, code: 'abc', email: 'test@email.com')
+		user2 = build(:user, code: 'abc', email: 'test@email.com')
+
+		user1.should be_valid
+		#user2.should be_valid
+		user2.should_not  have_valid(:code)
+	end
+end

data/lib/generators/jinda/templates/spec/spec_helper.rb

@@ -2,54 +2,10 @@
 # spec_helper.rb
 require 'rubygems'
 require 'capybara/rspec' 
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-  OmniAuth.config.test_mode = true
-  omniauth_hash = { 'provider' => 'google_oauth2',
-                    'uid' => '105362273761620533373',
-                    'info' => {
-                        'name' => 'Kulsoft',
-                        'email' => 'kulsoft.net@gmail.com',
-                        'nickname' => 'kulsoft'
-                    },
-                    'extra' => {'raw_info' =>
-                                    { 'location' => 'San Francisco',
-                                      'gravatar_id' => '123456789'
-                                    }
-                    }
-  }
-  OmniAuth.config.add_mock(:google_oauth2, omniauth_hash)
+# Set up the mock  
+require 'support/omniauth_macros'
+require 'valid_attribute'
 
-  omniauth_hash = { 'provider' => 'facebook',
-                    'uid' => '105362273761620533373',
-                    'info' => {
-                      'name' => 'Peter Colling',
-                      'email' => '1.0@kul.asia',
-                      'nickname' => 'Peter C'
-                      },
-                    'extra' => {'raw_info' =>
-                      {'location' => 'LA',
-                      'gravatar_id' => '13'
-                      }
-                    } 
-                  } 
-  OmniAuth.config.add_mock(:facebook, omniauth_hash)
-  
-
-###########################################################################################
-# This file was generated by the `rails generate rspec:install` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   # config.include SpecTestHelper, :type => :controller
@@ -63,8 +19,15 @@ RSpec.configure do |config|
   config.shared_context_metadata_behavior = :apply_to_host_groups
 
 # https://github.com/DatabaseCleaner/database_cleaner #
-
   config.use_transactional_fixtures = false
+	# https://stackoverflow.com/questions/15148585/undefined-method-visit-when-using-rspec-and-capybara-in-rails
+	config.include Capybara::DSL
+
+	# https://stackoverflow.com/questions/21445164/set-chrome-as-default-browser-for-rspec-capybara/30551595
+	Capybara.register_driver :chrome do |app|
+		  Capybara::Selenium::Driver.new(app, :browser => :chrome)
+	end
+	Capybara.javascript_driver = :chrome
 
   config.before(:suite) do
     if config.use_transactional_fixtures?

data/lib/generators/jinda/templates/spec/support/factory_bot.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory "Jinda/User"  do
+  factory :user, class: Jinda::User  do
     code {"Tester"}
     email {"tester@test.comm"}
   end

data/lib/jinda/version.rb

@@ -1,3 +1,3 @@
 module Jinda
-	VERSION = "0.2.9"
+	VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jinda
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
 platform: ruby
 authors:
 - Prateep Kul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -429,7 +429,7 @@ files:
 - lib/generators/jinda/templates/seeds.rb
 - lib/generators/jinda/templates/spec/controllers/sessions_controller_spec.rb
 - lib/generators/jinda/templates/spec/features/userlogins_spec.rb
-- lib/generators/jinda/templates/spec/models/user_spec.rbx
+- lib/generators/jinda/templates/spec/models/user_spec.rb
 - lib/generators/jinda/templates/spec/rails_helper.rb
 - lib/generators/jinda/templates/spec/spec_helper.rb
 - lib/generators/jinda/templates/spec/support/factory_bot.rb

data/lib/generators/jinda/templates/spec/models/user_spec.rbx

@@ -1,30 +0,0 @@
-require 'rails_helper'
-
-# RSpec.describe "Jinda::User", :type => :model do
-RSpec.describe "Jinda/User", :type => :model do
-
-  before(:all) do
-    @user1 = create "Jinda/User"
-  end
-
-  it "has a unique code name" do
-    user2 = build("Jinda/User", code: "tester", email: "tester@test.com")
-    expect(user2).to be_valid
-  end
-
-  it "is valid with valid attributes" do
-    expect(@user1).to be_valid
-  end
-
-  xit "is not valid without a code" do 
-    user2 = build("Jinda/User", code: nil)
-    expect(user2).to_not be_valid
-  end
-  
-  xit "is not valid without an email" do
-    user2 = build("Jinda/User", email: nil)
-    expect(user2).to_not be_valid
-  end
-
-end
-