prague 0.0.1 → 0.0.2

data/lib/generators/prague/model/model_generator.rb

@@ -4,7 +4,7 @@ module Prague
   module Generators
     class ModelGenerator < ::ActiveRecord::Generators::Base
       desc 'This generator generates a model for pages'
-      argument :name, default: 'Page'
+      argument :name, default: 'page'
       source_root File.expand_path('../templates', __FILE__)
 
       def create_migration
@@ -12,7 +12,7 @@ module Prague
       end
 
       def create_model
-        template 'model.rb.erb', "app/models/#{name}.rb"
+        template 'model.rb.erb', "app/models/#{singular_name}.rb"
       end
     end
   end

data/lib/generators/prague/model/templates/migration.rb.erb

@@ -5,6 +5,7 @@ class PragueCreate<%= table_name.camelize %> < ActiveRecord::Migration
       t.string :permalink, null: false, uniq: true
       t.string :link_title, null: false
       t.string :sort_value, limit: 100
+      t.text :head, null: false
       t.text :body, null: false
       t.boolean :online, default: false
     end

data/lib/generators/prague/model/templates/model.rb.erb

@@ -1,10 +1,23 @@
+# Prague-model for pages.
+#
+# Attributes:
+#
+# title - Title of the page.
+# permalink - Path the page should be accessed by.
+# link_title - Title for links in views.
+# sort_value - Pages are returned sorted by the the sort_value by default.
+# head - Content for meta tags for the page.
+# body - Content for main content of the page.
+# online - Whether or not the page should be visible to the outside world.
+#
 class <%= class_name %> < ActiveRecord::Base
-  attr_accessible :title, :permalink, :link_title, :sort_value, :body, :online
+  attr_accessible :title, :permalink, :link_title, :sort_value, :head, :body, :online
 
   validates :title, presence: true
   validates :permalink, presence: true, uniqueness: true
   validates :link_title, presence: true
   validates :sort_value, length: {maximum: 100}
+  validates :head, presence: true
   validates :body, presence: true
 
   default_scope order('sort_value DESC')

data/lib/generators/prague/scaffold/scaffold_generator.rb

@@ -4,7 +4,7 @@ module Prague
       include Rails::Generators::ResourceHelpers
 
       desc 'This generator generates a scaffold for pages'
-      argument :name, default: 'Page'
+      argument :name, default: 'page'
       source_root File.expand_path('../templates', __FILE__)
 
       def create_model_and_migration
@@ -12,7 +12,8 @@ module Prague
       end
 
       def create_controller
-        invoke 'scaffold_controller', [singular_name.classify]
+        generate 'scaffold_controller', singular_name.classify +
+            ' title permalink link_title sort_value head:text body:text online:boolean'
         inject_into_class "app/controllers/#{plural_name}_controller.rb",
             "#{controller_class_name}Controller", erb('action.rb.erb')
       end
@@ -21,14 +22,24 @@ module Prague
         template 'view.html.erb.erb', "app/views/#{plural_name}/display.html.erb"
       end
 
+      def add_display_link_to_show_view
+        append_to_file "app/views/#{plural_name}/show.html.erb",
+            "| <%= link_to 'Display', display_#{singular_name}_path(permalink: @#{singular_name}.permalink) %>"
+      end
+
+      def add_meta_tags_to_application_layout
+        gsub_file 'app/views/layouts/application.html.erb', '</head>',
+            "  <%= content_for :meta_tags if content_for? :meta_tags %>\n</head>"
+      end
+
       def create_display_helper
         template 'helper.rb.erb', "app/helpers/#{plural_name}_display_helper.rb"
       end
 
       def add_routes
-        route erb('route.rb.erb')
+        route "\n  resources :#{plural_name}"
         gsub_file 'config/routes.rb', /end\Z/,
-            "\n  match ':permalink' => '#{plural_name}#display'\nend"
+            "\n  match ':permalink' => '#{plural_name}#display', as: 'display_#{singular_name}'\nend"
       end
 
       private

data/lib/generators/prague/scaffold/templates/helper.rb.erb

@@ -2,7 +2,6 @@ module <%= plural_name.camelize %>DisplayHelper
   #
   # Helper for linking to <%= plural_name %> with a fallback.
   # html_options are the same as for link_to helper.
-  # Additionally you can switch between link_to and link_to_unless_current with option unless_current.
   #
   #   link_to_display_<%= singular_name %> 'about'
   #   # => <a href="/about" title="About's link title">About's link title</a>
@@ -26,17 +25,16 @@ module <%= plural_name.camelize %>DisplayHelper
   # If the <%= singular_name %> doesn't exist and you want to display just nothing use the unless_missing option.
   #
   def link_to_display_<%= singular_name %>(permalink, html_options={})
-    method_name = html_options.delete(:unless_current) ? :link_to_unless_current : :link_to
     unless_missing = html_options.delete :unless_missing
-    if <%= singular_name %> = <%= plural_name.classify %>.find_by_permalink permalink
+    if <%= singular_name %> = <%= plural_name.classify %>.find_by_permalink(permalink)
       url = display_<%= singular_name %>_path permalink: <%= singular_name %>.permalink
       html_options = html_options.reverse_merge title: <%= singular_name %>.link_title
       if block_given?
-        send :method_name, url, html_options do
+        link_to url, html_options do
           yield <%= singular_name %>
         end
       else
-        send :method_name, <%= singular_name %>.link_title, url, html_options
+        link_to <%= singular_name %>.link_title, url, html_options
       end
     elsif !unless_missing
       link_to permalink, "##{permalink}", title: t('prague.missing.<%= singular_name %>',

data/lib/generators/prague/scaffold/templates/view.html.erb.erb

@@ -1,7 +1,17 @@
+<%% if @<%= singular_name %>.head.present? %>
+  <%%= content_for :meta_tags do %>
+    <%%= raw @<%=singular_name%>.head %>
+  <%% end %>
+<%% end %>
+
 <h1><%%= @<%= singular_name %>.title %></h1>
 <p><%%= raw @<%= singular_name %>.body %></p>
 <ul>
-  <%% <%= plural_name.classify %>.online.each do |b| %>
-    <li><%%= link_to_display_<%= singular_name %> b.permalink, unless_current: true %></li>
+  <%% <%= plural_name.classify %>.online.each do |<%= singular_name %>| %>
+    <li>
+      <%%= link_to_display_<%= singular_name %> <%= singular_name %>.permalink do |<%= singular_name.first %>| %>
+        <b><%%= <%= singular_name.first %>.title %></b>
+      <%% end %>
+    </li>
   <%% end %>
 </ul>

data/lib/prague/version.rb

@@ -1,3 +1,3 @@
 module Prague
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/test/dummy/log/test.log

@@ -4,3 +4,12 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
    (0.4ms)  begin transaction
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (2.8ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (3.7ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (4.1ms)  begin transaction
+   (0.0ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prague
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,7 +56,6 @@ files:
 - lib/generators/prague/scaffold/scaffold_generator.rb
 - lib/generators/prague/scaffold/templates/action.rb.erb
 - lib/generators/prague/scaffold/templates/helper.rb.erb
-- lib/generators/prague/scaffold/templates/route.rb.erb
 - lib/generators/prague/scaffold/templates/view.html.erb.erb
 - lib/prague/version.rb
 - lib/prague.rb
@@ -105,10 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3324856822940849551
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3324856822940849551
+      hash: 4527774159099249935
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/generators/prague/scaffold/templates/route.rb.erb

@@ -1,4 +0,0 @@
-
-  resources :<%= plural_name %> do
-    get :display, on: :member
-  end