kilt-cms 1.0.0 → 1.1.0

data/app/controllers/kilt/kilt_controller.rb

@@ -4,6 +4,7 @@ module Kilt
     protect_from_forgery
     before_filter :ensure_config
     before_filter :authorize
+    before_filter :show_default_creds_warning
     
     # Show all the object types
     def index
@@ -48,10 +49,10 @@ module Kilt
         
         # Call Kilt's update method
         if Kilt.create(object)
-          flash[:notice] = "#{type.capitalize} successfully updated"
+          flash[:notice] = "#{Kilt::Formatting.singular_name_of(type)} successfully updated"
           redirect_to edit_object_path(type.pluralize, object.slug)
         else
-          flash[:error] = "Couldn't save #{type.capitalize}"
+          flash[:error] = "Couldn't save #{Kilt::Formatting.singular_name_of(type)}"
           redirect_to new_object_path(type.pluralize)
         end
       end
@@ -84,9 +85,9 @@ module Kilt
       
         # Call Kilt's update method
         if Kilt.update(slug, object)
-          flash[:notice] = "#{type.capitalize} successfully updated"
+          flash[:notice] = "#{Kilt::Formatting.singular_name_of(type)} successfully updated"
         else
-          flash[:error] = "Couldn't save #{type.capitalize}"
+          flash[:error] = "Couldn't save #{Kilt::Formatting.singular_name_of(type)}"
         end
       
         # redirect to the edit screen
@@ -102,9 +103,9 @@ module Kilt
       
       # Call Kilt's update method
       if Kilt.delete(slug)
-        flash[:notice] = "#{type.capitalize} successfully deleted"
+        flash[:notice] = "#{Kilt::Formatting.singular_name_of(type)} successfully deleted"
       else
-        flash[:error] = "Couldn't delete #{type.capitalize}"
+        flash[:error] = "Couldn't delete #{Kilt::Formatting.singular_name_of(type)}"
       end
       
       # redirect to the list screen
@@ -137,6 +138,13 @@ module Kilt
         true
       end
     end
+
+    def show_default_creds_warning
+      @show_default_creds_warning = Kilt.config.auth && Kilt.config.auth.username && Kilt.config.auth.password &&
+                                    Kilt.config.default_auth && Kilt.config.default_auth.username && Kilt.config.default_auth.password &&
+                                    Kilt.config.auth.username == Kilt.config.default_auth.username &&
+                                    Kilt.config.auth.password == Kilt.config.default_auth.password
+    end
     
   end
 end

data/app/views/kilt/kilt/_field_setup.html.erb

@@ -0,0 +1,6 @@
+<% Kilt.all_used_fields.each do |field| %>
+  <% begin %>
+    <%= render partial: "kilt/form/#{field}_#{type}" %>
+  <% rescue %>
+  <% end %>
+<% end %>

data/app/views/kilt/kilt/_form.html.erb

@@ -6,11 +6,15 @@
         plural   = Kilt::Formatting.plural_name_of @type
     %>
     
-    <h2><%= @object['name'] %> <small><%= singular %></small></h2>
-
     <div class="page-actions">
-        <%= link_to "← Back to #{plural}", list_path(@type), :class => 'button back' %>
-        <%= link_to "New #{singular}", new_object_path(@type), :class => 'button back' if !@object.empty? %>
+        <h2><%= @object['name'] || "New #{singular}" %> 
+            <% if @object['name'] %>
+                <small>Type: <%= singular %></small>
+            <% end %>
+        </h2>
+
+        <%= link_to "← Back to #{plural}", list_path(@type), :class => 'button back newline' %>
+        <%= link_to "New #{singular}", new_object_path(@type), :class => 'button back newline' if !@object.empty? %>
     </div>
 
     <% if flash[:error] -%>
@@ -33,7 +37,7 @@
         <% end %>
 
         <div class="form-input actions">
-            <input type="submit" class="submit save" value="Save">
+            <input type="submit" class="submit button save" value="Save">
         </div>
 
     <% end%>

data/app/views/kilt/kilt/index.html.erb

@@ -1,6 +1,4 @@
 <div class="wr">
-    <h2>Dashboard</h2>
-
     <ul class="object-list">
         <% @types.each do |type, _| %>
             <% name = Kilt::Formatting.plural_name_of(type) %>

data/app/views/kilt/kilt/list.html.erb

@@ -1,3 +1,4 @@
+
 <div class="wr">
 
     <% 
@@ -5,9 +6,8 @@
         plural   = Kilt::Formatting.plural_name_of @type
     %>
 
-    <h2><%= plural %></h2>
-
     <div class="page-actions">
+        <h3><%= plural %></h3>
         <%= link_to "New #{singular}", new_object_path(@type.singularize), :class => 'button' %>
     </div>
 
@@ -56,7 +56,7 @@
                         </td>
                         <td class="actions">
                             <%= link_to 'Edit', edit_object_path(@type.pluralize, object['slug']), :class => 'button edit' %>
-                            <%= link_to 'Delete', delete_object_path(@type.pluralize, object['slug']), :class => 'button delete', :method => 'delete', :data => {:confirm => "Are you sure you want to delete this #{@type.capitalize}?" } %>
+                            <%= link_to 'Delete', delete_object_path(@type.pluralize, object['slug']), :class => 'button delete', :method => 'delete', :data => {:confirm => "Are you sure you want to delete this #{Kilt::Formatting.singular_name_of(@type)}?" } %>
                         </td>
                     </tr>
                 <% end %>

data/app/views/layouts/kilt/cms.html.erb

@@ -5,7 +5,7 @@
         <meta charset="utf-8">
         <title><%= Kilt.config.name %></title>
         
-        <link href="http://fonts.googleapis.com/css?family=Open+Sans:400,800,300" rel="stylesheet" type="text/css">
+        <link href='http://fonts.googleapis.com/css?family=Oswald:400,700,300' rel='stylesheet' type='text/css'>
         <%= stylesheet_link_tag "kilt/application", :media => "all" %>
         
         <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror.min.js" %>
@@ -15,15 +15,26 @@
         <%= javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/mode/htmlmixed/htmlmixed.min.js" %>
         
         <%= javascript_include_tag "kilt/application" %>
+        
         <%= csrf_meta_tags %>
+
+        <%= render partial: 'kilt/kilt/field_setup', locals: { type: 'head' } %>
 </head>
 <body>
     
     <%= render :partial => 'layouts/kilt/cms/menu' %>
     
     <section class="body">
+        <%= render :partial => 'layouts/kilt/cms/default_creds_warning' %>
         <%= yield %>
     </section>
     
+    <footer>
+        <div class="icon">
+            <%= link_to image_tag('kilt/logo.png'), 'http://github.com/kilt-cms/kilt-cms', :target => '_blank' %>
+        </div>
+    </footer>
+    
+    <%= render partial: 'kilt/kilt/field_setup', locals: { type: 'foot' } %>
 </body>
 </html>

data/app/views/layouts/kilt/cms/_default_creds_warning.html.erb

@@ -0,0 +1,4 @@
+<% return unless @show_default_creds_warning %>
+<div class="wr">
+  <h4 style="text-align:center;color:red">You are still using the default username/password.<br />We strongly recommend that you change it in your config/kilt/creds.yml file.</h4>
+</div>

data/app/views/layouts/kilt/cms/_menu.html.erb

@@ -1,12 +1,6 @@
 <header class="hd">
     <div class="wr">
         <h6><a href="<%= kilt_engine.root_path %>"><%= Kilt.config.name %></a></h6>
-        <a class="button small dashboard" href="<%= kilt_engine.root_path %>">Dashboard</a>
-        <% Kilt.types.each do |type| %>
-          <% 
-              plural   = Kilt::Formatting.plural_name_of type
-          %>
-          <%= link_to plural, list_path(type.pluralize), class: "button small dashboard" %>
-        <% end %>
+        <a class="button dashboard home" href="<%= kilt_engine.root_path %>">Admin Home</a>
     </div>
 </header>

data/lib/generators/kilt/backend_generator.rb

@@ -22,7 +22,6 @@ module Kilt
 
       def add_the_credential_file_examples
         copy_file 'creds.yml.example', Rails.root.join('config', 'kilt', 'creds.yml')
-        copy_file 'creds.yml.rethinkdb.example', Rails.root.join('config', 'kilt', 'creds.yml.rethinkdb.example')
       end
 
       def add_the_database_migration_file

data/lib/generators/kilt/templates/backend/creds.yml.example

@@ -12,5 +12,9 @@ s3:
   secret: <S3 secret>
   bucket: <S3 bucket>
 auth:
-  username: <Username>
-  password: <Password>
+  username: admin
+  password: changeme
+default_auth:
+  username: admin
+  password: changeme
+  note: "Feel free to remove default_auth when you change your username/password"

data/lib/kilt.rb

@@ -1,9 +1,6 @@
 require "kilt/base"
 require_relative "kilt_object"
-
-# Include the Rethink shortcut module, which will among other things instantiate a new
-# Rethink object (as "r") if needed
-include RethinkDB::Shortcuts
+require_relative "kilt_view_model"
 
 module Kilt
   
@@ -41,7 +38,7 @@ module Kilt
     object['created_at'] = object['updated_at'] = Time.now
     object['unique_id']  = "#{(Time.now.to_f * 1000).to_i}"
     object['type']       = object.instance_eval { @type }
-    object['slug']       = slug_for object
+    object['slug']       = Slugger.slug_for object
 
     Utils.database.create object
   end
@@ -51,7 +48,7 @@ module Kilt
   # Example: Kilt.update(object)
   def self.update(slug, object)
     object['updated_at'] = Time.now
-    object['slug']       = slug_for object
+    object['slug']       = Slugger.slug_for object
 
     Utils.database.update object
   end
@@ -81,25 +78,20 @@ module Kilt
     Kilt::ObjectCollection.new results
   end
 
-  class << self
-
-    private
-
-    def slug_is_unique_for? slug, object
-      result = Utils.database.find(slug)
-      return true if result.nil?
-
-      "#{result['unique_id']}" == "#{object['unique_id']}"
-    end
-
-    def slug_for object
-      slug = object['slug'].to_s.strip == '' ? Utils.slugify(object['name'])
-                                             : "#{object['slug']}"
-      slug_is_unique_for?(slug, object) ? slug
-                                        : "#{slug}-#{(Time.now.to_f * 1000).to_i}"
-    end
-
+  # Get every field type used
+  # Returns: Array of strings
+  # Example: Kilt.all_used_fields
+  def self.all_used_fields
+    used_field_types = Kilt.config[:objects].map do |object|
+                         object.map do |config|
+                           begin
+                             config[:fields].map { |_, v| v }
+                           rescue
+                             nil
+                           end
+                         end
+                       end.flatten
+    used_field_types.select { |x| x }.group_by { |x| x }.map { |x| x[0] }
   end
 
 end
-

data/lib/kilt/base.rb

@@ -6,8 +6,10 @@ require "kilt/object_collection"
 
 require 'kilt/upload'
 
-require "kilt/db/rethink_db"
 require "kilt/db/active_record"
 require "kilt/utils"
 require "kilt/form"
 require "kilt/formatting"
+require "kilt/slugger"
+require "kilt/upload/s3"
+require "kilt/upload/local"

data/lib/kilt/engine.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'rethinkdb'
 require 'rails_config'
 require 'jquery-rails'
 require 'jquery-ui-rails'
@@ -14,4 +13,4 @@ module Kilt
     config.generators.test_framework :rspec
           
   end
-end
+end

data/lib/kilt/object.rb

@@ -43,7 +43,7 @@ module Kilt
     def the_value_for(key, field_type, params)
       if params["#{key}-hidden"] == 'clear' && !params[key]
         ''
-      elsif ['file', 'image'].include? field_type
+      elsif Kilt::Upload.uploadable_fields.include? field_type
         Kilt::Upload.send field_type, params[key]
       else
         params[key]

data/lib/kilt/slugger.rb

@@ -0,0 +1,55 @@
+module Kilt
+
+  module Slugger
+
+    def self.slug_for object
+      slug = possibly_duplicate_slug_for object
+      slug_is_unique_for?(slug, object) ? slug
+                                        : make_slug_unique(slug)
+    end
+
+    class << self
+
+      def slug_is_unique_for? slug, object
+        result = Utils.database.find(slug)
+        return true if result.nil?
+
+        "#{result['unique_id']}" == "#{object['unique_id']}"
+      end
+
+      def make_slug_unique slug
+        "#{slug}-#{(Time.now.to_f * 1000).to_i}"
+      end
+
+      def possibly_duplicate_slug_for object
+        if object['slug'].to_s.strip == ''
+          if prefix = prefix_for(object)
+            "#{prefix}-#{slugified_value_for(object)}"
+          else
+            slugified_value_for(object)
+          end
+        else
+          "#{object['slug']}"
+        end
+      end
+
+      def slugified_value_for object
+        Utils.slugify(object['name'])
+      end
+
+      def prefix_for object
+        return nil unless prefix = lookup_the_suggested_prefix_for(object)
+        slug = slugified_value_for object
+        slug.starts_with?(prefix) && slug != prefix ? nil
+                                                    : prefix
+      end
+
+      def lookup_the_suggested_prefix_for object
+        Kilt.send(object['type'].to_sym)['slug_prefix']
+      end
+
+    end
+
+  end
+
+end

data/lib/kilt/upload.rb

@@ -1,54 +1,26 @@
 module Kilt
-  class Upload  
-    
-    def self.file(file_reference)
-      self.do('file', file_reference)
-    end
-    
-    def self.image(file_reference)
-      self.do('image', file_reference)
+  module Upload  
+
+    def self.uploadable_fields
+      types = ['file', 'image'] + Kilt.config.uploadable_fields.to_s.split(',').map { |x| x.strip }
+      types.group_by { |x| x }.map { |x| x[0] }
     end
     
     def self.do(type, file_reference)
-      if Kilt.config.storage.strategy == 'local'
-        self.handle_local_upload(type, file_reference)
-      elsif Kilt.config.storage.strategy == 's3'
-        self.handle_s3_upload(type, file_reference)
-      end
-    end
-    
-    private
-    
-    def self.handle_local_upload(type, file_reference)
-      Kilt::Utils.ensure_local_storage_dir_exists
-      if file_reference
-        File.open(Rails.root.join('public', 'uploads', type, file_reference.original_filename), 'wb') do |file|
-          file.write(file_reference.read)
-        end
-        file_reference.original_filename
-      else
-        ''
-      end
+      uploader = begin
+                   strategy = Kilt.config.storage.strategy.to_s
+                   "Kilt::Upload::#{strategy.classify}".constantize
+                 rescue
+                   nil
+                 end
+      uploader.upload(type, file_reference) if uploader
     end
-    
-    def self.handle_s3_upload(type, file_reference)
-      Kilt::Utils.ensure_s3_bucket_exists
-      if file_reference
-        begin
-          s3 = AWS::S3.new(
-            :access_key_id     => Kilt.config.s3.key,
-            :secret_access_key => Kilt.config.s3.secret)   
-          bucket = s3.buckets[Kilt.config.s3.bucket]
-          new_file = bucket.objects["#{type}/#{file_reference.original_filename}"]
-          new_file.write(Pathname.new(file_reference.tempfile), :acl => :public_read)
-          file_reference.original_filename
-        rescue
-          ''
-        end
-      else
-        ''
+
+    class << self
+      def method_missing(meth, *args, &blk)
+        self.do meth.to_s, args[0]
       end
     end
-    
+
   end
-end
+end

data/lib/kilt/upload/local.rb

@@ -0,0 +1,17 @@
+module Kilt
+  module Upload
+    module Local
+      def self.upload type, file_reference
+        Kilt::Utils.ensure_local_storage_dir_exists
+        if file_reference
+          File.open(Rails.root.join('public', 'uploads', type, file_reference.original_filename), 'wb') do |file|
+            file.write(file_reference.read)
+          end
+          file_reference.original_filename
+        else
+          ''
+        end
+      end
+    end
+  end
+end