we_bridge_rails_engine_orgs 0.1.15 → 0.1.16

data/spec/models/org_member_spec.rb

@@ -50,4 +50,26 @@ RSpec.describe OrgMember, type: :model do
       expect(res.count).to eq(0)
     end
   end
+
+  context "#text.names" do
+    before do
+      @fn = "family"
+      @gn = "given"
+      @l = Lang.create!(code: 'xx',east: true)
+      @member = OrgMember.create!(org_id: @org.id, entried_on: Time.now-10, retired_on: Time.now)
+      t = @member.text(@l.code)
+      t.family_name = @fn
+      t.given_name  = @gn
+      t.save!
+    end
+
+    it "east" do
+      expect(@member.text(@l.code).names).to eq([@fn,@gn])
+    end
+
+    it "west" do
+      @l.update(east: false)
+      expect(@member.text(@l.code).names).to eq([@gn,@fn])
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: we_bridge_rails_engine_orgs
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Shinjiro Itagaki
@@ -201,7 +201,6 @@ files:
 - app/assets/javascripts/org_department_positions.js
 - app/assets/javascripts/org_departments.js
 - app/assets/javascripts/org_director_types.js
-- app/assets/javascripts/org_directors.js
 - app/assets/javascripts/org_member_tags.js
 - app/assets/javascripts/org_member_types.js
 - app/assets/javascripts/org_members.js
@@ -211,7 +210,6 @@ files:
 - app/assets/stylesheets/org_department_positions.css
 - app/assets/stylesheets/org_departments.css
 - app/assets/stylesheets/org_director_types.css
-- app/assets/stylesheets/org_directors.css
 - app/assets/stylesheets/org_member_tags.css
 - app/assets/stylesheets/org_member_types.css
 - app/assets/stylesheets/org_members.css
@@ -224,7 +222,6 @@ files:
 - app/controllers/org_department_positions_controller.rb
 - app/controllers/org_departments_controller.rb
 - app/controllers/org_director_types_controller.rb
-- app/controllers/org_directors_controller.rb
 - app/controllers/org_member_tags_controller.rb
 - app/controllers/org_member_types_controller.rb
 - app/controllers/org_members_controller.rb
@@ -234,7 +231,6 @@ files:
 - app/helpers/org_department_positions_helper.rb
 - app/helpers/org_departments_helper.rb
 - app/helpers/org_director_types_helper.rb
-- app/helpers/org_directors_helper.rb
 - app/helpers/org_member_tags_helper.rb
 - app/helpers/org_member_types_helper.rb
 - app/helpers/org_members_helper.rb
@@ -296,10 +292,6 @@ files:
 - app/views/org_director_types/index.html.builder
 - app/views/org_director_types/new.html.builder
 - app/views/org_director_types/show.html.builder
-- app/views/org_directors/edit.html.builder
-- app/views/org_directors/index.html.builder
-- app/views/org_directors/new.html.builder
-- app/views/org_directors/show.html.builder
 - app/views/org_member_tags/edit.html.builder
 - app/views/org_member_tags/index.html.builder
 - app/views/org_member_tags/new.html.builder
@@ -339,7 +331,6 @@ files:
 - spec/controllers/org_department_positions_controller_spec.rb
 - spec/controllers/org_departments_controller_spec.rb
 - spec/controllers/org_director_types_controller_spec.rb
-- spec/controllers/org_directors_controller_spec.rb
 - spec/controllers/org_member_tags_controller_spec.rb
 - spec/controllers/org_member_types_controller_spec.rb
 - spec/controllers/org_members_controller_spec.rb
@@ -498,7 +489,6 @@ files:
 - spec/factories/org_department_positions.rb
 - spec/factories/org_departments.rb
 - spec/factories/org_director_types.rb
-- spec/factories/org_directors.rb
 - spec/factories/org_member_tags.rb
 - spec/factories/org_member_types.rb
 - spec/factories/org_members.rb
@@ -508,7 +498,6 @@ files:
 - spec/helpers/org_department_positions_helper_spec.rb
 - spec/helpers/org_departments_helper_spec.rb
 - spec/helpers/org_director_types_helper_spec.rb
-- spec/helpers/org_directors_helper_spec.rb
 - spec/helpers/org_member_tags_helper_spec.rb
 - spec/helpers/org_member_types_helper_spec.rb
 - spec/helpers/org_members_helper_spec.rb
@@ -529,7 +518,6 @@ files:
 - spec/routing/org_department_positions_routing_spec.rb
 - spec/routing/org_departments_routing_spec.rb
 - spec/routing/org_director_types_routing_spec.rb
-- spec/routing/org_directors_routing_spec.rb
 - spec/routing/org_member_tags_routing_spec.rb
 - spec/routing/org_member_types_routing_spec.rb
 - spec/routing/org_members_routing_spec.rb
@@ -555,10 +543,6 @@ files:
 - spec/views/org_director_types/index.html.builder_spec.rb
 - spec/views/org_director_types/new.html.builder_spec.rb
 - spec/views/org_director_types/show.html.builder_spec.rb
-- spec/views/org_directors/edit.html.builder_spec.rb
-- spec/views/org_directors/index.html.builder_spec.rb
-- spec/views/org_directors/new.html.builder_spec.rb
-- spec/views/org_directors/show.html.builder_spec.rb
 - spec/views/org_member_tags/edit.html.builder_spec.rb
 - spec/views/org_member_tags/index.html.builder_spec.rb
 - spec/views/org_member_tags/new.html.builder_spec.rb
@@ -607,7 +591,6 @@ test_files:
 - spec/controllers/org_department_positions_controller_spec.rb
 - spec/controllers/org_departments_controller_spec.rb
 - spec/controllers/org_director_types_controller_spec.rb
-- spec/controllers/org_directors_controller_spec.rb
 - spec/controllers/org_member_tags_controller_spec.rb
 - spec/controllers/org_member_types_controller_spec.rb
 - spec/controllers/org_members_controller_spec.rb
@@ -766,7 +749,6 @@ test_files:
 - spec/factories/org_department_positions.rb
 - spec/factories/org_departments.rb
 - spec/factories/org_director_types.rb
-- spec/factories/org_directors.rb
 - spec/factories/org_member_tags.rb
 - spec/factories/org_member_types.rb
 - spec/factories/org_members.rb
@@ -776,7 +758,6 @@ test_files:
 - spec/helpers/org_department_positions_helper_spec.rb
 - spec/helpers/org_departments_helper_spec.rb
 - spec/helpers/org_director_types_helper_spec.rb
-- spec/helpers/org_directors_helper_spec.rb
 - spec/helpers/org_member_tags_helper_spec.rb
 - spec/helpers/org_member_types_helper_spec.rb
 - spec/helpers/org_members_helper_spec.rb
@@ -797,7 +778,6 @@ test_files:
 - spec/routing/org_department_positions_routing_spec.rb
 - spec/routing/org_departments_routing_spec.rb
 - spec/routing/org_director_types_routing_spec.rb
-- spec/routing/org_directors_routing_spec.rb
 - spec/routing/org_member_tags_routing_spec.rb
 - spec/routing/org_member_types_routing_spec.rb
 - spec/routing/org_members_routing_spec.rb
@@ -823,10 +803,6 @@ test_files:
 - spec/views/org_director_types/index.html.builder_spec.rb
 - spec/views/org_director_types/new.html.builder_spec.rb
 - spec/views/org_director_types/show.html.builder_spec.rb
-- spec/views/org_directors/edit.html.builder_spec.rb
-- spec/views/org_directors/index.html.builder_spec.rb
-- spec/views/org_directors/new.html.builder_spec.rb
-- spec/views/org_directors/show.html.builder_spec.rb
 - spec/views/org_member_tags/edit.html.builder_spec.rb
 - spec/views/org_member_tags/index.html.builder_spec.rb
 - spec/views/org_member_tags/new.html.builder_spec.rb

data/app/assets/javascripts/org_directors.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

data/app/assets/stylesheets/org_directors.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/

data/app/controllers/org_directors_controller.rb

@@ -1,5 +0,0 @@
-class OrgDirectorsController < ApplicationController
-  include WeBridge::AutoViewHelper::Controller
-  set_model OrgDirector
-  include OrgCommon
-end

data/app/helpers/org_directors_helper.rb

@@ -1,2 +0,0 @@
-module OrgDirectorsHelper
-end

data/app/views/org_directors/edit.html.builder

@@ -1 +0,0 @@
-render('common/edit')

data/app/views/org_directors/index.html.builder

@@ -1 +0,0 @@
-render('common/index')

data/app/views/org_directors/new.html.builder

@@ -1 +0,0 @@
-render('common/new')

data/app/views/org_directors/show.html.builder

@@ -1 +0,0 @@
-render('common/show')

data/spec/controllers/org_directors_controller_spec.rb

@@ -1,159 +0,0 @@
-require 'rails_helper'
-
-# This spec was generated by rspec-rails when you ran the scaffold generator.
-# It demonstrates how one might use RSpec to specify the controller code that
-# was generated by Rails when you ran the scaffold generator.
-#
-# It assumes that the implementation code is generated by the rails scaffold
-# generator.  If you are using any extension libraries to generate different
-# controller code, this generated spec may or may not pass.
-#
-# It only uses APIs available in rails and/or rspec-rails.  There are a number
-# of tools you can use to make these specs even more expressive, but we're
-# sticking to rails and rspec-rails APIs to keep things simple and stable.
-#
-# Compared to earlier versions of this generator, there is very limited use of
-# stubs and message expectations in this spec.  Stubs are only used when there
-# is no simpler way to get a handle on the object needed for the example.
-# Message expectations are only used when there is no simpler way to specify
-# that an instance is receiving a specific message.
-
-RSpec.describe OrgDirectorsController, type: :controller do
-
-  # This should return the minimal set of attributes required to create a valid
-  # OrgDirector. As you add validations to OrgDirector, be sure to
-  # adjust the attributes here as well.
-  let(:valid_attributes) {
-    skip("Add a hash of attributes valid for your model")
-  }
-
-  let(:invalid_attributes) {
-    skip("Add a hash of attributes invalid for your model")
-  }
-
-  # This should return the minimal set of values that should be in the session
-  # in order to pass any filters (e.g. authentication) defined in
-  # OrgDirectorsController. Be sure to keep this updated too.
-  let(:valid_session) { {} }
-
-  describe "GET #index" do
-    it "assigns all org_directors as @org_directors" do
-      org_director = OrgDirector.create! valid_attributes
-      get :index, {}, valid_session
-      expect(assigns(:org_directors)).to eq([org_director])
-    end
-  end
-
-  describe "GET #show" do
-    it "assigns the requested org_director as @org_director" do
-      org_director = OrgDirector.create! valid_attributes
-      get :show, {:id => org_director.to_param}, valid_session
-      expect(assigns(:org_director)).to eq(org_director)
-    end
-  end
-
-  describe "GET #new" do
-    it "assigns a new org_director as @org_director" do
-      get :new, {}, valid_session
-      expect(assigns(:org_director)).to be_a_new(OrgDirector)
-    end
-  end
-
-  describe "GET #edit" do
-    it "assigns the requested org_director as @org_director" do
-      org_director = OrgDirector.create! valid_attributes
-      get :edit, {:id => org_director.to_param}, valid_session
-      expect(assigns(:org_director)).to eq(org_director)
-    end
-  end
-
-  describe "POST #create" do
-    context "with valid params" do
-      it "creates a new OrgDirector" do
-        expect {
-          post :create, {:org_director => valid_attributes}, valid_session
-        }.to change(OrgDirector, :count).by(1)
-      end
-
-      it "assigns a newly created org_director as @org_director" do
-        post :create, {:org_director => valid_attributes}, valid_session
-        expect(assigns(:org_director)).to be_a(OrgDirector)
-        expect(assigns(:org_director)).to be_persisted
-      end
-
-      it "redirects to the created org_director" do
-        post :create, {:org_director => valid_attributes}, valid_session
-        expect(response).to redirect_to(OrgDirector.last)
-      end
-    end
-
-    context "with invalid params" do
-      it "assigns a newly created but unsaved org_director as @org_director" do
-        post :create, {:org_director => invalid_attributes}, valid_session
-        expect(assigns(:org_director)).to be_a_new(OrgDirector)
-      end
-
-      it "re-renders the 'new' template" do
-        post :create, {:org_director => invalid_attributes}, valid_session
-        expect(response).to render_template("new")
-      end
-    end
-  end
-
-  describe "PUT #update" do
-    context "with valid params" do
-      let(:new_attributes) {
-        skip("Add a hash of attributes valid for your model")
-      }
-
-      it "updates the requested org_director" do
-        org_director = OrgDirector.create! valid_attributes
-        put :update, {:id => org_director.to_param, :org_director => new_attributes}, valid_session
-        org_director.reload
-        skip("Add assertions for updated state")
-      end
-
-      it "assigns the requested org_director as @org_director" do
-        org_director = OrgDirector.create! valid_attributes
-        put :update, {:id => org_director.to_param, :org_director => valid_attributes}, valid_session
-        expect(assigns(:org_director)).to eq(org_director)
-      end
-
-      it "redirects to the org_director" do
-        org_director = OrgDirector.create! valid_attributes
-        put :update, {:id => org_director.to_param, :org_director => valid_attributes}, valid_session
-        expect(response).to redirect_to(org_director)
-      end
-    end
-
-    context "with invalid params" do
-      it "assigns the org_director as @org_director" do
-        org_director = OrgDirector.create! valid_attributes
-        put :update, {:id => org_director.to_param, :org_director => invalid_attributes}, valid_session
-        expect(assigns(:org_director)).to eq(org_director)
-      end
-
-      it "re-renders the 'edit' template" do
-        org_director = OrgDirector.create! valid_attributes
-        put :update, {:id => org_director.to_param, :org_director => invalid_attributes}, valid_session
-        expect(response).to render_template("edit")
-      end
-    end
-  end
-
-  describe "DELETE #destroy" do
-    it "destroys the requested org_director" do
-      org_director = OrgDirector.create! valid_attributes
-      expect {
-        delete :destroy, {:id => org_director.to_param}, valid_session
-      }.to change(OrgDirector, :count).by(-1)
-    end
-
-    it "redirects to the org_directors list" do
-      org_director = OrgDirector.create! valid_attributes
-      delete :destroy, {:id => org_director.to_param}, valid_session
-      expect(response).to redirect_to(org_directors_url)
-    end
-  end
-
-end

data/spec/factories/org_directors.rb

@@ -1,6 +0,0 @@
-FactoryGirl.define do
-  factory :org_director do
-    
-  end
-
-end

data/spec/helpers/org_directors_helper_spec.rb

@@ -1,15 +0,0 @@
-require 'rails_helper'
-
-# Specs in this file have access to a helper object that includes
-# the OrgDirectorsHelper. For example:
-#
-# describe OrgDirectorsHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       expect(helper.concat_strings("this","that")).to eq("this that")
-#     end
-#   end
-# end
-RSpec.describe OrgDirectorsHelper, type: :helper do
-  pending "add some examples to (or delete) #{__FILE__}"
-end

data/spec/routing/org_directors_routing_spec.rb

@@ -1,39 +0,0 @@
-require "rails_helper"
-
-RSpec.describe OrgDirectorsController, type: :routing do
-  describe "routing" do
-
-    it "routes to #index" do
-      expect(:get => "/org_directors").to route_to("org_directors#index")
-    end
-
-    it "routes to #new" do
-      expect(:get => "/org_directors/new").to route_to("org_directors#new")
-    end
-
-    it "routes to #show" do
-      expect(:get => "/org_directors/1").to route_to("org_directors#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      expect(:get => "/org_directors/1/edit").to route_to("org_directors#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      expect(:post => "/org_directors").to route_to("org_directors#create")
-    end
-
-    it "routes to #update via PUT" do
-      expect(:put => "/org_directors/1").to route_to("org_directors#update", :id => "1")
-    end
-
-    it "routes to #update via PATCH" do
-      expect(:patch => "/org_directors/1").to route_to("org_directors#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      expect(:delete => "/org_directors/1").to route_to("org_directors#destroy", :id => "1")
-    end
-
-  end
-end

data/spec/views/org_directors/edit.html.builder_spec.rb

@@ -1,14 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "org_directors/edit", type: :view do
-  before(:each) do
-    @org_director = assign(:org_director, OrgDirector.create!())
-  end
-
-  it "renders the edit org_director form" do
-    render
-
-    assert_select "form[action=?][method=?]", org_director_path(@org_director), "post" do
-    end
-  end
-end

data/spec/views/org_directors/index.html.builder_spec.rb

@@ -1,14 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe "org_directors/index", type: :view do
-  before(:each) do
-    assign(:org_directors, [
-      OrgDirector.create!(),
-      OrgDirector.create!()
-    ])
-  end
-
-  it "renders a list of org_directors" do
-    render
-  end
-end