embedded_associations 0.0.2 → 0.0.3

data/Gemfile

@@ -9,4 +9,6 @@ group :test do
 
   gem 'rspec'
   gem 'rspec-rails'
+
+  gem 'pry'
 end

data/lib/embedded_associations/version.rb

@@ -1,3 +1,3 @@
 module EmbeddedAssociations
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/embedded_associations.rb

@@ -31,9 +31,7 @@ module EmbeddedAssociations
   end
 
   # Simple callbacks for now, eventually should use a filter system
-  def before_embedded_update(record); end
-  def before_embedded_create(record); end
-  def before_embedded_destroy(record); end
+  def before_embedded(record, action); end
 
   class Definitions
     include Enumerable
@@ -102,6 +100,10 @@ module EmbeddedAssociations
       end
     end
 
+    def filter_attributes(name, attrs, action)
+      attrs
+    end
+
     def handle_plural_resource(parent, name, attr_array, child_definition)
       current_assoc = parent.send(name)
 
@@ -116,11 +118,13 @@ module EmbeddedAssociations
         if id = attrs['id']
           # can't use current_assoc.find(id), see http://stackoverflow.com/questions/11605120/autosave-ignored-on-has-many-relation-what-am-i-missing
           r = current_assoc.find{|r| r.id == id.to_i}
+          attrs = filter_attributes(r.class.name, attrs, :update)
           handle_resource(child_definition, r, attrs) if child_definition
           r.assign_attributes(attrs)
           run_before_update_callbacks(r)
         else
           r = current_assoc.build()
+          attrs = filter_attributes(r.class.name, attrs, :create)
           handle_resource(child_definition, r, attrs) if child_definition
           r.assign_attributes(attrs)
           run_before_create_callbacks(r)
@@ -130,8 +134,10 @@ module EmbeddedAssociations
 
     def handle_singular_resource(parent, name, attrs, child_definition)
       current_assoc = parent.send(name)
+      
       if r = current_assoc
         if attrs
+          attrs = filter_attributes(r.class.name, attrs, :update)
           handle_resource(child_definition, r, attrs) if child_definition
           r.assign_attributes(attrs)
           run_before_update_callbacks(r)
@@ -142,6 +148,7 @@ module EmbeddedAssociations
         end
       elsif attrs
         r = parent.send("build_#{name}")
+        attrs = filter_attributes(r.class.name, attrs, :create)
         handle_resource(child_definition, r, attrs) if child_definition
         r.assign_attributes(attrs)
         run_before_create_callbacks(r)
@@ -149,15 +156,15 @@ module EmbeddedAssociations
     end
 
     def run_before_create_callbacks(record)
-      controller.send(:before_embedded_create, record)
+      controller.send(:before_embedded, record, :create)
     end
 
     def run_before_update_callbacks(record)
-      controller.send(:before_embedded_update, record)
+      controller.send(:before_embedded, record, :update)
     end
 
     def run_before_destroy_callbacks(record)
-      controller.send(:before_embedded_destroy, record)
+      controller.send(:before_embedded, record, :destroy)
     end
   end
 

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'bundler'
 Bundler.require(:default, :test)
 
+ENV['RAILS_ENV'] = 'test'
+
 PROJECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')).freeze
 $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 
@@ -11,6 +13,10 @@ require 'rspec/rails'
 
 require 'support/serialization_helpers'
 
+puts File.expand_path("../support/app/db/migrate/", __FILE__)
+
+ActiveRecord::Migrator.migrate(File.expand_path("../support/app/db/migrate/", __FILE__))
+
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
 end

data/spec/support/app/.gitignore

@@ -9,6 +9,7 @@
 
 # Ignore the default SQLite database.
 /db/*.sqlite3
+/db/*.sqlite3-journal
 
 # Ignore all logfiles and tempfiles.
 /log/*.log

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embedded_associations
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -86,7 +86,6 @@ files:
 - spec/support/app/db/migrate/20130226001639_create_categories.rb
 - spec/support/app/db/schema.rb
 - spec/support/app/db/seeds.rb
-- spec/support/app/db/structure.sql
 - spec/support/app/lib/assets/.gitkeep
 - spec/support/app/lib/tasks/.gitkeep
 - spec/support/app/log/.gitkeep
@@ -159,7 +158,6 @@ test_files:
 - spec/support/app/db/migrate/20130226001639_create_categories.rb
 - spec/support/app/db/schema.rb
 - spec/support/app/db/seeds.rb
-- spec/support/app/db/structure.sql
 - spec/support/app/lib/assets/.gitkeep
 - spec/support/app/lib/tasks/.gitkeep
 - spec/support/app/log/.gitkeep

data/spec/support/app/db/structure.sql

@@ -1,19 +0,0 @@
-CREATE TABLE "accounts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer, "note" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
-CREATE TABLE "categories" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
-CREATE TABLE "comments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "post_id" integer, "user_id" integer, "content" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
-CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "user_id" integer, "category_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
-CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL);
-CREATE TABLE "tags" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "post_id" integer, "name" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
-CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "email" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL);
-CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version");
-INSERT INTO schema_migrations (version) VALUES ('20130225045501');
-
-INSERT INTO schema_migrations (version) VALUES ('20130225045512');
-
-INSERT INTO schema_migrations (version) VALUES ('20130225173707');
-
-INSERT INTO schema_migrations (version) VALUES ('20130225173717');
-
-INSERT INTO schema_migrations (version) VALUES ('20130226001629');
-
-INSERT INTO schema_migrations (version) VALUES ('20130226001639');