c3s 0.2.3 → 0.2.4

data/Manifest

@@ -1,7 +1,6 @@
 Manifest
 README.rdoc
 Rakefile
-c3s.gemspec
 lib/c3s.rb
 lib/c3s_logger.rb
 lib/component.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('c3s', '0.2.3') do |p|
+Echoe.new('c3s', '0.2.4') do |p|
   p.description    = "C3s library gem."
   p.url            = "http://github.com/rikas/c3s"
   p.author         = "Ricardo Otero"

data/c3s.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{c3s}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ricardo Otero"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{C3s library gem.}
   s.email = %q{oterosantos@gmail.com}
   s.extra_rdoc_files = ["README.rdoc", "lib/c3s.rb", "lib/c3s_logger.rb", "lib/component.rb", "lib/component_connection.rb", "lib/configreader.rb", "lib/databaseadapter.rb", "lib/model.rb", "lib/nodetracker.rb", "lib/publisher.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "c3s.gemspec", "lib/c3s.rb", "lib/c3s_logger.rb", "lib/component.rb", "lib/component_connection.rb", "lib/configreader.rb", "lib/databaseadapter.rb", "lib/model.rb", "lib/nodetracker.rb", "lib/publisher.rb"]
+  s.files = ["Manifest", "README.rdoc", "Rakefile", "lib/c3s.rb", "lib/c3s_logger.rb", "lib/component.rb", "lib/component_connection.rb", "lib/configreader.rb", "lib/databaseadapter.rb", "lib/model.rb", "lib/nodetracker.rb", "lib/publisher.rb", "c3s.gemspec"]
   s.homepage = %q{http://github.com/rikas/c3s}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "C3s", "--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/lib/model.rb

@@ -1,65 +1,63 @@
 require 'active_record'
 
-module C3s
-  class Model < ActiveRecord::Base
-    ##
-    # Attributes ignored and not included on model xml by default
-    IGNORE_ATTR = ["created_at", "updated_at", "id", "jid"]
-    
-    ##
-    # Updates multiple attributes at once
-    # attributes:: [Hash] the attributes hash
-    def update_attributes(attributes={})
-      self.send(:attributes=, attributes, false)
-    end
-    
-    ##
-    # Returns the class name for this model without module name
-    def _class_name
-      @class_name ||= self.class.name.split("::").last.downcase
-    end
-    
-    ##
-    # Gets the model nodes hash
-    def self.nodes
-      nodes = self.attributes
-      nodes.each do |key, val|
-        if IGNORE_ATTR.include?(key) or key.match(/.+_id/)
-          nodes.delete(key)
-        end
-      end
-      nodes.keys
-    end
-    
-    ##
-    # Gets the model xml to include in a packet.
-    # options:: [Hash] options
-    def to_xml(options={})
-      xml = first_element(options)
-      self.attributes.each do |key, val|
-        if !IGNORE_ATTR.include?(key) && !key.match(/.+_id/)
-          xml.add REXML::Element.new(key).add_text(value.to_s)
-        end
+module C3sModel
+  ##
+  # Attributes ignored and not included on model xml by default
+  IGNORE_ATTR = ["created_at", "updated_at", "id", "jid"]
+  
+  ##
+  # Updates multiple attributes at once
+  # attributes:: [Hash] the attributes hash
+  def update_attributes(attributes={})
+    self.send(:attributes=, attributes, false)
+  end
+  
+  ##
+  # Returns the class name for this model without module name
+  def _class_name
+    @class_name ||= self.class.name.split("::").last.downcase
+  end
+  
+  ##
+  # Gets the model nodes hash
+  def nodes
+    nodes = self.attributes
+    nodes.each do |key, val|
+      if IGNORE_ATTR.include?(key) or key.match(/.+_id/)
+        nodes.delete(key)
       end
-      xml
     end
-    
-    ##
-    # Returns the first element for the model xml
-    def first_element(options={})
-      if options[:parent]
-        first = options[:parent]
-      else
-        name = self._class_name
-        name = name.pluralize if options[:plural]
-        first = REXML::Element.new(name)
+    nodes.keys
+  end
+  
+  ##
+  # Gets the model xml to include in a packet.
+  # options:: [Hash] options
+  def to_xml(options={})
+    xml = first_element(options)
+    self.attributes.each do |key, val|
+      if !IGNORE_ATTR.include?(key) && !key.match(/.+_id/)
+        xml.add REXML::Element.new(key).add_text(value.to_s)
       end
     end
-    
-    ##
-    # Returns a default namespace based on class name
-    def xmlns
-      "http://c3s.hng.av.it.pt/#{self._class_name}"
+    xml
+  end
+  
+  ##
+  # Returns the first element for the model xml
+  def first_element(options={})
+    if options[:parent]
+      first = options[:parent]
+    else
+      name = self._class_name
+      name = name.pluralize if options[:plural]
+      first = REXML::Element.new(name)
     end
   end
+  
+  ##
+  # Returns a default namespace based on class name
+  def xmlns
+    "http://c3s.hng.av.it.pt/#{self._class_name}"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: c3s
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Ricardo Otero
@@ -34,7 +34,6 @@ files:
 - Manifest
 - README.rdoc
 - Rakefile
-- c3s.gemspec
 - lib/c3s.rb
 - lib/c3s_logger.rb
 - lib/component.rb
@@ -44,6 +43,7 @@ files:
 - lib/model.rb
 - lib/nodetracker.rb
 - lib/publisher.rb
+- c3s.gemspec
 has_rdoc: true
 homepage: http://github.com/rikas/c3s
 licenses: []