mls 0.2.2 → 0.2.3

data/lib/mls/properties/decimal.rb

@@ -1,7 +1,9 @@
 class MLS::Property::Decimal < MLS::Property
   
   def load(value) # from_json
-    if value.is_a?(BigDecimal)
+    if value.nil?
+			nil
+		elsif value.is_a?(BigDecimal)
       value
     else
       BigDecimal.new(value.to_s)

data/lib/mls/properties/hash.rb

@@ -0,0 +1,7 @@
+class MLS::Property::Hash < MLS::Property
+  
+  def load(value) # from_json
+    value
+  end
+
+end

data/lib/mls/resource.rb

@@ -1,6 +1,7 @@
 class MLS::Resource
 
-  attr_reader :errors, :persisted
+  attr_reader :persisted
+  attr_accessor :errors
 
   def self.inherited(subclass)
     subclass.extend(MLS::Model)
@@ -23,14 +24,42 @@ class MLS::Resource
   end
   
   def save
+    new_record? ? create : update
+  end
+
+  def save!
     new_record? ? create! : update!
   end
-  
+
+  def update!
+    update || raise(MLS::Exception::RecordInvalid)
+  end
+
+  def create!
+    create || raise(MLS::Exception::RecordInvalid)
+  end
+
+  def ==(other)
+    self.class == other.class && properties_for_comparison == other.properties_for_comparison
+  end
+
   # Properties ===================================================================================================
   
   def properties
     self.class.properties
   end
+
+  def properties_for_comparison
+    compare = {}
+    properties.reject{ |k, p| properties_excluded_from_comparison.include?(k) }.each do |k, p|
+      compare[k] = self.send(properties[k].name.to_sym)
+    end
+    compare
+  end
+
+  def properties_excluded_from_comparison
+    self.class.properties_excluded_from_comparison
+  end
   
   def set_default_values
     properties.each do |name, property|
@@ -39,7 +68,7 @@ class MLS::Resource
   end
 
   def update_attributes(attrs)
-    attrs.each { |k, v| self.send("#{k}=".to_sym, v) }
+    attrs.each { |k, v| self.send("#{k}=".to_sym, v) } unless attrs.nil?
   end
   
   # Combo Breaker ================================================================================================
@@ -48,7 +77,8 @@ class MLS::Resource
     hash = {}
     
     properties.each do |name, property|
-      serialize = property.options[:serialize] || :always
+      serialize = property.options[:serialize]
+      serialize = :always if serialize.nil?
       case serialize
       when :always
         hash[name] = property.dump(self.send(name))
@@ -66,4 +96,4 @@ class MLS::Resource
     persisted? ? [id] : nil
   end
   
-end
+end

data/lib/rdoc/generator/template/42floors/_context.rhtml

@@ -0,0 +1,209 @@
+<div id="content">
+  <% unless (description = context.description).empty? %>
+    <div class="description">
+      <%= description %>
+    </div>
+  <% end %>
+
+
+  <% unless context.requires.empty? %>
+    <!-- File only: requires -->
+    <div class="sectiontitle">Required Files</div>
+    <ul>
+      <% context.requires.each do |req| %>
+        <li><%= h req.name %></li>
+      <% end %>
+    </ul>
+  <% end %>
+
+
+  <% sections = context.sections.select { |s| s.title }.sort_by{ |s| s.title.to_s } %>
+  <% unless sections.empty? then %>
+    <!-- Sections -->
+    <div class="sectiontitle">Sections</div>
+    <ul>
+      <% sections.each do |section| %>
+        <li><a href="#<%= section.aref %>"><%= h section.title %></a></li>
+      <% end %>
+    </ul>
+  <% end %>
+
+
+  <% unless context.classes_and_modules.empty? %>
+    <!-- Namespace -->
+    <div class="sectiontitle">Namespace</div>
+    <ul>
+      <% (context.modules.sort + context.classes.sort).each do |mod| %>
+        <li>
+          <span class="type"><%= mod.type.upcase %></span>
+          <a href="<%= context.aref_to mod.path %>"><%= mod.full_name %></a>
+        </li>
+      <% end %>
+    </ul>
+  <% end %>
+
+
+  <% unless context.method_list.empty? %>
+    <!-- Method ref -->
+    <div class="sectiontitle">Methods</div>
+    <dl class="methods">
+      <% each_letter_group(context.method_list) do |group| %>
+        <dt><%= group[:name] %></dt>
+        <dd>
+          <ul>
+            <% group[:methods].each_with_index do |method, i|  %>
+              <%
+                comma = group[:methods].size == i+1 ? '' : ','
+              %>
+              <li>
+                <a href="#<%= method.aref %>"><%= h method.name %></a><%= comma %>
+              </li>
+            <% end %>
+          </ul>
+        </dd>
+      <% end %>
+    </dl>
+  <% end %>
+
+  <% unless context.includes.empty? %>
+    <!-- Includes -->
+    <div class="sectiontitle">Included Modules</div>
+    <ul>
+      <% context.includes.each do |inc| %>
+        <li>
+          <% unless String === inc.module %>
+            <a href="<%= context.aref_to inc.module.path %>">
+              <%= h inc.module.full_name %>
+            </a>
+          <% else %>
+            <%= h inc.name %>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  <% end %>
+
+
+
+  <% context.each_section do |section, constants, attributes| %>
+
+    <% if section.title then %>
+      <div class="contenttitle" id="<%= h section.aref %>">
+        <%= h section.title %>
+      </div>
+    <% end %>
+
+    <% if section.comment then %>
+      <div class="description">
+        <%= section.description %>
+      </div>
+    <% end %>
+
+    <% unless constants.empty? %>
+      <!-- Section constants -->
+      <div class="sectiontitle">Constants</div>
+      <table border='0' cellpadding='5'>
+        <% context.each_constant do |const| %>
+          <tr valign='top'>
+            <td class="attr-name"><%= h const.name %></td>
+            <td>=</td>
+            <td class="attr-value"><%= h const.value %></td>
+          </tr>
+          <% if const.comment %>
+            <tr valign='top'>
+              <td>&nbsp;</td>
+              <td colspan="2" class="attr-desc"><%= const.description.strip %></td>
+            </tr>
+          <% end %>
+        <% end %>
+      </table>
+    <% end %>
+
+
+    <% unless attributes.empty? %>
+      <!-- Section attributes -->
+      <div class="sectiontitle">Attributes</div>
+      <table border='0' cellpadding='5'>
+        <% attributes.each do |attrib| %>
+          <tr valign='top'>
+            <td class='attr-rw'>
+              [<%= attrib.rw %>]
+            </td>
+            <td class='attr-name'><%= h attrib.name %></td>
+            <td class='attr-desc'><%= attrib.description.strip %></td>
+          </tr>
+        <% end %>
+      </table>
+    <% end %>
+
+
+    <!-- Methods -->
+    <%
+      context.methods_by_type(section).each do |type, visibilities|
+        next if visibilities.empty?
+
+        visibilities.each do |visibility, methods|
+          next if methods.empty?
+    %>
+      <div class="sectiontitle"><%= type.capitalize %> <%= visibility.to_s.capitalize %> methods</div>
+      <% methods.each do |method| %>
+        <div class="method">
+          <div class="title method-title" id="<%= method.aref %>">
+            <% if method.call_seq %>
+              <a name="<%= method.aref %>"></a><b><%= method.call_seq.gsub(/->/, '&rarr;') %></b>
+            <% else %>
+              <a name="<%= method.aref %>"></a><b><%= h method.name %></b><%= h method.params %>
+            <% end %>
+          </div>
+          
+          <% if method.comment %>
+            <div class="description">
+              <%= method.description.strip %>
+            </div>
+          <% end %>
+          
+          <% unless method.aliases.empty? %>
+            <div class="aka">
+              Also aliased as: <%= method.aliases.map do |aka|
+                if aka.parent then # HACK lib/rexml/encodings
+                  %{<a href="#{context.aref_to aka.path}">#{h aka.name}</a>}
+                else
+                  h aka.name
+                end
+              end.join ", " %>
+            </div>
+          <% end %>
+          
+          <% if method.token_stream %>
+            <% markup = method.sdoc_markup_code %>
+            <div class="sourcecode">
+              <%
+                # generate github link
+                github = if options.github
+                  if markup =~ /File\s(\S+), line (\d+)/
+                    path = $1
+                    line = $2.to_i
+                  end
+                  path && github_url(path)
+                else
+                  false
+                end
+              %>
+              <p class="source-link">
+                Source: 
+                <a href="javascript:toggleSource('<%= method.aref %>_source')" id="l_<%= method.aref %>_source">show</a>
+                <% if github %>
+                  | <a href="<%= "#{github}#L#{line}" %>" target="_blank" class="github_url">on GitHub</a>
+                <% end %>
+              </p>
+              <div id="<%= method.aref %>_source" class="dyn-source">
+                <pre><%= markup %></pre>
+              </div>
+            </div>
+            <% end %>
+          </div>
+        <% end #methods.each %>
+      <% end #visibilities.each %>
+    <% end #context.methods_by_type %>
+  <% end #context.each_section %>
+</div>

data/lib/rdoc/generator/template/42floors/_head.rhtml

@@ -0,0 +1,7 @@
+<link rel="stylesheet" href="<%= "#{rel_prefix}/css/reset.css" %>" type="text/css" media="screen" />
+<link rel="stylesheet" href="<%= "#{rel_prefix}/css/main.css" %>" type="text/css" media="screen" />
+<link rel="stylesheet" href="<%= "#{rel_prefix}/css/github.css" %>" type="text/css" media="screen" />
+<script src="<%= "#{rel_prefix}/js/jquery-1.3.2.min.js" %>" type="text/javascript" charset="utf-8"></script>
+<script src="<%= "#{rel_prefix}/js/jquery-effect.js" %>" type="text/javascript" charset="utf-8"></script>
+<script src="<%= "#{rel_prefix}/js/main.js" %>" type="text/javascript" charset="utf-8"></script>
+<script src="<%= "#{rel_prefix}/js/highlight.pack.js" %>" type="text/javascript" charset="utf-8"></script>

data/lib/rdoc/generator/template/42floors/class.rhtml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title><%= h klass.full_name %></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=<%= @options.charset %>" />
+    <%= include_template '_head.rhtml', {:rel_prefix => rel_prefix} %>
+</head>
+
+<body>     
+    <div class="banner">
+        <% if ENV['HORO_PROJECT_NAME'] %>
+            <span><%= ERB::Util.html_escape(ENV['HORO_PROJECT_NAME']) %> <%= ERB::Util.html_escape(ENV['HORO_PROJECT_VERSION']) %></span><br />
+        <% end %>
+        <h1>
+            <span class="type"><%= klass.module? ? 'Module' : 'Class' %></span> 
+            <%= h klass.full_name %> 
+            <% if klass.type == 'class' %>
+                <span class="parent">&lt; 
+                    <% if String === klass.superclass %>
+                    <%= klass.superclass %>
+                    <% elsif !klass.superclass.nil? %>
+                    <a href="<%= klass.aref_to klass.superclass.path %>"><%= h klass.superclass.full_name %></a>
+                    <% end %>
+                </span>
+            <% end %>
+        </h1>
+        <ul class="files">
+            <% klass.in_files.each do |file| %>
+            <li><a href="<%= "#{rel_prefix}/#{h file.path}" %>"><%= h file.absolute_name %></a></li>
+            <% end  %>
+        </ul>
+    </div>
+    <div id="bodyContent">
+        <%= include_template '_context.rhtml', {:context => klass, :rel_prefix => rel_prefix} %>
+    </div>
+  </body>
+</html>    

data/lib/rdoc/generator/template/42floors/file.rhtml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <title><%= h file.name %></title>
+    <meta http-equiv="Content-Type" content="text/html; charset=<%= @options.charset %>" />
+    <%= include_template '_head.rhtml', {:rel_prefix => rel_prefix} %>
+</head>
+
+<body>     
+    <div class="banner">
+        <% if ENV['HORO_PROJECT_NAME'] %>
+            <span><%= ERB::Util.html_escape(ENV['HORO_PROJECT_NAME']) %> <%= ERB::Util.html_escape(ENV['HORO_PROJECT_VERSION']) %></span><br />
+        <% end %>
+        <h1>
+            <%= h file.name %>
+        </h1>
+        <ul class="files">
+            <% github = github_url(file.relative_name) if options.github %>
+            <li>
+                <%= h file.relative_name %>
+                <% if github %>
+                    <a href="<%= github %>" target="_blank" class="github_url">on GitHub</a>
+                <% end %>
+            </li>
+            <li>Last modified: <%= file.file_stat.mtime %></li>
+        </ul>
+    </div>
+
+    <div id="bodyContent">
+        <%= include_template '_context.rhtml', {:context => file, :rel_prefix => rel_prefix} %>
+    </div>
+  </body>
+</html>

data/lib/rdoc/generator/template/42floors/index.rhtml

@@ -0,0 +1,13 @@
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">    
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=<%= @options.charset %>" />
+    <title><%= @options.title %></title>
+</head>
+<frameset cols="300,*" frameborder="1" border="1" bordercolor="#999999" framespacing="1">
+    <frame src="panel/index.html" title="Search" name="panel" />
+    <frame src="<%= index_path %>" name="docwin" />
+</frameset>
+</html>

data/lib/rdoc/generator/template/42floors/resources/css/github.css

@@ -0,0 +1,129 @@
+/*
+
+github.com style (c) Vasily Polovnyov <vast@whiteants.net>
+
+*/
+
+pre code {
+  display: block; padding: 0.5em;
+  color: #000;
+  background: #f8f8ff
+}
+
+pre .comment,
+pre .template_comment,
+pre .diff .header,
+pre .javadoc {
+  color: #998;
+  font-style: italic
+}
+
+pre .keyword,
+pre .css .rule .keyword,
+pre .winutils,
+pre .javascript .title,
+pre .lisp .title,
+pre .subst {
+  color: #000;
+  font-weight: bold
+}
+
+pre .number,
+pre .hexcolor {
+  color: #40a070
+}
+
+pre .string,
+pre .tag .value,
+pre .phpdoc,
+pre .tex .formula {
+  color: #d14
+}
+
+pre .title,
+pre .id {
+  color: #900;
+  font-weight: bold
+}
+
+pre .javascript .title,
+pre .lisp .title,
+pre .subst {
+  font-weight: normal
+}
+
+pre .class .title,
+pre .haskell .label,
+pre .tex .command {
+  color: #458;
+  font-weight: bold
+}
+
+pre .tag,
+pre .tag .title,
+pre .rules .property,
+pre .django .tag .keyword {
+  color: #000080;
+  font-weight: normal
+}
+
+pre .attribute,
+pre .variable,
+pre .instancevar,
+pre .lisp .body {
+  color: #008080
+}
+
+pre .regexp {
+  color: #009926
+}
+
+pre .class {
+  color: #458;
+  font-weight: bold
+}
+
+pre .symbol,
+pre .ruby .symbol .string,
+pre .ruby .symbol .keyword,
+pre .ruby .symbol .keymethods,
+pre .lisp .keyword,
+pre .tex .special,
+pre .input_number {
+  color: #990073
+}
+
+pre .builtin,
+pre .built_in,
+pre .lisp .title {
+  color: #0086b3
+}
+
+pre .preprocessor,
+pre .pi,
+pre .doctype,
+pre .shebang,
+pre .cdata {
+  color: #999;
+  font-weight: bold
+}
+
+pre .deletion {
+  background: #fdd
+}
+
+pre .addition {
+  background: #dfd
+}
+
+pre .diff .change {
+  background: #0086b3
+}
+
+pre .chunk {
+  color: #aaa
+}
+
+pre .tex .formula {
+  opacity: 0.5;
+}