RubyGems - rhodes - Versions diffs - 0.2.1 → 0.2.2 - Mend

rhodes 0.2.1 → 0.2.2

Files changed (13) hide show

data/History.txt +6 -0
data/Manifest.txt +1 -2
data/generators/templates/application/layout.erb +3 -3
data/lib/date/format.rb +4 -4
data/lib/rhodes.rb +5 -1
data/lib/rhom/rhom_db_adapterME.rb +3 -1
data/lib/rhom/rhom_object_factory.rb +24 -24
data/lib/rhom/rhom_source.rb +54 -0
data/lib/time.rb +5 -8
data/spec/rho_spec.rb +1 -1
metadata +3 -4
data/lib/rho/settings_controller.rb +0 -23
data/spec/settings_controller_spec.rb +0 -49

data/History.txt CHANGED Viewed

@@ -1,3 +1,9 @@
+== 0.2.2 2009-01-23
+ * fixed bug in layout.erb template
+== 0.2.1 2009-01-20
+ * adding new layout framework to generator [#45]
 == 0.2.0 2009-01-07
  * releasing 0.2 version of gem
  * fixed sqlite3-ruby 1.2.4 dependency [#147]

data/Manifest.txt CHANGED Viewed

@@ -32,7 +32,6 @@ lib/rho/rhocontroller.rb
 lib/rho/rhofsconnector.rb
 lib/rho/rhosupport.rb
 lib/rho/rhoviewhelpers.rb
-lib/rho/settings_controller.rb
 lib/rhodes.rb
 lib/rhoframework.rb
 lib/rhofsconnector.rb
@@ -42,6 +41,7 @@ lib/rhom/rhom_db_adapter.rb
 lib/rhom/rhom_db_adapterME.rb
 lib/rhom/rhom_object.rb
 lib/rhom/rhom_object_factory.rb
+lib/rhom/rhom_source.rb
 lib/singleton.rb
 lib/time.rb
 rhodes.gemspec
@@ -54,7 +54,6 @@ spec/generator_spec_helper.rb
 spec/model_generator_spec.rb
 spec/rho_spec.rb
 spec/rhom_object_factory_spec.rb
-spec/settings_controller_spec.rb
 spec/source_generator_spec.rb
 spec/spec.opts
 spec/spec_helper.rb

data/generators/templates/application/layout.erb CHANGED Viewed

@@ -3,15 +3,15 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<title><%= class_name %></title>
-		<% if System::get_property('platform') == 'APPLE' %>
+		<%% if System::get_property('platform') == 'APPLE' %>
 			<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
 			<style type="text/css" media="screen">@import "/shared/js/iui/iui.css"; @import "/shared/css/rho.css";</style>
 			<script type="application/x-javascript" src="/shared/js/iui/iui.js"></script>
 			<script src="/shared/js/jquery-1.2.6.min.js"></script>
 			<script src="/shared/js/rho.js"></script>
-		<% end %>
+		<%% end %>
 	</head>
 	<body>
-		<%= @content %>
+		<%%= @content %>
 	</body>
 </html>

data/lib/date/format.rb CHANGED Viewed

@@ -298,7 +298,7 @@ class Date
       when 'w', 'Ow'; emit_n(wday, 1, f)
       when 'X', 'EX'; emit_a(strftime('%H:%M:%S'), 0, f)
       when 'x', 'Ex'; emit_a(strftime('%m/%d/%y'), 0, f)
-      when 'Y', 'EY'; emit_sn(year, 4, f)
+      when 'Y', 'EY'; emit_sn(year(), 4, f)
       when 'y', 'Ey', 'Oy'; emit_n(year % 100, 2, f)
       when 'Z'; emit_au(strftime('%:z'), 0, f)
       when /\A(:{0,3})z/
@@ -1034,7 +1034,7 @@ class Date
   def self._parse(str, comp=true)
     str = str.dup
-    e = Format::Bag.new
+    e = Date::Format::Bag.new
     e._comp = comp
@@ -1246,8 +1246,8 @@ class Date
       else
 	dst = zone.sub!(/\s+dst\z/, '')
       end
-      if Format::ZONES.include?(zone)
-	offset = Format::ZONES[zone]
+      if Date::Format::ZONES.include?(zone)
+	offset = Date::Format::ZONES[zone]
 	offset += 3600 if dst
       elsif zone.sub!(/\A(?:gmt|utc?)?([-+])/, '')
 	sign = $1

data/lib/rhodes.rb CHANGED Viewed

@@ -1,5 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
+  unless defined? Rhodes::DBVERSION
+    DBVERSION = '0.2.2'
+  end
 end

data/lib/rhom/rhom_db_adapterME.rb CHANGED Viewed

@@ -17,6 +17,8 @@
 #  You should have received a copy of the GNU General Public License
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
+require 'rhodes'
 module Rhom
   class RhomDbAdapter
@@ -26,7 +28,7 @@ module Rhom
       def open(dbfile=nil)
         puts "DB name = " + dbfile.inspect
         unless @@database or dbfile.nil?
-			db = DbAdapter.new(dbfile)
+			db = DbAdapter.new(Rhodes::DBVERSION)
 			@@database = db
         end

data/lib/rhom/rhom_object_factory.rb CHANGED Viewed

@@ -26,22 +26,24 @@ module Rhom
     def initialize
 	    unless not defined? Rho::RhoConfig::sources
-  	    init_source_attribs
+  	    ::Rhom::RhomObjectFactory::init_source_attribs
   	    init_objects
   	  end
     end
-	  def init_source_attribs
-  	  # merge source attributes into config hash
-  	  # TODO: This shouldn't reference 'source[1]' directly
-  	  Rho::RhoConfig::sources.each do |source|
-  	    src_attribs = ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME,
-  	                                                         'attrib',
-  	                                                         {"source_id"=>source[1]['source_id'].to_s},
-  	                                                         {"distinct"=>true})
-  	    # update our source with the proper attributes
-  		  source[1].merge!({"attribs"=>src_attribs})
-  	  end
+	  class << self
+	    def init_source_attribs
+    	  # merge source attributes into config hash
+    	  # TODO: This shouldn't reference 'source[1]' directly
+    	  Rho::RhoConfig::sources.each do |source|
+    	    src_attribs = ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME,
+    	                                                         'attrib',
+    	                                                         {"source_id"=>source[1]['source_id'].to_s},
+    	                                                         {"distinct"=>true})
+    	    # update our source with the proper attributes
+    		  source[1].merge!({"attribs"=>src_attribs})
+    	  end
+    	end
   	end
     # Initialize new object with dynamic attributes
@@ -103,8 +105,16 @@ module Rhom
                 # returns an array of objects based on an existing array
                 def get_list(objs)
                   new_list = []
-                  if objs and defined? Rho::RhoConfig::sources[self.name.to_s]
-                    attrib_length = Rho::RhoConfig::sources[self.name.to_s]['attribs'].length
+                  attrib_length = 0
+                  source = Rho::RhoConfig::sources[self.name.to_s]
+                  if source
+                    attrib_length = source['attribs'].length
+                  end
+                  if attrib_length == 0
+                    # source attributes are not initialized, try again
+                    ::Rhom::RhomObjectFactory::init_source_attribs
+                  end
+                  if objs and source and attrib_length > 0
                     list_length = 0
                     list_length = (objs.length / attrib_length) unless attrib_length == 0
                     new_obj = nil
@@ -129,10 +139,6 @@ module Rhom
                       end
                       new_list << new_obj
                     end
-                  else
-                    # source attributes are not initialized,
-                    # try again
-                    RhomObjectFactory::init_sources
                   end
                   new_list
                 end
@@ -210,12 +216,6 @@ module Rhom
                   # then we procede with update
                   if new_val and val != new_val
                     unless self.method_name_reserved?(method) or new_val.length == 0
-                      # update viewable list
-=begin
-                      result = ::Rhom::RhomDbAdapter::update_into_table(::Rhom::TABLE_NAME,
-                                                                {"value"=>new_val},
-                                                                {"object"=>obj, "attrib"=>method})
-=end
                       # update sync list
                       result = ::Rhom::RhomDbAdapter::insert_into_table(::Rhom::TABLE_NAME,
                                                                 {"source_id"=>self.get_inst_source_id,

data/lib/rhom/rhom_source.rb ADDED Viewed

@@ -0,0 +1,54 @@
+require 'time'
+require 'rhom/rhom_object'
+module Rhom
+  class RhomSource
+    attr_accessor :source_url
+    attr_reader   :source_id, :name, :last_updated, :last_inserted_size,
+                  :last_deleted_size, :last_sync_duration,
+                  :last_sync_success
+    def initialize(args)
+      # setup the name
+      # TODO: should really store this in the database
+      Rho::RhoConfig::sources.each do |key,value|
+        if value['source_id'].to_i == args['source_id'].to_i
+          @name = key
+        end
+      end
+      @source_id = args['source_id'].to_i
+      @source_url = args['source_url']
+      @last_updated = Time.at(args['last_updated'].to_i).to_s
+      @last_inserted_size = args['last_inserted_size'].to_i
+      @last_deleted_size = args['last_deleted_size'].to_i
+      @last_sync_duration = args['last_sync_duration'].to_i
+      @last_sync_success = args['last_sync_success'].to_i == 1 ? true : false
+    end
+    class << self
+      include RhomObject
+      def find(*args)
+        list = []
+        if args.first == :all
+          results = ::Rhom::RhomDbAdapter::select_from_table('sources', '*')
+          results.each do |result|
+            list << RhomSource.new(result)
+          end
+        else
+          result = ::Rhom::RhomDbAdapter::select_from_table('sources', '*',
+                                                            {"source_id" => strip_braces(args.first)}).first
+          list << RhomSource.new(result)
+        end
+        list.size > 1 ? list : list[0]
+      end
+    end
+    def update_attributes(params=nil)
+      if params
+        ::Rhom::RhomDbAdapter::update_into_table('sources', {"source_url"=>params['source_url']},
+                                                 {"source_id"=>strip_braces(params['source_id'])})
+      end
+    end
+  end
+end

data/lib/time.rb CHANGED Viewed

@@ -40,10 +40,7 @@
 # $Id$
 #
-if defined? RHO_ME
-else
-  require 'date/format'
-end
+require 'date/format'
 #
 # Implements the extensions to the Time class that are described in the
@@ -347,7 +344,7 @@ class Time
         else
           year += 1900
         end
-        self.utc(year, $2, $1.to_i, $4.to_i, $5.to_i, $6.to_i)
+        self.utc(year(), $2, $1.to_i, $4.to_i, $5.to_i, $6.to_i)
       elsif /\A\s*
              (?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\x20
              (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\x20
@@ -416,9 +413,9 @@ class Time
   #
   def rfc2822
     sprintf('%s, %02d %s %d %02d:%02d:%02d ',
-      RFC2822_DAY_NAME[wday],
-      day, RFC2822_MONTH_NAME[mon-1], year,
-      hour, min, sec) +
+      RFC2822_DAY_NAME[wday()],
+      day(), RFC2822_MONTH_NAME[mon()-1], year(),
+      hour(), min(), sec() ) +
     if utc?
       '-0000'
     else

data/spec/rho_spec.rb CHANGED Viewed

@@ -26,7 +26,7 @@ describe "Rho" do
   it "should populate configuration in sources table" do
     sources = Rhom::RhomDbAdapter::select_from_table('sources','*')
-    sources.size.should > 0
+    sources.size.should > 1
   end
   it "should initialize configuration only once" do

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rhodes
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Rhomobile Dev
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-01-20 00:00:00 -08:00
+date: 2009-01-23 00:00:00 -08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -139,7 +139,6 @@ files:
 - lib/rho/rhofsconnector.rb
 - lib/rho/rhosupport.rb
 - lib/rho/rhoviewhelpers.rb
-- lib/rho/settings_controller.rb
 - lib/rhodes.rb
 - lib/rhoframework.rb
 - lib/rhofsconnector.rb
@@ -149,6 +148,7 @@ files:
 - lib/rhom/rhom_db_adapterME.rb
 - lib/rhom/rhom_object.rb
 - lib/rhom/rhom_object_factory.rb
+- lib/rhom/rhom_source.rb
 - lib/singleton.rb
 - lib/time.rb
 - rhodes.gemspec
@@ -161,7 +161,6 @@ files:
 - spec/model_generator_spec.rb
 - spec/rho_spec.rb
 - spec/rhom_object_factory_spec.rb
-- spec/settings_controller_spec.rb
 - spec/source_generator_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb

data/lib/rho/settings_controller.rb DELETED Viewed

@@ -1,23 +0,0 @@
-require 'rho'
-require 'rho/rhocontroller'
-module Rho
-  class SettingsController < Rho::RhoController
-    include Rhom::RhomObject
-    def get_source(id)
-      ::Rhom::RhomDbAdapter::select_from_table('sources','*',{"source_id"=>strip_braces(id)}).first
-    end
-    def update_source(source, id)
-      if source and id
-        ::Rhom::RhomDbAdapter::update_into_table('sources',
-                                                 {"source_url"=>source['source_url']},
-                                                 {"source_id"=>strip_braces(id)})
-      end
-    end
-    def get_all_sources
-      Rho::RhoConfig::sources
-    end
-  end
-end

data/spec/settings_controller_spec.rb DELETED Viewed

@@ -1,49 +0,0 @@
-#
-#  settings_spec.rb
-#  rhodes
-#
-#  Copyright (C) 2008 Lars Burgess. All rights reserved.
-#
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rho/settings_controller'
-require File.dirname(__FILE__) + "/spec_helper"
-describe "Rho" do
-  it_should_behave_like "rho initializer"
-  before(:all) do
-    @controller = Rho::SettingsController.new
-  end
-  it "should get all sources for index" do
-    @controller.get_all_sources.size.should > 0
-  end
-  it "should retrieve source for update" do
-    @controller.get_source('{1}')['source_url'].should =~ /sources\/1/
-  end
-  it "should retrieve source without braces" do
-    @controller.get_source('1')['source_url'].should =~ /sources\/1/
-  end
-  it "should update source" do
-    @controller.update_source({'source_url'=>'http://acme.com/sources/30'},'1')
-    @controller.get_source('1')['source_url'].should == 'http://acme.com/sources/30'
-  end
-end