acts_as_relation 0.1.1 → 0.1.2

data/README.rdoc

@@ -17,10 +17,12 @@ declare the product as a +supermodel+ and all types of it as +acts_as+ +:product
 
   class Product < ActiveRecord::Base
     acts_as_superclass
+    attr_accessible :name, :price
   end
 
   class Pen < ActiveRecord::Base
     acts_as :product
+    attr_accessible :color
   end
 
   class Book < ActiveRecord::Base
@@ -80,14 +82,14 @@ On the other hand you can always access a specific object from its parent by cal
 The +acts_as+ relation support these options:
 
 * +:as+
-* +:auto_include+
+* +:auto_join+
 * +:class_name+
 * +:conditions+
 * +:dependent+
 * +:include+
 
 when +:auto_join+ option set to +true+ (which is by default), every query on child
-will automatically includes the parent. For example:
+will automatically joins the parent table. For example:
 
     Pen.where("name = ?", "somename")
 

data/lib/active_record/acts_as_relation.rb

@@ -56,11 +56,13 @@ module ActiveRecord
               base.alias_method_chain :#{name}, :autobuild
 
               base.extend ActiveRecord::ActsAsRelation::AccessMethods
-              all_attributes = #{class_name}.content_columns.map(&:name)
-              ignored_attributes = ["created_at", "updated_at", "#{association_name}_id", "#{association_name}_type"]
-              associations = #{class_name}.reflect_on_all_associations.map! { |assoc| assoc.name } - ["#{association_name}"]
-              attributes_to_delegate = all_attributes - ignored_attributes + associations
+              attributes = #{class_name}.content_columns.map(&:name)
+              associations = #{class_name}.reflect_on_all_associations.map(&:name)
+              ignored = ["created_at", "updated_at", "#{association_name}_id", "#{association_name}_type", "#{association_name}"]
+              attributes_to_delegate = attributes + associations - ignored
               base.send :define_acts_as_accessors, attributes_to_delegate, "#{name}"
+
+              base.attr_accessible.update(#{class_name}.attr_accessible)
             end
 
             def #{name}_with_autobuild
@@ -97,9 +99,11 @@ module ActiveRecord
         end
 
         if options.fetch :auto_join, true
-          class_eval "default_scope joins(:#{name}).readonly(false)"
+          class_eval "default_scope joins(:#{name})"
         end
 
+        class_eval "default_scope readonly(false)"
+
         code = <<-EndCode
           def acts_as_other_model?
             true

data/lib/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module ActsAsRelation
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/acts_as_relation_spec.rb

@@ -20,11 +20,12 @@ describe "Submodel" do
   end
 
   it "inherits Supermodel associations" do
-    store = Store.new
-    pen = Pen.new
+    store = Store.create :name => 'Big Store'
+    pen = Pen.create :name => 'RedPen', :price => 0.8, :color => 'red'
     pen.store = store
-    pen.store.should == store
-    pen.product.store.should == store
+    pen.save
+    Pen.find(pen.id).store.should == store
+    Pen.find(pen.id).product.store.should == store
   end
 
   it "inherits Supermodel validations" do
@@ -70,6 +71,12 @@ describe "Submodel" do
     end
   end
 
+  it "have supermodel attr_accessibles as attr_accessibles" do
+    Pen.attr_accessible[:default].each do |a|
+      Pencil.attr_accessible[:default].should include(a)
+    end
+  end
+
   it "should be findable" do
     pen = Pen.create :name => 'RedPen', :price => 0.8, :color => 'red'
     pen = Pen.find(pen.id)

data/spec/dummy/app/models/pen.rb

@@ -2,5 +2,7 @@ class Pen < ActiveRecord::Base
   acts_as_superclass
   acts_as :product, as: 'producible'
 
+  attr_accessible :name, :price, :color
+
   validates_presence_of :color
 end

data/spec/dummy/db/migrate/002_create_products.rb

@@ -3,6 +3,7 @@ class CreateProducts < ActiveRecord::Migration
     create_table :products, as_relation_superclass: 'producible' do |t|
       t.string :name
       t.float :price
+      t.integer :store_id
 
       t.timestamps
     end

data/spec/dummy/db/schema.rb

@@ -31,6 +31,7 @@ ActiveRecord::Schema.define(:version => 4) do
     t.string   "producible_type"
     t.string   "name"
     t.float    "price"
+    t.integer  "store_id"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_relation
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -206,53 +206,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Easy multi-table inheritance for rails
-test_files:
-- spec/acts_as_relation_spec.rb
-- spec/acts_as_superclass_spec.rb
-- spec/dummy/.rspec
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/mailers/.gitkeep
-- spec/dummy/app/models/.gitkeep
-- spec/dummy/app/models/pen.rb
-- spec/dummy/app/models/pencil.rb
-- spec/dummy/app/models/product.rb
-- spec/dummy/app/models/store.rb
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/001_create_stores.rb
-- spec/dummy/db/migrate/002_create_products.rb
-- spec/dummy/db/migrate/003_create_pens.rb
-- spec/dummy/db/migrate/004_create_pencils.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/lib/assets/.gitkeep
-- spec/dummy/log/.gitkeep
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/script/rails
-- spec/spec_helper.rb
+test_files: []