aa_associations 0.1.1 → 0.1.2

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gem 'meta_search', '>= 1.1.0.pre'
 gem 'kaminari'
-gem 'formtastic', '~> 2.0.2' # Until activeadmin updates for formatastic 2.1+
+gem 'formtastic', '~> 2.1' # Until activeadmin updates for formatastic 2.1+
 gem 'sass-rails',   '~> 3.2.3'
 gem 'factory_girl_rails', '~> 1.7'
 gem 'launchy'

data/Rakefile

@@ -5,10 +5,13 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
+APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
+Rake::TestTask.new(:test => 'app:db:test:prepare') do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true

data/aa_associations.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.extra_rdoc_files = ["README.md", "MIT_LICENSE.txt"]
 
-  s.add_dependency 'activeadmin', '~> 0.4'
+  s.add_dependency 'activeadmin', '~> 0.5'
   s.add_dependency 'rails', '~> 3.1'
 
   s.add_development_dependency 'shoulda'

data/app/helpers/active_admin_associations_helper.rb

@@ -21,7 +21,7 @@ module ActiveAdminAssociationsHelper
       if active_admin_config.active_association_form && active_admin_config.active_association_form.respond_to?(:call)
         active_admin_config.active_association_form.call(f)
       end
-      f.buttons
+      f.actions
     end
   end
   

data/lib/active_admin_associations/active_admin_extensions.rb

@@ -7,7 +7,11 @@ module ActiveAdmin
   
   class << self
     def resources
-      application.namespaces.values.map{|n| n.resources.resources }.flatten.compact.map(&:resource_class)
+      application.namespaces.values.map{|n| 
+        n.resources.resources
+      }.flatten.compact.select{|r|
+        r.class == ActiveAdmin::Resource
+      }.map(&:resource_class)
     end
   end
 end

data/lib/active_admin_associations/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdminAssociations
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aa_associations
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3239410897135078038
+      hash: 1075286965506754567
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3239410897135078038
+      hash: 1075286965506754567
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.21