your_platform 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d4f4254548dff774d063fd40e179c3e06189f97
-  data.tar.gz: da0eb80eaa45c980cedc8058e84cde0c514452d5
+  metadata.gz: bdb2a476e0a91647e85d31eb03cd09af8a3734c5
+  data.tar.gz: 133ef1bc00d68b4f1220107aa59f606cb1d7e410
 SHA512:
-  metadata.gz: 2e1cd54d69ff299c954eb839409122955c90e2f1e9f76d12265160190032cbcc6df87f25a3f9c4208249dde489c5f22540dd30e705f16f10da2051227802c432
-  data.tar.gz: 1d6a2f147d4abe217de66389ee16d7b4625b8d7f2ce94d1e35459c82c16a878586f1fdae580c2a9d26d3955d01c3cae664110873727df465c09cdfaafed62536
+  metadata.gz: 157f81d8d96f7ab2b1a69743dd03b9874367f9a4ba09adc265353661574cacdc0aa9a234b35553e0d0f0415e332374f9d1e1bafc8f53bb9d7e34f1808f03e721
+  data.tar.gz: 347e57de5ce3d7a4c598095fe4a181df8244537563b40374fd6b67dce612691888426ca473f92d11fef0bb4296db50c2b51a30b476194af8a608cea5ecfb85e0

data/README.md

@@ -35,6 +35,16 @@ If you have any troubles, **feel free to contact us on our [gitter channel](http
 
 Our [code documentation can be found on rubydoc.info](http://www.rubydoc.info/github/fiedl/your_platform).
 
+## Versioning
+
+* Have a quick look at [rubygem's short explanation of semantic versioning](http://guides.rubygems.org/patterns/#semantic-versioning).
+* The version can be bumped using one of these:
+  
+  ```
+  rake version:bump:major
+  rake version:bump:minor
+  rake version:bump:patch
+  ```
 
 ## Contributing
 
@@ -44,6 +54,7 @@ Our [code documentation can be found on rubydoc.info](http://www.rubydoc.info/gi
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+
 ## Authors and License
 
 **Copyright** (c) 2012-2015, Sebastian Fiedlschuster

data/Rakefile

@@ -1,15 +1,49 @@
 #!/usr/bin/env rake
 
+# Load demo application environment.
+# 
 require File.expand_path('../demo_app/my_platform/config/application', __FILE__)
-require 'rspec/core/rake_task'
-require 'rspec-rerun'
 
-MyPlatform::Application.load_tasks
 
-pattern = "{./spec/**/*_spec.rb}"
+# Do not load the application tasks for the moment, which would
+# invoke test:prepare, which has been dropped.
+# 
+# # MyPlatform::Application.load_tasks
+
+
+# Use rspec-rerun as default task.
+# 
+#   - rake
+#   - rake rspec-rerun:spec
+#
+require 'rspec/core/rake_task'
+require 'rspec-rerun'
 
 ENV['RSPEC_RERUN_RETRY_COUNT'] ||= '3'
-ENV['RSPEC_RERUN_PATTERN'] ||= pattern
+ENV['RSPEC_RERUN_PATTERN'] ||= "{./spec/**/*_spec.rb}"
 
 task default: 'rspec-rerun:spec'
 
+
+# Version bumping mechanism.
+# See: https://gist.github.com/grosser/1261469
+#
+#   - rake version:bump:major
+#   - rake version:bump:minor
+#   - rake version:bump:patch
+#
+rule /^version:bump:.*/ do |t|
+  sh "git status | grep 'nothing to commit'" # ensure we are not dirty
+  index = ['major', 'minor','patch'].index(t.name.split(':').last)
+  file = 'lib/your_platform/version.rb'
+ 
+  version_file = File.read(file)
+  old_version, *version_parts = version_file.match(/(\d+)\.(\d+)\.(\d+)/).to_a
+  version_parts[index] = version_parts[index].to_i + 1
+  version_parts[2] = 0 if index < 2
+  version_parts[1] = 0 if index < 1
+  new_version = version_parts * '.'
+  File.open(file,'w'){|f| f.write(version_file.sub(old_version, new_version)) }
+ 
+  sh "bundle && git add #{file} Gemfile.lock && git commit -m 'bump version to #{new_version}.'"
+end

data/app/controllers/application_controller.rb

@@ -3,6 +3,7 @@ class ApplicationController < ActionController::Base
 
   layout "bootstrap"
 
+  
   # TODO: Change before_filter to before_action  (http://stackoverflow.com/questions/16519828)
   #
   before_filter :redirect_www_subdomain, :set_locale
@@ -17,6 +18,7 @@ class ApplicationController < ActionController::Base
   
   # https://github.com/ryanb/cancan
   # 
+  before_action :configure_permitted_devise_parameters, if: :devise_controller?
   check_authorization(:unless => :devise_controller?)
   rescue_from CanCan::AccessDenied do |exception|
     session['return_to_after_login'] = request.fullpath 
@@ -156,7 +158,7 @@ class ApplicationController < ActionController::Base
   # If the current_user can? :read the :mini_profiler, is defined in the Ability class.
   #
   def authorize_miniprofiler
-    Rack::MiniProfiler.authorize_request if can? :use, Rack::MiniProfiler
+    #Rack::MiniProfiler.authorize_request if can? :use, Rack::MiniProfiler
   end
   
   
@@ -232,5 +234,11 @@ class ApplicationController < ActionController::Base
   def after_sign_in_path_for(resource)
     session['return_to_after_login'] || root_path
   end
+  
+  protected
+  
+  def configure_permitted_devise_parameters
+    devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:login, :password) }
+  end
 
 end

data/app/controllers/search_controller.rb

@@ -42,10 +42,10 @@ class SearchController < ApplicationController
       
       # eleminiate duplicate results
       #
-      @users.uniq!
-      @pages.uniq!
-      @groups.uniq!
-      @events.uniq!
+      @users = @users.uniq
+      @pages = @pages.uniq
+      @groups = @groups.uniq
+      @events = @events.uniq
 
       # AUTHORIZATION
       #

data/app/helpers/sublime_helper.rb

@@ -6,7 +6,7 @@ module SublimeHelper
   #
   
   # def sublime_token
-  #   ::SECRETS["sublime_token"] || ""
+  #   Rails.application.secrets.sublime_token || ""
   # end
   # 
   # def sublime_script_tag

data/app/models/active_record_json_url_extension.rb

@@ -1,16 +1,16 @@
 module ActiveRecordJsonUrlExtension
   extend ActiveSupport::Concern
 
-  def serializable_hash( options = {} )
-    options[ :methods ] = [ :url ] if not options[ :methods ]
-    options[ :methods ] = [ options[ :methods ] ] if options[ :methods ].kind_of? Symbol
-    options[ :methods ] << :url if options[ :methods ]
-    raise 'options[ :methods ] should be an array' unless options[ :methods ].kind_of? Array
+  def serializable_hash(options = {})
+    options[:methods] = [:url] if not options[:methods]
+    options[:methods] = [options[:methods]] if options[:methods].kind_of? Symbol
+    options[:methods] << :url if options[:methods]
+    raise 'options[:methods] should be an array' unless options[:methods].kind_of? Array
     super options
   end
 
   def url
-    UrlHelper.new( self ).url
+    UrlHelper.new(self).url
   end
   
   # The following class generates a scope that prevents the url helpers
@@ -22,30 +22,27 @@ module ActiveRecordJsonUrlExtension
   #
   #   my_instance = MyModel.create()
   #
-  # You may call <tt>my_instance.url()</tt> to get the same result as for
-  # <tt>url_for(my_instance)</tt>.
+  # You may call `my_instance.url()` to get the same result as for
+  # `url_for(my_instance)`.
   # But you should not be able to call, for example, 
-  # <tt>my_instance.my_model_path( ... )</tt>.
+  # `my_instance.my_model_path( ... )`.
   #
   class UrlHelper
-
     include Rails.application.routes.url_helpers
     include ActionDispatch::Routing::UrlFor
 
-    def initialize( obj )
+    def initialize(obj)
       @obj = obj
     end
     
     def url_options
-      Rails.application.config.action_mailer.default_url_options
+      Rails.application.config.action_mailer.default_url_options || raise("Please set 'config.action_mailer.default_url_options = {host: ...}' in the application config.")
     end
-
+  
     def url
-      url_for @obj
+      url_for(@obj)
     end
-
   end
-  
 end
 
-ActiveRecord::Base.send( :include, ActiveRecordJsonUrlExtension )
+ActiveRecord::Base.send(:include, ActiveRecordJsonUrlExtension)

data/app/models/attachment.rb

@@ -1,5 +1,5 @@
 class Attachment < ActiveRecord::Base
-  attr_accessible :description, :file, :parent_id, :parent_type, :title, :author
+  attr_accessible :description, :file, :parent_id, :parent_type, :title, :author if defined? attr_accessible
 
   belongs_to :parent, polymorphic: true
   belongs_to :author, :class_name => "User", foreign_key: 'author_user_id'

data/app/models/bookmark.rb

@@ -6,7 +6,7 @@
 # Such bookmarkable objects may be other users, or pages, groups, et cetera.
 #
 class Bookmark < ActiveRecord::Base
-  attr_accessible :bookmarkable_id, :bookmarkable_type, :user_id, :user, :bookmarkable
+  attr_accessible :bookmarkable_id, :bookmarkable_type, :user_id, :user, :bookmarkable if defined? attr_accessible
 
   belongs_to :bookmarkable, polymorphic: true
   belongs_to :user

data/app/models/cache_store_extension.rb

@@ -10,13 +10,13 @@ module CacheStoreExtension
     return result
   end
   
-  def fetch(key, options = {}, &block)
-    rescue_from_undefined_class_or_module do
-      rescue_from_other_errors(block) do
-        super(key, {force: @ignore_cache}.merge(options), &block)
-      end
-    end
-  end
+  #def fetch(key, options = {}, &block)
+  #  rescue_from_undefined_class_or_module do
+  #    rescue_from_other_errors(block) do
+  #      super(key, {force: @ignore_cache}.merge(options), &block)
+  #    end
+  #  end
+  #end
   
   def delete_regex(regex)
     if @data

data/app/models/concerns/user_avatar.rb

@@ -10,7 +10,7 @@ module UserAvatar
   
   included do
     attachment :avatar, type: :image
-    attr_accessible :avatar, :remove_avatar
+    attr_accessible :avatar, :remove_avatar if defined? attr_accessible
   end
 
 end

data/app/models/concerns/user_corporations.rb

@@ -12,7 +12,7 @@ module UserCorporations
   extend ActiveSupport::Concern
   
   included do
-    attr_accessible :corporation_name
+    attr_accessible :corporation_name if defined? attr_accessible
   end
     
   def corporation_id

data/app/models/dag_link.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 class DagLink < ActiveRecord::Base
 
-  attr_accessible :ancestor_id, :ancestor_type, :count, :descendant_id, :descendant_type, :direct
+  attr_accessible :ancestor_id, :ancestor_type, :count, :descendant_id, :descendant_type, :direct if defined? attr_accessible
   acts_as_dag_links polymorphic: true
 
   # We have to workaround a bug in Rails 3 here. But, since Rails 3 is no longer fully supported,

data/app/models/event.rb

@@ -1,5 +1,5 @@
 class Event < ActiveRecord::Base
-  attr_accessible :description, :location, :end_at, :name, :start_at, :localized_start_at, :localized_end_at, :publish_on_local_website, :publish_on_global_website
+  attr_accessible :description, :location, :end_at, :name, :start_at, :localized_start_at, :localized_end_at, :publish_on_local_website, :publish_on_global_website if defined? attr_accessible
 
   is_structureable ancestor_class_names: %w(Group), descendant_class_names: %w(Group Page)
   is_navable

data/app/models/flag.rb

@@ -1,5 +1,5 @@
 class Flag < ActiveRecord::Base
-  attr_accessible :flagable_id, :flagable_type, :key
+  attr_accessible :flagable_id, :flagable_type, :key if defined? attr_accessible
 
   belongs_to :flagable, polymorphic: true
 

data/app/models/geo_location.rb

@@ -1,5 +1,5 @@
 class GeoLocation < ActiveRecord::Base
-  attr_accessible :address #, :city, :country, :country_code, :latitude, :longitude, :postal_code, :queried_at
+  attr_accessible :address if defined? attr_accessible
 
 
   # When to perform geocoding queries (to google)

data/app/models/group.rb

@@ -6,17 +6,19 @@
 # 
 class Group < ActiveRecord::Base
   
-  attr_accessible( :name, # just the name of the group; example: 'Corporation A'
-                    :body, # a description text displayed on the groups pages top
-                    :token, # (optional) a short-name, abbreviation of the group's name, in 
-                            # a global context; example: 'A'
-                    :internal_token, # (optional) an internal abbreviation, i.e. used by the 
-                                     # members of the group; example: 'AC'
-                    :extensive_name, # (optional) a long version of the group's name;
-                                     # example: 'The Corporation of A'
-                    :direct_members_titles_string # Used for inline-editing: The comma-separated
-                                                  # titles of the child users of the group.
-                    )
+  if defined? attr_accessible
+    attr_accessible( :name, # just the name of the group; example: 'Corporation A'
+                      :body, # a description text displayed on the groups pages top
+                      :token, # (optional) a short-name, abbreviation of the group's name, in 
+                              # a global context; example: 'A'
+                      :internal_token, # (optional) an internal abbreviation, i.e. used by the 
+                                       # members of the group; example: 'AC'
+                      :extensive_name, # (optional) a long version of the group's name;
+                                       # example: 'The Corporation of A'
+                      :direct_members_titles_string # Used for inline-editing: The comma-separated
+                                                    # titles of the child users of the group.
+                      )
+  end
   
   include ActiveModel::ForbiddenAttributesProtection  # TODO: Move into initializer
 
@@ -70,7 +72,7 @@ class Group < ActiveRecord::Base
       name + (parent_events.first ? ": " + parent_events.first.name : '')
     elsif has_flag? :contact_people
       name + (parent_events.first ? ": " + parent_events.first.name : '')
-    elsif has_flag? :admins_parent
+    elsif has_flag?(:admins_parent) && parent_groups.first.parent_groups.first
       name + ": " + parent_groups.first.parent_groups.first.name
     elsif super.present?
       super

data/app/models/group_mixins/memberships.rb

@@ -95,7 +95,7 @@ module GroupMixins::Memberships
     end
     
     def memberships_including_members
-      memberships.includes(:descendant).order('valid_from' => 'desc')
+      memberships.includes(:descendant).order(valid_from: :desc)
     end
     
     # This returns the memberships that appear in the member list

data/app/models/last_seen_activity.rb

@@ -1,5 +1,5 @@
 class LastSeenActivity < ActiveRecord::Base
-  attr_accessible :description, :link_to_object_id, :link_to_object_type, :user_id
+  attr_accessible :description, :link_to_object_id, :link_to_object_type, :user_id if defined? attr_accessible
   
   belongs_to :user
   belongs_to :link_to_object, polymorphic: true

data/app/models/nav_node.rb

@@ -4,7 +4,7 @@
 # relevant to the position of the Navable object within the navigational structure.
 #
 class NavNode < ActiveRecord::Base
-  attr_accessible :breadcrumb_item, :hidden_menu, :menu_item, :slim_breadcrumb, :slim_menu, :slim_url, :url_component
+  attr_accessible :breadcrumb_item, :hidden_menu, :menu_item, :slim_breadcrumb, :slim_menu, :slim_url, :url_component if defined? attr_accessible
 
   belongs_to :navable, polymorphic: true
 

data/app/models/page.rb

@@ -1,6 +1,6 @@
 class Page < ActiveRecord::Base
 
-  attr_accessible        :content, :title, :redirect_to, :author
+  attr_accessible        :content, :title, :redirect_to, :author if defined? attr_accessible
 
   is_structureable       ancestor_class_names: %w(Page User Group Event), descendant_class_names: %w(Page User Group)
   is_navable

data/app/models/post.rb

@@ -1,5 +1,5 @@
 class Post < ActiveRecord::Base
-  attr_accessible :author_user_id, :external_author, :group_id, :sent_at, :sticky, :subject, :text
+  attr_accessible :author_user_id, :external_author, :group_id, :sent_at, :sticky, :subject, :text if defined? attr_accessible
   belongs_to :group
   belongs_to :author, :class_name => "User", foreign_key: 'author_user_id'
 

data/app/models/profile_field.rb

@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
 class ProfileField < ActiveRecord::Base
 
-  attr_accessible        :label, :type, :value, :key, :profileable_id, :profileable_type
+  attr_accessible        :label, :type, :value, :key, :profileable_id, :profileable_type if defined? attr_accessible
 
   belongs_to             :profileable, polymorphic: true
   
+  after_commit           :delete_cache
+  
   include ProfileFieldMixins::HasChildProfileFields
   
   # Only allow the type column to be an existing class name.
@@ -88,13 +90,6 @@ class ProfileField < ActiveRecord::Base
     end
   end
   
-  # Overwrite save to ensure that the cache is deleted in case of changes.
-  #
-  def save( *args )
-    delete_cache
-    super( *args )
-  end
-
   def delete_cache
     super
     parent.try(:delete_cache)

data/app/models/profile_field_mixins/has_child_profile_fields.rb

@@ -28,7 +28,7 @@ module ProfileFieldMixins::HasChildProfileFields
     before_save :build_child_fields_if_absent
     after_save :save_child_profile_fields
     
-    attr_accessible *keys
+    attr_accessible *keys if defined? attr_accessible
 
     include HasChildProfileFieldsInstanceMethods
 

data/app/models/profile_field_types/address.rb

@@ -5,7 +5,7 @@ module ProfileFieldTypes
   class Address < ProfileField
     def self.model_name; ProfileField.model_name; end
 
-    attr_accessible :postal_address
+    attr_accessible :postal_address if defined? attr_accessible
 
     # Google Maps integration
     # see: http://rubydoc.info/gems/gmaps4rails/

data/app/models/relationship.rb

@@ -10,7 +10,7 @@
 #
 class Relationship < ActiveRecord::Base
 
-  attr_accessible :user1, :user2, :name, :who, :is, :of, :who_by_title, :of_by_title
+  attr_accessible :user1, :user2, :name, :who, :is, :of, :who_by_title, :of_by_title if defined? attr_accessible
 
   belongs_to :user1, class_name: "User", inverse_of: :relationships_as_first_user
   belongs_to :user2, class_name: "User", inverse_of: :relationships_as_second_user

data/app/models/setting.rb

@@ -1,5 +1,5 @@
 class Setting < RailsSettings::CachedSettings
-	attr_accessible :var
+	attr_accessible :var if defined? attr_accessible
 
   def self.app_name=(name)
     super(name)

data/app/models/status_group_membership.rb

@@ -18,7 +18,7 @@ class StatusGroupMembership < UserGroupMembership
             :event, :event=,   # alias methods
             to: :find_or_create_status_group_membership_info )
 
-  attr_accessible :event_by_name
+  attr_accessible :event_by_name if defined? attr_accessible
 
   # Alias Methods For Delegated Methods
   # ==========================================================================================

data/app/models/status_group_membership_info.rb

@@ -1,7 +1,5 @@
 class StatusGroupMembershipInfo < ActiveRecord::Base
   
-  attr_accessible
-
   belongs_to :membership, touch: true, class_name: "StatusGroupMembership", inverse_of: :status_group_membership_info 
 
   belongs_to :promoted_by_workflow, foreign_key: 'promoted_by_workflow_id', class_name: "Workflow"

data/app/models/user.rb

@@ -1,16 +1,18 @@
 # -*- coding: utf-8 -*-
 class User < ActiveRecord::Base
 
-  attr_accessible           :first_name, :last_name, :name, :alias, :email, :create_account, :female, :add_to_group,
-                            :add_to_corporation, :date_of_birth, :localized_date_of_birth,
-                            :aktivmeldungsdatum, :study_address, :home_address, :work_address, :phone, :mobile
+  if defined? attr_accessible
+    attr_accessible           :first_name, :last_name, :name, :alias, :email, :create_account, :female, :add_to_group,
+                              :add_to_corporation, :date_of_birth, :localized_date_of_birth,
+                              :aktivmeldungsdatum, :study_address, :home_address, :work_address, :phone, :mobile
+  end
 
   attr_accessor             :create_account, :add_to_group, :add_to_corporation
   # Boolean, der vormerkt, ob dem (neuen) Benutzer ein Account hinzugefügt werden soll.
 
   validates_presence_of     :first_name, :last_name
-  validates_format_of       :first_name, with: /^[^\,]*$/  # The name must not contain a comma.
-  validates_format_of       :last_name, with: /^[^\,]*$/
+  validates_format_of       :first_name, with: /\A[^\,]*\z/  # The name must not contain a comma.
+  validates_format_of       :last_name, with: /\A[^\,]*\z/
   
   validates_uniqueness_of   :alias, :if => Proc.new { |user| user.account and user.alias.present? }
   validates_format_of       :email, :with => Devise::email_regexp, :if => Proc.new { |user| user.email.present? }, judge: :ignore
@@ -289,7 +291,7 @@ class User < ActiveRecord::Base
     unless readonly?
       if description and not self.incognito?
         activity = find_or_build_last_seen_activity
-        activity.touch # even if the attributes didn't change. The user probably hit 'reload' then.
+        activity.touch unless activity.new_record? # even if the attributes didn't change. The user probably hit 'reload' then.
         activity.description = description
         activity.link_to_object = object
         activity.save
@@ -393,7 +395,7 @@ class User < ActiveRecord::Base
     cached do
       if first_corporation
         my_memberships = UserGroupMembership.find_all_by_user( self )
-        my_memberships = my_memberships.now.reorder{ |membership| membership.valid_from }
+        my_memberships = my_memberships.now.reorder(:valid_from)
         my_groups = my_memberships.collect { |membership| membership.try( :group ) } if my_memberships
         my_groups ||= []
         my_groups.select do |group|

data/app/models/user_account.rb

@@ -33,7 +33,7 @@ class UserAccount < ActiveRecord::Base
   #     Can unlock via email or after a specified time period.
   # 
   devise :database_authenticatable, :recoverable, :rememberable, :validatable, :registerable
-  attr_accessible :password, :password_confirmation, :remember_me
+  attr_accessible :login, :password, :password_confirmation, :remember_me if defined? attr_accessible
 
   # Virtual attribute for authenticating by either username, alias or email
   attr_accessor :login

data/app/models/user_group_membership.rb

@@ -28,7 +28,7 @@ class UserGroupMembership < DagLink
   #
   has_many_flags
   may_need_review
-  attr_accessible :needs_review
+  attr_accessible :needs_review if defined? attr_accessible
   
 
   # General Properties

data/app/models/workflow.rb

@@ -1,5 +1,5 @@
 class Workflow < WorkflowKit::Workflow  #< ActiveRecord::Base
-  attr_accessible    :name
+  attr_accessible    :name if defined? attr_accessible
 
   is_structureable   ancestor_class_names: %w(Group)
 

data/config/environment.rb

@@ -1,5 +1,5 @@
-# Load the rails application
+# Load the Rails application.
 require File.expand_path('../application', __FILE__)
 
-# Initialize the rails application
-MyPlatform::Application.initialize!
+# Initialize the Rails application.
+Rails.application.initialize!

data/config/initializers/assets.rb

@@ -0,0 +1,7 @@
+# This file lists the assets that need to be compiled into separate files.
+
+# Layout
+Rails.application.config.assets.precompile += %w( bootstrap_setup.css bootstrap_layout.css )
+
+# Galleria
+Rails.application.config.assets.precompile += %w( galleria-classic.js galleria/classic-loader.gif galleria/classic-map.png )

data/config/initializers/best_in_place_display_definitions.rb

@@ -19,13 +19,13 @@
 
 # This calls the instance method on the model: ProfileField#display_html
 #
-BestInPlace::DisplayMethods.add_model_method('ProfileField', :value, :display_html)
+BestInPlace::DisplayMethods.add_model_method(ProfileField, :value, :display_html)
 
 # This calls a helper method `markup(str)`.
 #
-BestInPlace::DisplayMethods.add_helper_method('Page', :content, :markup)
-BestInPlace::DisplayMethods.add_helper_method('Group', :body, :markup)
-BestInPlace::DisplayMethods.add_helper_method('Event', :description, :markup)
+BestInPlace::DisplayMethods.add_helper_method(Page, :content, :markup)
+BestInPlace::DisplayMethods.add_helper_method(Group, :body, :markup)
+BestInPlace::DisplayMethods.add_helper_method(Event, :description, :markup)
 
-BestInPlace::DisplayMethods.add_helper_method('Group', :direct_members_titles_string, :add_quick_links_to_comma_separated_list)
-BestInPlace::DisplayMethods.add_helper_method('User', :corporation_name, :add_quick_link)
+BestInPlace::DisplayMethods.add_helper_method(Group, :direct_members_titles_string, :add_quick_links_to_comma_separated_list)
+BestInPlace::DisplayMethods.add_helper_method(User, :corporation_name, :add_quick_link)

data/config/initializers/protected_attributes.rb

@@ -0,0 +1,7 @@
+module SanitizeOverride
+  def sanitize_forbidden_attributes(attributes)
+    attributes
+  end
+end
+
+ActiveRecord::Relation.include SanitizeOverride

data/config/routes.rb

@@ -13,8 +13,8 @@ Rails.application.routes.draw do
   # Users should be allowed to change their password(update registration), but not to sign up(create registration)
   devise_for :user_accounts, :controllers => {:sessions => 'sessions'}, :skip => [:registrations]
   devise_scope :user_account do
-    match 'sign_in' => 'devise/sessions#new', as: :sign_in
-    match 'sign_out' => 'devise/sessions#destroy', as: :sign_out
+    get 'sign_in' => 'devise/sessions#new', as: :sign_in
+    delete 'sign_out' => 'devise/sessions#destroy', as: :sign_out
     get 'change_password' => 'devise/registrations#edit', :as => 'edit_registration'
     get 'change_password' => 'devise/registrations#edit', :as => 'edit_password'
     get 'change_password' => 'devise/registrations#edit', :as => 'change_password'

data/db/migrate/20130309193623_add_devise_to_user_accounts.rb

@@ -3,7 +3,13 @@ class AddDeviseToUserAccounts < ActiveRecord::Migration
     change_table(:user_accounts) do |t|
       ## Database authenticatable
       #t.string :email,              :null => false, :default => ""
-      t.string :encrypted_password, :null => false, :default => ""
+      if Rails.version.starts_with?("3")
+        t.string :encrypted_password, :null => false, :default => ""
+      else
+        # https://github.com/fiedl/wingolfsplattform/commit/01f7d3182387aaca99564216661bb7b222fee084#diff-e7267e28ca9cf34b8ba67e6b088344caR5
+        # http://stackoverflow.com/a/12990129/2066546
+        t.change :encrypted_password, :string, null: false, default: ""
+      end
 
       ## Recoverable
       t.string   :reset_password_token

data/lib/best_in_place/controller_extensions.rb

@@ -5,21 +5,21 @@ module BestInPlace
   module ControllerExtensions
 
   private
-    def respond_bip_ok(obj)
-      #if obj.respond_to?(:id)
-      #  klass = "#{obj.class}_#{obj.id}"
-      #else
-      #  klass = obj.class.to_s
-      #end
-      param_key = BestInPlace::Utils.object_to_key(obj)
-      updating_attr = params[param_key].keys.first
-
-      if renderer = BestInPlace::DisplayMethods.lookup(obj.class.name, updating_attr) || BestInPlace::DisplayMethods.lookup(obj.class.base_class.name, updating_attr)
-        render :json => renderer.render_json(obj)
-      else
-        head :no_content
-      end
-    end
+    # def respond_bip_ok(obj)
+    #   #if obj.respond_to?(:id)
+    #   #  klass = "#{obj.class}_#{obj.id}"
+    #   #else
+    #   #  klass = obj.class.to_s
+    #   #end
+    #   param_key = BestInPlace::Utils.object_to_key(obj)
+    #   updating_attr = params[param_key].keys.first
+    # 
+    #   if renderer = BestInPlace::DisplayMethods.lookup(obj.class.name, updating_attr) || BestInPlace::DisplayMethods.lookup(obj.class.base_class.name, updating_attr)
+    #     render :json => renderer.render_json(obj)
+    #   else
+    #     head :no_content
+    #   end
+    # end
 
   end
 end

data/lib/best_in_place/helper.rb

@@ -2,115 +2,22 @@ require 'best_in_place'
 require_dependency(Gem::Specification.find_by_name('best_in_place').gem_dir + '/' + 'lib/best_in_place/helper')
 
 module BestInPlace
-  module BestInPlaceHelpers
-    
-    def best_in_place(object, field, opts = {})
-      if opts[:display_as] && opts[:display_with]
-        raise ArgumentError, "Can't use both 'display_as' and 'display_with' options at the same time"
-      end
-
-      if opts[:display_with] && !opts[:display_with].is_a?(Proc) && !ViewHelpers.respond_to?(opts[:display_with])
-        raise ArgumentError, "Can't find helper #{opts[:display_with]}"
-      end
-
-      real_object = real_object_for object
-      opts[:type] ||= :input
-      opts[:collection] ||= []
-      field = field.to_s
-
-      display_value = build_value_for(real_object, field, opts)
-
-      collection = nil
-      value = nil
-      if opts[:type] == :select && !opts[:collection].blank?
-        value = real_object.send(field)
-        display_value = Hash[opts[:collection]].stringify_keys[value.to_s]
-        collection = opts[:collection].to_json
-      end
-      if opts[:type] == :checkbox
-        value = !!real_object.send(field)
-        if opts[:collection].blank? || opts[:collection].size != 2
-          opts[:collection] = ["No", "Yes"]
-        end
-        display_value = value ? opts[:collection][1] : opts[:collection][0]
-        collection = opts[:collection].to_json
-      end
-      classes = ["best_in_place"]
-      unless opts[:classes].nil?
-        # the next three lines enable this opt to handle both a stings and a arrays
-        classes << opts[:classes]
-        classes.flatten!
-      end
-
-      out = "<span class='#{classes.join(" ")}'"
-      out << " id='#{BestInPlace::Utils.build_best_in_place_id(real_object, field)}'"
-      out << " data-url='#{opts[:path].blank? ? url_for(object) : url_for(opts[:path])}'"
-      out << " data-object='#{opts[:object_name] || BestInPlace::Utils.object_to_key(real_object)}'"
-      out << " data-collection='#{attribute_escape(collection)}'" unless collection.blank?
-      out << " data-attribute='#{field}'"
-      out << " data-activator='#{opts[:activator]}'" unless opts[:activator].blank?
-      out << " data-ok-button='#{opts[:ok_button]}'" unless opts[:ok_button].blank?
-      out << " data-ok-button-class='#{opts[:ok_button_class]}'" unless opts[:ok_button_class].blank?
-      out << " data-cancel-button='#{opts[:cancel_button]}'" unless opts[:cancel_button].blank?
-      out << " data-cancel-button-class='#{opts[:cancel_button_class]}'" unless opts[:cancel_button_class].blank?
-      out << " data-nil='#{attribute_escape(opts[:nil])}'" unless opts[:nil].blank?
-      out << " data-use-confirm='#{opts[:use_confirm]}'" unless opts[:use_confirm].nil?
-      out << " data-type='#{opts[:type]}'"
-      out << " data-inner-class='#{opts[:inner_class]}'" if opts[:inner_class]
-      out << " data-html-attrs='#{opts[:html_attrs].to_json}'" unless opts[:html_attrs].blank?
-      out << " data-original-content='#{attribute_escape(real_object.send(field))}'" #if opts[:display_as] || opts[:display_with]
-      out << " data-value='#{attribute_escape(value)}'" if value
-
-      if opts[:data] && opts[:data].is_a?(Hash)
-        opts[:data].each do |k, v|
-          if !v.is_a?(String) && !v.is_a?(Symbol)
-            v = v.to_json
-          end
-          out << %( data-#{k.to_s.dasherize}="#{v}")
-        end
-      end
-      if !opts[:sanitize].nil? && !opts[:sanitize]
-        out << " data-sanitize='false'>"
-        out << display_value.to_s
-      else
-        out << ">#{h(display_value.to_s)}"
-      end
-      out << "</span>"
-      raw out
-    end
+  module Helper
     
   private
     
-    def build_value_for(object, field, opts)
+    # This overrides the lookup for best in place displays.
+    # The original method is defined here:
+    #   https://github.com/bernat/best_in_place/blob/master/lib/best_in_place/helper.rb#L93
+    # 
+    # This is needed in order to render according to the definitions of
+    #   config/initializers/best_in_place_display_definitions.rb
+    # 
+    def best_in_place_build_value_for(object, field, opts)
       return "" if object.send(field).blank?
-
-      # klass = if object.respond_to?(:id)
-      #   "#{object.class}_#{object.id}"
-      # else
-      #   object.class.to_s
-      # end
-      # 
-      # if opts[:display_as]
-      #   BestInPlace::DisplayMethods.add_model_method(klass, field, opts[:display_as])
-      #   object.send(opts[:display_as]).to_s
-      # 
-      # elsif opts[:display_with].try(:is_a?, Proc)
-      #   BestInPlace::DisplayMethods.add_helper_proc(klass, field, opts[:display_with])
-      #   opts[:display_with].call(object.send(field))
-      # 
-      # elsif opts[:display_with]
-      #   BestInPlace::DisplayMethods.add_helper_method(klass, field, opts[:display_with], opts[:helper_options])
-      #   if opts[:helper_options]
-      #     BestInPlace::ViewHelpers.send(opts[:display_with], object.send(field), opts[:helper_options])
-      #   else
-      #     BestInPlace::ViewHelpers.send(opts[:display_with], object.send(field))
-      #   end
-      # 
-      # else
-      #   object.send(field).to_s
-      # end
       
-      renderer = BestInPlace::DisplayMethods.lookup(object.class.name, field) || BestInPlace::DisplayMethods.lookup(object.class.base_class.name, field)
+      renderer = BestInPlace::DisplayMethods.lookup(object.class, field) || BestInPlace::DisplayMethods.lookup(object.class.base_class, field)
+      
       if renderer.nil?
         return object.send(field).to_s
       elsif renderer.opts[:type] == :helper

data/lib/your_platform/engine.rb

@@ -7,7 +7,7 @@ require 'rubygems'
 
 # Rails and Additions
 require 'rails-i18n'
-require 'strong_parameters'
+require 'strong_parameters' unless defined? ActionController::Parameters
 
 # JavaScript
 require 'jquery-ui-rails'
@@ -54,7 +54,6 @@ require 'gmaps4rails'
 
 # Form Helpers
 require 'formtastic'
-require 'judge/formtastic'
 
 # File Uploads
 require 'carrierwave'

data/lib/your_platform/version.rb

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

data/spec/models/active_record_json_url_extension_spec.rb

@@ -42,7 +42,7 @@ describe ActiveRecordJsonUrlExtension do
     subject { @user.serializable_hash }
     it { should be_kind_of Hash }
     it "should include the url" do
-      subject[ :url ].should == @user.url
+      subject['url'].should == @user.url
     end
 
     describe "for associated objects" do
@@ -52,16 +52,16 @@ describe ActiveRecordJsonUrlExtension do
       end
       subject { @user.serializable_hash( :include => :parent_groups ) }
       it "should include the urls of the associated objects" do
-        subject[ :parent_groups ][ 0 ][ :url ].should == @group.url
+        subject['parent_groups'][0]['url'].should == @group.url
       end
       
       describe "with other methods being included as well" do
         subject { @user.serializable_hash( :include => { :parent_groups => { :methods => :title } } ) }
         it "should include the other methods" do
-          subject[ :parent_groups ][ 0 ][ :title ].should == @group.title
+          subject['parent_groups'][0]['title'].should == @group.title
         end
         it "should include the url" do
-          subject[ :parent_groups ][ 0 ][ :url ].should == @group.url
+          subject['parent_groups'][0]['url'].should == @group.url
         end
       end
     end

data/spec/models/bookmark_spec.rb

@@ -57,12 +57,12 @@ describe Bookmark do
   describe "#serializable_hash" do
     it "should include the bookmarkable object's title" do
       @bookmarks.each do |bookmark| # check it for several types of bookmarks
-        bookmark.serializable_hash[ :bookmarkable ][ :title ].should == bookmark.bookmarkable.title
+        bookmark.serializable_hash['bookmarkable']['title'].should == bookmark.bookmarkable.title
       end
     end
     it "should include the bookmarkable object's url" do
       @bookmarks.each do |bookmark|
-        bookmark.serializable_hash[ :bookmarkable ][ :url ].should == bookmark.bookmarkable.url
+        bookmark.serializable_hash['bookmarkable']['url'].should == bookmark.bookmarkable.url
       end
     end
   end

data/spec/models/corporation_spec.rb

@@ -25,7 +25,8 @@ describe Corporation do
     it { should_not include @group }
 
     it "should return an array of Corporation-type objects" do
-      subject.should be_kind_of Array
+      subject.should be_kind_of ActiveRecord::Relation
+      subject.to_a.should be_kind_of Array
       subject.first.should be_kind_of Corporation
     end
     it "should not find the officers_parent group of the corporations_parent" do
@@ -121,7 +122,7 @@ describe Corporation do
     specify "the cache should be updated after a status group is renamed" do
       @corporation.status_groups # This created the cached version.
       @status_group.update_attributes name: 'New Status Name'
-      subject.map(&:name).should include 'New Status Name'
+      subject.reload.map(&:name).should include 'New Status Name'
     end
   end
 

data/spec/models/event_spec.rb

@@ -43,7 +43,7 @@ describe Event do
       subject.should == @event.parent_groups
     end
     it "should return an array of the associated groups" do
-      subject.should be_kind_of Array
+      subject.to_a.should be_kind_of Array
       subject.should include @group
     end
   end
@@ -125,8 +125,8 @@ describe Event do
     describe "chained with .find_all_by_group" do
       subject { Event.find_all_by_group( @group ).upcoming }
       it "should commute with find_all_by_group" do
-        Event.find_all_by_group( @group ).upcoming.should ==
-          Event.upcoming.find_all_by_group( @group )
+        Event.find_all_by_group(@group).upcoming.to_a.should ==
+          Event.upcoming.find_all_by_group(@group).to_a
       end
       it "should return associated events starting in the future" do
         subject.should include @upcoming_event

data/spec/models/group_mixins/corporations_spec.rb

@@ -57,7 +57,7 @@ describe GroupMixins::Corporations do
         subject.should == Group.find_corporation_groups
       end
       it "should be of the proper type" do  # bug test: is the `corporations` method overridden correctly? 
-        subject.should be_kind_of Array
+        subject.to_a.should be_kind_of Array
         subject.first.should_not be_kind_of User
         subject.first.should be_kind_of Group
       end

data/spec/models/profileable_spec.rb

@@ -120,7 +120,7 @@ describe Profileable do
       end
       subject { @profileable.profile_fields }
       it "should be an Array of ProfileFields" do
-        subject.should be_kind_of Array
+        subject.to_a.should be_kind_of Array
         subject.first.should be_kind_of ProfileField
       end
       describe "#to_json" do

data/spec/models/structureable_mixins/has_special_groups_spec.rb

@@ -390,7 +390,7 @@ describe StructureableMixins::HasSpecialGroups do
         it { should == @my_structureable.testers }
       end
       context "for an absent special group" do
-        it { should be_kind_of Array }
+        its(:to_a) { should be_kind_of Array }
         it { should_not == nil }
       end
     end

data/spec/models/user_group_membership_mixins/validity_range_for_indirect_memberships_spec.rb

@@ -36,6 +36,11 @@ describe UserGroupMembershipMixins::ValidityRangeForIndirectMemberships do
     @direct_membership_a.update_attribute(:valid_to, @t2)
     @direct_membership_b.update_attribute(:valid_from, @t2)
     @direct_membership_b.update_attribute(:valid_to, @t3)
+    @indirect_membership.delete_cache
+    
+    @direct_membership_a.reload
+    @direct_membership_b.reload
+    @indirect_membership.reload
   end
   
   specify "preliminaries" do
@@ -98,7 +103,7 @@ describe UserGroupMembershipMixins::ValidityRangeForIndirectMemberships do
       @direct_membership_b.update_attribute(:valid_from, @t2)
       @direct_membership_b.update_attribute(:valid_to, @t3)
     end
-    subject { @indirect_membership.recalculate_validity_range_from_direct_memberships; @indirect_membership.reload }
+    subject { @indirect_membership.reload.recalculate_validity_range_from_direct_memberships; @indirect_membership.reload }
     it "should make the indirect validity range match the direct memberships' combined range" do
       subject
       @indirect_membership.valid_from.to_i.should == @t1.to_i

data/spec/models/user_spec.rb

@@ -1665,7 +1665,7 @@ describe User do
     it { should include @hidden_user }
     it { should_not include @visible_user }
     it "should be chainable" do
-      subject.where(id: @hidden_user.id).should == User.where(id: @hidden_user.id).hidden
+      subject.where(id: @hidden_user.id).to_a.should == User.where(id: @hidden_user.id).hidden.to_a
       subject.count.should > 0
     end
   end

data/spec/spec_helper.rb

@@ -171,7 +171,7 @@ Spork.prefork do
     # in the specs.
     #
     config.include RSpec::Matchers
-    config.include Rails.application.routes.url_helpers
+    config.include Rails.application.routes.url_helpers  if Rails.version.starts_with?("3")
     config.include FactoryGirl::Syntax::Methods
     config.include EmailSpec::Helpers
     config.include EmailSpec::Matchers

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: your_platform
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Sebastian Fiedlschuster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.21
 - !ruby/object:Gem::Dependency
@@ -182,14 +182,14 @@ dependencies:
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.5
 - !ruby/object:Gem::Dependency
@@ -238,16 +238,16 @@ dependencies:
   name: rails-settings-cached
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -322,14 +322,14 @@ dependencies:
   name: best_in_place
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
@@ -388,20 +388,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: judge-formtastic
-  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: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -1148,6 +1134,7 @@ files:
 - config/initializers/active_record_structureable_extension.rb
 - config/initializers/active_record_update_attributes_bip_extension.rb
 - config/initializers/array_extension.rb
+- config/initializers/assets.rb
 - config/initializers/best_in_place_display_definitions.rb
 - config/initializers/cache_store_extension.rb
 - config/initializers/devise.rb
@@ -1157,6 +1144,7 @@ files:
 - config/initializers/mime_types.rb
 - config/initializers/mini_profiler.rb
 - config/initializers/object_to_b_extension.rb
+- config/initializers/protected_attributes.rb
 - config/initializers/refile.rb
 - config/initializers/sidekiq.rb
 - config/locales/attachments/de.yml