soxer 0.9.8 → 0.9.9

data/CHANGES

@@ -1,3 +1,18 @@
+= 0.9.9 / 2011-03-03
+
+  * Changed the names of Classes to match CamelCase convention in Ruby
+  
+  * Added .eot font to the mime collection to Rack
+  
+  * Cleaned up the superfuous blocks of documentation.
+  
+  * Fixed interpretation of layout: 'false' statement, if used inside yaml 
+    file.
+  
+  * Added dependancy on 'hashie' gem. Now page keys can be accessed 
+    as hash keys(strings or symbols) as well as methods.
+    The following will yield the same: page[:date], page['date'], page.date
+  
 = 0.9.8 / 2010-11-28
   
   * Standardized and beautified code (no particular standard though.)

data/README.markdown

@@ -19,7 +19,6 @@ What Soxer is not (yet)...
 
 - ... a complete CMS in classic sense.
 - ... a *turn-key-slap-the-logo-on-and-charge-for-it* solution.
-- ... mature product.
 
 
 Test drive the soxer

data/bin/soxer

@@ -61,8 +61,8 @@ def help
   
   Examples:
   
-  #{b '$ soxer create blog myblog'}
-    This command would create a new project directory 'myblog' with a mockup blog
+  #{b '$ soxer create empty app'}
+    This command would create a new project directory 'app' with a mockup empty
     soxer/sinatra application in it. You can tweak the design and parameters to
     acheve the desired experience.
     
@@ -86,6 +86,7 @@ def create template, dir
       return err "The destination directory exists."
     else
       FileUtils.copy_entry( File.join(skel, template), dir)
+      FileUtils.rm Dir.glob('**/EMPTY')
       return notice "Successfuly created '#{dir}' application directory from '#{template}'."
   end
 end

data/lib/soxer/main.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+
+require 'hashie'
 require 'sinatra/base'
 require 'yaml'
 require 'haml'
@@ -22,17 +25,17 @@ module Sinatra
   # License:   Distributed under the GPL licence. http://www.gnu.org/licenses/gpl.html
   module Soxer
     
-    # === The Filereader class
+    # === The FileReader class
     #
-    # Filereader is responsible for reading a YAML file, that contains the
+    # FileReader is responsible for reading a YAML file, that contains the
     # content and metadata for each web page.
     #
-    # Filereader also assumes that each YAML file contains 2 top level fields:
+    # FileReader also assumes that each YAML file contains 2 top level fields:
     # uuid:: A Universally Unique Identifier field 
     # date:: A standard date and time field
     # if the fields are not present, they are automatically generated and
     # saved in the file.
-    class Filereader
+    class FileReader
       # The name of the YAML file
       attr_accessor :filename
       
@@ -79,13 +82,13 @@ module Sinatra
       end
     end
     
-    # === The Urlreader class
+    # === The UrlReader class
     #
-    # Urlreader simply checks if the URL recieved can be matched to a file.
+    # UrlReader simply checks if the URL recieved can be matched to a file.
     # Currelntly it either matches a file path (ending with .yaml) from origin 
     # (the default is "content" directory within application root) or a 
     # directory path with index.yaml
-    class Urlreader
+    class UrlReader
 
       # Url, recieved from the request
       attr_accessor :url
@@ -97,7 +100,7 @@ module Sinatra
         @s = Sinatra::Application
       end
       
-      # Creates a filereader instance, maps the url to either yaml file or 
+      # Creates a FileReader instance, maps the url to either yaml file or 
       # index.yaml within a directory represented by url.
       def get_content
         self.settings
@@ -106,12 +109,36 @@ module Sinatra
              when File.exist?( f = File.join( @s.origin, @url+'/index.yaml' ) ) then f
              else throw :halt, [404, "Document not found"]
              end
-        out = Filereader.new
+        out = FileReader.new
         out.filename = fn
         out.get_content
       end
     end
     
+    # === The DocumentStore class
+    #
+    # DocumentStore class extends the hash to enable document attribute access
+    # in one of three ways:
+    # hash key:    page['key'] => value
+    # method call: page.key => value
+    # symbol:      page[:key] => value
+    class Document < Hash
+      def initialize(attrs)
+        attrs.each do |k, v|
+          self[k] = v
+        end
+      end
+    
+      def []=(k, v)
+        unless respond_to?(k)
+          self.class.send :define_method, k do
+            self[k]
+          end
+        end
+        super
+      end
+    end
+    
     # === Helper module
     # 
     # This module introduces several helper methods to Soxer application.
@@ -127,9 +154,9 @@ module Sinatra
       # [=> Hash]
       #   A hash representation of yaml file.
       def get_page url=params[:splat][0]
-        out = Urlreader.new
+        out = UrlReader.new
         out.url = url
-        out.get_content
+        Hashie::Mash.new out.get_content
       end
   
       # === Document list generator method
@@ -146,7 +173,7 @@ module Sinatra
         fileset= Dir.glob File.join( settings.origin, "**", "*.yaml" )
         fileset.delete_if {|d| (d=~/\/index.yaml$/ and fileset.include? d[0..-12]+'.yaml') }
         output = fileset.map! do |f|
-          file = Filereader.new
+          file = FileReader.new
           file.filename = f
           if block_given?
             f = block.call file.get_content
@@ -283,18 +310,6 @@ module Sinatra
         haml ('_'+snippet.to_s).to_sym, options.merge!(:layout => false)
       end
       
-      #=== "link_to" rails like link_to generator
-      #
-      # This funnction accepts a 1 or 2 strings. 
-      # 
-      #==== text
-      # A string that becomes the link text. If there is no second parameter,
-      # link_to converts the string into a local url by replacing all spaces with
-      # an underscore and downcasing the string.
-      #
-      #==== url
-      # This string is used for 'href' in a link
-      
       # === Link tag generator method
       # Generates Html <a href="#"></a> tag accordng to RoR convention.
       # 
@@ -312,16 +327,6 @@ module Sinatra
         "<a href=\"#{url}\"> #{text}</a>"
       end
       
-      # A simple string obuscator.
-      # Useful for hiding emails and such
-      #=== "obfuscate" simple string obuscator.
-      #
-      # This funnction accepts a 1 or 2 strings. 
-      # 
-      #==== str=nil
-      # Obfuscates a string replacing characters with html entities.
-      # Useful for hiding emails and such
-
       # === String obfuscator method
       # Converts strings into a stream of html character codes.
       # 
@@ -351,6 +356,7 @@ module Sinatra
       
       mime_type :otf, 'application/x-font-TrueType'
       mime_type :ttf, 'application/x-font-TrueType'
+      mime_type :eot, 'application/vnd.ms-fontobject'
       
       app.get("/sitemap.xml") { sitemap }
 
@@ -392,7 +398,8 @@ module Sinatra
         content_type "text/html", :charset => "utf-8"
         page = get_page
         page['layout'] ||= 'layout'
-        haml page['content'], :layout => page['layout'].to_sym, :locals => { :page => page }
+        page['layout'] == 'false' ? layout = false : layout = page['layout'].to_sym
+        haml page['content'], :layout => layout, :locals => { :page => page }
       end
       
     end

data/soxer.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.7'
 
   s.name              = 'soxer'
-  s.version           = '0.9.8'
-  s.date              = '2010-11-28'
+  s.version           = '0.9.9'
+  s.date              = '2011-03-03'
   s.rubyforge_project = 'soxer'
 
   s.summary     = "Dynamic web site generator engine"
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency('sinatra', "~> 1")
   s.add_dependency('haml', "~> 3")
   s.add_dependency('uuid', "~> 2")
+  s.add_dependency('hashie', "~> 1.0.0")
   s.add_dependency('sinatra-reloader', "~> 0.5")
 
   # = MANIFEST =
@@ -34,7 +35,7 @@ Gem::Specification.new do |s|
     bin/soxer
     lib/soxer.rb
     lib/soxer/main.rb
-  ] + Dir.glob("{lib/soxer/views,lib/soxer/skel}/**/*")
+  ] + Dir.glob("{lib/soxer/views,lib/soxer/skel/**}/**")
   # = MANIFEST =
   
   s.executables = ['soxer']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soxer
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Toni Anzlovar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-28 00:00:00 +01:00
+date: 2011-03-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,9 +61,25 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sinatra-reloader
+  name: hashie
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: sinatra-reloader
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,7 +90,7 @@ dependencies:
         - 5
         version: "0.5"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 description: Soxer is a file based dynamic web site creation tool for Sinatra.
 email: toni@formalibre.si
 executables: 
@@ -98,7 +114,10 @@ files:
 - lib/soxer/views/google_analytics.haml
 - lib/soxer/views/google_ads.haml
 - lib/soxer/views/breadcrumb.haml
+- lib/soxer/skel/empty/bin/EMPTY
 - lib/soxer/skel/empty/content/index.yaml
+- lib/soxer/skel/empty/log/EMPTY
+- lib/soxer/skel/empty/public/EMPTY
 - lib/soxer/skel/empty/config.yml
 - lib/soxer/skel/empty/config.ru
 - lib/soxer/skel/empty/views/layout.haml