gluttonberg-core 2.6.4 → 3.0.0

data/lib/generators/gluttonberg/resource/templates/backend_view_form.html.haml

@@ -1,13 +1,11 @@
 .span5
   %legend
     Content
-
   <% attributes.each do |attribute| -%>%p
     = f.label :<%= attr_db_name_wrapper(attribute) %>
   <% if ['asset', 'image','video','document', 'audio'].include?(attribute.type.to_s) %>  = f.asset_browser :<%= attr_db_name_wrapper(attribute) %> , :class => "attr_<%= attr_db_name_wrapper(attribute) %> " , :filter => "<%=asset_filter_value(attribute)%>"
   <%else%>  = f.<%= attribute.field_type %> :<%= attribute.name %> , :class => "attr_<%= attribute.name %> span5 <%= attribute.field_type.to_s == 'text_area' ? 'jwysiwyg' : ''  %>" <%end%>
   <% end %>
-
 .span4
   %legend{ :class => "expandable" , "rel"=>".seo_body"}
     SEO
@@ -28,16 +26,7 @@
       = f.label :fb_icon_id , "Facebook Icon"
       = f.asset_browser :fb_icon_id , :class => "" , :filter => "image"
 
-  %legend
-    Publishing
-  %p
-    - if can? :publish , <%=class_name %>
-      = f.publisable_dropdown
-  %p
-    = submit_tag "Publish", :class => "btn btn-success"
-    or
-    %a{:href => admin_<%= plural_name %>_path}
-      Cancel
+  = submit_and_publish_controls(f, @<%= singular_name %>, can?(:publish , <%=class_name %>))
 
-= enable_jwysiwyg_on_class("jwysiwyg")
-= enable_slug_management_on("attr_#{f.object.get_slug_source}")
+= enable_redactor("jwysiwyg")
+= enable_slug_management_on("attr_#{f.object.get_slug_source}")

data/lib/generators/gluttonberg/resource/templates/backend_view_import.html.haml

@@ -16,13 +16,16 @@
             %p
               No records were imported, Please fix following errors and re-import the CSV file.
             %ul
-              - @feedback.each_with_index do |feed , index|
-                - unless feed == true
-                  %li
-                    Row #{index+2}
-                    %ul
-                      - feed.full_messages.each do |msg|
-                        %li= msg
+              - if @feedback.kind_of? String
+                %li= @feedback
+              - else
+                - @feedback.each_with_index do |feed , index|
+                  - unless feed == true
+                    %li
+                      Row #{index+2}
+                      %ul
+                        - feed.full_messages.each do |msg|
+                          %li= msg
         .span5
           %legend CSV Content
           %p

data/lib/generators/gluttonberg/resource/templates/backend_view_index.html.haml

@@ -16,8 +16,8 @@
           = nav_link('Export', admin_<%= plural_name %>_export_path)
           <% end %>
         <% unless draggable? %>
-        - if !@<%= plural_name %>.blank? || !params[:query].blank?
-          - form_tag(admin_<%=plural_name%>_path, :method => :get  , :id => "list_search_form") do
+        - if !@<%= plural_name %>.blank?
+          = form_tag(admin_<%=plural_name%>_path, :method => :get  , :id => "list_search_form") do
             = text_field_tag :query, params[:query]
             = submit_tag "Search" , :class => "button"
 
@@ -29,7 +29,7 @@
       - else
 
         <% if draggable? %>
-        %table{:id => 'pages_table', :class => "table table-bordered #{(can?(:reorder , <%=class_name%>) ? "#{drag_tree_table_class} " : " " )}", :cellpadding => 0, :cellspacing => 0, :rel => "" , :summary => "<%= plural_name %>" , :rel => drag_tree_url }
+        %table{:id => 'pages_table', :class => "table table-bordered #{(can?(:reorder , <%=class_name%>) ? "#{drag_tree_table_class} " : " " )}", :cellpadding => 0, :cellspacing => 0, :summary => "<%= plural_name %>" , :rel => drag_tree_url }
         <%else%>
         %table{:cellpadding => 0, :cellspacing => 0 , :class => "table table-bordered"}
         <%end%>
@@ -73,9 +73,10 @@
                       %li= link_to "Edit", edit_admin_<%= singular_name %>_path(<%= singular_name %>) , :class => ""
                       %li.divider
                       %li= link_to "Duplicate", duplicate_admin_<%= singular_name %>_path(<%= singular_name %>) , :class => ""
-                      - if can? :destroy , <%= class_name %>
+                      - if can? :destroy , <%= singular_name %>
                         %li.divider
-                        %li= link_to "Delete", delete_admin_<%= singular_name %>_path(<%= singular_name %>)  , :class => ""
+                        %li.danger
+                          = link_to "Delete", delete_admin_<%= singular_name %>_path(<%= singular_name %>)  , :class => ""
 
         <% unless draggable? %>
         = will_paginate @<%= plural_name %>

data/lib/generators/gluttonberg/resource/templates/backend_view_show.html.haml

@@ -12,8 +12,8 @@
   %div.pageBlock
     %dl
     <% attributes.each do |attribute| -%>
-  %dt <%= attribute.name %>
-      %dd #{@<%= singular_name %>.<%= attribute.name %>.humanize}
+  %dt <%= attribute.name.humanize %>
+      %dd #{@<%= singular_name %>.<%= attribute.name %>}
     <% end %>
 
   %dl.meta

data/lib/generators/gluttonberg/resource/templates/migration.rb

@@ -1,6 +1,6 @@
 class Create<%= class_name %> < ActiveRecord::Migration
 
-  def change
+  def up
     create_table :<%= table_name %> do |t|
     <% unless localized? %><% attributes.each do |attribute| -%>
   t.<%= attr_db_type_wrapper(attribute)%> :<%= attr_db_name_wrapper(attribute) %>
@@ -18,6 +18,7 @@ class Create<%= class_name %> < ActiveRecord::Migration
       t.integer :parent_id
       t.integer :locale_id
       <%end%>
+      t.integer :user_id
       t.timestamps
     end
     <% if localized? %>
@@ -34,6 +35,16 @@ class Create<%= class_name %> < ActiveRecord::Migration
       t.timestamps
     end
     <% end %>
+
+    <% if versioned? %><% if localized? %><%= class_name %><% end %>
+    <%= versioned_class_name %>.create_versioned_table
+    <% end %>
+  end
+
+  def down
+    drop_table :<%= table_name %>
+    <% if versioned? %><%= versioned_class_name %>.drop_versioned_table<% end %>
+    <% if localized? %>drop_table :<%= singular_name %>_localizations<% end %>  
   end
 
 end

data/lib/generators/gluttonberg/resource/templates/model.rb

@@ -2,7 +2,11 @@ class <%= class_name %> < ActiveRecord::Base
   include Gluttonberg::Content::Publishable
   include Gluttonberg::Content::SlugManagement
   #self.slug_source_field_name = :name  #uncomment this line and provide your source for slug. by default it looks for name or title or id
-  attr_accessible <%= attributes.collect{|attr| ":#{attr_db_name_wrapper(attr)}"}.join(",") %>, :slug, :seo_title, :seo_keywords, :seo_description, :fb_icon_id, :state, :published_at
+  attr_accessible <%= attributes.collect{|attr| ":#{attr_db_name_wrapper(attr)}"}.join(",") %>, :slug, :seo_title, :seo_keywords, :seo_description, :fb_icon_id, :state, :position , :published_at
+  # it validates all columns values using max limit from database schema
+  validate :max_field_length
+  validate :integer_values
+  validate :decimal_values
   <% if localized? %>include Gluttonberg::Content::Localization
   delegate :fb_icon , :to =>  :current_localization
   <% attributes.find_all{|attr| ['asset', 'image','video','document','audio'].include?(attr.type.to_s) }.each do |attr| %>
@@ -13,13 +17,26 @@ class <%= class_name %> < ActiveRecord::Base
   <% if importable? %>import_export_csv(<%=attributes.collect{|attr| "#{attr.name}"} %>) <% end %>
   <%if draggable? %>is_drag_tree :flat => true , :order => "position"<%end%>
   <% if localized? %>is_localized do
+    <% if versioned? %>
+    is_versioned :non_versioned_columns => []
+    delegate :state, :_publish_status, :state_changed?, :title_or_name? , :to => :parent, :allow_nil => true
+    <% end %>
     belongs_to :fb_icon , :class_name => "Gluttonberg::Asset" , :foreign_key => "fb_icon_id"
+    # it validates all columns values using max limit from database schema
+    validate :max_field_length
+    validate :integer_values
+    validate :decimal_values
   <% attributes.find_all{|attr| ['asset', 'image','video','document', 'audio'].include?(attr.type.to_s) }.each do |attr| %>
     belongs_to :<%=attr_name_wrapper(attr)%> , :foreign_key => "<%=attr_db_name_wrapper(attr)%>" , :class_name => "Gluttonberg::Asset"
   <% end %>end<% end %>
   <% unless localized? %><% attributes.find_all{|attr| ['asset', 'image','video','document', 'audio'].include?(attr.type.to_s) }.each do |attr| %>
   belongs_to :<%=attr_name_wrapper(attr)%> , :foreign_key => "<%=attr_db_name_wrapper(attr)%>" , :class_name => "Gluttonberg::Asset"
   <% end %><% end %>
+  belongs_to :user
+  <% if versioned? %>
+  <% unless localized? %>is_versioned :non_versioned_columns => []<% end %>
+  <% if localized? %>delegate :version, :loaded_version, :versions,  :to => :current_localization<% end %>
+  <% end %>
 
   def title_or_name?
     <% if attributes.find{|attr| attr.name == "name"}.blank?  %><% if attributes.find{|attr| attr.name == "title"}.blank?  %>id<%else%>title<%end%><%else%>name<%end%>

data/lib/generators/gluttonberg/resource/templates/public_view_index.html.haml

@@ -1,13 +1,30 @@
-%h1
+%h2
   <%= plural_class_name %>
-  
+
 - if @<%= plural_name %>.blank?
-  %p
-    No <%= plural_class_name %>
+  .alert.alert-warning
+    There are no <%= plural_class_name %>
 - else
-  - @<%= plural_name %>.each do |<%= singular_name %>|
-    %p
-      <% attributes.each do |attribute| -%>
-= link_to <%= singular_name %>.<%= attribute.name %>, <%= singular_name %>_path(<%= singular_name %>.slug) 
-      %br
-      <% end %>
+  %table.table.table-striped
+    %thead
+      %tr
+        %th
+          \#
+        <% attributes.each do |attribute| -%>
+%th
+          <%= attribute.name.humanize %>
+        <% end %>
+    %tbody
+      - @<%= plural_name %>.each do |<%= singular_name %>|
+        %tr
+          %td
+            = <%= singular_name %>.id
+          <% attributes.each_with_index do |attribute, index| -%>
+          <% if index == 0 %>
+          %td
+            = link_to <%= singular_name %>.<%= attribute.name %>, <%= singular_name %>_path(<%= singular_name %>.slug)
+          <% else %>
+          %td
+            = <%= singular_name %>.<%= attribute.name %>
+          <% end %>
+          <% end %>

data/lib/generators/gluttonberg/resource/templates/public_view_show.html.haml

@@ -1,7 +1,13 @@
-%h1
+%h2
   <%= singular_name %>
-  
+
 <% attributes.each do |attribute| -%>
 %p
-  = @<%= singular_name %>.<%= attribute.name %>.humanize
-<% end %>
+  <% if attribute.type == :text %>
+  = @<%= singular_name %>.<%= attribute.name %>.html_safe
+  <% elsif attribute.type == :asset %>
+  %img{:src => "#{@<%= singular_name %>.<%= attribute.name %>.url_for(:wysiwyg_medium_size)}"}
+  <% else %>
+  = @<%= singular_name %>.<%= attribute.name %>
+  <% end %>
+<% end %>

data/lib/gluttonberg.rb

@@ -1,47 +1,78 @@
 module Gluttonberg
-  require 'engine' if defined?(Rails) && Rails::VERSION::MAJOR == 3
-  require 'haml'
-  require 'authlogic'
-  require 'will_paginate'
-  require 'zip/zip'
-  require 'acts_as_tree'
-  require 'acts_as_list'
-  require 'acts_as_versioned'
-  require 'delayed_job'
-  require 'paperclip'
-  require 'cancan'
-  require 'texticle'
-  require 'audio_job'
-  require 'aws'
-  require 'acl9'
-  require 'sitemap_generator'
-  require 'gluttonberg/authorizable'
-  require 'gluttonberg/components'
-  require 'gluttonberg/content'
-  require 'gluttonberg/drag_tree'
-  require 'gluttonberg/extensions'
-  require 'gluttonberg/helpers'
-  require 'gluttonberg/library'
-  require 'gluttonberg/page_description'
-  require 'gluttonberg/templates'
-  require 'gluttonberg/middleware'
-  require 'gluttonberg/can_flag'
-  require 'gluttonberg/record_history'
-
-
-    # These should likely move into one of the initializers inside of the
-    # engine config. This will ensure they only run after Rails and the app
-    # has been loaded.
-    #Helpers.setup
-    DragTree.setup
-    RecordHistory.setup
+
+  def self.require_dependencies
+    require 'engine' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
+    require 'active_support/concern'
+    require 'haml'
+    require 'authlogic'
+    require 'will_paginate'
+    require 'will_paginate/array'
+    require 'zip'
+    require 'acts_as_tree'
+    require 'acts_as_versioned'
+    require 'paperclip'
+    require 'cancan'
+    require 'texticle'
+    require 'audio_job'
+    require 'photo_job'
+    require 'aws'
+    require 'acl9'
+    require 'sidekiq'
+    require 'sitemap_generator'
+    require 'jeditable-rails'
+    require 'rabl'
+  end
+
+  def self.require_gluttonberg_components
+    require 'gluttonberg/components'
+    require 'gluttonberg/mixin_manager'
+    require 'gluttonberg/content'
+    require 'gluttonberg/drag_tree'
+    require 'gluttonberg/extensions'
+    require 'gluttonberg/library'
+    require 'gluttonberg/page_description'
+    require 'gluttonberg/templates'
+    require 'gluttonberg/middleware'
+    require 'gluttonberg/membership'
+    require 'gluttonberg/can_flag'
+    require 'gluttonberg/record_history'
+    require 'gluttonberg/gb_file'
+    require 'gluttonberg/random_string_generator'
+    require 'gluttonberg/helpers/form_builder'
+  end
 
   # Check to see if Gluttonberg is configured to be localized.
   def self.localized?
     Engine.config.localize
   end
 
-  require 'jeditable-rails'
+  def self.dbms_name
+    if ActiveRecord::Base.configurations[Rails.env]
+      adapter_name = ActiveRecord::Base.configurations[Rails.env]["adapter"]
+      if ["mysql2" , "mysql"].include?(adapter_name)
+        "mysql"
+      else
+        adapter_name.to_s
+      end
+    end
+  end
+
+  def self.like_or_ilike
+    Gluttonberg.dbms_name == "postgresql" ? "ilike" : "like"
+  end
+
+  def self.next_migration_number(dirname)
+    if ActiveRecord::Base.timestamped_migrations
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+    else
+      "%.3d" % (current_migration_number(dirname) + 1)
+    end
+  end
+
+  self.require_dependencies
+  self.require_gluttonberg_components
+  DragTree.setup
+  RecordHistory.setup
 end
 
 

data/lib/gluttonberg/can_flag.rb

@@ -1,93 +1,81 @@
 # CanFlag
 module Gluttonberg
   module CanFlag
-      def self.setup
-        ::ActiveRecord::Base.send :include, Gluttonberg::CanFlag
-      end
+    extend ActiveSupport::Concern
+    def self.setup
+      ::ActiveRecord::Base.send :include, Gluttonberg::CanFlag
+    end
       
-      def self.included(klass)
-        klass.class_eval do
-          extend ClassMethods
-          #include InstanceMethods
-          if defined?(::ActiveSupport::Callbacks)
-            klass.define_callbacks :after_flagged
-          end
-          
-        end
+    included do
+      if defined?(::ActiveSupport::Callbacks)
+        self.define_callbacks :after_flagged
       end
-      
+    end
+    
 
-      module ClassMethods
-        # Call can_be_flagged from your content model, or from anything
-        # you want to flag.
-        def can_be_flagged(opts={})
-          has_many :flags, :as => :flaggable, :dependent => :destroy
-          validates_associated :flags, :message => 'failed to validate'
-          include Gluttonberg::CanFlag::InstanceMethods
-          extend  Gluttonberg::CanFlag::SingletonMethods
-          cattr_accessor :reasons
-          self.reasons = opts[:reasons] || [:inappropriate]
-          (::Flag.flaggable_models ||= []) << self
-        end
-        
-        # Call can_flag from your user model, or anything that can own a flagging.
-        # That's a paddlin!
-        # Limitation for now: you should only allow one model to own flags.
-        # This is ridiculously easy to make polymorphic, but no ponies yet.
-        def can_flag
-          # has_many :flaggables, :foreign_key => "user_id"
-          # User created these flags
-          has_many :flags, :foreign_key => "user_id", :order => "id desc"
-          
-          # User was responsible for creating this filth
-          has_many :flaggings, :foreign_key => "flaggable_user_id", :class_name => "Flag"
-          include CanFlagInstanceMethods
-          
-          # Associate the flag back here
-          # Flag.belongs_to :user
-          # Flag.belongs_to :owner, :foreign_key => flaggable_user_id
-          ::Flag.class_eval "belongs_to :#{name.underscore}, :foreign_key => :user_id; 
-            belongs_to :owner, :foreign_key => :flaggable_user_id, :class_name => '#{name}'"
-        end
+    module ClassMethods
+      # Call can_be_flagged from your content model, or from anything
+      # you want to flag.
+      def can_be_flagged(opts={})
+        has_many :flags, :as => :flaggable, :dependent => :destroy
+        validates_associated :flags, :message => 'failed to validate'
+        include Gluttonberg::CanFlag::CanBeFlaggedMixin
+        cattr_accessor :reasons
+        self.reasons = opts[:reasons] || [:inappropriate]
+        (::Flag.flaggable_models ||= []) << self
       end
       
-      # This module contains class methods
-      module SingletonMethods
-      
-      end
-      
-      module CanFlagInstanceMethods
-        def flagged?(content)
-          logger.warn "Looking for flags with #{content.inspect} #{content.class.name}"
-          ::Flag.find(:first,
-            :conditions => { :flaggable_type => content.class.name, :flaggable_id => content[:id] })
-        end
+      # Call can_flag from your user model, or anything that can own a flagging.
+      # That's a paddlin!
+      # Limitation for now: you should only allow one model to own flags.
+      # This is ridiculously easy to make polymorphic, but no ponies yet.
+      def can_flag
+        # has_many :flaggables, :foreign_key => "user_id"
+        # User created these flags
+        has_many :flags, :foreign_key => "user_id", :order => "id desc"
+        
+        # User was responsible for creating this filth
+        has_many :flaggings, :foreign_key => "flaggable_user_id", :class_name => "Flag"
+        include CanFlagMixin
         
-        def flagged_by?(content, user)
-          ::Flag.find(:first,
-            :conditions => { :flaggable_type => content.class.name, :flaggable_id => content[:id], :flaggable_user_id => user.id })
-        end
+        # Associate the flag back here
+        # Flag.belongs_to :user
+        # Flag.belongs_to :owner, :foreign_key => flaggable_user_id
+        ::Flag.class_eval "belongs_to :#{name.underscore}, :foreign_key => :user_id; 
+          belongs_to :owner, :foreign_key => :flaggable_user_id, :class_name => '#{name}'"
+      end
+    end
+
+    module CanBeFlaggedMixin
+      extend ActiveSupport::Concern
+      def flagged?
+        flags.size > 0
       end
       
-      ## This module contains instance methods
-      module InstanceMethods
-        
-        def flagged?
-          flags.size > 0
-        end
+      def inappropriate?
+        flags.find_all{|f| f.approved == true }.size > 0
+      end
         
-        def inappropriate?
-          flags.find_all{|f| f.approved == true }.size > 0
-        end
-          
-        # Flag content with a mass-updater; sets the flagging user.
-        # article.update_attributes { 'flagged' => current_user.id }
-        def flagged=(by_who)
-          flags.build :user_id => by_who
-        end
+      # Flag content with a mass-updater; sets the flagging user.
+      # article.update_attributes { 'flagged' => current_user.id }
+      def flagged=(by_who)
+        flags.build :user_id => by_who
+      end
+    end
+    
+    
+    module CanFlagMixin
+      extend ActiveSupport::Concern
+      def flagged?(content)
+        logger.warn "Looking for flags with #{content.inspect} #{content.class.name}"
+        ::Flag.where(:flaggable_type => content.class.name, :flaggable_id => content[:id]).first
+      end
       
+      def flagged_by?(content, user)
+        ::Flag.where(:flaggable_type => content.class.name, :flaggable_id => content[:id], :flaggable_user_id => user.id).first
       end
+    end
+    
       
   end
 end
-