modulate 0.0.4 → 0.0.5

data/lib/generators/modulate/modulate_generator.rb

@@ -13,8 +13,8 @@ class ModulateGenerator < Rails::Generators::Base
   end
 
   def copy_view_files
-    template "_modulate_documents.html.haml", "app/views/#{model_name.underscore}s/_modulate_#{model_name.underscore}_documents.html.haml"
-    template "_modulate_attachments.html.haml", "app/views/#{model_name.underscore}s/_modulate_attachments.html.haml"
+    template "_modulate_documents.html.haml", "#{folder_name}s/_modulate_#{partial_name}_documents.html.haml"
+    template "_modulate_attachments.html.haml", "#{folder_name}s/_modulate_attachments.html.haml"
   end
 
   def copy_initializer
@@ -29,5 +29,24 @@ class ModulateGenerator < Rails::Generators::Base
     File.open(path, 'wb') { |file| file.write(content) }
   end 
 
+  def partial_name
+    name.join("_")
+  end
+
+  def name
+    model_name.downcase.split('::')
+  end
+
+  def folder_name
+    array = name.tap{
+                      last = name.last
+                      new = last + 's'
+                      name.pop
+                      name.push new
+    }
+    tail = array.join("/")
+    "app/views/#{tail}"
+  end
+
 end
 

data/lib/modulate/version.rb

@@ -1,3 +1,3 @@
 module Modulate
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/dummy/log/development.log

@@ -3858,3 +3858,21 @@ Served asset /application.js - 304 Not Modified (1ms)
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml

data/spec/dummy/log/test.log

@@ -360,3 +360,97 @@ 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 11ms (Views: 4.7ms | 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-03-27 18:25:49', 'test_account', '2013-03-27 18:25:49')
+   (0.4ms)  COMMIT
+Started GET "/accounts/36" for 127.0.0.1 at 2013-03-27 14:25:49 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"36"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 36 LIMIT 1
+  Rendered accounts/_modulate_attachments.html.haml (15.8ms)
+  Rendered accounts/show.html.erb within layouts/application (24.8ms)
+Completed 500 Internal Server Error in 100ms
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (2.2ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-03-27 19:26:09', 'test_account', '2013-03-27 19:26:09')
+   (0.4ms)  COMMIT
+Started GET "/accounts/37" for 127.0.0.1 at 2013-03-27 15:26:09 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"37"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 37 LIMIT 1
+  Rendered accounts/_modulate_attachments.html.haml (15.6ms)
+  Rendered accounts/show.html.erb within layouts/application (25.6ms)
+Completed 500 Internal Server Error in 47ms
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (2.2ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-03-27 19:26:50', 'test_account', '2013-03-27 19:26:50')
+   (0.4ms)  COMMIT
+Started GET "/accounts/38" for 127.0.0.1 at 2013-03-27 15:26:51 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"38"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 38 LIMIT 1
+  Rendered accounts/_modulate_attachments.html.haml (16.2ms)
+  Rendered accounts/show.html.erb within layouts/application (25.6ms)
+Completed 500 Internal Server Error in 100ms
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (2.4ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-03-27 19:27:35', 'test_account', '2013-03-27 19:27:35')
+   (0.4ms)  COMMIT
+Started GET "/accounts/39" for 127.0.0.1 at 2013-03-27 15:27:35 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"39"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 39 LIMIT 1
+  Rendered accounts/show.html.erb within layouts/application (16.4ms)
+Completed 500 Internal Server Error in 90ms
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (2.2ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-03-27 19:28:24', 'test_account', '2013-03-27 19:28:24')
+   (0.4ms)  COMMIT
+Started GET "/accounts/40" for 127.0.0.1 at 2013-03-27 15:28:25 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"40"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 40 LIMIT 1
+  Rendered accounts/show.html.erb within layouts/application (16.4ms)
+Completed 500 Internal Server Error in 88ms
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (42.4ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-03-27 19:30:24', 'test_account', '2013-03-27 19:30:24')
+   (0.4ms)  COMMIT
+Started GET "/accounts/41" for 127.0.0.1 at 2013-03-27 15:30:24 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"41"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 41 LIMIT 1
+  Rendered accounts/_modulate_attachments.html.haml (15.5ms)
+  Rendered accounts/show.html.erb within layouts/application (25.5ms)
+Completed 500 Internal Server Error in 98ms
+Connecting to database specified by database.yml
+   (0.1ms)  BEGIN
+  SQL (2.5ms)  INSERT INTO `accounts` (`created_at`, `name`, `updated_at`) VALUES ('2013-03-27 19:34:42', 'test_account', '2013-03-27 19:34:42')
+   (0.4ms)  COMMIT
+Started GET "/accounts/42" for 127.0.0.1 at 2013-03-27 15:34:42 -0400
+Processing by AccountsController#show as HTML
+  Parameters: {"id"=>"42"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 42 LIMIT 1
+   (0.2ms)  SELECT COUNT(*) FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 42 AND `modulate_documents`.`attachable_type` = 'Account'
+  Rendered accounts/_modulate_account_documents.html.haml (55.2ms)
+  Rendered accounts/_modulate_attachments.html.haml (315.7ms)
+  Rendered accounts/show.html.erb within layouts/application (325.2ms)
+Completed 200 OK in 400ms (Views: 391.0ms | ActiveRecord: 3.1ms)
+Started PUT "/accounts/42" for 127.0.0.1 at 2013-03-27 15:34:43 -0400
+Processing by AccountsController#update as HTML
+  Parameters: {"utf8"=>"✓", "account"=>{"modulate_documents_attributes"=>[{"attachment"=>#<ActionDispatch::Http::UploadedFile:0x007f9d243926a0 @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/RackMultipart20130327-95496-nsw8h7>>}]}, "button"=>"", "id"=>"42"}
+  Account Load (0.3ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 42 LIMIT 1
+  Modulate::Document Load (0.3ms)  SELECT `modulate_documents`.* FROM `modulate_documents` WHERE `modulate_documents`.`attachable_id` = 42 AND `modulate_documents`.`attachable_type` = 'Account'
+   (0.1ms)  BEGIN
+  CACHE (0.0ms)  SELECT `accounts`.* FROM `accounts` WHERE `accounts`.`id` = 42 LIMIT 1
+  Modulate::Document Exists (0.3ms)  SELECT 1 AS one FROM `modulate_documents` WHERE (`modulate_documents`.`key` = BINARY '42-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 (42, 'Account', 1, '42-test.txt', 'Dummy::Account', 'text/plain', '2013-03-27 19:34:43', 'test.txt', '42-test.txt', NULL, 0, '2013-03-27 19:34:43')
+   (0.5ms)  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-03-27 15:34:43 -0400
+Processing by AccountsController#index as HTML
+  Account Load (0.5ms)  SELECT `accounts`.* FROM `accounts` 
+  Rendered accounts/index.html.haml within layouts/application (1.2ms)
+Completed 200 OK in 12ms (Views: 4.8ms | ActiveRecord: 0.5ms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modulate
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -191,7 +191,6 @@ files:
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/carrierwave.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/database.yml.example
 - spec/dummy/config/environment.rb
@@ -289,7 +288,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3947230191988836994
+      hash: -2141877784016317984
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -298,7 +297,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3947230191988836994
+      hash: -2141877784016317984
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -319,7 +318,6 @@ test_files:
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/carrierwave.rb
 - spec/dummy/config/database.yml
 - spec/dummy/config/database.yml.example
 - spec/dummy/config/environment.rb

data/spec/dummy/config/carrierwave.rb

@@ -1,5 +0,0 @@
-CarrierWave.configure do |config|
-  config.storage = :riak
-  config.riak_host = 'localhost'
-  config.riak_port = 8098
-end