remarkable_activerecord 3.1.11 → 3.1.12

data/lib/remarkable_activerecord/matchers/accept_nested_attributes_for_matcher.rb

@@ -28,8 +28,12 @@ module Remarkable
             return true unless @options.key?(:allow_destroy)
 
             @subject.instance_eval <<-ALLOW_DESTROY
-              def assign_nested_attributes_for_#{reflection_type}_association(association, attrs, allow)
-                return allow
+              def assign_nested_attributes_for_#{reflection_type}_association(association, *args)
+                if self.respond_to?(:nested_attributes_options)
+                  self.nested_attributes_options[association.to_sym][:allow_destroy]
+                else
+                  args.last
+                end
               end
             ALLOW_DESTROY
 
@@ -73,7 +77,11 @@ module Remarkable
           end
 
           def reject_if_proc
-            subject_class.reject_new_nested_attributes_procs[@association.to_sym]
+            if subject_class.respond_to?(:nested_attributes_options)
+              subject_class.nested_attributes_options[@association.to_sym][:reject_if]
+            else
+              subject_class.reject_new_nested_attributes_procs[@association.to_sym]
+            end
           end
 
       end

data/lib/remarkable_activerecord/matchers/allow_mass_assignment_of_matcher.rb

@@ -15,25 +15,25 @@ module Remarkable
           #
           def allows?
             return positive? unless @attributes.empty?
-            protected_attributes.empty?
+            protected_attributes.nil? || protected_attributes.empty?
           end
 
           def is_accessible?
-            return positive? if accessible_attributes.empty?
+            return positive? if accessible_attributes.nil?
             accessible_attributes.include?(@attribute.to_s)
           end
 
           def is_protected?
-            return accessible_attributes.empty? || positive? if protected_attributes.empty?
+            return accessible_attributes.nil? || positive? if protected_attributes.nil?
             !protected_attributes.include?(@attribute.to_s)
           end
 
           def interpolation_options
             if @subject
               if positive?
-                { :protected_attributes => array_to_sentence(protected_attributes.to_a, false, '[]') }
+                { :protected_attributes => array_to_sentence((protected_attributes || []).to_a, false, '[]') }
               else
-                { :accessible_attributes => array_to_sentence(accessible_attributes.to_a, false, '[]') }
+                { :accessible_attributes => array_to_sentence((accessible_attributes || []).to_a, false, '[]') }
               end
             else
               {}
@@ -43,11 +43,11 @@ module Remarkable
         private
 
           def accessible_attributes
-            @accessible_attributes ||= subject_class.accessible_attributes || []
+            @accessible_attributes = subject_class.accessible_attributes
           end
 
           def protected_attributes
-            @protected_attributes ||= subject_class.protected_attributes || []
+            @protected_attributes = subject_class.protected_attributes
           end
       end
 

data/remarkable_activerecord.gemspec

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{remarkable_activerecord}
+  s.version = "3.1.12"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Carlos Brando", "Jos\303\251 Valim", "Diego Carrion"]
+  s.date = %q{2010-01-19}
+  s.description = %q{Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord}
+  s.email = ["eduardobrando@gmail.com", "jose.valim@gmail.com", "dc.rec1@gmail.com"]
+  s.extra_rdoc_files = ["README", "LICENSE", "CHANGELOG"]
+  s.files = ["README", "LICENSE", "CHANGELOG", "lib/remarkable_activerecord", "lib/remarkable_activerecord/base.rb", "lib/remarkable_activerecord/describe.rb", "lib/remarkable_activerecord/human_names.rb", "lib/remarkable_activerecord/matchers", "lib/remarkable_activerecord/matchers/accept_nested_attributes_for_matcher.rb", "lib/remarkable_activerecord/matchers/allow_mass_assignment_of_matcher.rb", "lib/remarkable_activerecord/matchers/allow_values_for_matcher.rb", "lib/remarkable_activerecord/matchers/association_matcher.rb", "lib/remarkable_activerecord/matchers/have_column_matcher.rb", "lib/remarkable_activerecord/matchers/have_default_scope_matcher.rb", "lib/remarkable_activerecord/matchers/have_index_matcher.rb", "lib/remarkable_activerecord/matchers/have_readonly_attributes_matcher.rb", "lib/remarkable_activerecord/matchers/have_scope_matcher.rb", "lib/remarkable_activerecord/matchers/validate_acceptance_of_matcher.rb", "lib/remarkable_activerecord/matchers/validate_associated_matcher.rb", "lib/remarkable_activerecord/matchers/validate_confirmation_of_matcher.rb", "lib/remarkable_activerecord/matchers/validate_exclusion_of_matcher.rb", "lib/remarkable_activerecord/matchers/validate_inclusion_of_matcher.rb", "lib/remarkable_activerecord/matchers/validate_length_of_matcher.rb", "lib/remarkable_activerecord/matchers/validate_numericality_of_matcher.rb", "lib/remarkable_activerecord/matchers/validate_presence_of_matcher.rb", "lib/remarkable_activerecord/matchers/validate_uniqueness_of_matcher.rb", "lib/remarkable_activerecord.rb", "locale/en.yml", "remarkable_activerecord.gemspec"]
+  s.homepage = %q{http://github.com/carlosbrando/remarkable}
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{remarkable}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rspec>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<remarkable>, ["~> 3.1.12"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.0"])
+      s.add_dependency(%q<remarkable>, ["~> 3.1.12"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.0"])
+    s.add_dependency(%q<remarkable>, ["~> 3.1.12"])
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remarkable_activerecord
 version: !ruby/object:Gem::Version 
-  version: 3.1.11
+  version: 3.1.12
 platform: ruby
 authors: 
 - Carlos Brando
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -03:00
+date: 2010-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.11
+        version: 3.1.12
     version: 
 description: "Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord"
 email: 
@@ -74,6 +74,7 @@ files:
 - lib/remarkable_activerecord/matchers/validate_uniqueness_of_matcher.rb
 - lib/remarkable_activerecord.rb
 - locale/en.yml
+- remarkable_activerecord.gemspec
 has_rdoc: true
 homepage: http://github.com/carlosbrando/remarkable
 licenses: []
@@ -98,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: remarkable
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: "Remarkable ActiveRecord: collection of matchers and macros with I18n for ActiveRecord"