sinatra_fedora 1.1 → 1.2

data/lib/sinatra_fedora.rb

@@ -29,4 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
 =end
 
-require File.join(File.dirname(__FILE__), 'sinatra_fedora', 'fedora')
+require 'sinatra/base'
+require 'require_all'
+
+require_rel './sinatra_fedora/*.rb'

data/lib/sinatra_fedora/fedora.rb

@@ -29,116 +29,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
 =end
 
-require 'sinatra/base'
-
-# Memoizable code for caching link_to objects
-# see http://snippets.dzone.com/posts/show/5300
-module Memoizable
-  # Store for cached values.
-  CACHE = Hash.new{|h,k| h[k] = Hash.new{|h,k| h[k] = {}}} # 3 level hash; CACHE[:foo][:bar][:yelp]
-  
-  # Memoize the given method(s).
-  def memoize(*names)
-    names.each do |name|
-      unmemoized = "__unmemoized_#{name}"
-      
-      class_eval %Q{
-        alias   :#{unmemoized} :#{name}
-        private :#{unmemoized}
-        def #{name}(*args)
-          cache = CACHE[self][#{name.inspect}]
-          cache.has_key?(args) ? cache[args] : (cache[args] = send(:#{unmemoized}, *args))
-        end
-      }
-    end
-  end
-  
-  # Flush cached return values.
-  def flush_memos
-    CACHE.clear
-  end
-  module_function :flush_memos
-end
-
-module Sinatra
-  # simple way to escape HTML (method 'h')
-  module HTMLEscapeHelper
-    def h(text)
-      Rack::Utils.escape_html(text)
-    end
-  end
-
-  # link_to helper
-  module LinkHelper
-    extend Memoizable
-
-    def get_namespace(klass)
-      begin
-        Object.const_get(klass).namespace
-      rescue
-        klass
-      end
-    end
-
-    def link_to(link, disable=false)
-      if disable
-        return link
-      end
-
-      _class = link.gsub(/^\/([\w\d]+)/, '\1').split('/')
-      _name = get_namespace _class[0].capitalize
-      _name + _class.join('/').gsub(_class[0], '')
-    end
-    # cache the namespace to save time
-    memoize :get_namespace
-  end
-
-  module Templates
-    def render(engine, data, options={}, locals={}, &block)
-      # merge app-level options
-      options = settings.send(engine).merge(options) if settings.respond_to?(engine)
-      options[:outvar]           ||= '@_out_buf'
-      options[:default_encoding] ||= settings.default_encoding
-
-      # extract generic options
-      locals          = options.delete(:locals) || locals         || {}
-      views           = options.delete(:views)  || settings.views || "./views"
-      @default_layout = :layout if @default_layout.nil?
-      layout          = options.delete(:layout)
-      eat_errors      = layout.nil?
-      layout          = @default_layout if layout.nil? or layout == true
-      content_type    = options.delete(:content_type)  || options.delete(:default_content_type)
-      layout_engine   = options.delete(:layout_engine) || engine
-      scope           = options.delete(:scope)         || self
-
-      # Fedora views
-      if data != :layout and options[:views_directory].nil?
-        look_in = (scope.class.name.downcase || scope.class.views_from) if scope.class.views_from.nil?
-        data = "#{look_in}/#{data.to_s}".to_sym
-      end
-
-      # compile and render template
-      layout_was      = @default_layout
-      @default_layout = false
-      template        = compile_template(engine, data, options, views)
-      output          = template.render(scope, locals, &block)
-      @default_layout = layout_was
-
-      # render layout
-      if layout
-        options = options.merge(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope)
-        catch(:layout_missing) { return render(layout_engine, layout, options, locals) { output } }
-      end
-
-      output.extend(ContentTyped).content_type = content_type if content_type
-      output
-    end
-  end
-end
-
 class Fedora < Sinatra::Base
   helpers Sinatra::HTMLEscapeHelper
   helpers Sinatra::LinkHelper
+  helpers Sinatra::Partials
 
   def self.inherited(klass)
     super

data/lib/sinatra_fedora/helpers.rb

@@ -0,0 +1,84 @@
+module Sinatra
+  # Simple way to escape HTML (method 'h')
+  module HTMLEscapeHelper
+    def h(text)
+      Rack::Utils.escape_html(text)
+    end
+  end
+
+  # partials helper
+  module Partials
+    def partial(page, options = {})
+      options[:views_directory] ||= options[:via]
+      options[:layout] ||= false
+      render (options[:engine] ||= "haml"), page.to_sym, options
+    end
+  end
+
+  # link_to helper
+  module LinkHelper
+    extend Memoizable
+
+    def get_namespace(klass)
+      begin
+        Object.const_get(klass).namespace
+      rescue
+        klass
+      end
+    end
+
+    def link_to(link, disable=false)
+      if disable
+        return link
+      end
+
+      _class = link.gsub(/^\/([\w\d]+)/, '\1').split('/')
+      _name = get_namespace _class[0].capitalize
+      _name + _class.join('/').gsub(_class[0], '')
+    end
+    # Cache the namespace to save time
+    memoize :get_namespace
+  end
+
+  module Templates
+    def render(engine, data, options={}, locals={}, &block)
+      # Merge app-level options
+      options = settings.send(engine).merge(options) if settings.respond_to?(engine)
+      options[:outvar]           ||= '@_out_buf'
+      options[:default_encoding] ||= settings.default_encoding
+
+      # Extract generic options
+      locals          = options.delete(:locals) || locals         || {}
+      views           = options.delete(:views)  || settings.views || "./views"
+      @default_layout = :layout if @default_layout.nil?
+      layout          = options.delete(:layout)
+      eat_errors      = layout.nil?
+      layout          = @default_layout if layout.nil? or layout == true
+      content_type    = options.delete(:content_type)  || options.delete(:default_content_type)
+      layout_engine   = options.delete(:layout_engine) || engine
+      scope           = options.delete(:scope)         || self
+
+      # Fedora views
+      if data != :layout and options[:views_directory].nil?
+        look_in = (scope.class.views_from || scope.class.name.downcase)
+        data = "#{look_in}/#{data.to_s}".to_sym
+      end
+
+      # Compile and render template
+      layout_was      = @default_layout
+      @default_layout = false
+      template        = compile_template(engine, data, options, views)
+      output          = template.render(scope, locals, &block)
+      @default_layout = layout_was
+
+      # Render layout
+      if layout
+        options = options.merge(:views => views, :layout => false, :eat_errors => eat_errors, :scope => scope)
+        catch(:layout_missing) { return render(layout_engine, layout, options, locals) { output } }
+      end
+
+      output.extend(ContentTyped).content_type = content_type if content_type
+      output
+    end
+  end
+end

data/lib/sinatra_fedora/memoize.rb

@@ -0,0 +1,28 @@
+# Memoizable code for caching link_to objects
+# see http://snippets.dzone.com/posts/show/5300
+module Memoizable
+  # Store for cached values.
+  CACHE = Hash.new{|h,k| h[k] = Hash.new{|h,k| h[k] = {}}} # 3 level hash; CACHE[:foo][:bar][:yelp]
+  
+  # Memoize the given method(s).
+  def memoize(*names)
+    names.each do |name|
+      unmemoized = "__unmemoized_#{name}"
+      
+      class_eval %Q{
+        alias   :#{unmemoized} :#{name}
+        private :#{unmemoized}
+        def #{name}(*args)
+          cache = CACHE[self][#{name.inspect}]
+          cache.has_key?(args) ? cache[args] : (cache[args] = send(:#{unmemoized}, *args))
+        end
+      }
+    end
+  end
+  
+  # Flush cached return values.
+  def flush_memos
+    CACHE.clear
+  end
+  module_function :flush_memos
+end

metadata

@@ -1,46 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra_fedora
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: '1.2'
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  version: "1.1"
 platform: ruby
-authors: 
+authors:
 - Daniel Durante
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-01 00:00:00 -04:00
+date: 2011-08-27 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2161353300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-description: Converts class names intro controllers and automatically maps them. Same thing with views and both, views and controllers, can be configured to your liking. It combines the best of both Padrino and Sinatra.
+  prerelease: false
+  version_requirements: *2161353300
+description: Converts class names intro controllers and automatically maps them. Same
+  thing with views and both, views and controllers, can be configured to your liking.
+  It combines the best of both Padrino and Sinatra.
 email: officedebo@gmail.com
-executables: 
+executables:
 - fedora
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/fedora
 - lib/hatrack/concert/app/controllers/home.rb
 - lib/hatrack/concert/app/views/index.haml
@@ -59,44 +50,35 @@ files:
 - lib/hatrack/official/app.rb
 - lib/hatrack/official/config.ru
 - lib/sinatra_fedora/fedora.rb
+- lib/sinatra_fedora/helpers.rb
+- lib/sinatra_fedora/memoize.rb
 - lib/sinatra_fedora.rb
 - COPYING
 - README.rdoc
 has_rdoc: true
 homepage: https://github.com/durango/sinatra_fedora
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An even classier way to use Sinatra.
 test_files: []
-