your_platform 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdb2a476e0a91647e85d31eb03cd09af8a3734c5
-  data.tar.gz: 133ef1bc00d68b4f1220107aa59f606cb1d7e410
+  metadata.gz: 885faa86efc2aa424a99b5e5347a5776a5f487fc
+  data.tar.gz: 1e268cea5b6b923ccdcdae9ca7f21e4b45e92fd8
 SHA512:
-  metadata.gz: 157f81d8d96f7ab2b1a69743dd03b9874367f9a4ba09adc265353661574cacdc0aa9a234b35553e0d0f0415e332374f9d1e1bafc8f53bb9d7e34f1808f03e721
-  data.tar.gz: 347e57de5ce3d7a4c598095fe4a181df8244537563b40374fd6b67dce612691888426ca473f92d11fef0bb4296db50c2b51a30b476194af8a608cea5ecfb85e0
+  metadata.gz: 8cfe1bc0d55464b938e545a4dafe305596a20776c4fc6722302f75f1e213b5563a7b8141fe323ac08cce7ecfd366629beb2edd9e213a275787f98141b6487395
+  data.tar.gz: 2db144d068a210992ea8469ee65e253a943f05c4f9553b7cd260fe19d4e70a000e65d3cca0191507f901fc0d3aa8e2ea5fb8b34d05b26243278ff9896cc7224f

data/README.md

@@ -1,6 +1,7 @@
 # YourPlatform
 
 [![Join the chat at https://gitter.im/fiedl/your_platform](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/fiedl/your_platform?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gem Version](https://badge.fury.io/rb/your_platform.svg)](http://badge.fury.io/rb/your_platform)
 [![Build Status](https://travis-ci.org/fiedl/your_platform.svg?branch=master)](https://travis-ci.org/fiedl/your_platform)
 [![Code Climate](https://codeclimate.com/github/fiedl/your_platform/badges/gpa.svg)](https://codeclimate.com/github/fiedl/your_platform)
 [![Dependency Status](https://gemnasium.com/fiedl/your_platform.svg)](https://gemnasium.com/fiedl/your_platform)

data/app/helpers/corporate_vita_helper.rb

@@ -8,12 +8,12 @@ module CorporateVitaHelper
   def status_group_membership_valid_from_best_in_place( membership )
     best_in_place( membership,
                    :valid_from_localized_date,  # type: :date,
-                   path: user_group_membership_path( id: membership.id,
+                   url: user_group_membership_path( id: membership.id,
                                                      controller: :user_group_memberships,
                                                      action: :update,
                                                      format: :json
                                                      ),
-                   :classes => "status_group_date_of_joining"
+                   :class => "status_group_date_of_joining"
                    )
   end
   
@@ -21,8 +21,8 @@ module CorporateVitaHelper
     event = membership.event
     best_in_place( membership,
                    :event_by_name,
-                   path: status_group_membership_path( membership ),
-                   classes: 'status_event_by_name',
+                   url: status_group_membership_path(membership),
+                   class: 'status_event_by_name',
                    # display_with does more harm than it's good for. We wait for angular!
 #                   display_with: lambda do |v|
 #                     link_to membership.event.name, membership.event, :class => 'status_event_label'

data/app/models/concerns/user_corporations.rb

@@ -38,7 +38,7 @@ module UserCorporations
   # The user is added as member to this corporation.
   #
   def corporation_name=(new_corporation_name)
-    Corporation.find_or_create_by_name(new_corporation_name).assign_user self
+    Corporation.find_or_create_by(name: new_corporation_name).assign_user self
   end
   
 end

data/app/models/flagable.rb

@@ -33,12 +33,8 @@ module Flagable
       self.add_flags new_flag
     end
 
-    def remove_flags( *flags_to_remove )
-      for flag_to_remove in flags_to_remove
-        self.flags.find_all_by_key( flag_to_remove ).each do |flag|
-          flag.destroy
-        end
-      end
+    def remove_flags(*flags_to_remove)
+      self.flags.where(key: flags_to_remove).destroy_all
     end
 
     def remove_flag( flag_to_remove )

data/app/models/group_mixins/memberships.rb

@@ -6,9 +6,6 @@ module GroupMixins::Memberships
   
   extend ActiveSupport::Concern
   
-  # TODO: Refactor conditions to rails 4 standard when migrating to rails 4.
-  # See, for example, https://github.com/fiedl/neo4j_ancestry/blob/master/lib/models/neo4j_ancestry/active_record_additions.rb#L117.
-  
   included do
 
     # User Group Memberships
@@ -18,23 +15,26 @@ module GroupMixins::Memberships
     # memberships.
     #
     has_many( :memberships, 
+              -> { where ancestor_type: 'Group', descendant_type: 'User' },
               class_name: 'UserGroupMembership',
-              foreign_key: :ancestor_id, conditions: { ancestor_type: 'Group', descendant_type: 'User' } )
+              foreign_key: :ancestor_id )
     
     # This associates all memberships of the group that are direct, i.e. direct 
     # parent_group-child_user memberships.
     #
     has_many( :direct_memberships,
+              -> { where ancestor_type: 'Group', descendant_type: 'User', direct: true },
               class_name: 'UserGroupMembership', 
-              foreign_key: :ancestor_id, conditions: { ancestor_type: 'Group', descendant_type: 'User', direct: true } )
+              foreign_key: :ancestor_id )
               
     # This associates all memberships of the group that are indirect, i.e. 
     # ancestor_group-descendant_user memberships, where groups are between the
     # ancestor_group and the descendant_user.
     #
     has_many( :indirect_memberships,
+              -> { where ancestor_type: 'Group', descendant_type: 'User', direct: false },
               class_name: 'UserGroupMembership', 
-              foreign_key: :ancestor_id, conditions: { ancestor_type: 'Group', descendant_type: 'User', direct: false } )
+              foreign_key: :ancestor_id )
      
     
     #  This method builds a new membership having this group (self) as group associated.
@@ -182,25 +182,25 @@ module GroupMixins::Memberships
     # when generating the SQL query. This is why the conditions have to be repeated here.
     #
     has_many(:members, 
+      -> { where('dag_links.ancestor_type' => 'Group').uniq },
       through: :memberships, 
-      source: :descendant, source_type: 'User', :uniq => true,
-      conditions: { 'dag_links.ancestor_type' => 'Group' }
+      source: :descendant, source_type: 'User'
       )
 
     # This associates only the direct group members (users).
     #
     has_many(:direct_members, 
+      -> { where('dag_links.ancestor_type' => 'Group', 'dag_links.direct' => true).uniq },
       through: :direct_memberships, 
-      source: :descendant, source_type: 'User', :uniq => true,
-      conditions: { 'dag_links.ancestor_type' => 'Group', 'dag_links.direct' => true }
+      source: :descendant, source_type: 'User'
       )
     
     # This associates only the indirect group members (users).
     #
     has_many(:indirect_members, 
+      -> { where('dag_links.ancestor_type' => 'Group', 'dag_links.direct' => false).uniq },
       through: :indirect_memberships, 
-      source: :descendant, source_type: 'User', :uniq => true,
-      conditions: { 'dag_links.ancestor_type' => 'Group', 'dag_links.direct' => false }
+      source: :descendant, source_type: 'User'
       )
     
   end

data/app/models/profile_field_types/address.rb

@@ -20,7 +20,7 @@ module ProfileFieldTypes
     end
 
     def find_or_create_geo_location
-      @geo_location ||= GeoLocation.find_or_create_by_address(value) if self.value && self.value != "—"
+      @geo_location ||= GeoLocation.find_or_create_by address: value if self.value && self.value != "—"
     end
 
     def display_html

data/app/models/profileable.rb

@@ -13,7 +13,7 @@ module Profileable
   def is_profileable( options = {} )
     @profile_section_titles = options[:profile_sections] || default_profile_section_titles
     has_many :profile_fields, as: :profileable, dependent: :destroy, autosave: true
-    has_many :address_profile_fields, class_name: 'ProfileFieldTypes::Address', conditions: 'type = "ProfileFieldTypes::Address"', as: :profileable, dependent: :destroy, autosave: true
+    has_many :address_profile_fields, -> { where type: 'ProfileFieldTypes::Address' }, class_name: 'ProfileFieldTypes::Address', as: :profileable, dependent: :destroy, autosave: true
     
     include InstanceMethodsForProfileables
   end

data/app/models/user_mixins/identification.rb

@@ -1,16 +1,15 @@
-# -*- coding: utf-8 -*-
-
 # This module extends the User class. Its purpose is to provide methods to identify a user using 
-# a given login string. The user may identify himself using his first name plus last name, his last name only, his 
-# email address or his alias, as long as the identifyer is unique.
+# a given login string. The user may identify himself using his:
+# 
+#   * first name plus last name
+#   * last name only
+#   * email address
+#   * alias
 #
 module UserMixins::Identification
 
   extend ActiveSupport::Concern
 
-  included do
-  end
-
   module ClassMethods
 
     # The user may identify himself using one of these attributes.
@@ -27,9 +26,12 @@ module UserMixins::Identification
     # returns a user object if the match was unique.
     #
     def find_all_by_identification_string( identification_string )
-      self.attributes_used_for_identification.collect do |attribute_name|
-        self.send( "find_all_by_#{attribute_name}".to_sym, identification_string )
-      end.flatten.uniq
+      (
+        User.where(alias: identification_string) +
+        User.where(last_name: identification_string) +
+        User.find_all_by_name(identification_string) +
+        User.find_all_by_email(identification_string)
+      ).uniq
     end
 
   end

data/app/models/user_mixins/memberships.rb

@@ -6,9 +6,6 @@ module UserMixins::Memberships
   
   extend ActiveSupport::Concern
   
-  # TODO: Refactor conditions to rails 4 standard when migrating to rails 4.
-  # See, for example, https://github.com/fiedl/neo4j_ancestry/blob/master/lib/models/neo4j_ancestry/active_record_additions.rb#L117.
-  
   included do
     
     # User Group Memberships
@@ -17,24 +14,27 @@ module UserMixins::Memberships
     # This associates all UserGroupMembership objects of the group, including indirect 
     # memberships.
     #
-    has_many( :memberships, 
+    has_many( :memberships,
+              -> { where ancestor_type: 'Group', descendant_type: 'User' },
               class_name: 'UserGroupMembership',
-              foreign_key: :descendant_id, conditions: { ancestor_type: 'Group', descendant_type: 'User' } )
+              foreign_key: :descendant_id )
     
     # This associates all memberships of the group that are direct, i.e. direct 
     # parent_group-child_user memberships.
     #
     has_many( :direct_memberships,
+              -> { where ancestor_type: 'Group', descendant_type: 'User', direct: true },
               class_name: 'UserGroupMembership', 
-              foreign_key: :descendant_id, conditions: { ancestor_type: 'Group', descendant_type: 'User', direct: true } )
+              foreign_key: :descendant_id )
               
     # This associates all memberships of the group that are indirect, i.e. 
     # ancestor_group-descendant_user memberships, where groups are between the
     # ancestor_group and the descendant_user.
     #
     has_many( :indirect_memberships,
+              -> { where ancestor_type: 'Group', descendant_type: 'User', direct: false },
               class_name: 'UserGroupMembership', 
-              foreign_key: :descendant_id, conditions: { ancestor_type: 'Group', descendant_type: 'User', direct: false } )
+              foreign_key: :descendant_id )
     
     
     # This returns the membership of the user in the given group if existant.
@@ -49,26 +49,26 @@ module UserMixins::Memberships
 
     # This associates the groups the user is member of, direct as well as indirect.
     #
-    has_many(:groups, 
+    has_many(:groups,
+      -> { where('dag_links.descendant_type' => 'User').uniq },
       through: :memberships,
-      source: :ancestor, source_type: 'Group', :uniq => true,
-      conditions: { 'dag_links.descendant_type' => 'User' }
+      source: :ancestor, source_type: 'Group'
       )
 
     # This associates only the direct groups.
     #
     has_many(:direct_groups, 
+      -> { where('dag_links.descendant_type' => 'User', 'dag_links.direct' => true).uniq },
       through: :direct_memberships, 
-      source: :ancestor, source_type: 'Group', :uniq => true,
-      conditions: { 'dag_links.descendant_type' => 'User', 'dag_links.direct' => true }
+      source: :ancestor, source_type: 'Group'
       )
     
     # This associates only the indirect groups.
     #
     has_many(:indirect_groups, 
+      -> { where('dag_links.descendant_type' => 'User', 'dag_links.direct' => false).uniq },
       through: :indirect_memberships, 
-      source: :ancestor, source_type: 'Group', :uniq => true,
-      conditions: { 'dag_links.descendant_type' => 'User', 'dag_links.direct' => false }
+      source: :ancestor, source_type: 'Group'
       )
     
   end

data/app/views/events/_event_details.html.haml

@@ -1,17 +1,17 @@
 %table.event_details
   %tr.description
     %th=t :description
-    %td= best_in_place_if can?(:update, @event), @event, :description, placeholder: I18n.t(:description), type: 'textarea'
+    %td= best_in_place_if can?(:update, @event), @event, :description, placeholder: I18n.t(:description), as: :textarea
   %tr.start_at
     %th=t :start_at
-    %td= best_in_place_if can?(:update, @event), @event, :localized_start_at, type: 'datetime'
+    %td= best_in_place_if can?(:update, @event), @event, :localized_start_at, as: :datetime
   %tr.end_at
     %th
       =t :end_at
       - if can? :update, @event
         = surround '(', ')' do
           =t :optional
-    %td= best_in_place_if can?(:update, @event), @event, :localized_end_at, type: 'datetime'
+    %td= best_in_place_if can?(:update, @event), @event, :localized_end_at, as: :datetime
   %tr.location
     %th=t :location
     %td= best_in_place_if can?(:update, @event), @event, :location
@@ -35,7 +35,7 @@
     %tr.publish_on_local_website
       %th
       %td
-        = best_in_place @event, :publish_on_local_website, classes: "show_always", :type => :select, collection: [['false', "Nicht auf lokaler Homepage veröffentlichen"], ['true', "Auf lokaler Homepage veröffentlichen"]]
+        = best_in_place @event, :publish_on_local_website, class: "show_always", as: :select, collection: [['false', "Nicht auf lokaler Homepage veröffentlichen"], ['true', "Auf lokaler Homepage veröffentlichen"]]
         –
         = link_to group_events_public_url(group_id: @event.group) do
           = icon 'list-alt'
@@ -45,7 +45,7 @@
     %tr.publish_on_global_website
       %th
       %td
-        = best_in_place @event, :publish_on_global_website, classes: "show_always", :type => :select, collection: [['false', "Nicht auf öffentlicher Homepage veröffentlichen (#{Page.find_root.title})"], ['true', "Auf öffentlicher Homepage veröffentlichen (#{Page.find_root.title})"]]
+        = best_in_place @event, :publish_on_global_website, class: "show_always", as: :select, collection: [['false', "Nicht auf öffentlicher Homepage veröffentlichen (#{Page.find_root.title})"], ['true', "Auf öffentlicher Homepage veröffentlichen (#{Page.find_root.title})"]]
         –
         = link_to public_events_url do
           = icon 'list-alt'

data/app/views/groups/show.html.haml

@@ -1,7 +1,7 @@
 - set_title @group.title
 %h1= best_in_place_if can?(:rename, @group), @group, :name
 %div
-  = best_in_place_if can?(:update, @group), @group, :body, type: :textarea
+  = best_in_place_if can?(:update, @group), @group, :body, as: :textarea
   .show_only_in_edit_mode
     = render partial: 'shared/markdown_help'
     

data/app/views/pages/_page.html.haml

@@ -3,7 +3,7 @@
     = best_in_place_if can?(:update, page), page, :title
   - else  # Blog Entries:
     = link_to(page) do
-      = best_in_place_if can?(:update, page), page, :title, classes: 'click_does_not_trigger_edit', activator: 'only_manual'
+      = best_in_place_if can?(:update, page), page, :title, class: 'click_does_not_trigger_edit', activator: 'only_manual'
 %div.page
   %div.page_header
     - if page.author
@@ -18,7 +18,7 @@
         = localize(page.updated_at)
   %div.page_body
     %div{ id: 'page_content', data: { mercury: 'full' } }
-      = best_in_place_if can?(:update, page), page, :content, type: 'textarea', sanitize: false
+      = best_in_place_if can?(:update, page), page, :content, as: :textarea, sanitize: false
     .show_only_in_edit_mode
       = render partial: 'shared/markdown_help'
 

data/app/views/profile_fields/_profile_field.html.haml

@@ -4,8 +4,8 @@
 -#
 - profile_field_css_class = profile_field.parent ? 'attribute profile_field profile_field_child' : 'attribute profile_field profile_field_parent'
 - profile_field_css_class += " #{profile_field.key}" if profile_field.parent_id
-- input_type = 'input'
-- input_type = 'textarea' if %w(ProfileFieldTypes::Address ProfileFieldTypes::Description ProfileFieldTypes::About).include? profile_field.type   
+- input_type = :input
+- input_type = :textarea if %w(ProfileFieldTypes::Address ProfileFieldTypes::Description ProfileFieldTypes::About).include? profile_field.type   
 -# # For the moment, no 'date' type. The date selector does not work properly with edit_mode.
 -# input_type = 'date' if profile_field.type == "ProfileFieldTypes::Date"
 - no_remove ||= false
@@ -25,12 +25,12 @@
     - if profile_field.parent || lock_label || cannot?(:update, profile_field)
       %span.label.profile_field_label= profile_field.label
     - else
-      = best_in_place profile_field, :label, classes: 'profile_field_label label', html_attrs: { placeholder: I18n.t(profile_field.underscored_type) }
+      = best_in_place profile_field, :label, class: 'profile_field_label label', html_attrs: { placeholder: I18n.t(profile_field.underscored_type) }
 
   - # value
   %span.value-wrapper
     - if profile_field.children_count == 0
-      = best_in_place_if can?(:update, profile_field), profile_field, :value, {type: input_type, classes: 'value'}
+      = best_in_place_if can?(:update, profile_field), profile_field, :value, {as: input_type, class: 'value'}
           
     - if profile_field.children_count > 0
       %ul

data/lib/your_platform/version.rb

@@ -1,3 +1,3 @@
 module YourPlatform
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/factories/mail_message.rb

@@ -6,7 +6,7 @@ FactoryGirl.define do
   #
   factory :mail_message_to_group, :class => Mail do
   
-    ignore do
+    transient do
       message "Date: Fri, 29 Mar 2013 23:55:00 +0100\n" +
         "From: foo@exampe.org\n" +
         "Subject: Testing Group Email Lists\n" +
@@ -19,7 +19,7 @@ FactoryGirl.define do
 
   factory :html_mail_message, :class => Mail do
     
-    ignore do
+    transient do
       email_file_name = File.join(File.dirname(__FILE__), './html_email.eml')
       message File.open(email_file_name, "r").read
     end

data/spec/factories/user.rb

@@ -83,7 +83,7 @@ FactoryGirl.define do
     end
     
     factory :local_admin do
-      ignore do
+      transient do
         of nil  # syntax: create(:local_admin, of: @group)
       end
       create_account true

data/spec/factories/workflow.rb

@@ -26,7 +26,7 @@ FactoryGirl.define do
   #
   factory :promotion_workflow, :class => Workflow do 
     
-    ignore do
+    transient do
       remove_from_group_id 0
       add_to_group_id 0
     end

data/spec/models/geo_location_spec.rb

@@ -73,7 +73,7 @@ describe GeoLocation do
   # ==========================================================================================
 
   describe ".find_or_create_by_address" do
-    subject { GeoLocation.find_or_create_by_address(@address_string) }
+    subject { GeoLocation.find_or_create_by address: @address_string }
     describe "for an existing record" do
       before { @geo_location = GeoLocation.create( address: @address_string ) }
       it "should find the existing one" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: your_platform
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Sebastian Fiedlschuster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -911,7 +911,6 @@ files:
 - app/models/ability.rb
 - app/models/active_record_associations_patches.rb
 - app/models/active_record_cache_extension.rb
-- app/models/active_record_find_by_extension.rb
 - app/models/active_record_json_url_extension.rb
 - app/models/active_record_metric_events_extension.rb
 - app/models/active_record_read_only_extension.rb
@@ -1123,7 +1122,6 @@ files:
 - app/views/users/show.html.haml
 - config/environment.rb
 - config/initializers/active_record_cache_extension.rb
-- config/initializers/active_record_find_by_extension.rb
 - config/initializers/active_record_flagable_extension.rb
 - config/initializers/active_record_json_url_extension.rb
 - config/initializers/active_record_may_need_review_extension.rb
@@ -1305,7 +1303,6 @@ files:
 - spec/helpers/attachments_helper_spec.rb
 - spec/models/ability_spec.rb
 - spec/models/active_record_cache_extension_spec.rb
-- spec/models/active_record_find_by_extension_spec.rb
 - spec/models/active_record_json_url_extension_spec.rb
 - spec/models/address_label_spec.rb
 - spec/models/app_version_spec.rb
@@ -1450,7 +1447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Administrative and social network platform for closed user groups.
@@ -1497,7 +1494,6 @@ test_files:
 - spec/helpers/attachments_helper_spec.rb
 - spec/models/ability_spec.rb
 - spec/models/active_record_cache_extension_spec.rb
-- spec/models/active_record_find_by_extension_spec.rb
 - spec/models/active_record_json_url_extension_spec.rb
 - spec/models/address_label_spec.rb
 - spec/models/app_version_spec.rb

data/app/models/active_record_find_by_extension.rb

@@ -1,20 +0,0 @@
-module ActiveRecordFindByExtension
-  extend ActiveSupport::Concern
-
-  module ClassMethods
-
-    # A Rails 4 alias for `where`.
-    # See: https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/finder_methods.rb
-    #
-    # It will return the first matching object and return the object, not an ActiveRecord::Relation.
-    # If an ActiveRecord::Relation, which is chainable, is needed, use where().
-    #
-    def find_by( args )
-      where( args ).limit( 1 ).first
-    end
-
-  end
-
-end
-
-ActiveRecord::Base.send( :include, ActiveRecordFindByExtension ) if Rails.version < "4.0"

data/config/initializers/active_record_find_by_extension.rb

@@ -1 +0,0 @@
-require 'active_record_find_by_extension'

data/spec/models/active_record_find_by_extension_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe ActiveRecordFindByExtension do
-
-  # The extension described here applies to all ActiveRecord::Base models.
-  # Therefore, we pick the user model, here.
-
-  before do
-    @user = create( :user )
-    @other_user = create( :user )
-  end
-
-  describe ".find_by" do
-    subject { User.find_by( first_name: @user.first_name, last_name: @user.last_name ) }
-    it "should return an object" do
-      subject.should be_kind_of User
-    end
-    it "should not return an ActiveRecord::Relation" do
-      subject.should_not be_kind_of ActiveRecord::Relation
-    end
-    it "should find the correct object" do
-      subject.should == @user
-    end
-  end
-
-end