bootswatch_rails 3.2.0.10 → 3.2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60232bc73b47d3b4656dd3498d9bdcdf5bbb9fa6
-  data.tar.gz: df80d969c88617677b7f5cb07ebfca77e11ca21c
+  metadata.gz: d5c6154711bbb92cd3ebe2aab4d6c05ec7429918
+  data.tar.gz: 5be253e8c04f076e177fa0b45c9ff35040cb8100
 SHA512:
-  metadata.gz: 90a3a2da7c4633b33988d8f389333b6c43fa7e0bb5d0376e215317ff784d25ba83b998f4031766a63b8d410536696bae0ff0c227be209c2b21f066000293ce33
-  data.tar.gz: 6b90ff94b904769f85eaab1a291f9ef5144b0f84466dae57091ecfed90908b76380d0b1ac0513a81d6141d620b382a36a305f36ab0c9a497b9838a15950ca271
+  metadata.gz: 27b4412d15686c3d171b7a24ba1fca046cc8db835a969082dc743371afd7cfe170fa3678f922d172b0057f1ef137652496d06bbb95e755f1e7f6402077f802f2
+  data.tar.gz: b547102e9fc4420e8218718f4e145162af116be51d493162b5d1516897b5462fea7878b05f5d2e7eeb5d5142dac6d63ddc0aa478584d7eb31d0878e7e381dcd9

data/Makefile

@@ -3,12 +3,18 @@
 # Makefile for building the Gem
 #
 
-all:
+all: build
+	vim lib/bootswatch_rails/version.rb
+	git commit -a
+	rake release
+
+install: build
+	git commit -a
+	sudo rake install
+
+build:
 	./generate.sh
 	test -d cleditor && git add cleditor || true
 	git add lib
 	git add vendor
-	vim lib/bootswatch_rails/version.rb
-	git commit -a
-	rake release
 

data/lib/bootswatch_rails/version.rb

@@ -1,5 +1,5 @@
 module BootswatchRails
-  VERSION = "3.2.0.10"
+  VERSION = "3.2.0.11"
   THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 1
 end

data/lib/generators/bootswatch_rails/created_by/created_by_generator.rb

@@ -18,7 +18,7 @@ module BootswatchRails
       end
       
       def add_helper
-        copy_file "created_by_helper.rb", "app/helpers/created_by_helper.rb"
+        template "created_by_helper.rb", "app/helpers/created_by_helper.rb"
       end
       
       def update_controller

data/lib/generators/bootswatch_rails/created_by/templates/created_by_helper.rb

@@ -1,14 +1,30 @@
 module CreatedByHelper
-  def text_created_by(model, mode = "create", full = true)
+  def text_created_by(model, action = "create", mode = "short")
     begin
-      id = model.send("#{mode}d_by")
-      day = model.send("#{mode}d_at").to_date
-      user = User.find(id)
+      if action.include?("update")
+        id = model.updated_by
+        time = model.updated_at
+      else
+        id = model.created_by
+        time = model.created_at
+      end
+      user = <%= user.camelize %>.find(id)
       name = user.name
+      email = user.email
     rescue
-      return "???"
+      return ""
+    end
+    case mode
+      when "name"
+        name
+      when "email"
+        email
+      when "user"
+        mail_to(email, name)
+      when "long"
+        "#{mail_to(email, name)} (#{l(time)})"
+      else          
+        "#{mail_to(email, name)} (#{l(time.to_date)})"
     end
-    return name unless full
-    "#{mail_to(user.email, name)} (#{l(day)})"
   end
 end

data/lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/_form.html.erb

@@ -2,6 +2,7 @@
   <%%= f.error_notification %>
 
 <%- attributes.each do |attribute| -%>
+<%- next if [ "created_by", "updated_by" ].include? attribute.name -%>
   <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %>
 <%- if attribute.name.include?("picture") -%>
   <%%= f.input :<%= attribute.name %>_cache, as: :hidden %>

data/lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/index.html.erb

@@ -4,9 +4,17 @@
   <thead>
     <tr>
 <% attributes.each do |attribute| -%>
-      <th><%%= t('activerecord.attributes.<%= singular_table_name %>.<%= attribute.name %>') %></th>
+      <th>
+  <%- if [ "created_by", "updated_by" ].include? attribute.name -%>
+        <%%= t('activerecord.attributes.<%= attribute.name %>') %>
+  <%- else -%>
+        <%%= t('activerecord.attributes.<%= singular_table_name %>.<%= attribute.name %>') %>
+  <%- end -%>
+      </th>
 <% end -%>
-      <th class="index-actions"><%%= t('actions.title') %></th>
+      <th class="index-actions">
+        <%%= t('actions.title') %>
+      </th>
     </tr>
   </thead>
 
@@ -21,6 +29,10 @@
           <%%= <%= singular_table_name %>.<%= attribute.name %> ? t('simple_form.yes') : t('simple_form.no') %>
   <%- elsif attribute.type == :belongs_to -%>
           <%%= <%= singular_table_name %>.<%= attribute.name %>.name %>
+  <%- elsif attribute.name == "created_by" -%>
+          <%%= raw(text_created_by(<%= singular_table_name %>, "create")) %>
+  <%- elsif attribute.name == "updated_by" -%>
+          <%%= raw(text_created_by(<%= singular_table_name %>, "update")) %>
   <%- else -%>
           <%%= <%= singular_table_name %>.<%= attribute.name %> %>
   <%- end -%>

data/lib/generators/bootswatch_rails/install/templates/lib/templates/erb/scaffold/show.html.erb

@@ -5,7 +5,11 @@
 <% attributes.each do |attribute| -%>
     <tr>
       <td>
+  <%- if [ "created_by", "updated_by" ].include? attribute.name -%>
+        <%%= t('activerecord.attributes.<%= attribute.name %>') %>
+  <%- else -%>
         <%%= t('activerecord.attributes.<%= singular_table_name %>.<%= attribute.name %>') %>
+  <%- end -%>
       </td>
       <td>
   <%- if attribute.name.include?("picture") -%>
@@ -17,6 +21,10 @@
         <%%= @<%= singular_table_name %>.<%= attribute.name %> ? t('simple_form.yes') : t('simple_form.no') %>
   <%- elsif attribute.type == :belongs_to -%>
         <%%= @<%= singular_table_name %>.<%= attribute.name %>.name %>
+  <%- elsif attribute.name == "created_by" -%>
+        <%%= raw(text_created_by(@<%= singular_table_name %>, "create")) %>
+  <%- elsif attribute.name == "updated_by" -%>
+        <%%= raw(text_created_by(@<%= singular_table_name %>, "update")) %>
   <%- else -%>
         <%%= @<%= singular_table_name %>.<%= attribute.name %> %>
   <%- end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0.10
+  version: 3.2.0.11
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties