knitkit 2.0.4 → 2.0.5

data/app/models/document.rb

@@ -1,8 +1,25 @@
 class Document < ActiveRecord::Base
-  has_relational_dynamic_attributes
+  DOCUMENT_DYNAMIC_ATTRIBUTE_PREFIX = 'dyn_'
+  
+  has_dynamic_attributes :dynamic_attribute_prefix => DOCUMENT_DYNAMIC_ATTRIBUTE_PREFIX, :destroy_dynamic_attribute_for_nil => false
+  
   has_file_assets
 
   belongs_to :document_record, :polymorphic => true
   belongs_to :document_type
   
+  class << self
+    def add_dyn_prefix(field)
+      "#{DOCUMENT_DYNAMIC_ATTRIBUTE_PREFIX}#{field}"
+    end
+    
+    def remove_dyn_prefix(field)
+      field.gsub(DOCUMENT_DYNAMIC_ATTRIBUTE_PREFIX, '')
+    end
+  end
+  
+  def set_dyn_attribute(field, value)
+    self.send("#{Document.add_dyn_prefix(field)}=", value)
+  end
+  
 end

data/app/models/website.rb

@@ -99,7 +99,7 @@ class Website < ActiveRecord::Base
 
   def setup_website
     PublishedWebsite.create(:website => self, :version => 0, :active => true, :comment => 'New Site Created')
-    Role.create(:description => "Website #{self.title}", :internal_identifier => website_role_iid)
+    Role.create(:description => "Website #{self.title}", :internal_identifier => website_role_iid) if self.role.nil?
     configuration = ::Configuration.find_template('default_website_configuration').clone(true)
     configuration.description = "Website #{self.name} Configuration"
     configuration.internal_identifier = configuration.description.underscore
@@ -194,7 +194,7 @@ class Website < ActiveRecord::Base
 
     articles_path = Pathname.new(File.join(tmp_dir,'articles'))
     FileUtils.mkdir_p(articles_path) unless articles_path.exist?
-    
+
     documented_contents_path = Pathname.new(File.join(tmp_dir, 'documented contents'))
     FileUtils.mkdir_p(documented_contents_path) unless documented_contents_path.exist?
 
@@ -309,7 +309,7 @@ class Website < ActiveRecord::Base
       FileUtils.rm_rf(tmp_dir.to_s)
 
       if Website.find_by_internal_identifier(setup_hash[:internal_identifier]).nil?
-        website = Website.create(
+        website = Website.new(
           :name => setup_hash[:name],
           :title => setup_hash[:title],
           :subtitle => setup_hash[:subtitle],
@@ -318,6 +318,7 @@ class Website < ActiveRecord::Base
           :email_inquiries => setup_hash[:email_inquiries],
           :auto_activate_publication => setup_hash[:auto_activate_publication]
         )
+        website.save!
 
         #set default publication published by user
         first_publication = website.published_websites.first
@@ -382,6 +383,7 @@ class Website < ActiveRecord::Base
           website.publish("Website Imported", current_user)
 
         rescue Exception=>ex
+          Rails.logger.error "#{ex.inspect} #{ex.backtrace}"
           website.destroy unless website.nil?
           raise ex
         end
@@ -392,7 +394,7 @@ class Website < ActiveRecord::Base
         message = 'Website already exists with that internal_identifier'
         success = false
       end
-      
+
       return success, message
     end
 

data/app/widgets/contact_us/base.rb

@@ -18,7 +18,7 @@ module Widgets
         @validation[:email] = "Please Enter a Valid Email Address" unless /^.+@.+\..+$/.match(params[:email])
 			
         if @is_html_form and !@validation.empty?
-          return render :view => :error
+          return render :update => {:id => "#{@uuid}_result", :view => :error}
         end
 			
         @website = Website.find_by_host(request.host_with_port)

data/app/widgets/search/base.rb

@@ -4,14 +4,14 @@ module Widgets
       include ActionDispatch::Routing::UrlFor
       include Rails.application.routes.url_helpers
       include WillPaginate::ActionView
-         
+
       def set_variables
         @results_permalink = params[:results_permalink]
         @section_permalink = params[:section_permalink]
         @content_type = params[:content_type]
         @per_page = params[:per_page]
         @css_class = params[:class]
-        
+
         if @results_permalink.nil? or @results_permalink.blank?
           @ajax_results = true
         else
@@ -50,16 +50,16 @@ module Widgets
       def locate
         File.dirname(__FILE__)
       end
-        
+
       class << self
         def title
           "Search"
         end
-        
+
         def widget_name
           File.basename(File.dirname(__FILE__))
         end
-          
+
         def base_layout
           begin
             file = File.join(File.dirname(__FILE__),"/views/layouts/base.html.erb")
@@ -69,7 +69,7 @@ module Widgets
           end
         end
       end
-        
+
     end
   end
 end

data/db/migrate/20120628165503_add_dynamic_attributes_to_documents.rb

@@ -0,0 +1,5 @@
+class AddDynamicAttributesToDocuments < ActiveRecord::Migration
+  def change
+    add_column :documents, :dynamic_attributes, :text
+  end
+end

data/lib/knitkit/engine.rb

@@ -1,5 +1,4 @@
 require 'nokogiri'
-require 'permalink_fu'
 require 'acts-as-taggable-on'
 require 'zip/zip'
 require 'zip/zipfilesystem'

data/lib/knitkit/version.rb

@@ -2,7 +2,7 @@ module Knitkit
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY  = 4
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/lib/knitkit.rb

@@ -2,6 +2,7 @@
 require 'erp_app'
 require 'erp_forms'
 
+require "permalink_fu/lib/permalink_fu"
 require 'routing_filter'
 require "knitkit/version"
 require "knitkit/routing_filter/section_router.rb"

data/lib/permalink_fu/README.markdown

@@ -0,0 +1,64 @@
+# PermalinkFu
+
+A simple plugin for creating URL-friendly permalinks (slugs) from attributes.
+
+Uses [`ActiveSupport::Multibyte::Handlers::UTF8Handler`](http://api.rubyonrails.org/classes/ActiveSupport/Multibyte/Handlers/UTF8Handler.html) (part of Rails since 1.2) rather than `iconv` (which is [inconsistent between platforms](http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/243426)) for normalization/decomposition.
+
+
+## Usage
+
+    class Article < ActiveRecord::Base
+      has_permalink :title
+    end
+
+This will escape the title in a before_validation callback, turning e.g. "Föö!! Bàr" into "foo-bar".
+
+The permalink is by default stored in the `permalink` attribute.
+
+    has_permalink :title, :as => :slug
+  
+will store it in `slug` instead.
+
+    has_permalink [:category, :title]
+  
+will store a permalink form of `"#{category}-#{title}"`.
+
+Permalinks are guaranteed unique: "foo-bar-2", "foo-bar-3" etc are used if there are conflicts. You can set the scope of the uniqueness like
+
+    has_permalink :title, :scope => :blog_id
+
+This means that two articles with the same `blog_id` can not have the same permalink, but two articles with different `blog_id`s can.
+
+Two finders are provided:
+
+    Article.find_by_permalink(params[:id])
+    Article.find_by_permalink!(params[:id])
+    
+These methods keep their name no matter what attribute is used to store the permalink.
+
+The `find_by_permalink` method returns `nil` if there is no match; the `find_by_permalink!` method will raise `ActiveRecord::RecordNotFound`.
+
+You can override the model's `to_param` method with
+
+    has_permalink :title, :param => true
+    
+This means that the permalink will be used instead of the primary key (id) in generated URLs. Remember to change your controller code from e.g. `find` to `find_by_permalink!`.
+
+You can add conditions to `has_permalink` like so:
+
+  	class Article < ActiveRecord::Base
+  	  has_permalink :title, :if => Proc.new { |article| article.needs_permalink? }
+  	end
+
+Use the `:if` or `:unless` options to specify a Proc, method, or string to be called or evaluated. The permalink will only be generated if the option evaluates to true.
+
+You can use `PermalinkFu.escape` to escape a string manually.
+
+
+## Credits
+
+Originally extracted from [Mephisto](http://mephistoblog.com) by [technoweenie](http://github.com/technoweenie/permalink_fu/).
+
+Conditions added by [Pat Nakajima](http://github.com/nakajima/permalink_fu/).
+
+[Henrik Nyh](http://github.com/technoweenie/permalink_fu/) replaced `iconv` with `ActiveSupport::Multibyte`.

data/lib/permalink_fu/init.rb

@@ -0,0 +1 @@
+require 'permalink_fu'

data/lib/permalink_fu/lib/data/x00.yml

@@ -0,0 +1,257 @@
+---
+- "\0"
+- "\x01"
+- "\x02"
+- "\x03"
+- "\x04"
+- "\x05"
+- "\x06"
+- "\a"
+- "\x08"
+- '	'
+- "\n"
+- "\v"
+- "\f"
+- "\r"
+- "\x0e"
+- "\x0f"
+- "\x10"
+- "\x11"
+- "\x12"
+- "\x13"
+- "\x14"
+- "\x15"
+- "\x16"
+- "\x17"
+- "\x18"
+- "\x19"
+- "\x1a"
+- "\e"
+- "\x1c"
+- "\x1d"
+- "\x1e"
+- "\x1f"
+- ' '
+- '!'
+- '"'
+- '#'
+- $
+- '%'
+- '&'
+- "'"
+- (
+- )
+- '*'
+- +
+- ','
+- -
+- .
+- /
+- 0
+- 1
+- 2
+- 3
+- 4
+- 5
+- 6
+- 7
+- 8
+- 9
+- ':'
+- ;
+- <
+- =
+- '>'
+- '?'
+- '@'
+- A
+- B
+- C
+- D
+- E
+- F
+- G
+- H
+- I
+- J
+- K
+- L
+- M
+- N
+- O
+- P
+- Q
+- R
+- S
+- T
+- U
+- V
+- W
+- X
+- Y
+- Z
+- ']'
+- \
+- ']'
+- '^'
+- _
+- '`'
+- a
+- b
+- c
+- d
+- e
+- f
+- g
+- h
+- i
+- j
+- k
+- l
+- m
+- n
+- o
+- p
+- q
+- r
+- s
+- t
+- u
+- v
+- w
+- x
+- y
+- z
+- '{'
+- '|'
+- '}'
+- '~'
+- '\x7f'
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ''
+- ' '
+- '!'
+- C/
+- PS
+- $?
+- Y=
+- '|'
+- SS
+- '"'
+- (c)
+- a
+- <<
+- '!'
+- ''
+- (r)
+- -
+- deg
+- +-
+- 2
+- 3
+- "'"
+- u
+- P
+- '*'
+- ','
+- 1
+- o
+- '>>'
+- 1/4
+- 1/2
+- 3/4
+- '?'
+- A
+- A
+- A
+- A
+- A
+- A
+- AE
+- C
+- E
+- E
+- E
+- E
+- I
+- I
+- I
+- I
+- D
+- N
+- O
+- O
+- O
+- O
+- O
+- x
+- O
+- U
+- U
+- U
+- U
+- U
+- Th
+- ss
+- a
+- a
+- a
+- a
+- a
+- a
+- ae
+- c
+- e
+- e
+- e
+- e
+- i
+- i
+- i
+- i
+- d
+- n
+- o
+- o
+- o
+- o
+- o
+- /
+- o
+- u
+- u
+- u
+- u
+- y
+- th
+- y