yodel 0.0.1 → 0.0.2

data/lib/yodel/command/installer.rb

@@ -20,7 +20,7 @@ class Installer
   end
   
   def default_ruby_path
-    if Config.ruby =~ /rubies\/(.*)\/bin/
+    if RbConfig.ruby =~ /rubies\/(.*)\/bin/
       `rvm wrapper #{$1} yodel`
       `which yodel_ruby`.strip
     else

data/lib/yodel/models/core/associations/query/query_association.rb

@@ -3,9 +3,7 @@ module QueryAssociation
   
   def initialize(name, options={})
     super
-    if @options['where']
-      @options['where'] = Plucky::CriteriaHash.new(@options['where']).to_hash
-    end
+    options['where'] = Plucky::CriteriaHash.new(options['where']).to_hash if options['where']
   end
   
   def validate(record, errors)
@@ -21,12 +19,12 @@ module QueryAssociation
   end
   
   def associate(associated_record, store, record)
-    associated_record.set_meta(foreign_key(record), record.id)
+    associated_record.set_meta(foreign_key(record), association_value(record))
     associated_record.save_without_validation
   end
   
   def unassociate(associated_record, store, record)
-    return unless associated_record.get_meta(foreign_key) == record.id
+    return unless associated_record.get_meta(foreign_key) == association_value(record)
     associated_record.set_meta(foreign_key(record), nil)
     associated_record.save_without_validation
   end
@@ -41,24 +39,44 @@ module QueryAssociation
     end
     
     def scope(record)
-      if @options['through']
-        through_query = record.field(@options['through'].to_s).scope(record).only('_id')
+      if options['through']
+        through_query = record.field(options['through'].to_s).scope(record).only('_id')
         cursor = Record.collection.find(through_query.criteria.to_hash, through_query.options.to_hash)
         ids = cursor.to_a.collect {|doc| doc['_id']}
         scope = record.site.model(model_name).where(foreign_key(record) => ids)
-      elsif @options['extends']
-        scope = record.field(@options['extends'].to_s).scope(record)
+        
+      elsif options['extends']
+        # to allow extended associations to override the association's original query, remove
+        # any conditions which occur in the additional criteria
+        scope = record.field(options['extends'].to_s).scope(record)
+        if options['where']
+          options['where'].keys.each do |field|
+            scope.criteria.source.delete(field)
+          end
+        end
+
       else
-        scope = record.site.model(model_name).where(foreign_key(record) => record.id)
+        scope = record.site.model(model_name).where(foreign_key(record) => association_value(record))
       end
-      scope = scope.where(@options['where'].to_hash) if @options['where']
-      scope = scope.sort(@options['order'].to_s) if @options['order']
-      scope = scope.limit(@options['limit'].to_i) if @options['limit']
-      scope = scope.skip(@options['skip'].to_i) if @options['skip']
+
+      scope = scope.where(options['where'].to_hash) if options['where']
+      scope = scope.sort(options['order'].to_s) if options['order']
+      scope = scope.limit(options['limit'].to_i) if options['limit']
+      scope = scope.skip(options['skip'].to_i) if options['skip']
       scope
     end
     
     def associated(store, record)
-      record.site.model(model_name).first(foreign_key(record) => record.id)
+      record.site.model(model_name).first(foreign_key(record) => association_value(record))
+    end
+    
+    def association_value(record)
+      if options['value_field']
+        field = record.fields[options['value_field']]
+        raise new InvalidField("Unknown field '#{options['value_field']}' specified in association '#{name}' of model '#{record.model.name}'") if field.nil?
+        field.untypecast(record.send(options['value_field']), record)
+      else # id
+        record.id
+      end
     end
 end

data/lib/yodel/models/core/attachments/attachment.rb

@@ -38,6 +38,10 @@ class Attachment
     File.exist?(path)
   end
   
+  def empty?
+    !exist?
+  end
+  
   def remove_files
     FileUtils.rm_r directory_path if exist?
   end

data/lib/yodel/models/core/attachments/image.rb

@@ -5,7 +5,7 @@ class Image < Attachment
   end
 
   def crop_image
-    sizes = @field.options['sizes'].to_hash.merge('admin_thumb' => '100x100')
+    sizes = (@field.options['sizes'] || {}).to_hash.merge('admin_thumb' => '100x100')
     return unless exist?    
     sizes.each do |size_name, size|
       image = MiniMagick::Image.open(path.to_s)

data/lib/yodel/models/core/functions/function.rb

@@ -122,6 +122,8 @@ class Function
       previous_value(context, parent_context, params.first)
     when 'collect'
       collect(context, parent_context, params.first)
+    when 'flatten'
+      flatten(context)
     when 'majority'
       majority(context, parent_context, params.first)
     when 'count'
@@ -272,6 +274,11 @@ class Function
       context.collect {|item| execute(item, field, parent_context)}
     end
     
+    def flatten(context)
+      raise "Context to flatten must respond to flatten" unless context.respond_to?(:flatten)
+      context.flatten
+    end
+    
     def each(context, parent_context, statement)
       raise "Context to each must respond to each" unless context.respond_to?(:each)
       context.each {|item| execute(item, statement, parent_context)}

data/lib/yodel/models/core/record/record.rb

@@ -363,7 +363,7 @@ class Record < SiteRecord
   # Rendering
   # ----------------------------------------
   def content
-    @content
+    @content ||= get('content')
   end
   
   def set_content(content)

data/lib/yodel/models/core/site/site.rb

@@ -45,7 +45,13 @@ class Site < MongoRecord
   end
   
   def public_directories
-    @public_dirs ||= Yodel.config.public_directories + [public_directory]
+    @public_dirs ||= begin
+      if Yodel.env.production?
+        Yodel.config.public_directories + [public_directory]
+      else
+        Yodel.config.public_directories + [public_directory, attachments_directory]
+      end
+    end
   end
   
   def layouts_directory

data/lib/yodel/models/migrations/01_record_model.rb

@@ -9,7 +9,7 @@ class RecordModelMigration < Migration
       add_field :name, :string
       add_field :show_in_search, :boolean, default: true, section: 'Options'
       add_field :search_keywords, :array, of: :string, display: false
-      add_field :search_title, :string, display: false
+      add_field :search_title, :alias, of: :name, display: false
 
       # modelling
       add_one   :eigenmodel, model: :model, destroy: true, display: false

data/lib/yodel/models/migrations/06_snippet_model.rb

@@ -2,6 +2,7 @@ class SnippetModelMigration < Migration
   def self.up(site)
     site.records.create_model :snippets do |snippets|
       add_field :name, :string, validations: {required: {}}, index: true
+      add_field :show_in_search, :boolean, default: false, display: false
       add_field :content, :text
       snippets.searchable = false
     end

data/lib/yodel/models/pages/form_builder.rb

@@ -27,7 +27,7 @@ class FormBuilder
     @embedded_record = options.delete(:embedded_record)
     @blank_record = options.delete(:blank_record)
     @prefix = options.delete(:prefix)
-    @id = options.delete(:id) || "form_for_#{record.id}"
+    @id = @params.delete(:id) || options.delete(:id) || "form_for_#{record.id}"
     
     # js functions
     @success_function = options.delete(:success)

data/lib/yodel/models/pages/html_decorator.rb

@@ -116,17 +116,29 @@ module HTMLDecorator
   # ----------------------------------------
   # Formatters
   # ----------------------------------------
-  def paragraph(index, field=:content)
-    text = self[field]
+  def paragraph(index, options={})
+    text = self.send(options[:field] || :content)
     paragraphs = Hpricot(text).search('/p')
     return '' if paragraphs.nil? || paragraphs[index].nil?
-    paragraphs[index].inner_html
+    if options[:strip]
+      paragraphs[index].search('//text()').join
+    else
+      paragraphs[index].inner_html
+    end
   end
   
-  def paragraphs_from(index, field=:content)
-    text = self[field]
+  # TODO: determine whether the initial search (Hpricot(text).children) should
+  # be changed to Hpricot(text).search('/p'), i.e should paragraphs_from return
+  # only p tags, or all child tags. This is dependent on the WYSIWYG editor -
+  # does it wrap <ul>s etc. in <p>s first, or are they top level elements?
+  def paragraphs_from(index, options={})
+    text = self.send(options[:field] || :content)
     paragraphs = Hpricot(text).children
     return '' if paragraphs.nil? || paragraphs[index..-1].nil?
-    paragraphs[index..-1].collect {|p| p.to_s}.join('')
+    if options[:strip]
+      paragraphs[index..-1].collect {|p| p.search('//text()').join}.join
+    else
+      paragraphs[index..-1].collect {|p| p.to_s}.join
+    end
   end
 end

data/lib/yodel/models/pages/page.rb

@@ -34,21 +34,33 @@ class Page < Record
   
   def assign_path(prefix=nil)
     if prefix
-      new_prefix = prefix + '/' + permalink
+      prefix = '' if prefix == '/' # when the root page is parent, prefix will be "/"
+      base = prefix + '/' + permalink
     else
-      new_prefix = '/' + parents.reverse[1..-1].collect(&:permalink).join('/')
+      base = '/' + parents.reverse[1..-1].collect(&:permalink).join('/')
     end
     
-    self.path = new_prefix
+    permalink_character = site.option('pages.permalink_character') || '-'
+    self.path = base
     count = 0
     
     while site.pages.where(:path => self.path, :_id.ne => self.id).exists?
       count += 1
-      self.path = "#{new_prefix}#{count}"
+      self.path = "#{base}#{permalink_character}#{count}"
     end
     
-    save_without_validation if prefix
-    children.each {|child| child.assign_path(new_prefix)}
+    # child pages are called with prefix supplied
+    # FIXME: with the identity map, this call could save another record which has been modified
+    # elsewhere; change to update path only, not a full save
+    save_without_validation unless prefix.nil?
+    children.each {|child| child.assign_path(self.path)}
+  end
+  
+  after_validation :assign_child_paths
+  def assign_child_paths
+    return unless path_changed? || (!path.nil? && values['path'].nil?)
+    return unless @errors.empty? # @errors.present? == invalid
+    children.each {|child| child.assign_path(path)}
   end
   
   

data/lib/yodel/models/search/search_page.rb

@@ -10,24 +10,27 @@ class SearchPage < Page
   }
   
   def query
-    q = (type || site.records).where(show_in_search: true)
+    @query ||= begin
+      query_type = type || site.records
+      q = query_type.where(show_in_search: true)
     
-    # constant constraints
-    conditions.each do |condition|
-      q = add_condition(q, type, condition.name, condition.operator, condition.value)
-    end
+      # constant constraints
+      conditions.each do |condition|
+        q = add_condition(q, query_type, condition.name, condition.operator, condition.value)
+      end
     
-    # user conditions
-    user_conditions.each do |condition|
-      param_name = condition.as || condition.name
-      q = add_condition(q, type, condition.name, condition.operator, params[param_name])
-    end
+      # user conditions
+      user_conditions.each do |condition|
+        param_name = condition.as || condition.name
+        q = add_condition(q, query_type, condition.name, condition.operator, params[param_name])
+      end
     
-    # add other optional search parameters
-    q = q.sort(sort || params['sort']) if sort || params['sort']
-    q = q.limit(limit || params['limit'].to_i) if limit || params['limit']
-    q = q.skip(skip || params['skip'].to_i) if skip || params['skip']
-    q
+      # add other optional search parameters
+      q = q.sort(sort || params['sort']) if sort || params['sort']
+      q = q.limit(limit || params['limit'].to_i) if limit || params['limit']
+      q = q.skip(skip || params['skip'].to_i) if skip || params['skip']
+      q
+    end
   end
   
   def add_condition(q, type, field, operator, value)
@@ -39,11 +42,6 @@ class SearchPage < Page
       value = type.all_record_fields[field.to_s].from_json(value, type)
     end
     
-    # the in operator works on arrays
-    #if operator == :in
-    #  value = value.to_s.split(' ').reject(&:blank?).collect(&:downcase)
-    #end
-    
     if operator
       q.where(field.send(operator) => value)
     else

data/lib/yodel/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yodel
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000Z
+date: 2011-12-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70308430598920 !ruby/object:Gem::Requirement
+  requirement: &70168508652460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.21
   type: :runtime
   prerelease: false
-  version_requirements: *70308430598920
+  version_requirements: *70168508652460
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70308430597580 !ruby/object:Gem::Requirement
+  requirement: &70168508651520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70308430597580
+  version_requirements: *70168508651520
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70308430596000 !ruby/object:Gem::Requirement
+  requirement: &70168508650680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70308430596000
+  version_requirements: *70168508650680
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70308430594940 !ruby/object:Gem::Requirement
+  requirement: &70168508649740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70308430594940
+  version_requirements: *70168508649740
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70308430593740 !ruby/object:Gem::Requirement
+  requirement: &70168508648780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70308430593740
+  version_requirements: *70168508648780
 - !ruby/object:Gem::Dependency
   name: plucky
-  requirement: &70308430569480 !ruby/object:Gem::Requirement
+  requirement: &70168508647460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70308430569480
+  version_requirements: *70168508647460
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70308430568120 !ruby/object:Gem::Requirement
+  requirement: &70168508646540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70308430568120
+  version_requirements: *70168508646540
 - !ruby/object:Gem::Dependency
   name: ember
-  requirement: &70308430566900 !ruby/object:Gem::Requirement
+  requirement: &70168508645640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70308430566900
+  version_requirements: *70168508645640
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70308430566300 !ruby/object:Gem::Requirement
+  requirement: &70168508645080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70308430566300
+  version_requirements: *70168508645080
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70308430565480 !ruby/object:Gem::Requirement
+  requirement: &70168508644040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70308430565480
+  version_requirements: *70168508644040
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70308430564580 !ruby/object:Gem::Requirement
+  requirement: &70168508643160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70308430564580
+  version_requirements: *70168508643160
 - !ruby/object:Gem::Dependency
   name: rack-contrib
-  requirement: &70308430559860 !ruby/object:Gem::Requirement
+  requirement: &70168508641600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70308430559860
+  version_requirements: *70168508641600
 - !ruby/object:Gem::Dependency
   name: rubydns
-  requirement: &70308430559240 !ruby/object:Gem::Requirement
+  requirement: &70168508640940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70308430559240
+  version_requirements: *70168508640940
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70308430558500 !ruby/object:Gem::Requirement
+  requirement: &70168508640040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70308430558500
+  version_requirements: *70168508640040
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70308430557500 !ruby/object:Gem::Requirement
+  requirement: &70168508638960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70308430557500
+  version_requirements: *70168508638960
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: &70308430556260 !ruby/object:Gem::Requirement
+  requirement: &70168508638200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70308430556260
+  version_requirements: *70168508638200
 - !ruby/object:Gem::Dependency
   name: linguistics
-  requirement: &70308430554780 !ruby/object:Gem::Requirement
+  requirement: &70168508625780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70308430554780
+  version_requirements: *70168508625780
 - !ruby/object:Gem::Dependency
   name: yodel_admin
-  requirement: &70308430554200 !ruby/object:Gem::Requirement
+  requirement: &70168508625160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308430554200
+  version_requirements: *70168508625160
 - !ruby/object:Gem::Dependency
   name: yodel_queue
-  requirement: &70308430553420 !ruby/object:Gem::Requirement
+  requirement: &70168508624200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308430553420
+  version_requirements: *70168508624200
 - !ruby/object:Gem::Dependency
   name: yodel_blog
-  requirement: &70308430552980 !ruby/object:Gem::Requirement
+  requirement: &70168508623420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308430552980
+  version_requirements: *70168508623420
 - !ruby/object:Gem::Dependency
   name: yodel_shop
-  requirement: &70308430552400 !ruby/object:Gem::Requirement
+  requirement: &70168508623000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308430552400
+  version_requirements: *70168508623000
 - !ruby/object:Gem::Dependency
   name: yodel_development_environment
-  requirement: &70308430551520 !ruby/object:Gem::Requirement
+  requirement: &70168508622560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308430551520
+  version_requirements: *70168508622560
 - !ruby/object:Gem::Dependency
   name: yodel_production_environment
-  requirement: &70308430550760 !ruby/object:Gem::Requirement
+  requirement: &70168508621920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -263,7 +263,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70308430550760
+  version_requirements: *70168508621920
 description: Yodel CMS
 email:
 - me@willcannings.com