hobo 2.1.0.pre1 → 2.1.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5de6d624783c705dfe7dd66c79518ebc2ec68b3f
-  data.tar.gz: 634bf9f6c3831df42e818c03fe46a45d0a8e5255
+  metadata.gz: d7336e8e2a7390f1f40021cfdd08a189bf29ac35
+  data.tar.gz: 9f288f5771fffa1229ef481c612818669798ad62
 SHA512:
-  metadata.gz: 78ea8f82e5ac95ddcc3085afd7cce6ac1f1d01f499b8b589ab3f2ab1e55111d7671b9e5c735ed8754c7755463b160982a68eceb3847e01549cb407c36205fb07
-  data.tar.gz: df53268326185eef5f0cea67c8fe7773a7dc0f9d5883e823aa0a911bf8cf78680e20221dadc1658a9ebcc7bdcd04e12697e09056ec98484b8870cc33d96d98f8
+  metadata.gz: 6dad7a8ab5cf38b41f9d058b9d964660fa2262ef60cea0d1b2163796e7d503c50dd0d3f4a5481bdcde93a713121adb2163a577b4176c742d285c4f597e4a42ad
+  data.tar.gz: 9ed8941bc73ad88f3f282a47e4cdcfcc2bd8a86417dbd0988af5b5a525eb3a41540a3c323aec87401e7f7ae2f97cb1670f013ca38dc873e754f0ac691cc33b25

data/CHANGES-2.1.markdown

@@ -47,6 +47,7 @@ In order to make Hobo compatible with Rails 4, these are the main changes that h
 ## Other
 * `protected_attributes` gem has been added to support the "old" way of protecting attributes
 * Domizio has made Hobo thread safe :)
+* Hobo's custom `will_paginate` has been packaged into the `hobo_will_paginate` gem. This should make possible to install Hobo without Git (it seems to be a bit hard under Windows).
 
 
 
@@ -54,4 +55,4 @@ In order to make Hobo compatible with Rails 4, these are the main changes that h
 
 The integration tests in the "agility_bootstrap" folder have been updated for Hobo 2.1 and Rails 4.
 
-see https://github.com/tablatom/hobo/integration_tests/agility_bootstrap/README
+see https://github.com/Hobo/hobo/blob/master/integration_tests/agility_bootstrap/README

data/VERSION

@@ -1 +1 @@
-2.1.0.pre1
+2.1.0.pre2

data/lib/hobo/extensions/active_record/associations/association.rb

@@ -27,7 +27,7 @@ module ActiveRecord
       def raise_on_type_mismatch!(record)
         # Don't complain if the interface type of a polymorphic association doesn't exist
         klass = @reflection.klass rescue nil
-        unless klass.nil? || record.is_a?(klass)
+        unless klass.nil? || record.is_a?(klass) || record.is_a?(Array)
           raise ActiveRecord::AssociationTypeMismatch, "#{@reflection.klass} expected, got #{record.class}"
         end
       end

data/lib/hobo/model/accessible_associations.rb

@@ -103,8 +103,23 @@ module Hobo
 
       # --- has_many mass assignment support --- #
 
-      def self.has_many_with_accessible(name, options={}, &block)
-        has_many_without_accessible(name, options, &block)
+      def self.has_many_with_accessible(name, received_scope=nil, options={}, &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
+            options = {}
+          else
+            options = received_scope
+          end
+          has_many_without_accessible(name, options, &block)
+        end
+        # End of the received_scope hack
+
         if options[:accessible]
           class_eval %{
             def #{name}_with_accessible=(array_or_hash)

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, options = {}, &extension)
-          has_many_without_hobo_permission_check(association_id, options, &extension)
+        def has_many_with_hobo_permission_check(association_id, scope=nil, options = {}, &extension)
+          has_many_without_hobo_permission_check(association_id, scope, options, &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, options = {}, &extension)
-          has_one_without_hobo_permission_check(association_id, options, &extension)
+        def has_one_with_hobo_permission_check(association_id, scope=nil, options = {}, &extension)
+          has_one_without_hobo_permission_check(association_id, scope, options, &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, options = {}, &extension)
-          belongs_to_without_hobo_permission_check(association_id, options, &extension)
+        def belongs_to_with_hobo_permission_check(association_id, scope=nil, options = {}, &extension)
+          belongs_to_without_hobo_permission_check(association_id, scope, options, &extension)
           reflection = reflections[association_id]
           if reflection.options[:dependent]==:destroy
             #overriding dynamic method created in ActiveRecord::Associations#configure_dependency_for_belongs_to

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobo
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre1
+  version: 2.1.0.pre2
 platform: ruby
 authors:
 - Tom Locke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 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.0.pre1
+        version: 2.1.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.pre1
+        version: 2.1.0.pre2
 - !ruby/object:Gem::Dependency
   name: hobo_fields
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.pre1
+        version: 2.1.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.pre1
+        version: 2.1.0.pre2
 - !ruby/object:Gem::Dependency
   name: dryml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.pre1
+        version: 2.1.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.0.pre1
+        version: 2.1.0.pre2
 - !ruby/object:Gem::Dependency
   name: hobo_will_paginate
   requirement: !ruby/object:Gem::Requirement