RubyGems - somatics3-generators - Versions diffs - 0.0.8 → 0.0.9 - Mend

somatics3-generators 0.0.8 → 0.0.9

Files changed (13) hide show

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.0.8
1	+ 0.0.9

data/lib/generators/somatics/install/templates/config/locales/somatics_en.yml CHANGED Viewed

@@ -31,3 +31,5 @@ en:
   no_data_available: No Data Available
   Add: Add
   Cancel: Cancel
+  Sort_by_this_field: Sort by this field
+  sort_by: sort by {{field}}

data/lib/generators/somatics/install/templates/config/locales/somatics_zh-TW.yml CHANGED Viewed

@@ -30,4 +30,6 @@
   next: 下一頁
   no_data_available: 未有可用的資料
   Add: 加入
-  Cancel: 取消
+  Cancel: 取消
+  Sort_by_this_field: 以此列排序
+  sort_by: sort by {{field}}

data/lib/generators/somatics/install/templates/controller_admin.rb CHANGED Viewed

@@ -4,9 +4,6 @@
 class Admin::AdminController < ActionController::Base
   helper :all # include all helpers, all the time
   protect_from_forgery # See ActionController::RequestForgeryProtection for details
-  # Scrub sensitive parameters from your log
-  filter_parameter_logging :password
   include RedmineFilter
   include UserAuthenticatedSystem

data/lib/generators/somatics/install/templates/helper_admin.rb CHANGED Viewed

@@ -19,24 +19,19 @@ module Admin::AdminHelper
   end
   def sort_asc_desc_helper(model_name, param)
-    result = image_tag('admin/sort_asc.png') if params[:"#{model_name}_sort"] == param
-    result = image_tag('admin/sort_desc.png') if params[:"#{model_name}_sort"] == param + "_reverse"
+    result = image_tag('somatics/sort_asc.png') if params[:"#{model_name}_sort"] == param
+    result = image_tag('somatics/sort_desc.png') if params[:"#{model_name}_sort"] == param + "_reverse"
     return result || ''
   end
   def sort_link_helper(text, model_name ,param)
     key = param
     key += "_reverse" if params[:"#{model_name}_sort"] == param
-    options = {
-      :url => {:action => 'index', :params => params.merge({:"#{model_name}_sort" => key, :page => nil})},
-      :update => 'content',
-      :method => :get
-    }
     html_options = {
-      :title => "Sort by this field",
-      :href => url_for(:action => 'index', :params => params.merge({:"#{model_name}_sort" => key, :page => nil}))
+      :title => I18n.t("sort_by",:field => text),
+      :remote=>true
     }
-    link_to(text + sort_asc_desc_helper(model_name,param), options, html_options,:remote=>true)
+    link_to(text, params.merge({:"#{model_name}_sort" => key}), html_options)  + sort_asc_desc_helper(model_name,param)
   end
   def operators_for_select(filter_type)

data/lib/generators/somatics/install/templates/layout_admin.html.erb CHANGED Viewed

@@ -6,18 +6,17 @@
   <%%= stylesheet_link_tag 'somatics/base', 'somatics/jstoolbar', :media => 'all' %>
   <%%#= stylesheet_link_tag 'somatics/context_menu', :media => 'all' %>
   <!--[if IE]>
   <style type="text/css">
     * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
     body {behavior: url(/stylesheets/somatics/csshover.htc);}
   </style>
   <![endif]-->
+  <%%= javascript_include_tag 'somatics/prototype.js', "rails", 'somatics/effects.js', 'somatics/dragdrop.js', 'somatics/controls.js','somatics/base.js','somatics/select_list_move.js','somatics/context_menu.js' %>
+  <%%= csrf_meta_tag %>
-  <%%= javascript_include_tag 'somatics/prototype.js', 'somatics/effects.js', 'somatics/dragdrop.js', 'somatics/controls.js','somatics/base.js','somatics/select_list_move.js','somatics/context_menu.js' %>
-  <!--
-  <link href="http://www.redmine.org/issues.atom?query_id=" rel="alternate" title="Issues" type="application/atom+xml" />
-  <link href="http://www.redmine.org/issues/changes?format=atom&amp;query_id=" rel="alternate" title="Details of all changes" type="application/atom+xml" />
-  -->
   <%%= init_tinymce_hammer_if_required %>
 </head>
 <body>

data/lib/generators/somatics/install/templates/lib/somatic_link_renderer.rb CHANGED Viewed

@@ -1,16 +1,5 @@
 class SomaticLinkRenderer < WillPaginate::ViewHelpers::LinkRenderer
-  def to_html
-    links = @options[:page_links] ? windowed_links : []
-    # previous/next buttons
-    links.unshift page_link_or_span(@collection.previous_page, 'disabled prev_page', @options[:previous_label])
-    links.push    page_link_or_span(@collection.next_page,     'disabled next_page', @options[:next_label])
-    html = links.join(@options[:separator])
-    html += "( #{@collection.offset+1}-#{@collection.offset + @collection.per_page}/#{@collection.total_entries} )"
-    @options[:container] ? @template.content_tag(:p, html, html_attributes) : html
-  end
   def prepare(collection, options, template)
     super
     @collection_name = template.controller.controller_name
@@ -19,24 +8,17 @@ class SomaticLinkRenderer < WillPaginate::ViewHelpers::LinkRenderer
     @options[:next_label] = I18n.t(:next)
   end
-protected
-  def page_link(page, text, attributes = {})
-    # @template.content_tag(:li, @template.link_to(text, url_for(page)), attributes)
-    # @template.link_to(text, url_for(page), attributes)
-    @template.link_to(text,{
-        :url => url_for(page),
-        :update => 'content',
-        :method => :get
-    },attributes.merge({
-      :href => url_for(page)
-    }),:remote=>true
-    )
+  private
+  def link(text, target, attributes = {})
+    if target.is_a? Fixnum
+      attributes[:rel] = rel_value(target)
+      target = url(target)
+    end
+    attributes[:href] = target
+    # tag(:a, text, attributes)
+    @template.link_to(text,target, attributes.merge({:remote => true}))
   end
-  def page_span(page, text, attributes = {})
-    # @template.content_tag(:li, text, attributes)
-    @template.content_tag(:span, text, attributes)
-  end
 end

data/lib/generators/somatics/install/templates/public/javascripts/somatics/base.js CHANGED Viewed

@@ -226,6 +226,12 @@ Event.observe(window, 'load', function() {
 	});
 });
+Event.observe(window, "ajax:complete", function(event){
+  if(event.memo.responseText != 'undefined'){
+    $("content").update(event.memo.responseText); // insert content
+  }
+});
 function link_to(url) {
   window.location = url;
 }

data/lib/generators/somatics/scaffold_controller/templates/partial_list.html.erb CHANGED Viewed

@@ -2,16 +2,10 @@
 	<thead>
 		<tr>
       <!-- <th><%%#= link_to image_tag('toggle_check.png', :alt => "Toggle_check"), admin_<%= plural_name %>_path, :onclick => "toggleIssuesSelection(Element.up(this, &quot;form&quot;)); return false;", :title => "Check all/Uncheck all" %></th> -->
-      <th title="Sort by &quot;#&quot;"><%%= sort_link_helper t('ID'), '<%=singular_name%>', 'id' %></th>
-<% if options[:admin_authenticated] || options[:authenticated] -%>
-      <th title="Sort by &quot;Login&quot;"><%%= sort_link_helper <%= class_name %>.human_attribute_name(:login), '<%=singular_name%>', 'login' %></th>
-	    <th title="Sort by &quot;Name&quot;"><%%= sort_link_helper <%= class_name %>.human_attribute_name(:name), '<%=singular_name%>', 'name' %></th>
-	    <th title="Sort by &quot;Email&quot;"><%%= sort_link_helper <%= class_name %>.human_attribute_name(:email), '<%=singular_name%>', 'email' %></th>
-	    <th title="Sort by &quot;Created At&quot;"><%%= sort_link_helper <%= class_name %>.human_attribute_name(:created_at), '<%=singular_name%>', 'created_at' %></th>
-<% end -%>
-<% for attribute in attributes -%>
-      <th title="Sort by &quot;<%= attribute.name.humanize %>&quot;"><%%= sort_link_helper <%= class_name %>.human_attribute_name(:<%= attribute.name %>), '<%=singular_name%>', '<%= attribute.name %>' %></th>
-<% end -%>
+      <th title="<%%=t "sort_by", :field => '#'%>"><%%= sort_link_helper t('ID'), '<%=singular_name%>', 'id' %></th>
+      <% for attribute in attributes -%>
+            <th title="<%%=t "sort_by", :field => <%= class_name %>.human_attribute_name(:<%= attribute.name %>) %>"><%%= sort_link_helper <%= class_name %>.human_attribute_name(:<%= attribute.name %>), '<%=singular_name%>', '<%= attribute.name %>' %></th>
+      <% end -%>
       <!-- More Sort Link Helper -->
 		</tr>
 	</thead>
@@ -21,15 +15,9 @@
 		<tr id="<%% dom_id(<%=singular_name%>)%>" class="hascontextmenu <%%= cycle 'odd' , 'even' %> issue">
       <!-- <td class="checkbox"><input name="ids[]" type="checkbox" value="<%%#= <%=singular_name%>.id %>" /></td> -->
       <td onclick="link_to(<%%= "'#{admin_<%=singular_name%>_path(<%=singular_name%>)}'" %>);"><%%= link_to <%= singular_name %>.id, [:admin, <%= singular_name %>]%></td>
-<% if options[:admin_authenticated] || options[:authenticated] -%>
-      <td onclick="link_to(<%%= "'#{admin_<%=singular_name%>_path(<%=singular_name%>)}'" %>);" class="login"><%%=h <%= singular_name %>.login %></td>
-      <td onclick="link_to(<%%= "'#{admin_<%=singular_name%>_path(<%=singular_name%>)}'" %>);" class="name"><%%=h <%= singular_name %>.name %></td>
-      <td onclick="link_to(<%%= "'#{admin_<%=singular_name%>_path(<%=singular_name%>)}'" %>);" class="email"><%%=h <%= singular_name %>.email %></td>
-      <td onclick="link_to(<%%= "'#{admin_<%=singular_name%>_path(<%=singular_name%>)}'" %>);" class="created_at"><%%=h <%= singular_name %>.created_at %></td>
-<% end -%>
-<% for attribute in attributes -%>
+      <% for attribute in attributes -%>
       <td onclick="link_to(<%%= "'#{admin_<%=singular_name%>_path(<%=singular_name%>)}'" %>);" class="<%= attribute.name %>"><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
-<% end -%>
+      <% end -%>
       <!-- More Fields -->
     </tr>
 		<%% end %>

data/lib/generators/somatics/scaffold_controller/templates/view_index.html.erb CHANGED Viewed

@@ -24,5 +24,5 @@
 <%% content_for :sidebar do %>
   <h3>Actions</h3>
-  <%%= link_to "#{t('new')} #{<%= class_name %>.model_name.human}", new_admin_<%= singular_name %>_path %>
+  <%%= link_to "#{t('New')} #{<%= class_name %>.model_name.human}", new_admin_<%= singular_name %>_path %>
 <%% end %>

data/somatics3-generators.gemspec CHANGED Viewed

@@ -5,7 +5,7 @@
 Gem::Specification.new do |s|
   s.name = %q{somatics3-generators}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benjamin Wong"]

data/templates/somatics.rb CHANGED Viewed

@@ -1,12 +1,10 @@
 # somatics.rb
-# app_name = ask 'Type your Application Name for the Heroku project, followed by [ENTER]:'
 #
 # repo_entered = ask 'Type your repository for the project (SVN), followed by [ENTER]:'
 gem 'will_paginate', :version => "~> 3.0.pre2"
 gem 'prawn', :version => '0.6.3'
-gem 'somatics3-generators'
+gem 'somatics3-generators', :group => :development
 gem 'json'
 plugin 'action_mailer_optional_tls',
@@ -35,57 +33,57 @@ plugin 'dynamic_form',
 rakefile "setup_svn.rake" do
   <<-TASK
-  desc "Configure Subversion for Rails"
-  task :setup_svn do
-    system "svn info"
-    if $? != 0
-      puts 'Please Import your project to svn before executing this task'
-      exit(0)
-    end
-    system "svn commit -m 'initial commit'"
-    puts "Add .gems"
-    system "svn add .gems"
-    system "svn commit -m 'add .gems'"
-    puts "Add .gitignore"
-    system "echo '.svn' > .gitignore"
-    system "svn add .gitignore"
-    system "svn commit -m 'add .gitignore'"
-    puts "Ignoring .git"
-    system "svn propset svn:ignore '.git' ."
-    puts "Removing /log"
-    system "svn remove log/*"
-    system "svn commit -m 'removing all log files from subversion'"
-    system 'svn propset svn:ignore "*.log" log/'
-    system "svn update log/"
-    system "svn commit -m 'Ignoring all files in /log/ ending in .log'"
-    puts "Ignoring /db"
-    system 'svn propset svn:ignore "*.db" db/'
-    system "svn update db/"
-    system "svn commit -m 'Ignoring all files in /db/ ending in .db'"
-    puts "Renaming database.yml database.example"
-    system "svn move config/database.yml config/database.example"
-    system "svn commit -m 'Moving database.yml to database.example to provide a template for anyone who checks out the code'"
-    system 'svn propset svn:ignore "database.yml" config/'
-    system "svn update config/"
-    system "svn commit -m 'Ignoring database.yml'"
-    puts "Ignoring /tmp"
-    system 'svn propset svn:ignore "*" tmp/'
-    system "svn update tmp/"
-    system "svn commit -m 'Ignoring all files in /tmp/'"
-    puts "Ignoring /doc"
-    system 'svn propset svn:ignore "*" doc/'
-    system "svn update doc/"
-    system "svn commit -m 'Ignoring all files in /doc/'"
+desc "Configure Subversion for Rails"
+task :setup_svn do
+  system "svn info"
+  if $? != 0
+    puts 'Please Import your project to svn before executing this task'
+    exit(0)
   end
+  system "svn commit -m 'initial commit'"
+  puts "Add .gems"
+  system "svn add .gems"
+  system "svn commit -m 'add .gems'"
+  puts "Add .gitignore"
+  system "echo '.svn' > .gitignore"
+  system "svn add .gitignore"
+  system "svn commit -m 'add .gitignore'"
+  puts "Ignoring .git"
+  system "svn propset svn:ignore '.git' ."
+  puts "Removing /log"
+  system "svn remove log/*"
+  system "svn commit -m 'removing all log files from subversion'"
+  system 'svn propset svn:ignore "*.log" log/'
+  system "svn update log/"
+  system "svn commit -m 'Ignoring all files in /log/ ending in .log'"
+  puts "Ignoring /db"
+  system 'svn propset svn:ignore "*.db" db/'
+  system "svn update db/"
+  system "svn commit -m 'Ignoring all files in /db/ ending in .db'"
+  puts "Renaming database.yml database.example"
+  system "svn move config/database.yml config/database.example"
+  system "svn commit -m 'Moving database.yml to database.example to provide a template for anyone who checks out the code'"
+  system 'svn propset svn:ignore "database.yml" config/'
+  system "svn update config/"
+  system "svn commit -m 'Ignoring database.yml'"
+  puts "Ignoring /tmp"
+  system 'svn propset svn:ignore "*" tmp/'
+  system "svn update tmp/"
+  system "svn commit -m 'Ignoring all files in /tmp/'"
+  puts "Ignoring /doc"
+  system 'svn propset svn:ignore "*" doc/'
+  system "svn update doc/"
+  system "svn commit -m 'Ignoring all files in /doc/'"
+end
   TASK
 end
@@ -101,28 +99,53 @@ generate "somatics:settings"
 rake "db:create"
 rake "db:migrate"
-rake "somatics:create_user" if yes?(%(Create Default Admin User (username:admin, password:somatics)?))
-# unless app_name.blank?
-#   run "git init"
-#   rake "heroku:gems"
-#   run "heroku create #{app_name}"
-#   run "git add ."
-#   run "git commit -a -m 'Initial Commit' "
-#   run "heroku addons:add cron:daily"
-#   run "heroku addons:add deployhooks:email \
-#       recipient=heroku@inspiresynergy.com \
-#       subject=\"#{app_name} Deployed\" \
-#       body=\"{{user}} deployed app\""
-#   run "heroku addons:add piggyback_ssl"
-#   run "heroku addons:add newrelic:bronze"
-#   run "heroku addons:add cron:daily"
-#   run "git push heroku master"
-#   run "heroku rake db:migrate"
-# end
-#
-# unless repo_entered.blank?
-#   run "svn co #{repo_entered}"
-#   rake "setup_svn"
-# end
+if yes?(%(Create Default Admin User (username:admin, password:somatics)?))
+  rake "somatics:create_user"
+else
+  puts "You can run rake somatics:create_user to create default user"
+end
+# Delete unnecessary files
+run "rm README"
+# run "rm public/index.html"
+app_name = ARGV[0]
+# Commit all work so far to the local repository
+git :init
+git :add => '.'
+git :commit => "-a -m 'Initial commit'"
+rakefile "heroku.rake" do
+  <<-TASK
+namespace :heroku do
+  desc "Configure Heroku"
+  task :setup do
+    system "heroku create #{app_name}"
+    system "git add ."
+    system "git commit -a -m 'Initial Commit'"
+    # system "heroku addons:add cron:daily"
+    system "heroku addons:add deployhooks:email \
+        recipient=heroku@inspiresynergy.com \
+        subject='[#{app_name}] Deployed' \
+        body='{{user}} deployed #{app_name} successfully'"
+    system "heroku addons:add piggyback_ssl"
+    system "heroku addons:add newrelic:bronze"
+  end
+  desc "Deploy to Heroku"
+  task :deploy do
+    system "git add ."
+    system "git commit -a -m 'Heroku Release'"
+    system "git push heroku master"
+  end
+  desc "Deploy and Migrate to Heroku"
+  task :deploy_migrate => :deploy do
+    system "heroku rake db:migrate"
+  end
+end
+  TASK
+end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: somatics3-generators
 version: !ruby/object:Gem::Version
-  hash: 15
+  hash: 13
   prerelease: false
   segments:
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors:
 - Benjamin Wong