we_bridge_rails_engine_orgs 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b776cc74377da7ae7d813f539840fb1a7f5fa55
-  data.tar.gz: bb48620a819f8bd5568a8f3cb5f3fc073998a9d3
+  metadata.gz: b1cb26b89030f532c066b9a1dfefdd50d0b51f83
+  data.tar.gz: cc1757b3afab73d3ab6337fd55d3729f14f9860a
 SHA512:
-  metadata.gz: ecff8ec03513af7b0aea0681a8abca7b9a712a280a4316862e2b1f5bd9081398afd59940f5532cceaff91308a139d110433655c38e138877f8f95e40a7f22529
-  data.tar.gz: 39b95d11e3878347798bc50833ead1bc31f8747208e323a13fc550f0969efda8c513cc041968b88d1686c60e21c825e55e97c70149a73c0c575e0a57d44f5b1d
+  metadata.gz: 5bfa7af99706f57207a46e0c19b8804c83354c906c734260071302ed193d48e00cb0da4b43da0f96b9652809ffd48abf0210506a7a33cab20d4b8133c931abbf
+  data.tar.gz: be888e57acbca06863ca8dcf1b62adb1e394b6c533fccfb70442edc2deb4c4c521dd10f249df384497f178ae9567e0fc08bb618a9563332bd7c2af205a5e42ab

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    we_bridge_rails_engine_orgs (0.1.12)
+    we_bridge_rails_engine_orgs (0.1.13)
       actionview-helpers-auto_tag_helper
       activerecord-mlang
       we_bridge-auto_view_helper

data/app/models/org_member.rb

@@ -26,6 +26,7 @@ class OrgMember < ActiveRecord::Base
 
   default_scope ->(){ where(retired_on: nil) }
   scope :without_secret, ->(){ where(private: false) }
+  scope :without_director, ->(){ where(org_director_type_id: nil) }
 
   def others
     self.class.where(org_id: self.org_id).where.not(id: self.id)

data/lib/we_bridge_rails_engine_orgs/version.rb

@@ -1,3 +1,3 @@
 module WeBridgeRailsEngineOrgs
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

data/spec/dummy/log/development.log

@@ -34768,3 +34768,5 @@ Migrating to AddPhoneNumberToOrgMember (20151220104955)
             FROM sqlite_temp_master
             WHERE name='index_user_texts_on_lang_id_and_parent_id' AND type='index'
 
+  Org Load (46.4ms)  SELECT  "orgs".* FROM "orgs"  ORDER BY "orgs"."id" ASC LIMIT 1
+  OrgMemberType Load (0.8ms)  SELECT "org_member_types".* FROM "org_member_types" WHERE "org_member_types"."org_id" = ?  [["org_id", 1]]

data/spec/dummy/log/test.log

@@ -5467,3 +5467,188 @@ Completed 200 OK in 38ms (Views: 24.8ms | ActiveRecord: 0.8ms)
    (0.1ms)  SELECT COUNT(*) FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."private" = ?  [["org_id", 1], ["private", "f"]]
   OrgMember Load (0.1ms)  SELECT  "org_members".* FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."private" = ?  ORDER BY "org_members"."id" ASC LIMIT 1  [["org_id", 1], ["private", "f"]]
    (0.8ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (1.3ms)  CREATE TABLE "lang_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "label" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.1ms)  CREATE UNIQUE INDEX "index_lang_texts_on_parent_id_and_lang_id" ON "lang_texts" ("parent_id", "lang_id")
+   (1.2ms)  CREATE TABLE "langs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "code" varchar(5) NOT NULL, "east" boolean DEFAULT 'f' NOT NULL, "position" integer DEFAULT 10000 NOT NULL, "enable" boolean DEFAULT 't' NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "index_langs_on_code" ON "langs" ("code")
+   (1.0ms)  CREATE TABLE "org_activities" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_id" integer NOT NULL, "position" integer DEFAULT 0 NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE TABLE "org_activity_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "label" varchar, "description" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.9ms)  CREATE UNIQUE INDEX "index_org_activity_texts_on_lang_id_and_parent_id" ON "org_activity_texts" ("lang_id", "parent_id")
+   (1.0ms)  CREATE TABLE "org_branch_member_mappings" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_member_id" integer NOT NULL, "org_branch_id" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "index_org_branch_member_mappings" ON "org_branch_member_mappings" ("org_member_id", "org_branch_id")
+   (1.0ms)  CREATE TABLE "org_branch_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "index_org_branch_texts" ON "org_branch_texts" ("parent_id", "lang_id")
+   (0.9ms)  CREATE TABLE "org_branch_type_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "label" varchar, "desc" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "index_org_branch_type_texts" ON "org_branch_type_texts" ("parent_id", "lang_id")
+   (0.8ms)  CREATE TABLE "org_branch_types" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_id" integer NOT NULL, "position" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE TABLE "org_branches" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_branch_type_id" integer NOT NULL, "org_id" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "position" integer DEFAULT 0 NOT NULL) 
+   (1.0ms)  CREATE TABLE "org_department_position_member_mappings" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_department_position_id" integer NOT NULL, "org_member_id" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "index_org_department_position_member_mappings" ON "org_department_position_member_mappings" ("org_department_position_id", "org_member_id")
+   (1.0ms)  CREATE TABLE "org_department_position_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "name" varchar DEFAULT '' NOT NULL, "desc" text DEFAULT '' NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.9ms)  CREATE UNIQUE INDEX "index_org_department_position_texts" ON "org_department_position_texts" ("lang_id", "parent_id")
+   (1.1ms)  CREATE TABLE "org_department_positions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_department_id" integer NOT NULL, "position" integer DEFAULT 0 NOT NULL, "limit" integer DEFAULT 0 NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE TABLE "org_department_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "name" varchar DEFAULT '' NOT NULL, "desc" text DEFAULT '' NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "index_org_department_texts" ON "org_department_texts" ("lang_id", "parent_id")
+   (1.1ms)  CREATE TABLE "org_departments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_id" integer NOT NULL, "manager_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE TABLE "org_director_type_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "label" varchar, "desc" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "index_org_director_type_texts_on_parent_id_and_lang_id" ON "org_director_type_texts" ("parent_id", "lang_id")
+   (0.9ms)  CREATE TABLE "org_director_types" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_id" integer NOT NULL, "position" integer DEFAULT 0 NOT NULL, "limit" integer DEFAULT 0 NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.9ms)  CREATE TABLE "org_member_tag_mappings" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_member_tag_id" integer NOT NULL, "org_member_id" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.1ms)  CREATE UNIQUE INDEX "index_org_member_tag_mappings" ON "org_member_tag_mappings" ("org_member_tag_id", "org_member_id")
+   (1.1ms)  CREATE TABLE "org_member_tag_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "label" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "index_org_member_tag_texts_on_lang_id_and_parent_id" ON "org_member_tag_texts" ("lang_id", "parent_id")
+   (1.0ms)  CREATE TABLE "org_member_tags" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_id" integer NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.1ms)  CREATE TABLE "org_member_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "comment" text, "comment_format" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "family_name" varchar DEFAULT '' NOT NULL, "given_name" varchar DEFAULT '' NOT NULL, "family_name_pron" varchar DEFAULT '' NOT NULL, "given_name_pron" varchar DEFAULT '' NOT NULL) 
+   (1.1ms)  CREATE UNIQUE INDEX "index_org_member_texts_on_lang_id_and_parent_id" ON "org_member_texts" ("lang_id", "parent_id")
+   (1.0ms)  CREATE TABLE "org_member_type_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "label" varchar, "desc" text, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE UNIQUE INDEX "index_org_member_type_texts_on_lang_id_and_parent_id" ON "org_member_type_texts" ("lang_id", "parent_id")
+   (1.2ms)  CREATE TABLE "org_member_types" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_id" integer NOT NULL, "position" integer DEFAULT 0 NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.3ms)  CREATE TABLE "org_members" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "org_id" integer, "user_id" integer, "lang_id" integer, "type_id" integer DEFAULT 0 NOT NULL, "org_director_type_id" integer, "org_member_type_id" integer, "byear" integer, "bmonth" integer, "bday" integer, "entried_on" date NOT NULL, "sex" integer(1), "expire_at" datetime, "retired_on" date, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL, "handle_name" varchar DEFAULT '' NOT NULL, "private" boolean DEFAULT 'f' NOT NULL, "uuid" varchar(40) DEFAULT '' NOT NULL, "phone_number" varchar) 
+   (1.5ms)  CREATE TABLE "org_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "name" varchar, "description" text, "www_author" varchar, "www_keywords" varchar, "address" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.3ms)  CREATE UNIQUE INDEX "index_org_texts" ON "org_texts" ("lang_id", "parent_id")
+   (1.5ms)  CREATE TABLE "orgs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "lang_id" integer NOT NULL, "email" varchar, "url" varchar, "domain" varchar, "started_on" date, "post_number" varchar, "tel" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.2ms)  CREATE TABLE "people" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "sex" integer DEFAULT 1 NOT NULL, "birth_year" integer DEFAULT 0 NOT NULL, "birth_month" integer DEFAULT 0 NOT NULL, "birth_day" integer DEFAULT 0 NOT NULL, "blood_type" varchar, "created_by" integer NOT NULL, "updated_by" integer NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (1.1ms)  CREATE TABLE "person_name_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "first_name" varchar, "first_name_pron" varchar, "last_name" varchar, "last_name_pron" varchar) 
+   (1.1ms)  CREATE UNIQUE INDEX "idx_person_name_texts" ON "person_name_texts" ("parent_id", "lang_id")
+   (1.4ms)  CREATE TABLE "person_names" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "person_id" integer NOT NULL, "revision" integer DEFAULT 0 NOT NULL, "modified_on" date NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (1.3ms)  CREATE UNIQUE INDEX "index_person_names_on_person_id_and_revision" ON "person_names" ("person_id", "revision")
+   (1.0ms)  CREATE TABLE "person_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "created_by" integer NOT NULL, "updated_by" integer NOT NULL, "created_at" datetime, "updated_at" datetime) 
+   (1.0ms)  CREATE UNIQUE INDEX "index_person_texts_on_parent_id_and_lang_id" ON "person_texts" ("parent_id", "lang_id")
+   (1.0ms)  CREATE TABLE "user_accounts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "provider" varchar NOT NULL, "uid" varchar NOT NULL, "token" varchar, "name" varchar, "nickname" varchar, "email" varchar, "url" varchar, "image_url" varchar, "description" varchar, "other" text, "credentials" text, "raw_info" text, "deleted_at" datetime, "created_at" datetime, "updated_at" datetime) 
+   (1.0ms)  CREATE UNIQUE INDEX "index_user_accounts_on_uid" ON "user_accounts" ("uid")
+   (1.0ms)  CREATE TABLE "user_texts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "parent_id" integer NOT NULL, "lang_id" integer NOT NULL, "nick_name" varchar, "nick_name_pron" varchar, "deleted_at" datetime, "created_at" datetime, "updated_at" datetime) 
+   (1.2ms)  CREATE UNIQUE INDEX "index_user_texts_on_lang_id_and_parent_id" ON "user_texts" ("lang_id", "parent_id")
+   (1.2ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "person_id" integer, "email" varchar, "user_img_url" varchar, "lang_id" integer NOT NULL, "deleted_at" datetime, "created_at" datetime, "updated_at" datetime) 
+   (1.2ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (1.3ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151220104955')
+   (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150812025526')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150814183339')
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151009112829')
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151203153522')
+   (1.2ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151204024709')
+   (1.4ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151204183447')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151204183612')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151216145030')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151216145424')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150803101150')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150814101311')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150612005752')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20150712132226')
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "orgs" ("lang_id", "created_at", "updated_at") VALUES (?, ?, ?)  [["lang_id", 1], ["created_at", "2015-12-22 03:08:53.453770"], ["updated_at", "2015-12-22 03:08:53.453770"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "org_members" ("org_id", "entried_on", "retired_on", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["retired_on", "2015-12-22"], ["created_at", "2015-12-22 03:08:53.476679"], ["updated_at", "2015-12-22 03:08:53.476679"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  UPDATE "org_members" SET "retired_on" = ?, "updated_at" = ? WHERE "org_members"."id" = ?  [["retired_on", nil], ["updated_at", "2015-12-22 03:08:53.479823"], ["id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  OrgMember Load (0.3ms)  SELECT  "org_members".* FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ?  ORDER BY "org_members"."id" ASC LIMIT 1  [["org_id", 1]]
+   (0.6ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.2ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "orgs" ("lang_id", "created_at", "updated_at") VALUES (?, ?, ?)  [["lang_id", 1], ["created_at", "2015-12-22 03:08:53.529042"], ["updated_at", "2015-12-22 03:08:53.529042"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "org_members" ("org_id", "entried_on", "retired_on", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["retired_on", "2015-12-22"], ["created_at", "2015-12-22 03:08:53.531300"], ["updated_at", "2015-12-22 03:08:53.531300"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ?  [["org_id", 1]]
+   (0.6ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO "orgs" ("lang_id", "created_at", "updated_at") VALUES (?, ?, ?)  [["lang_id", 1], ["created_at", "2015-12-22 03:08:53.536033"], ["updated_at", "2015-12-22 03:08:53.536033"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "org_members" ("org_id", "entried_on", "private", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["private", "t"], ["created_at", "2015-12-22 03:08:53.541584"], ["updated_at", "2015-12-22 03:08:53.541584"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "org_members" ("org_id", "entried_on", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["created_at", "2015-12-22 03:08:53.543902"], ["updated_at", "2015-12-22 03:08:53.543902"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."private" = ?  [["org_id", 1], ["private", "f"]]
+  OrgMember Load (0.2ms)  SELECT  "org_members".* FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."private" = ?  ORDER BY "org_members"."id" ASC LIMIT 1  [["org_id", 1], ["private", "f"]]
+   (0.7ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "orgs" ("lang_id", "created_at", "updated_at") VALUES (?, ?, ?)  [["lang_id", 1], ["created_at", "2015-12-22 03:08:53.549330"], ["updated_at", "2015-12-22 03:08:53.549330"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "org_members" ("org_id", "entried_on", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["created_at", "2015-12-22 03:08:53.551578"], ["updated_at", "2015-12-22 03:08:53.551578"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."org_director_type_id" IS NULL  [["org_id", 1]]
+  OrgMember Load (0.1ms)  SELECT  "org_members".* FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."org_director_type_id" IS NULL  ORDER BY "org_members"."id" ASC LIMIT 1  [["org_id", 1]]
+   (0.8ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "orgs" ("lang_id", "created_at", "updated_at") VALUES (?, ?, ?)  [["lang_id", 1], ["created_at", "2015-12-22 03:08:53.557247"], ["updated_at", "2015-12-22 03:08:53.557247"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO "org_members" ("org_id", "entried_on", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["created_at", "2015-12-22 03:08:53.560732"], ["updated_at", "2015-12-22 03:08:53.560732"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  UPDATE "org_members" SET "org_director_type_id" = ?, "updated_at" = ? WHERE "org_members"."id" = ?  [["org_director_type_id", 1], ["updated_at", "2015-12-22 03:08:53.564270"], ["id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."org_director_type_id" IS NULL  [["org_id", 1]]
+   (0.8ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "orgs" ("lang_id", "created_at", "updated_at") VALUES (?, ?, ?)  [["lang_id", 1], ["created_at", "2015-12-22 03:09:05.877004"], ["updated_at", "2015-12-22 03:09:05.877004"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO "org_members" ("org_id", "entried_on", "retired_on", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["retired_on", "2015-12-22"], ["created_at", "2015-12-22 03:09:05.894332"], ["updated_at", "2015-12-22 03:09:05.894332"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  UPDATE "org_members" SET "retired_on" = ?, "updated_at" = ? WHERE "org_members"."id" = ?  [["retired_on", nil], ["updated_at", "2015-12-22 03:09:05.896708"], ["id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  OrgMember Load (0.3ms)  SELECT  "org_members".* FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ?  ORDER BY "org_members"."id" ASC LIMIT 1  [["org_id", 1]]
+   (8.9ms)  rollback transaction
+   (0.2ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "orgs" ("lang_id", "created_at", "updated_at") VALUES (?, ?, ?)  [["lang_id", 1], ["created_at", "2015-12-22 03:09:05.937606"], ["updated_at", "2015-12-22 03:09:05.937606"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "org_members" ("org_id", "entried_on", "retired_on", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["retired_on", "2015-12-22"], ["created_at", "2015-12-22 03:09:05.941997"], ["updated_at", "2015-12-22 03:09:05.941997"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SELECT COUNT(*) FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ?  [["org_id", 1]]
+   (0.8ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "orgs" ("lang_id", "created_at", "updated_at") VALUES (?, ?, ?)  [["lang_id", 1], ["created_at", "2015-12-22 03:09:05.948507"], ["updated_at", "2015-12-22 03:09:05.948507"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "org_members" ("org_id", "entried_on", "private", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["private", "t"], ["created_at", "2015-12-22 03:09:05.950956"], ["updated_at", "2015-12-22 03:09:05.950956"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "org_members" ("org_id", "entried_on", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["created_at", "2015-12-22 03:09:05.953577"], ["updated_at", "2015-12-22 03:09:05.953577"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.2ms)  SELECT COUNT(*) FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."private" = ?  [["org_id", 1], ["private", "f"]]
+  OrgMember Load (0.1ms)  SELECT  "org_members".* FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."private" = ?  ORDER BY "org_members"."id" ASC LIMIT 1  [["org_id", 1], ["private", "f"]]
+   (0.7ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "orgs" ("lang_id", "created_at", "updated_at") VALUES (?, ?, ?)  [["lang_id", 1], ["created_at", "2015-12-22 03:09:05.961573"], ["updated_at", "2015-12-22 03:09:05.961573"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "org_members" ("org_id", "entried_on", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["created_at", "2015-12-22 03:09:05.964206"], ["updated_at", "2015-12-22 03:09:05.964206"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SELECT COUNT(*) FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."org_director_type_id" IS NULL  [["org_id", 1]]
+  OrgMember Load (0.1ms)  SELECT  "org_members".* FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."org_director_type_id" IS NULL  ORDER BY "org_members"."id" ASC LIMIT 1  [["org_id", 1]]
+   (0.6ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "orgs" ("lang_id", "created_at", "updated_at") VALUES (?, ?, ?)  [["lang_id", 1], ["created_at", "2015-12-22 03:09:05.969401"], ["updated_at", "2015-12-22 03:09:05.969401"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "org_members" ("org_id", "entried_on", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["org_id", 1], ["entried_on", "2015-12-22"], ["created_at", "2015-12-22 03:09:05.971910"], ["updated_at", "2015-12-22 03:09:05.971910"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  UPDATE "org_members" SET "org_director_type_id" = ?, "updated_at" = ? WHERE "org_members"."id" = ?  [["org_director_type_id", 1], ["updated_at", "2015-12-22 03:09:05.973696"], ["id", 1]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SELECT COUNT(*) FROM "org_members" WHERE "org_members"."retired_on" IS NULL AND "org_members"."org_id" = ? AND "org_members"."org_director_type_id" IS NULL  [["org_id", 1]]
+   (0.8ms)  rollback transaction

data/spec/models/org_member_spec.rb

@@ -25,10 +25,29 @@ RSpec.describe OrgMember, type: :model do
       @member = OrgMember.create!(org_id: @org.id, entried_on: Time.now-10, private: true)
       @member2 = OrgMember.create!(org_id: @org.id, entried_on: Time.now-10, private: false)
     end
+
     it "hit only one user" do
       res = @org.members.without_secret
       expect(res.count).to eq(1)
       expect(res.first.id).to eq(@member2.id)
     end
   end
+
+  context ".without_director" do
+    before do
+      @member = OrgMember.create!(org_id: @org.id, entried_on: Time.now-10, private: false, org_director_type_id: nil)
+    end
+
+    it "hit only one user" do
+      res = @org.members.without_director
+      expect(res.count).to eq(1)
+      expect(res.first.id).to eq(@member.id)
+    end
+
+    it "hit no user" do
+      @member.update(org_director_type_id: 1)
+      res = @org.members.without_director
+      expect(res.count).to eq(0)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: we_bridge_rails_engine_orgs
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Shinjiro Itagaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-20 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-mlang