modulate 0.0.7 → 0.0.8

data/lib/generators/modulate/templates/_modulate_attachments.html.haml

@@ -1,10 +1,10 @@
-= semantic_form_for @<%= model_name.underscore %> do |f|
-  = render "modulate_<%= model_name.underscore %>_documents", f: f
+= semantic_form_for @<%= name.last %> do |f|
+  = render "modulate_<%= partial_name %>_documents", f: f
 
   = f.inputs do
-    = f.semantic_fields_for :modulate_documents, @<%= model_name.underscore %>.modulate_documents.build do |d|
+    = f.semantic_fields_for :modulate_uploads, @<%= name.last %>.modulate_documents.build do |d|
       = d.input(:attachment, as: :file, label: 'Choose document to attach', required: true, 
-        input_html: {multiple: true, name: "<%= model_name %>[modulate_documents_attributes][][attachment]"}).sub('[attachment][]', '[attachment]').html_safe
+        input_html: {multiple: true, name: "<%= name.last %>[modulate_uploads_attributes][][attachment]"}).sub('[attachment][]', '[attachment]').html_safe
 
   = f.actions do
     = f.action :submit, as: 'button', button_html: {class: 'btn btn-primary'}

data/lib/generators/modulate/templates/_modulate_documents.html.haml

@@ -9,8 +9,8 @@
       %th 
       %th
   %tbody
-    - if @<%= model_name.underscore %>.modulate_documents.any?
-      - @<%= model_name.underscore %>.modulate_documents.each do |document|
+    - if @<%= name.last %>.modulate_documents.any?
+      - @<%= name.last %>.modulate_documents.each do |document|
         - next unless document.persisted?
         = f.fields_for :modulate_documents, document do |d|
           %tr

data/lib/modulate/relation.rb

@@ -1,7 +1,9 @@
 module Modulate::Relation
 
   def modulate(name=:modulate_documents, options={})
-    has_many name, {as: :attachable, class_name: "Modulate::Document"}.reverse_merge(options)
+    has_many name, {as: :attachable, class_name: "Modulate::Document"}.reverse_merge(options) # for uploading
+    has_many :modulate_uploads, as: :attachable, class_name: 'Modulate::Document' # for creating
+    accepts_nested_attributes_for :modulate_uploads
     accepts_nested_attributes_for name 
     attr_accessor :"#{Modulate.configuration.user_method}" unless Modulate.configuration.user_method == nil
   end

data/lib/modulate/version.rb

@@ -1,3 +1,3 @@
 module Modulate
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/dummy/log/test.log

@@ -515,3 +515,243 @@ Processing by AccountsController#index as HTML
   Account Load (0.4ms)  SELECT `accounts`.* FROM `accounts` 
   Rendered accounts/index.html.haml within layouts/application (1.4ms)
 Completed 200 OK in 14ms (Views: 5.6ms | ActiveRecord: 0.4ms)
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (2.5ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-04-03 19:09:46', 'test_account', '2013-04-03 19:09:46')
+   (0.4ms)  COMMIT
+Started GET "/accounts/45" for 127.0.0.1 at 2013-04-03 15:09:46 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"45"}
+  Account Load (0.4ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 45 LIMIT 1
+   (0.3ms)  SELECT COUNT(*) FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 45 AND `modulate_documents`.`attachable_type` = 'Account'
+  Rendered accounts/_modulate_account_documents.html.haml (145.1ms)
+  Rendered accounts/_modulate_attachments.html.haml (401.6ms)
+  Rendered accounts/show.html.erb within layouts/application (419.2ms)
+Completed 200 OK in 466ms (Views: 417.3ms | ActiveRecord: 31.5ms)
+Started PUT "/accounts/45" for 127.0.0.1 at 2013-04-03 15:09:47 -0400
+Processing by AccountsController#update as HTML
+  Parameters: {"utf8"=>"✓", "account"=>{"modulate_documents_attributes"=>[{"attachment"=>#<ActionDispatch::Http::UploadedFile:0x007fccbdc70560 @original_filename="test.txt", @content_type="text/plain", @headers="Content-Disposition: form-data; name=\"account[modulate_documents_attributes][][attachment]\"; filename=\"test.txt\"\r\nContent-Type: text/plain\r\nContent-Length: 25\r\n", @tempfile=#<File:/var/folders/lb/j1c12jc524zfb75l84v94qr40000gn/T/RackMultipart20130403-61908-rxeeij>>}]}, "button"=>"", "id"=>"45"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 45 LIMIT 1
+  Modulate::Document Load (0.3ms)  SELECT `modulate_documents`.* FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 45 AND `modulate_documents`.`attachable_type` = 'Account'
+   (0.1ms)  BEGIN
+  CACHE (0.0ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 45 LIMIT 1
+  Modulate::Document Exists (0.4ms)  SELECT 1 AS one FROM `modulate_documents` WHERE (`modulate_documents`.`key` = BINARY '45-test.txt' AND `modulate_documents`.`bucket` = 'Dummy::Account') LIMIT 1
+  SQL (0.3ms)  INSERT INTO `modulate_documents` (`attachable_id`, `attachable_type`, `attached_by_id`, `attachment`, `bucket`, `content_type`, `created_at`, `filename`, `key`, `label`, `public`, `updated_at`) VALUES (45, 'Account', 1, '45-test.txt', 'Dummy::Account', 'text/plain', '2013-04-03 19:09:47', 'test.txt', '45-test.txt', NULL, 0, '2013-04-03 19:09:47')
+   (0.4ms)  COMMIT
+Redirected to http://www.example.com/accounts
+Completed 302 Found in 142ms (ActiveRecord: 1.8ms)
+Started GET "/accounts" for 127.0.0.1 at 2013-04-03 15:09:47 -0400
+Processing by AccountsController#index as HTML
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` 
+  Rendered accounts/index.html.haml within layouts/application (1.2ms)
+Completed 200 OK in 12ms (Views: 5.0ms | ActiveRecord: 0.3ms)
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (2.1ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-04-03 19:13:13', 'test_account', '2013-04-03 19:13:13')
+   (0.4ms)  COMMIT
+Started GET "/accounts/46" for 127.0.0.1 at 2013-04-03 15:13:13 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"46"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 46 LIMIT 1
+   (0.3ms)  SELECT COUNT(*) FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 46 AND `modulate_documents`.`attachable_type` = 'Account'
+  Rendered accounts/_modulate_account_documents.html.haml (101.2ms)
+  Rendered accounts/_modulate_attachments.html.haml (275.5ms)
+  Rendered accounts/show.html.erb within layouts/application (288.9ms)
+Completed 200 OK in 314ms (Views: 304.6ms | ActiveRecord: 3.1ms)
+Started PUT "/accounts/46" for 127.0.0.1 at 2013-04-03 15:13:14 -0400
+Processing by AccountsController#update as HTML
+  Parameters: {"utf8"=>"✓", "account"=>{"modulate_documents_attributes"=>[{"attachment"=>#<ActionDispatch::Http::UploadedFile:0x007fcb3c827b48 @original_filename="test.txt", @content_type="text/plain", @headers="Content-Disposition: form-data; name=\"account[modulate_documents_attributes][][attachment]\"; filename=\"test.txt\"\r\nContent-Type: text/plain\r\nContent-Length: 25\r\n", @tempfile=#<File:/var/folders/lb/j1c12jc524zfb75l84v94qr40000gn/T/RackMultipart20130403-62010-1md7zbl>>}]}, "button"=>"", "id"=>"46"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 46 LIMIT 1
+  Modulate::Document Load (0.4ms)  SELECT `modulate_documents`.* FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 46 AND `modulate_documents`.`attachable_type` = 'Account'
+   (0.1ms)  BEGIN
+  CACHE (0.0ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 46 LIMIT 1
+  Modulate::Document Exists (0.3ms)  SELECT 1 AS one FROM `modulate_documents` WHERE (`modulate_documents`.`key` = BINARY '46-test.txt' AND `modulate_documents`.`bucket` = 'Dummy::Account') LIMIT 1
+  SQL (0.3ms)  INSERT INTO `modulate_documents` (`attachable_id`, `attachable_type`, `attached_by_id`, `attachment`, `bucket`, `content_type`, `created_at`, `filename`, `key`, `label`, `public`, `updated_at`) VALUES (46, 'Account', 1, '46-test.txt', 'Dummy::Account', 'text/plain', '2013-04-03 19:13:14', 'test.txt', '46-test.txt', NULL, 0, '2013-04-03 19:13:14')
+   (0.4ms)  COMMIT
+Redirected to http://www.example.com/accounts
+Completed 302 Found in 113ms (ActiveRecord: 1.8ms)
+Started GET "/accounts" for 127.0.0.1 at 2013-04-03 15:13:14 -0400
+Processing by AccountsController#index as HTML
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` 
+  Rendered accounts/index.html.haml within layouts/application (1.2ms)
+Completed 200 OK in 13ms (Views: 4.8ms | ActiveRecord: 0.3ms)
+Connecting to database specified by database.yml
+   (0.2ms)  BEGIN
+  SQL (2.1ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-04-03 19:13:47', 'test_account', '2013-04-03 19:13:47')
+   (0.4ms)  COMMIT
+Started GET "/accounts/47" for 127.0.0.1 at 2013-04-03 15:13:47 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"47"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 47 LIMIT 1
+   (0.2ms)  SELECT COUNT(*) FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 47 AND `modulate_documents`.`attachable_type` = 'Account'
+  Rendered accounts/_modulate_account_documents.html.haml (57.6ms)
+  Rendered accounts/_modulate_attachments.html.haml (279.8ms)
+  Rendered accounts/show.html.erb within layouts/application (289.0ms)
+Completed 200 OK in 366ms (Views: 357.0ms | ActiveRecord: 3.0ms)
+Started PUT "/accounts/47" for 127.0.0.1 at 2013-04-03 15:13:47 -0400
+Processing by AccountsController#update as HTML
+  Parameters: {"utf8"=>"✓", "account"=>{"modulate_documents_attributes"=>[{"attachment"=>#<ActionDispatch::Http::UploadedFile:0x007ffac6fdee68 @original_filename="test.txt", @content_type="text/plain", @headers="Content-Disposition: form-data; name=\"account[modulate_documents_attributes][][attachment]\"; filename=\"test.txt\"\r\nContent-Type: text/plain\r\nContent-Length: 25\r\n", @tempfile=#<File:/var/folders/lb/j1c12jc524zfb75l84v94qr40000gn/T/RackMultipart20130403-62040-1qr8rvz>>}]}, "button"=>"", "id"=>"47"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 47 LIMIT 1
+  Modulate::Document Load (0.3ms)  SELECT `modulate_documents`.* FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 47 AND `modulate_documents`.`attachable_type` = 'Account'
+   (0.1ms)  BEGIN
+  CACHE (0.0ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 47 LIMIT 1
+  Modulate::Document Exists (0.3ms)  SELECT 1 AS one FROM `modulate_documents` WHERE (`modulate_documents`.`key` = BINARY '47-test.txt' AND `modulate_documents`.`bucket` = 'Dummy::Account') LIMIT 1
+  SQL (0.3ms)  INSERT INTO `modulate_documents` (`attachable_id`, `attachable_type`, `attached_by_id`, `attachment`, `bucket`, `content_type`, `created_at`, `filename`, `key`, `label`, `public`, `updated_at`) VALUES (47, 'Account', 1, '47-test.txt', 'Dummy::Account', 'text/plain', '2013-04-03 19:13:47', 'test.txt', '47-test.txt', NULL, 0, '2013-04-03 19:13:47')
+   (0.4ms)  COMMIT
+Redirected to http://www.example.com/accounts
+Completed 302 Found in 113ms (ActiveRecord: 1.8ms)
+Started GET "/accounts" for 127.0.0.1 at 2013-04-03 15:13:48 -0400
+Processing by AccountsController#index as HTML
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` 
+  Rendered accounts/index.html.haml within layouts/application (1.2ms)
+Completed 200 OK in 13ms (Views: 4.7ms | ActiveRecord: 0.3ms)
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (2.3ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-04-03 19:18:28', 'test_account', '2013-04-03 19:18:28')
+   (0.4ms)  COMMIT
+Started GET "/accounts/48" for 127.0.0.1 at 2013-04-03 15:18:28 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"48"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 48 LIMIT 1
+   (0.2ms)  SELECT COUNT(*) FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 48 AND `modulate_documents`.`attachable_type` = 'Account'
+  Rendered accounts/_modulate_account_documents.html.haml (57.2ms)
+  Rendered accounts/_modulate_attachments.html.haml (267.2ms)
+  Rendered accounts/show.html.erb within layouts/application (276.1ms)
+Completed 200 OK in 352ms (Views: 342.5ms | ActiveRecord: 3.1ms)
+Started PUT "/accounts/48" for 127.0.0.1 at 2013-04-03 15:18:29 -0400
+Processing by AccountsController#update as HTML
+  Parameters: {"utf8"=>"✓", "account"=>{"modulate_documents_attributes"=>[{"attachment"=>#<ActionDispatch::Http::UploadedFile:0x007fd8069de668 @original_filename="test.txt", @content_type="text/plain", @headers="Content-Disposition: form-data; name=\"account[modulate_documents_attributes][][attachment]\"; filename=\"test.txt\"\r\nContent-Type: text/plain\r\nContent-Length: 25\r\n", @tempfile=#<File:/var/folders/lb/j1c12jc524zfb75l84v94qr40000gn/T/RackMultipart20130403-62146-d5dcqd>>}]}, "button"=>"", "id"=>"48"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 48 LIMIT 1
+  Modulate::Document Load (0.3ms)  SELECT `modulate_documents`.* FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 48 AND `modulate_documents`.`attachable_type` = 'Account'
+   (0.1ms)  BEGIN
+  CACHE (0.0ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 48 LIMIT 1
+  Modulate::Document Exists (0.3ms)  SELECT 1 AS one FROM `modulate_documents` WHERE (`modulate_documents`.`key` = BINARY '48-test.txt' AND `modulate_documents`.`bucket` = 'Dummy::Account') LIMIT 1
+  SQL (0.3ms)  INSERT INTO `modulate_documents` (`attachable_id`, `attachable_type`, `attached_by_id`, `attachment`, `bucket`, `content_type`, `created_at`, `filename`, `key`, `label`, `public`, `updated_at`) VALUES (48, 'Account', 1, '48-test.txt', 'Dummy::Account', 'text/plain', '2013-04-03 19:18:29', 'test.txt', '48-test.txt', NULL, 0, '2013-04-03 19:18:29')
+   (0.4ms)  COMMIT
+Redirected to http://www.example.com/accounts
+Completed 302 Found in 111ms (ActiveRecord: 1.8ms)
+Started GET "/accounts" for 127.0.0.1 at 2013-04-03 15:18:29 -0400
+Processing by AccountsController#index as HTML
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` 
+  Rendered accounts/index.html.haml within layouts/application (1.2ms)
+Completed 200 OK in 12ms (Views: 4.6ms | ActiveRecord: 0.3ms)
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (2.1ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-04-03 19:18:46', 'test_account', '2013-04-03 19:18:46')
+   (0.4ms)  COMMIT
+Started GET "/accounts/49" for 127.0.0.1 at 2013-04-03 15:18:46 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"49"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 49 LIMIT 1
+   (0.2ms)  SELECT COUNT(*) FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 49 AND `modulate_documents`.`attachable_type` = 'Account'
+  Rendered accounts/_modulate_account_documents.html.haml (58.1ms)
+  Rendered accounts/_modulate_attachments.html.haml (271.7ms)
+  Rendered accounts/show.html.erb within layouts/application (280.6ms)
+Completed 200 OK in 356ms (Views: 347.3ms | ActiveRecord: 3.0ms)
+Started PUT "/accounts/49" for 127.0.0.1 at 2013-04-03 15:18:47 -0400
+Processing by AccountsController#update as HTML
+  Parameters: {"utf8"=>"✓", "account"=>{"modulate_documents_attributes"=>[{"attachment"=>#<ActionDispatch::Http::UploadedFile:0x007f9133bf3738 @original_filename="test.txt", @content_type="text/plain", @headers="Content-Disposition: form-data; name=\"account[modulate_documents_attributes][][attachment]\"; filename=\"test.txt\"\r\nContent-Type: text/plain\r\nContent-Length: 25\r\n", @tempfile=#<File:/var/folders/lb/j1c12jc524zfb75l84v94qr40000gn/T/RackMultipart20130403-62174-xdn13>>}]}, "button"=>"", "id"=>"49"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 49 LIMIT 1
+  Modulate::Document Load (0.3ms)  SELECT `modulate_documents`.* FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 49 AND `modulate_documents`.`attachable_type` = 'Account'
+   (0.1ms)  BEGIN
+  CACHE (0.0ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 49 LIMIT 1
+  Modulate::Document Exists (0.3ms)  SELECT 1 AS one FROM `modulate_documents` WHERE (`modulate_documents`.`key` = BINARY '49-test.txt' AND `modulate_documents`.`bucket` = 'Dummy::Account') LIMIT 1
+  SQL (0.3ms)  INSERT INTO `modulate_documents` (`attachable_id`, `attachable_type`, `attached_by_id`, `attachment`, `bucket`, `content_type`, `created_at`, `filename`, `key`, `label`, `public`, `updated_at`) VALUES (49, 'Account', 1, '49-test.txt', 'Dummy::Account', 'text/plain', '2013-04-03 19:18:47', 'test.txt', '49-test.txt', NULL, 0, '2013-04-03 19:18:47')
+   (0.4ms)  COMMIT
+Redirected to http://www.example.com/accounts
+Completed 302 Found in 109ms (ActiveRecord: 1.7ms)
+Started GET "/accounts" for 127.0.0.1 at 2013-04-03 15:18:47 -0400
+Processing by AccountsController#index as HTML
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` 
+  Rendered accounts/index.html.haml within layouts/application (1.2ms)
+Completed 200 OK in 12ms (Views: 4.6ms | ActiveRecord: 0.3ms)
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (2.1ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-04-03 19:19:14', 'test_account', '2013-04-03 19:19:14')
+   (0.4ms)  COMMIT
+Started GET "/accounts/50" for 127.0.0.1 at 2013-04-03 15:19:15 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"50"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 50 LIMIT 1
+   (0.2ms)  SELECT COUNT(*) FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 50 AND `modulate_documents`.`attachable_type` = 'Account'
+  Rendered accounts/_modulate_account_documents.html.haml (56.1ms)
+  Rendered accounts/_modulate_attachments.html.haml (265.4ms)
+  Rendered accounts/show.html.erb within layouts/application (274.3ms)
+Completed 200 OK in 351ms (Views: 341.8ms | ActiveRecord: 2.9ms)
+Started PUT "/accounts/50" for 127.0.0.1 at 2013-04-03 15:19:15 -0400
+Processing by AccountsController#update as HTML
+  Parameters: {"utf8"=>"✓", "account"=>{"modulate_documents_attributes"=>[{"attachment"=>#<ActionDispatch::Http::UploadedFile:0x007f94744ed350 @original_filename="test.txt", @content_type="text/plain", @headers="Content-Disposition: form-data; name=\"account[modulate_documents_attributes][][attachment]\"; filename=\"test.txt\"\r\nContent-Type: text/plain\r\nContent-Length: 25\r\n", @tempfile=#<File:/var/folders/lb/j1c12jc524zfb75l84v94qr40000gn/T/RackMultipart20130403-62206-fquekf>>}]}, "button"=>"", "id"=>"50"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 50 LIMIT 1
+  Modulate::Document Load (0.3ms)  SELECT `modulate_documents`.* FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 50 AND `modulate_documents`.`attachable_type` = 'Account'
+   (0.1ms)  BEGIN
+  CACHE (0.0ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 50 LIMIT 1
+  Modulate::Document Exists (0.3ms)  SELECT 1 AS one FROM `modulate_documents` WHERE (`modulate_documents`.`key` = BINARY '50-test.txt' AND `modulate_documents`.`bucket` = 'Dummy::Account') LIMIT 1
+  SQL (0.3ms)  INSERT INTO `modulate_documents` (`attachable_id`, `attachable_type`, `attached_by_id`, `attachment`, `bucket`, `content_type`, `created_at`, `filename`, `key`, `label`, `public`, `updated_at`) VALUES (50, 'Account', 1, '50-test.txt', 'Dummy::Account', 'text/plain', '2013-04-03 19:19:15', 'test.txt', '50-test.txt', NULL, 0, '2013-04-03 19:19:15')
+   (0.4ms)  COMMIT
+Redirected to http://www.example.com/accounts
+Completed 302 Found in 109ms (ActiveRecord: 1.7ms)
+Started GET "/accounts" for 127.0.0.1 at 2013-04-03 15:19:15 -0400
+Processing by AccountsController#index as HTML
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` 
+  Rendered accounts/index.html.haml within layouts/application (1.2ms)
+Completed 200 OK in 12ms (Views: 4.6ms | ActiveRecord: 0.3ms)
+Connecting to database specified by database.yml
+   (0.7ms)  BEGIN
+  SQL (2.3ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-04-03 19:19:49', 'test_account', '2013-04-03 19:19:49')
+   (0.4ms)  COMMIT
+Started GET "/accounts/51" for 127.0.0.1 at 2013-04-03 15:19:50 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"51"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 51 LIMIT 1
+   (0.2ms)  SELECT COUNT(*) FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 51 AND `modulate_documents`.`attachable_type` = 'Account'
+  Rendered accounts/_modulate_account_documents.html.haml (56.2ms)
+  Rendered accounts/_modulate_attachments.html.haml (267.3ms)
+  Rendered accounts/show.html.erb within layouts/application (276.6ms)
+Completed 200 OK in 352ms (Views: 342.7ms | ActiveRecord: 3.1ms)
+Started PUT "/accounts/51" for 127.0.0.1 at 2013-04-03 15:19:50 -0400
+Processing by AccountsController#update as HTML
+  Parameters: {"utf8"=>"✓", "account"=>{"modulate_documents_attributes"=>[{"attachment"=>#<ActionDispatch::Http::UploadedFile:0x007fe1b6426400 @original_filename="test.txt", @content_type="text/plain", @headers="Content-Disposition: form-data; name=\"account[modulate_documents_attributes][][attachment]\"; filename=\"test.txt\"\r\nContent-Type: text/plain\r\nContent-Length: 25\r\n", @tempfile=#<File:/var/folders/lb/j1c12jc524zfb75l84v94qr40000gn/T/RackMultipart20130403-62237-iuzcr>>}]}, "button"=>"", "id"=>"51"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 51 LIMIT 1
+  Modulate::Document Load (0.3ms)  SELECT `modulate_documents`.* FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 51 AND `modulate_documents`.`attachable_type` = 'Account'
+   (0.1ms)  BEGIN
+  CACHE (0.0ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 51 LIMIT 1
+  Modulate::Document Exists (0.3ms)  SELECT 1 AS one FROM `modulate_documents` WHERE (`modulate_documents`.`key` = BINARY '51-test.txt' AND `modulate_documents`.`bucket` = 'Dummy::Account') LIMIT 1
+  SQL (0.3ms)  INSERT INTO `modulate_documents` (`attachable_id`, `attachable_type`, `attached_by_id`, `attachment`, `bucket`, `content_type`, `created_at`, `filename`, `key`, `label`, `public`, `updated_at`) VALUES (51, 'Account', 1, '51-test.txt', 'Dummy::Account', 'text/plain', '2013-04-03 19:19:50', 'test.txt', '51-test.txt', NULL, 0, '2013-04-03 19:19:50')
+   (0.4ms)  COMMIT
+Redirected to http://www.example.com/accounts
+Completed 302 Found in 108ms (ActiveRecord: 1.8ms)
+Started GET "/accounts" for 127.0.0.1 at 2013-04-03 15:19:50 -0400
+Processing by AccountsController#index as HTML
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` 
+  Rendered accounts/index.html.haml within layouts/application (1.2ms)
+Completed 200 OK in 13ms (Views: 4.6ms | ActiveRecord: 0.3ms)
+Connecting to database specified by database.yml
+   (0.2ms)  BEGIN
+  SQL (2.2ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-04-03 19:20:15', 'test_account', '2013-04-03 19:20:15')
+   (0.4ms)  COMMIT
+Started GET "/accounts/52" for 127.0.0.1 at 2013-04-03 15:20:16 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"52"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 52 LIMIT 1
+   (0.2ms)  SELECT COUNT(*) FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 52 AND `modulate_documents`.`attachable_type` = 'Account'
+  Rendered accounts/_modulate_account_documents.html.haml (98.2ms)
+  Rendered accounts/_modulate_attachments.html.haml (268.4ms)
+  Rendered accounts/show.html.erb within layouts/application (277.6ms)
+Completed 200 OK in 302ms (Views: 292.6ms | ActiveRecord: 3.1ms)
+Started PUT "/accounts/52" for 127.0.0.1 at 2013-04-03 15:20:16 -0400
+Processing by AccountsController#update as HTML
+  Parameters: {"utf8"=>"✓", "account"=>{"modulate_documents_attributes"=>[{"attachment"=>#<ActionDispatch::Http::UploadedFile:0x007fa750d1a278 @original_filename="test.txt", @content_type="text/plain", @headers="Content-Disposition: form-data; name=\"account[modulate_documents_attributes][][attachment]\"; filename=\"test.txt\"\r\nContent-Type: text/plain\r\nContent-Length: 25\r\n", @tempfile=#<File:/var/folders/lb/j1c12jc524zfb75l84v94qr40000gn/T/RackMultipart20130403-62266-14d933f>>}]}, "button"=>"", "id"=>"52"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 52 LIMIT 1
+  Modulate::Document Load (0.3ms)  SELECT `modulate_documents`.* FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 52 AND `modulate_documents`.`attachable_type` = 'Account'
+   (0.1ms)  BEGIN
+  CACHE (0.0ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 52 LIMIT 1
+  Modulate::Document Exists (0.3ms)  SELECT 1 AS one FROM `modulate_documents` WHERE (`modulate_documents`.`key` = BINARY '52-test.txt' AND `modulate_documents`.`bucket` = 'Dummy::Account') LIMIT 1
+  SQL (0.3ms)  INSERT INTO `modulate_documents` (`attachable_id`, `attachable_type`, `attached_by_id`, `attachment`, `bucket`, `content_type`, `created_at`, `filename`, `key`, `label`, `public`, `updated_at`) VALUES (52, 'Account', 1, '52-test.txt', 'Dummy::Account', 'text/plain', '2013-04-03 19:20:16', 'test.txt', '52-test.txt', NULL, 0, '2013-04-03 19:20:16')
+   (0.3ms)  COMMIT
+Redirected to http://www.example.com/accounts
+Completed 302 Found in 113ms (ActiveRecord: 1.6ms)
+Started GET "/accounts" for 127.0.0.1 at 2013-04-03 15:20:16 -0400
+Processing by AccountsController#index as HTML
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` 
+  Rendered accounts/index.html.haml within layouts/application (1.2ms)
+Completed 200 OK in 12ms (Views: 4.6ms | ActiveRecord: 0.3ms)

data/spec/modulate_spec.rb

@@ -11,12 +11,14 @@ describe Modulate do
   end
 
   it "adds a relationship to each model that calls it" do
-    Account.should_receive(:has_many).with(:modulate_documents, as: :attachable, class_name: "Modulate::Document")
+    Account.should_receive(:has_many).once.with(:modulate_uploads, as: :attachable, class_name: "Modulate::Document")
+    Account.should_receive(:has_many).once.with(:modulate_documents, as: :attachable, class_name: "Modulate::Document")
     Account.modulate
   end
 
   it "adds nested attributes to each model that calls it" do
     Account.should_receive(:accepts_nested_attributes_for).with(:modulate_documents)
+    Account.should_receive(:accepts_nested_attributes_for).with(:modulate_uploads)
     Account.modulate
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modulate
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave-riak
@@ -166,7 +166,6 @@ files:
 - app/controllers/modulate/documents_controller.rb
 - app/models/modulate/document.rb
 - app/uploaders/modulate/document_uploader.rb
-- app/views/modulate/documents/show.html.haml
 - config/routes.rb
 - db/migrate/20130320174022_add_modulate_document_table.rb
 - lib/generators/modulate/modulate_generator.rb
@@ -290,7 +289,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3555518139713941680
+      hash: -4285118924785943183
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -299,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3555518139713941680
+      hash: -4285118924785943183
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24