hobo 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3c69c088cf89eb5b2d6b877c17437c026ca795
-  data.tar.gz: 545a25135cc273cab0b952710559315b9826c380
+  metadata.gz: 12fc9a9fb6626d3e125ab54d4357c98f4ffec9b6
+  data.tar.gz: bd705d3d658a46e93373599305f85476616911cb
 SHA512:
-  metadata.gz: d013a30cde686a23630791d048ba675ff58401791f5d0aedf477d55fc0a5e94f98204b1788173107a9ccd854e587e486495900169da8f6b6a7728801410debd7
-  data.tar.gz: 8b1430a8ed7eeb40ed5f062a7fd4c89a4be47a7276f7a806befe3bc7fd76c413984eceb81deaca56106aa4b827fec032afc4f5259d5e2ae4b7be053f18c6f792
+  metadata.gz: f43ce9b0b3b8f70fa5f702de7b7ad11d0e5b1e347fd49718582ffdd63a23bfe6e1821ca36fd046b43f86850046d17448146fdd62b49bdcb0a376cfcc958172f9
+  data.tar.gz: 61186300408c90cc1dbc6c24a0257fd027fd299a424e0ba3a59237d924b6ea282431ae78222be644fec1af91402e60ad73d6f647922e9ea0be0f430166f853a1

data/Gemfile

@@ -1,7 +1,8 @@
 source "http://rubygems.org"
 
 gem 'rubydoctest', :git => 'git://github.com/bryanlarsen/rubydoctest.git'
-gem 'rails', '3.2.12'
+gem 'rails', '4.0.8'
+gem 'protected_attributes'
 gemspec :path => "../dryml"
 gemspec :path => "../hobo_support"
 gemspec :path => "../hobo_fields"
@@ -13,3 +14,5 @@ end
 platform :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
+
+gem "irt"

data/Rakefile

@@ -4,6 +4,10 @@ require 'rake/testtask'
 require 'tmpdir'
 
 require 'active_record'
+require 'action_view'
+require 'action_controller'
+require 'action_mailer'
+
 ActiveRecord::ActiveRecordError # hack for https://rails.lighthouseapp.com/projects/8994/tickets/2577-when-using-activerecordassociations-outside-of-rails-a-nameerror-is-thrown
 $:.unshift File.expand_path('../lib', __FILE__)
 $:.unshift File.expand_path('../../hobo_support/lib', __FILE__)

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/app/helpers/hobo_permissions_helper.rb

@@ -21,13 +21,20 @@ module HoboPermissionsHelper
         object = object.new
       elsif (refl = object.try.proxy_association._?.reflection) && refl.macro == :has_many
         if Hobo.simple_has_many_association?(object)
-          object = object.build
-          object.set_creator(current_user)
+          new_object = object.build
+          new_object.set_creator(current_user)
         else
           return false
         end
       end
-      object.creatable_by?(current_user)
+      # When running `can_create?(@something.children)`, a new object is instantiated to check if we can create
+      # After the check we need to remove it from memory
+      if new_object
+        new_object.creatable_by?(current_user)
+        object.delete(new_object)
+      else
+        object.creatable_by?(current_user)
+      end
     end
 
 

data/hobo.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('dryml', ["= #{version}"])
   s.add_runtime_dependency('hobo_will_paginate')
 
-  s.add_development_dependency('rubydoctest', [">= 1.1.3"])
+  # s.add_development_dependency('rubydoctest', [">= 1.1.3"])
   s.add_development_dependency('shoulda', [">= 0"])
-  s.add_development_dependency('irt', ["= 1.2.11"])
+  s.add_development_dependency('irt', ["= 1.3.2"])
   s.add_development_dependency('mocha')
   s.add_development_dependency('yard')
 

data/lib/generators/hobo/i18n/templates/hobo.en.yml

@@ -134,6 +134,7 @@ en:
       you_signed_up: "You have signed up"
       none: "No %{model} available."
       confirm: "Are you sure?"
+      confirm_delete: "Are you sure that you want to delete #{name}?"
 
     # default hobo collection translation
     collection:

data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb

@@ -109,7 +109,7 @@ NOTE: You might want to sign up as the administrator before adding this!
         @invite_only = invite_only?
         private_site = options[:private_site]
       end
-      inject_into_file 'app/controllers/application_controller.rb', <<EOI, :after => "protect_from_forgery\n" if private_site
+      inject_into_file 'app/controllers/application_controller.rb', <<EOI, :after => "protect_from_forgery with: :exception\n" if private_site
   include Hobo::Controller::AuthenticationSupport
   before_filter :except => [:login, :forgot_password, :accept_invitation, :do_accept_invitation, :reset_password,
 :do_reset_password] do

data/lib/generators/hobo/user_model/templates/model_injection.rb.erb

@@ -2,6 +2,11 @@
   hobo_user_model # Don't put anything above this
 
   fields do
+
+    # NOTE: If you add fields here, you may need to include them in both the attr_accessible list, and
+    # the list of fields passed to 'only_changed?' in the update_permitted? method for them to appear 
+    # on the user#edit form.
+
     name          :string, :required, :unique
     email_address :email_address, :login => true
     administrator :boolean, :default => false

data/lib/hobo/controller/model.rb

@@ -335,7 +335,7 @@ module Hobo
 
 
     def parse_sort_param(*args)
-      _, desc, field = *params[:sort]._?.match(/^(-)?([a-z_]+(?:\.[a-z_]+)?)$/)
+      _, desc, field = *params[:sort]._?.match(/^(-)?([a-z0-9_]+(?:\.[a-z0-9_]+)?)$/)
 
       if field
         hash = args.extract_options!

data/lib/hobo/extensions/active_record/permissions.rb

@@ -103,13 +103,21 @@ ActiveRecord::Associations::HasManyThroughAssociation.class_eval do
 
   # TODO - add dependent option support
   def delete_records_with_hobo_permission_check(records, method)
-    klass  = @reflection.through_reflection.klass
     user = acting_user
+
+    problem_joiner=nil
+    association = self.respond_to?(:proxy_association) ? proxy_association : self
+    through_assoc_name = association.send(:through_reflection).name
     if user && records.any? { |r|
-        joiner = klass.where(construct_join_attributes(r)).first
+        ja = construct_join_attributes(r)
+        problem_joiner = joiner = association.owner.send(through_assoc_name).where(ja).first
         joiner.is_a?(Hobo::Model) && !joiner.destroyable_by?(user)
       }
-      raise Hobo::PermissionDeniedError, "#{@owner.class}##{proxy_association.reflection.name}.destroy"
+      message =  "#{@owner.class}##{association.reflection.name}.destroy "
+      if 'development' == Rails.env
+        message += " because of #{problem_joiner.class.name}(#{problem_joiner.to_json})"
+      end
+      raise Hobo::PermissionDeniedError, message
     end
     delete_records_without_hobo_permission_check(records, method)
   end

data/lib/hobo/model.rb

@@ -132,13 +132,29 @@ module Hobo
         names += public_instance_methods.*.to_s
       end
 
-      def belongs_to_with_creator_metadata(name, options={}, &block)
+      def belongs_to_with_creator_metadata(name, *args, &block)
+        if args.size == 0 || (args.size == 1 && args[0].kind_of?(Proc))
+            options = {}
+            args.push(options)
+        elsif args.size == 1
+            options = args[0]
+        else
+            options = args[1]
+        end
         self.creator_attribute = name.to_sym if options.delete(:creator)
-        belongs_to_without_creator_metadata(name, options, &block)
+        belongs_to_without_creator_metadata(name, *args, &block)
       end
 
-      def belongs_to_with_test_methods(name, options={}, &block)
-        belongs_to_without_test_methods(name, options, &block)
+      def belongs_to_with_test_methods(name, *args, &block)
+        if args.size == 0 || (args.size == 1 && args[0].kind_of?(Proc))
+            options = {}
+            args.push(options)
+        elsif args.size == 1
+            options = args[0]
+        else
+            options = args[1]
+        end
+        belongs_to_without_test_methods(name, *args, &block)
         refl = reflections[name]
         id_method = refl.options[:primary_key] || refl.klass.primary_key
         if options[:polymorphic]

data/lib/hobo/model/accessible_associations.rb

@@ -103,21 +103,20 @@ module Hobo
 
       # --- has_many mass assignment support --- #
 
-      def self.has_many_with_accessible(name, received_scope=nil, options={}, &block)
+      def self.has_many_with_accessible(name, *args, &block)
         # Rails 4 supports a lambda as the second argument in a has_many association
         # We need to support it too (required for gems like papertrail)
         # The problem is that when it is not used, the options hash is taken as the scope
         # To fix this, we make a small hack checking the second argument's class
-        if received_scope.is_a?(Proc)
-          has_many_without_accessible(name, received_scope, options, &block)
-        else
-          if received_scope == nil
+        if args.size == 0 || (args.size == 1 && args[0].kind_of?(Proc))
             options = {}
-          else
-            options = received_scope
-          end
-          has_many_without_accessible(name, options, &block)
+            args.push(options)
+        elsif args.size == 1
+            options = args[0]
+        else
+            options = args[1]
         end
+        has_many_without_accessible(name, *args, &block)
         # End of the received_scope hack
 
         if options[:accessible]
@@ -138,8 +137,16 @@ module Hobo
 
       # --- belongs_to assignment support --- #
 
-      def self.belongs_to_with_accessible(name, options={}, &block)
-        belongs_to_without_accessible(name, options, &block)
+      def self.belongs_to_with_accessible(name,*args, &block)
+        if args.size == 0 || (args.size == 1 && args[0].kind_of?(Proc))
+            options = {}
+            args.push(options)
+        elsif args.size == 1
+            options = args[0]
+        else
+            options = args[1]
+        end
+        belongs_to_without_accessible(name,*args, &block)
 
         if options[:accessible]
           class_eval %{

data/lib/hobo/model/lifecycles/creator.rb

@@ -48,6 +48,7 @@ module Hobo
 
         def run!(user, attributes)
           record = lifecycle.model.new
+          record.set_creator user
           record.lifecycle.active_step = self
           record.with_acting_user(user) do
             prepare!(record, attributes)

data/lib/hobo/model/permissions.rb

@@ -79,8 +79,8 @@ module Hobo
         #  ensure active_user gets passed down to :dependent => destroy
         #  associations  (Ticket #528)
 
-        def has_many_with_hobo_permission_check(association_id, scope=nil, options = {}, &extension)
-          has_many_without_hobo_permission_check(association_id, scope, options, &extension)
+        def has_many_with_hobo_permission_check(association_id, *args, &extension)
+          has_many_without_hobo_permission_check(association_id, *args, &extension)
           reflection = reflections[association_id]
           if reflection.options[:dependent]==:destroy
             #overriding dynamic method created in ActiveRecord::Associations#configure_dependency_for_has_many
@@ -91,8 +91,8 @@ module Hobo
           end
         end
 
-        def has_one_with_hobo_permission_check(association_id, scope=nil, options = {}, &extension)
-          has_one_without_hobo_permission_check(association_id, scope, options, &extension)
+        def has_one_with_hobo_permission_check(association_id, *args, &extension)
+          has_one_without_hobo_permission_check(association_id, *args, &extension)
           reflection = reflections[association_id]
           if reflection.options[:dependent]==:destroy
             #overriding dynamic method created in ActiveRecord::Associations#configure_dependency_for_has_one
@@ -106,8 +106,8 @@ module Hobo
           end
         end
 
-        def belongs_to_with_hobo_permission_check(association_id, scope=nil, options = {}, &extension)
-          belongs_to_without_hobo_permission_check(association_id, scope, options, &extension)
+        def belongs_to_with_hobo_permission_check(association_id, *args, &extension)
+          belongs_to_without_hobo_permission_check(association_id, *args, &extension)
           reflection = reflections[association_id]
           if reflection.options[:dependent]==:destroy
             #overriding dynamic method created in ActiveRecord::Associations#configure_dependency_for_belongs_to

data/lib/hobo/model/scopes/apply_scopes.rb

@@ -7,9 +7,9 @@ module Hobo
           result = self
           scopes.each_pair do |scope, arg|
             if arg.is_a?(Array)
-              result = self.send(scope, *arg) unless arg.first.blank?
+              result = result.send(scope, *arg) unless arg.first.blank?
             else
-              result = self.send(scope, arg) unless arg.blank?
+              result = result.send(scope, arg) unless arg.blank?
             end
           end
           result

data/lib/hobo/model/scopes/automatic_scopes.rb

@@ -322,13 +322,18 @@ module Hobo
             return true if check_only
 
             def_scope do |query, *fields|
-              match_keyword = %w(PostgreSQL PostGIS).include?(::ActiveRecord::Base.connection.adapter_name) ? "ILIKE" : "LIKE"
-
+              using_postgresql = %w(PostgreSQL PostGIS).include?(::ActiveRecord::Base.connection.adapter_name)
+              match_keyword = using_postgresql ? "ILIKE" : "LIKE"
               words = (query || "").split
               args = []
               word_queries = words.map do |word|
                 field_query = '(' + fields.map { |field|
-                  field = "#{@klass.table_name}.#{field}" unless field =~ /\./
+                  if using_postgresql
+                    casted_field = "CAST(#{@klass.table_name}.#{field} AS TEXT)"
+                  else
+                    casted_field = "#{@klass.table_name}.#{field}"
+                  end
+                  field = "#{casted_field}" unless field =~ /\./
                   "(#{field} #{match_keyword} ?)"
                 }.join(" OR ") + ')'
                 args += ["%#{word}%"] * fields.length

data/lib/hobo/model/user_base.rb

@@ -42,7 +42,7 @@ module Hobo
           # https://hobo.lighthouseapp.com/projects/8324-hobo/tickets/530
           attr_accessor :current_password, :password, :password_confirmation, :type => :password
 
-          before_save :encrypt_password
+          before_save :encrypt_password, :downcase_email
           after_save :stash_current_password
 
           never_show *AUTHENTICATION_FIELDS
@@ -75,6 +75,9 @@ module Hobo
 
         # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
         def authenticate(login, password)
+          # Downcase emails before logging in
+          login = login.downcase if attr_type(@login_attribute) == HoboFields::Types::EmailAddress
+
           u = where("#{@login_attribute} = ?", login).first # need to get the salt
 
           if u && u.authenticated?(password)
@@ -179,6 +182,13 @@ module Hobo
           if changing_password? && !authenticated?(current_password)
       end
 
+      # Downcase emails used for logging in before saving them to the database
+      def downcase_email
+        if self.login.class == HoboFields::Types::EmailAddress
+          self.login = self.login.downcase
+        end
+      end
+
     end
   end
 end

data/test/irt/generators/front_controller.irt

@@ -18,6 +18,7 @@ test_value_eql? true
 
 desc "Routes added"
 file_include? 'config/routes.rb',
-              %(match 'search' => 'front#search', :as => 'site_search'),
+              %(post 'search' => 'front#search', :as => 'site_search_post'),
+              %(get 'search' => 'front#search', :as => 'site_search'),
               %(root :to => 'front#index')
 test_value_eql? true

data/test/irt/generators/test_framework.irt

@@ -24,7 +24,7 @@ file_include? 'config/application.rb',
 test_value_eql? true
 
 desc "shoulda Gemfile injection"
-file_include? 'Gemfile', %(gem "shoulda", :group => :test)
+file_include? 'Gemfile', %(gem "shoulda", group: :test)
 test_value_eql? true
 
 git_reset_app
@@ -38,7 +38,7 @@ file_include? 'config/application.rb',
 test_value_eql? true
 
 desc "rspec Gemfile injection"
-file_include? 'Gemfile',  %(gem "rspec-rails", ">= 2.5.0", :group => [:test, :development])
+file_include? 'Gemfile',  %(gem "rspec-rails", ">= 2.5.0", group: [:test, :development])
 test_value_eql? true
 
 git_reset_app
@@ -52,8 +52,8 @@ file_include? 'config/application.rb',
 test_value_eql? true
 
 desc "rspec_with_shoulda Gemfile injection"
-file_include? 'Gemfile', %(gem "rspec-rails", ">= 2.5.0", :group => [:test, :development]),
-                       %(gem "shoulda", :group => :test)
+file_include? 'Gemfile', %(gem "rspec-rails", ">= 2.5.0", group: [:test, :development]),
+                       %(gem "shoulda", group: :test)
 test_value_eql? true
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobo
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo_support
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: hobo_fields
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: dryml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: hobo_will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +66,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubydoctest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.11
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.11
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement