ecm_staff2 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f74bbb1b554ec04f7963934bba4cb55f0a86712d
-  data.tar.gz: 4740aef068369f7fb2ead41183998b48838269f8
+  metadata.gz: ac39e10a4689a2a1fdca68806b7685cb480de90a
+  data.tar.gz: 2f7b00490f379dd3356420e898dc9eb70a1d1ea5
 SHA512:
-  metadata.gz: 3a6381eaec3198c36a7d045b541049f439b657e5f6b3f2533bf79ba71181f30a7f365b98c5e3635e2e4729095c03c963c8b24f10f842c3cecc429bd64bbff14c
-  data.tar.gz: 93813b0f34c73ba472b610e2013b115860b5ade78f7cf3088648d2ffcd5bb971b9c6ecdaecdcd5c79b3ac11d7dd70adaab3a05ac1aeb58ac9f29de8cb170c0f5
+  metadata.gz: 76c62c75e370cf17cd0fac89d27e01194d34d30c098d419346efb0ce6f57db91898229b0eaf05bec5b9ec4ff47fb1fde4c0a5d4104c094320e3bcde15f0311d2
+  data.tar.gz: c43ec106e8bd3258297c5f98c3ec3ee8ac0466cea9bf280afad891366ee43e9925767834ae0d69062b8822978885698cd269173c76b52e9cf9f64da344cf36fa

data/app/models/ecm/staff/business_unit.rb

@@ -4,28 +4,17 @@ class Ecm::Staff::BusinessUnit < Ecm::Staff::Base
   has_many :person_positions, dependent: :restrict_with_error
   has_many :people, through: :person_positions
 
-  # # attributes
-  # attr_accessible :description,
-  #                 :name,
-  #                 :markup_language,
-  #                 :organisation_id,
-  #                 :parent_id,
-  #                 :slug
-
   # callbacks
   after_initialize :set_defaults, if: :new_record?
 
-  # globalization support
-  translates :description, :name, :slug
-  # attr_accessible :translations, :translations_attributes
-  accepts_nested_attributes_for :translations
-
   # default scope
   # default_scope order: 'lft'
+  
+  translates :description, :name, :slug if ActiveRecord::Base.connection.table_exists?(:ecm_staff_business_unit_translations)
 
   # friendly id support
   extend FriendlyId
-  friendly_id :name, use: [:slugged, :finders]
+  friendly_id :name, use: [:slugged]
 
   # markup support
   acts_as_markup language: :variable,
@@ -35,7 +24,6 @@ class Ecm::Staff::BusinessUnit < Ecm::Staff::Base
   acts_as_nested_set
 
   # validations
-  validates :organisation, presence: true
   validates :name, presence: true,
                    uniqueness: { scope: [:organisation_id] }
 

data/app/models/ecm/staff/organisation.rb

@@ -2,22 +2,14 @@ class Ecm::Staff::Organisation < Ecm::Staff::Base
   # associations
   has_many :business_units
 
-  # # attributes
-  # attr_accessible :description,
-  #                 :markup_language,
-  #                 :name
-
   # callbacks
   after_initialize :set_defaults, if: :new_record?
 
-  # globalization support
-  translates :description, :name, :slug
-  # attr_accessible :translations, :translations_attributes
-  accepts_nested_attributes_for :translations
+  translates :description, :name, :slug if ActiveRecord::Base.connection.table_exists?(:ecm_staff_organisation_translations)
 
   # friendly id support
   extend FriendlyId
-  friendly_id :name, use: [:slugged, :globalize, :finders]
+  friendly_id :name, use: [:slugged]
 
   # markup support
   acts_as_markup language: :variable,

data/app/models/ecm/staff/person.rb

@@ -1,49 +1,34 @@
 class Ecm::Staff::Person < Ecm::Staff::Base
   # associations
   has_many :person_positions, ->() { order(begin_at: :desc) },
-           class_name: Ecm::Staff::PersonPosition,
+           class_name: 'Ecm::Staff::PersonPosition',
            inverse_of: :person
   accepts_nested_attributes_for :person_positions, allow_destroy: true
 
   has_many :positions, through: :person_positions,
-                       class_name: Ecm::Staff::Position
+                       class_name: 'Ecm::Staff::Position'
 
   has_many :attached_pictures, as: :pictureable,
-                               class_name: Ecm::Pictures::AttachedPicture,
+                               class_name: 'Ecm::Pictures::AttachedPicture',
                                inverse_of: :pictureable
   has_many :pictures, through: :attached_pictures,
-                      class_name: Ecm::Pictures::Picture
+                      class_name: 'Ecm::Pictures::Picture'
 
   accepts_nested_attributes_for :attached_pictures, allow_destroy: true
   accepts_nested_attributes_for :pictures, allow_destroy: true
 
-  # # attributes
-  # attr_accessible :attached_pictures_attributes,
-  #                 :birthdate,
-  #                 :description,
-  #                 :firstname,
-  #                 :lastname,
-  #                 :markup_language,
-  #                 :person_positions_attributes,
-  #                 :pictures_attributes,
-  #                 :position,
-  #                 :prefix
-
   # acts as list
   acts_as_list
   # default_scope order: 'position ASC'
 
+  translates :description, :prefix, :slug if ActiveRecord::Base.connection.table_exists?(:ecm_staff_person_translations)
+
   # callbacks
   after_initialize :set_defaults, if: :new_record?
 
-  # globalization support
-  translates :description, :prefix, :slug
-  # attr_accessible :translations, :translations_attributes
-  accepts_nested_attributes_for :translations
-
   # friendly id support
   extend FriendlyId
-  friendly_id :fullname, use: [:slugged, :finders]
+  friendly_id :fullname, use: [:slugged]
 
   # markup support
   acts_as_markup language: :variable,

data/app/models/ecm/staff/person_position.rb

@@ -5,18 +5,7 @@ class Ecm::Staff::PersonPosition < Ecm::Staff::Base
   belongs_to :person, class_name: Ecm::Staff::Configuration.person_class_name
   belongs_to :position
 
-  # # attributes
-  # attr_accessible :begin_at,
-  #                 :business_unit_id,
-  #                 :end_at,
-  #                 :organisation_id,
-  #                 :person_id,
-  #                 :position_id
-
   # validations
   # @TODO: Validate end_at > begin_at if present
   validates :begin_at,      presence: true
-  validates :business_unit, presence: true
-  validates :person,        presence: true
-  validates :position,      presence: true
 end

data/app/models/ecm/staff/position.rb

@@ -4,22 +4,14 @@ class Ecm::Staff::Position < Ecm::Staff::Base
   has_many :people, through: :person_positions,
                     class_name: Ecm::Staff::Configuration.person_class_name
 
-  # # attributes
-  # attr_accessible :description,
-  #                 :name,
-  #                 :parent_id
-
   # callbacks
   after_initialize :set_defaults, if: :new_record?
 
-  # globalization support
-  translates :description, :name, :slug
-  # attr_accessible :translations, :translations_attributes
-  accepts_nested_attributes_for :translations
-
   # friendly id support
   extend FriendlyId
-  friendly_id :name, use: [:slugged, :finders]
+  friendly_id :name, use: [:slugged]
+
+  translates :description, :name, :slug if ActiveRecord::Base.connection.table_exists?(:ecm_staff_position_translations)
 
   # markup support
   acts_as_markup language: :variable,

data/config/locales/de.yml

@@ -19,7 +19,9 @@ de:
         markup_language: Markupsprache
         name: Name
         organisation_id: Unternehmen
+        organisation: Unternehmen
         parent_id:  Übergeordnete Abteilung
+        parent:  Übergeordnete Abteilung
         created_at: Erstellt am
         updated_at: Aktualisiert am
       ecm/staff/organisation:
@@ -37,6 +39,7 @@ de:
         lastname: Nachname
         markup_language: Markupsprache
         person_positions: Stellen
+        pictures: Bilder
         position: Position
         prefix: Prefix
         preview_picture: Bild
@@ -57,7 +60,8 @@ de:
         show:
           back: 'Zurück'
   routes:
-    ecm_staff: 'team'
+    ecm_staff_engine: team
     business_units: 'abteilungen'
     organsiations: 'organisationen'
-    people: 'mitarbeiter'
+    people: 'mitarbeiter'
+    positions: 'stellen'

data/config/routes.rb

@@ -1,6 +1,6 @@
 Ecm::Staff::Engine.routes.draw do
   localized do
-    scope :ecm_staff do
+    scope :ecm_staff_engine do
       resources :organisations,  only: [:show, :index]
       resources :business_units, only: [:show, :index]
       resources :people,         only: [:show, :index]

data/db/migrate/001_create_ecm_staff_organisations.rb

@@ -1,4 +1,4 @@
-class CreateEcmStaffOrganisations < ActiveRecord::Migration
+class CreateEcmStaffOrganisations < ActiveRecord::Migration[4.2]
   def change
     create_table :ecm_staff_organisations do |t|
       t.string :name

data/db/migrate/002_create_ecm_staff_business_units.rb

@@ -1,4 +1,4 @@
-class CreateEcmStaffBusinessUnits < ActiveRecord::Migration
+class CreateEcmStaffBusinessUnits < ActiveRecord::Migration[4.2]
   def change
     create_table :ecm_staff_business_units do |t|
       t.references :organisation

data/db/migrate/003_create_ecm_staff_positions.rb

@@ -1,4 +1,4 @@
-class CreateEcmStaffPositions < ActiveRecord::Migration
+class CreateEcmStaffPositions < ActiveRecord::Migration[4.2]
   def change
     create_table :ecm_staff_positions do |t|
       t.string :name

data/db/migrate/004_create_ecm_staff_person_positions.rb

@@ -1,4 +1,4 @@
-class CreateEcmStaffPersonPositions < ActiveRecord::Migration
+class CreateEcmStaffPersonPositions < ActiveRecord::Migration[4.2]
   def change
     create_table :ecm_staff_person_positions do |t|
       t.references :person

data/db/migrate/005_create_ecm_staff_people.rb

@@ -1,4 +1,4 @@
-class CreateEcmStaffPeople < ActiveRecord::Migration
+class CreateEcmStaffPeople < ActiveRecord::Migration[4.2]
   def change
     create_table :ecm_staff_people do |t|
       t.string :prefix

data/db/migrate/006_create_ecm_staff_organisation_translations.rb

@@ -1,4 +1,4 @@
-class CreateEcmStaffOrganisationTranslations < ActiveRecord::Migration
+class CreateEcmStaffOrganisationTranslations < ActiveRecord::Migration[4.2]
   def up
     Ecm::Staff::Organisation.create_translation_table!({
                                                          name: :string,

data/db/migrate/007_create_ecm_staff_business_unit_translations.rb

@@ -1,4 +1,4 @@
-class CreateEcmStaffBusinessUnitTranslations < ActiveRecord::Migration
+class CreateEcmStaffBusinessUnitTranslations < ActiveRecord::Migration[4.2]
   def up
     Ecm::Staff::BusinessUnit.create_translation_table!({
                                                          name: :string,

data/db/migrate/008_create_ecm_staff_position_translations.rb

@@ -1,4 +1,4 @@
-class CreateEcmStaffPositionTranslations < ActiveRecord::Migration
+class CreateEcmStaffPositionTranslations < ActiveRecord::Migration[4.2]
   def up
     Ecm::Staff::Position.create_translation_table!({
                                                      name: :string,

data/db/migrate/009_create_ecm_staff_person_translations.rb

@@ -1,4 +1,4 @@
-class CreateEcmStaffPersonTranslations < ActiveRecord::Migration
+class CreateEcmStaffPersonTranslations < ActiveRecord::Migration[4.2]
   def up
     Ecm::Staff::Person.create_translation_table!({
                                                    prefix: :string,

data/db/migrate/20170611221519_drop_translation_table_for_business_units.rb

@@ -0,0 +1,13 @@
+class DropTranslationTableForBusinessUnits < ActiveRecord::Migration[4.2]
+  def change
+    reversible do |dir|
+      dir.up do
+        Ecm::Staff::BusinessUnit.drop_translation_table!
+      end
+
+      dir.down do
+        Ecm::Staff::BusinessUnit.create_translation_table! name: :string, description: :text, slug: :string
+      end
+    end
+  end
+end

data/db/migrate/20170611221534_drop_translation_table_for_organsiations.rb

@@ -0,0 +1,13 @@
+class DropTranslationTableForOrgansiations < ActiveRecord::Migration[4.2]
+  def change
+    reversible do |dir|
+      dir.up do
+        Ecm::Staff::Organisation.drop_translation_table!
+      end
+
+      dir.down do
+        Ecm::Staff::Organisation.create_translation_table! name: :string, description: :text, slug: :string
+      end
+    end
+  end
+end

data/db/migrate/20170611221542_drop_translation_table_for_people.rb

@@ -0,0 +1,13 @@
+class DropTranslationTableForPeople < ActiveRecord::Migration[4.2]
+  def change
+    reversible do |dir|
+      dir.up do
+        Ecm::Staff::Person.drop_translation_table!
+      end
+
+      dir.down do
+        Ecm::Staff::Person.create_translation_table! prefix: :string, description: :text, slug: :string
+      end
+    end
+  end
+end

data/db/migrate/20170611221546_drop_translation_table_for_positions.rb

@@ -0,0 +1,13 @@
+class DropTranslationTableForPositions < ActiveRecord::Migration[4.2]
+  def change
+    reversible do |dir|
+      dir.up do
+        Ecm::Staff::Position.drop_translation_table!
+      end
+
+      dir.down do
+        Ecm::Staff::Position.create_translation_table! name: :string, description: :text, slug: :string
+      end
+    end
+  end
+end

data/lib/ecm/staff/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Staff
-    VERSION = '2.0.0'.freeze
+    VERSION = '3.0.0'.freeze
   end
 end

data/lib/ecm_staff2.rb

@@ -1,6 +1,5 @@
 require 'awesome_nested_set'
 require 'friendly_id'
-require 'globalize'
 require 'route_translator'
 
 require 'ecm/staff'

data/spec/factories/ecm_staff_people.rb

@@ -4,5 +4,6 @@ FactoryGirl.define do
   factory :ecm_staff_person, class: Ecm::Staff::Person do
     firstname 'John'
     lastname 'Doe'
+    markup_language 'textile'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_staff2
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-07 00:00:00.000000000 Z
+date: 2017-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: globalize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: route_translator
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +106,10 @@ files:
 - db/migrate/007_create_ecm_staff_business_unit_translations.rb
 - db/migrate/008_create_ecm_staff_position_translations.rb
 - db/migrate/009_create_ecm_staff_person_translations.rb
+- db/migrate/20170611221519_drop_translation_table_for_business_units.rb
+- db/migrate/20170611221534_drop_translation_table_for_organsiations.rb
+- db/migrate/20170611221542_drop_translation_table_for_people.rb
+- db/migrate/20170611221546_drop_translation_table_for_positions.rb
 - lib/ecm/staff.rb
 - lib/ecm/staff/configuration.rb
 - lib/ecm/staff/engine.rb
@@ -151,9 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ecm::Staff.
 test_files: []
-has_rdoc: