RubyGems - amrita2 - Versions diffs - 2.0.0 → 2.0.1 - Mend

amrita2 2.0.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (53) hide show

data/sample/hello/test1.rb ADDED Viewed

@@ -0,0 +1,23 @@
+require "amrita2/template"
+include Amrita2
+tmpl = Template.new <<-END
+<<html<
+  <<body<
+    <<h1 :title |Attr[:title, :body]>>
+    <<p <
+      Amrita2 is a html template libraly for Ruby.
+    <%= x %>
+END
+tmpl.set_trace(STDOUT)
+puts tmpl.render_with(:title=>{:title=>"hello world", :body=>"hello world" })
+__END__
+<html>
+   <body>
+      <h1>hello world</h1>
+      <p>Amrita2 is a html template libraly for Ruby</p>
+   </body>
+</html>

data/sample/login_engine/config/environment.rb CHANGED Viewed

@@ -1,9 +1,4 @@
-$KCODE = 'u'            # UTF-8�ξ�硣's' = SJIS, 'e' = EUC-JP�ʤ�
-require 'jcode'         # String���饹�Υ᥽�åɤʤɤ�$KCODE�˻��ꤷ��
-                        # ʸ�������ɤ�Ŭ�ڤ�ư���褦���֤������ޤ���
 # Be sure to restart your web server when you modify this file.
 # Uncomment below to force Rails into production mode when
@@ -48,20 +43,12 @@ Rails::Initializer.run do |config|
   # config.active_record.default_timezone = :utc
   # See Rails::Configuration for more options
-end
-# Add new inflection rules using the following format
-# (all these examples are active by default):
-# Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
-# Add new mime types for use in respond_to blocks:
-# Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register "application/x-mobile", :mobile
+  config.action_controller.session = {
+    :session_key => '_login_engine_session',
+    :secret      => 'a148d6564bd91d6e6c41e3bf845a816bf1776789860fe524361b23a5bbcd4846ba7f3fd2bc8534961ff9f95ac0ed0c9ef10b81c3444d15605a5c8895fa7a0437'
+  }
+end
 # Include your application configuration below
@@ -119,11 +106,11 @@ module LoginEngine
   end
   # controls whether or not email is used
-  config :use_email_notification, true
+  config :use_email_notification, false
   # Controls whether accounts must be confirmed after signing up
   # ONLY if this and use_email_notification are both true
-  config :confirm_account, true
+  config :confirm_account, false
   config :salt, "your-salt-here"
@@ -138,3 +125,14 @@ require 'amrita2/macro'
 # set text domain for get_text
 Amrita2View::Base.text_domain = "login_engine"
+# fix trouble with gettext and rails2.0
+# http://zargony.com/2007/07/29/using-ruby-gettext-with-edge-rails/
+class CGI
+  module QueryExtension
+    alias index_without_fix :[]
+    def [] (key)
+      return nil unless @params[key]
+      index_without_fix(key)
+    end
+  end
+end

data/sample/login_engine/config/environments/development.rb CHANGED Viewed

@@ -9,7 +9,7 @@ config.cache_classes = false
 config.whiny_nils = true
 # Enable the breakpoint server that script/breakpointer connects to
-config.breakpoint_server = true
+#config.breakpoint_server = true
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
@@ -18,4 +18,4 @@ config.action_view.cache_template_extensions         = false
 config.action_view.debug_rjs                         = true
 # Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
+#config.action_mailer.raise_delivery_errors = false

data/sample/login_engine/db/schema.rb CHANGED Viewed

@@ -1,25 +1,32 @@
-# This file is autogenerated. Instead of editing this file, please use the
-# migrations feature of ActiveRecord to incrementally modify your database, and
+# This file is auto-generated from the current state of the database. Instead of editing this file,
+# please use the migrations feature of ActiveRecord to incrementally modify your database, and
 # then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
 ActiveRecord::Schema.define(:version => 1) do
   create_table "users", :force => true do |t|
-    t.column "login",           :string,   :limit => 80, :default => "", :null => false
-    t.column "salted_password", :string,   :limit => 40, :default => "", :null => false
-    t.column "email",           :string,   :limit => 60, :default => "", :null => false
-    t.column "firstname",       :string,   :limit => 40
-    t.column "lastname",        :string,   :limit => 40
-    t.column "salt",            :string,   :limit => 40, :default => "", :null => false
-    t.column "verified",        :integer,                :default => 0
-    t.column "role",            :string,   :limit => 40
-    t.column "security_token",  :string,   :limit => 40
-    t.column "token_expiry",    :datetime
-    t.column "created_at",      :datetime
-    t.column "updated_at",      :datetime
-    t.column "logged_in_at",    :datetime
-    t.column "deleted",         :integer,                :default => 0
-    t.column "delete_after",    :datetime
+    t.string   "login",           :limit => 80, :default => "", :null => false
+    t.string   "salted_password", :limit => 40, :default => "", :null => false
+    t.string   "email",           :limit => 60, :default => "", :null => false
+    t.string   "firstname",       :limit => 40
+    t.string   "lastname",        :limit => 40
+    t.string   "salt",            :limit => 40, :default => "", :null => false
+    t.integer  "verified",                      :default => 0
+    t.string   "role",            :limit => 40
+    t.string   "security_token",  :limit => 40
+    t.datetime "token_expiry"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.datetime "logged_in_at"
+    t.integer  "deleted",                       :default => 0
+    t.datetime "delete_after"
   end
 end

data/sample/login_engine/lib/login_engine/authenticated_system.rb CHANGED Viewed

@@ -1,10 +1,10 @@
 module LoginEngine
   module AuthenticatedSystem
     protected
     # overwrite this if you want to restrict access to only a few actions
-    # or if you want to check if the user has the correct rights
+    # or if you want to check if the user has the correct rights
     # example:
     #
     #  # only allow nonbobs
@@ -14,10 +14,10 @@ module LoginEngine
     def authorize?(user)
        true
     end
     # overwrite this method if you only want to protect certain actions of the controller
     # example:
-    #
+    #
     #  # don't protect the login and the about method
     #  def protect?(action)
     #    if ['action', 'about'].include?(action)
@@ -29,42 +29,42 @@ module LoginEngine
     def protect?(action)
       true
     end
-    # login_required filter. add
+    # login_required filter. add
     #
     #   before_filter :login_required
     #
-    # if the controller should be under any rights management.
+    # if the controller should be under any rights management.
     # for finer access control you can overwrite
-    #
+    #
     #   def authorize?(user)
-    #
+    #
     def login_required
       if not protect?(action_name)
-        return true
+        return true
       end
       if user? and authorize?(session[:user])
         return true
       end
-      # store current location so that we can
+      # store current location so that we can
       # come back after the user logged in
       store_location
       # call overwriteable reaction to unauthorized access
       access_denied
     end
     # overwrite if you want to have special behavior in case the user is not authorized
-    # to access the current operation.
+    # to access the current operation.
     # the default action is to redirect to the login screen
     # example use :
     # a popup window might just close itself for instance
     def access_denied
       redirect_to :controller => "/user", :action => "login"
-    end
+    end
     # store current uri in  the session.
     # we can return to this location by calling return_location
     def store_location
@@ -76,7 +76,7 @@ module LoginEngine
       if session['return-to'].nil?
         redirect_to default
       else
-        redirect_to_url session['return-to']
+        redirect_to session['return-to']
         session['return-to'] = nil
       end
     end
@@ -104,10 +104,10 @@ module LoginEngine
       # Everything failed
       return false
     end
     # Returns the current user from the session, if any exists
     def current_user
       session[:user]
     end
   end
-end
+end

data/sample/login_engine/test/functional/user_controller_test.rb CHANGED Viewed

@@ -67,6 +67,7 @@ class UserControllerTest < Test::Unit::TestCase
   def test_signup
     LoginEngine::CONFIG[:use_email_notification] = true
+    LoginEngine::CONFIG[:confirm_account] = true
     ActionMailer::Base.deliveries = []

data/sample/ramaze/ramaise_amrita2.rb ADDED Viewed

@@ -0,0 +1,156 @@
+# Ramaise Amrita, the Ramaze version of Reprise, a minimal hAtom blog
+#   with Amrita2
+#
+# http://redflavor.com/reprise.rb
+# http://www.rubyinside.com/reprise-a-ruby-powered-blogging-app-in-
+#                            100-lines-including-templates-646.html
+#
+# Usage:
+#
+#   1. gem install ramaze bluecloth rubypants amrita2 -y
+#   2. mkdir entries
+#   3. vi entries/YYYY.MM.DD.Title.Goes.Here
+#   4. ruby ramaise_amrita2.rb
+%w(rubygems ramaze bluecloth rubypants amrita2).each{|lib| require lib }
+class BlogPost
+  include Amrita2::DictionaryData
+  DIR = __DIR__/:entries
+  def initialize filename
+    raise 'Invalid BlogPost filename' unless File.exists?(filename)
+    @filename, filename = filename, File.basename(filename)
+    @date = Date.strptime(filename, '%Y.%m.%d').to_s
+    @title = filename[11..-1].tr('.', ' ')
+  end
+  def body
+    RubyPants.new(BlueCloth.new(File.read(@filename)).to_html).to_html
+  end
+  def slug
+    @slug ||= title.gsub(/[^\w\s-]/, '').gsub(/\s+/, '-').downcase
+  end
+  attr_reader :date, :title
+  class << self
+    include Enumerable
+    def each
+      Dir[DIR/'*'].sort.reverse.each do |file| yield BlogPost.new(file) end
+    end
+    def [] key
+      BlogPost.find{|post| post.slug == key }
+    end
+  end
+end
+class MainController < Ramaze::Controller
+  include Amrita2
+  TITLE = 'Ramaise with Amrita2 BLOG'
+  AUTHOR = { :name => 'Taku Nakajima', :url => 'http://retro.brain-tokyo.net' }
+  engine :Amrita2
+  def index slug = nil
+    title = nil
+    if slug.nil?
+      @posts = BlogPost.collect
+      raise Ramaze::Error::NoAction,
+            'No blog posts found, create
+             entries/YYYY.MM.DD.My.First.Blog.Post' unless @posts.any?
+    else
+      raise Ramaze::Error::NoAction,
+           'Invalid blog post' unless post = BlogPost[slug]
+      post = BlogPost[slug]
+      title = post.title
+      @posts = [ post ]
+    end
+    title_hook = Amrita2::Core::Hook.new do
+      if title
+        render_child(:post_title, :href=>'/', :text=>title)
+      else
+        render_child(:index_title, :text=>TITLE)
+      end
+    end
+    @data = binding
+    %(
+      <<h1 :title_hook | AcceptData[:hook] <
+        <<a :post_title | Attr[:href] <
+          <<:text>>
+        <<span :index_title <
+          <<:text>>
+      <<div.hentry :posts <
+        <<h2 { :url=> '/' + $_.slug } <
+          <<abbr.updated title="$1" :| Eval["Time.parse($_.date).iso8601", :date] <
+            $2
+          <<a.entry-title href="$1" rel="bookmark" :| NVar[:url, :title] <
+            $2
+        <<div.entry-content :body | NoSanitize >>
+    )
+  end
+  def error
+    title = "#{TITLE}: Resource not found"
+    message = Ramaze::Dispatcher::Error.current.message + '.'
+    go_back = {
+      :href => '/',
+      :body => 'the front page.'
+    }
+    @data = binding
+    %(
+      <<h1 :title>>
+      <<h2 :message>>
+      Go back to the
+      <<a :go_back | Attr[:href, :body] >>
+    )
+  end
+  def layout
+    @data = binding
+    %(
+      <<html<
+        <<head<
+          <<title<
+            %= TITLE
+            %= ': ' + @title if @title
+          <<style type='text/css'<
+            body {
+              font-size: 90%;
+              line-height: 1.4;
+              width: 94%;
+              margin: auto;
+            }
+            abbr { border: 0; }
+            .entry-content {
+              -moz-column-width: 30em;
+              -moz-column-gap: 1.5em;
+              -webkit-column-width: 30em;
+              -webkit-column-gap: 1.5em;
+            }
+            h2 { border-bottom: 0.05em solid #999; }
+        <<body<
+          <<:content | NoSanitize >>
+          <<address.author.vcard <
+            <<a.url.fn :AUTHOR | Attr[:href=>:url, :body=>:name]>>
+    )
+  end
+  layout :layout
+end
+Ramaze.start :sessions => false #, :adapter => :mongrel, :port => 3000

data/specs/attribute.rb CHANGED Viewed

@@ -83,6 +83,17 @@ context "Attribute" do
     end
   end
+  specify "key with space" do
+    t = Amrita2::Template.new(%[<div><a am:src="aaa" am:filter="Attr[:body=>true, :href=>:'my url']">aaa</a></div>])
+    t.test_with(:aaa => {
+                    :"my url"=>"http://amrita2.rubyforge.org/",
+                    :body=>"Amrita"
+                  }
+                  ) do |r|
+      r.should_be_samexml_as '<div><a href="http://amrita2.rubyforge.org/">Amrita</a></div>'
+    end
+  end
   specify "change body key" do
     t = Amrita2::Template.new('<div><a am:src="aaa|Attr[:href=>:url, :body=>:text]">aaa</a></div>')
     t.test_with(:aaa => {

data/specs/datatypes.rb CHANGED Viewed

@@ -40,6 +40,19 @@ context "DictionaryData" do
     def self.aaa; 'Amrita2';end;
     @t.render_with(binding).should_be_samexml_as('Amrita2')
   end
+  specify "Accepts key contains spaces" do
+    t = Amrita2::Template.new('<span am:src="key with space" />')
+    result = "Amrita2"
+    t.render_with(:"key with space"=>'Amrita2').should_be_samexml_as("Amrita2")
+  end
+  specify "Accepts key contains not-word-character" do
+    t = Amrita2::Template.new('<span am:src="Time.local(2008,1,23,9,23,12)" />')
+    t.render_with(binding).should_be_samexml_as("Wed Jan 23 09:23:12 +0900 2008")
+    t = Amrita2::Template.new('<span am:src="Amrita2::Version::STRING" />')
+    t.render_with(binding).should_be_samexml_as(Amrita2::Version::STRING)
+  end
 end
 context "NullObject" do