myobie-turbine-core 0.2.0 → 0.3.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 2
+:minor: 3
 :patch: 0

data/lib/turbine-core/importers/hash_importer.rb

@@ -0,0 +1,14 @@
+class HashImporter
+  
+  attr_accessor :result, :type
+  
+  def initialize(type)
+    @type = type
+    @result = {}
+  end
+  
+  def import(hash)
+    @result = hash
+  end
+  
+end

data/lib/turbine-core/importers/json_importer.rb

@@ -1,3 +1,7 @@
+require 'json'
+
+class Json < String; end # just so that we know which importer to run
+
 class JsonImporter
   
   attr_accessor :result, :type

data/lib/turbine-core/importers/{text_importer.rb → string_importer.rb}

@@ -1,4 +1,4 @@
-class TextImporter
+class StringImporter
   
   attr_accessor :remainder, :result, :type
   

data/lib/turbine-core/post_type.rb

@@ -99,6 +99,7 @@ class PostType
                                 ].flatten.uniq
   end
   
+  # TODO: when setting an attr, we should also run it's special block if it has one
   def set_attr(key, value)
     key = key.make_attr
     
@@ -125,8 +126,11 @@ class PostType
     get_attr(key).blank?
   end
   
-  alias :get_attr? :blank_attr?
+  def get_attr?(key)
+    !blank_attr?(key)
+  end
   
+  # TODO: get_attr should return a default if it's blank
   def get_attr(key, html = true)
     key = key.make_attr
     
@@ -182,7 +186,7 @@ class PostType
   end
   
   def self.get_pairs(text)
-    TextImporter.new(self).import(text)
+    StringImporter.new(self).import(text)
   end
   
   def self.get_pairs_count(text, fields)
@@ -202,18 +206,8 @@ class PostType
   end
   
   def content=(stuff) # !> method redefined; discarding old content=
-    case stuff
-    when String
-      @content = { :type => self.class.name.to_s }
-      import(stuff)
-      eval_specials
-      eval_defaults
-      parse_tags unless blank_attr?(:tags)
-      generate_slug if get_attr?(:slug)
-    when Hash
-      @content = stuff.merge(:type => self.class.name.to_s)
-    end
-      
+    @content = { :type => self.class.name.to_s }
+    import(stuff)
     @content
   end#of content=
   
@@ -229,9 +223,9 @@ class PostType
     v
   end
   
-  def initialize(text = nil)
-    if text
-      self.content = text
+  def initialize(stuff = nil)
+    if stuff
+      self.content = stuff
       # sanitize_content_fields
     end
   end
@@ -246,10 +240,8 @@ class PostType
     end
   end
   
-  # TODO: how to determine the type of stuff? (text, json, yaml, image, video, photo, pdf, generic download file (can lookup type of file for icon if needed))
-  def import(stuff, type = :text)
-    set_attr(:__original, stuff)
-    importer = Kernel.const_get(type.to_s.camel_case+'Importer').new(self.class)
+  def import(stuff)
+    importer = Kernel.const_get(stuff.class.name+'Importer').new(self.class)
     
     # The result sent back by an importer is either:
     #   Array:
@@ -264,6 +256,11 @@ class PostType
     when Hash
       commit_hash(result)
     end
+    
+    eval_specials # this won't be needed once the set_attr takes care of it
+    eval_defaults # this won't be needed once the get_attr takes care of it
+    parse_tags unless blank_attr?(:tags) # TODO: parse_tags needs to be turned into a special block
+    generate_slug if get_attr?(:slug) # TODO: generate_slug should be turned into a default block
   end
   
   def commit_hash(pairs_hash)
@@ -319,6 +316,8 @@ class PostType
   end
 
   def generate_slug # OPTIMIZE: this slug generation is ugly
+    return unless blank_attr?(:slug)
+    
     result = ''
   
     unless self.class.always_use_uuid
@@ -366,4 +365,22 @@ class PostType
     UUID.timestamp_create.to_s
   end
   
+  def to_s
+    fields_to_parse = self.class.fields_list - [self.class.primary_field]
+    
+    result = fields_to_parse.map do |field|
+      unless blank_attr?(field)
+        
+        "#{field}: #{get_attr(field)}" 
+        
+        # TODO: make a way to override this like string_for :content { "hello" }
+      
+      end#unless
+    end.join("\n") << "\n"
+    
+    result << get_attr(self.class.primary_field, false)
+    
+    result.strip
+  end
+  
 end

data/lib/turbine-core/types/photo.rb

@@ -1,8 +1,20 @@
 class Photo < PostType
-  fields :photo_url, :caption, :embed
+  fields :photo_url, :caption
   required :photo_url
   primary :caption
   
+  # special :photo_url do |photo_url_content|
+  #   if photo_url_content.blank? && !blank_attr?(:caption)
+  #     possible_url = get_attr(:caption).match(/^(http:\/\/.+)\n/)
+  #     unless possible_url.blank?
+  #       possible_url = possible_url.captures.first
+  #       if %w(jpg gif png).include?(possible_url[-3..-1])
+  #         set_attr :photo_url, possible_url
+  #       end#if
+  #     end#unless
+  #   end#if
+  # end#special
+  
   def self.detect?(text)
     has_required? text
   end

data/lib/turbine-core.rb

@@ -3,6 +3,6 @@ require 'extlib'
 
 include FileUtils
 
-%w( ext importers/json_importer importers/text_importer post_type types/article types/audio types/chat types/link types/photo types/quote types/review types/video ).each do |file|
+%w( ext importers/hash_importer importers/json_importer importers/string_importer post_type types/article types/audio types/chat types/link types/photo types/quote types/review types/video ).each do |file|
   require "#{File.dirname(__FILE__)}/turbine-core/#{file}.rb"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: myobie-turbine-core
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Nathan Herald
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-13 00:00:00 -07:00
+date: 2009-04-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -26,8 +26,9 @@ files:
 - VERSION.yml
 - lib/turbine-core.rb
 - lib/turbine-core/ext.rb
+- lib/turbine-core/importers/hash_importer.rb
 - lib/turbine-core/importers/json_importer.rb
-- lib/turbine-core/importers/text_importer.rb
+- lib/turbine-core/importers/string_importer.rb
 - lib/turbine-core/post_type.rb
 - lib/turbine-core/types/article.rb
 - lib/turbine-core/types/audio.rb