rhodes 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,6 @@
+== 0.1.1 2008-11-18
+* Fixed template application name
+
 == 0.1.0 2008-11-18
 
 * 1 major enhancement:

data/Rakefile

@@ -15,6 +15,9 @@ $hoe = Hoe.new('rhodes', Rhodes::VERSION) do |p|
     ['sqlite3-ruby','>= 1.2.4'],
     ['rcov'],
     ['rspec'],
+    ['templater'],
+    ['diff-lcs'],
+    ['extlib']
   ]
   p.extra_dev_deps = [
     ['newgem', ">= #{::Newgem::VERSION}"]

data/generators/templates/application/application.rb

@@ -1,4 +1,4 @@
 require 'rho/rhoapplication'
 
-class <%= class_name %> < Rho::RhoApplication
+class <%= class_name %>Application < Rho::RhoApplication
 end

data/lib/rho/render.rb

@@ -2,6 +2,9 @@ require 'erb'
 	
 module Rho
   class RhoController
+	def self.renderfile(filename)
+		ERB.new(IO.read(filename)).result(binding)
+	end
     def render(view)
 		ERB.new(IO.read(@request[:modelpath]+view.to_s+'.erb')).result(binding)
     end

data/lib/rho/renderME.rb

@@ -1,6 +1,9 @@
 
 module Rho
   class RhoController
+	def self.renderfile(filename)
+		eval(filename+'_erb', binding)
+	end  
     def render(view)
 		eval(@request[:modelpath]+view.to_s+'_erb', binding )
     end

data/lib/rho/rho.rb

@@ -1,4 +1,9 @@
 require 'time'
+if defined? RHO_ME
+	require 'rho/renderME'
+else
+	require 'rho/render'
+end
 require 'rho/rhoapplication'
 require 'rhom'
 require 'rhofsconnector'
@@ -32,10 +37,10 @@ module Rho
     
     # setup the sources table and model attributes for all applications
     def init_sources
-      if defined? Rho::RhoConfig::sources
+      puts 'sources initialized? ' + self.sources_initialized?.inspect
+      if defined? Rho::RhoConfig::sources and not self.sources_initialized?
         Rhom::RhomDbAdapter::delete_all_from_table('sources')
         src_attribs = []
-        attribs_empty = false
         
         # quick and dirty way to get unique array of hashes
         uniq_sources = Rho::RhoConfig::sources.values.inject([]) { |result,h| 
@@ -51,6 +56,10 @@ module Rho
         end
       end
     end
+    
+    def sources_initialized?
+      Rhom::RhomDbAdapter::select_from_table('sources','*').size > 0 ? true : false
+    end
 	
     def get_app(appname)
       if (APPLICATIONS[appname].nil?)
@@ -82,6 +91,17 @@ module Rho
 		end	
     end
 	
+	def serve_index(index_name)
+		begin
+			puts 'inside RHO.serve_index: ' + index_name
+			res = init_response
+			res['request-body'] = RhoController::renderfile(index_name)
+			return send_response(res)
+		rescue Exception => e
+			return send_error(e.message,500,true)
+		end
+	end
+	
     def init_response(status=200,message="OK",body="")
       res = Hash.new
       res['status'] = status

data/lib/rhodes.rb

@@ -1,5 +1,5 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
-end
+end

data/lib/rhom/rhom_object_factory.rb

@@ -87,7 +87,7 @@ module Rhom
                     obj = strip_braces(args.first.to_s)
                     result = ::Rhom::RhomDbAdapter::select_from_table(::Rhom::TABLE_NAME,
                                                               '*',
-                                                              {"object"=>obj})
+                                                              {"object"=>obj,"update_type"=>'query'})
                   end
                   list = get_list(result)
                   if list.length == 1

data/spec/rho_spec.rb

@@ -21,8 +21,24 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require File.dirname(__FILE__) + "/spec_helper"
 
 describe "Rho" do
+  
+  it_should_behave_like "rho initializer"
 
   it "should populate configuration in sources table" do
-    pending 'somebody should implement this!'
+    sources = Rhom::RhomDbAdapter::select_from_table('sources','*')
+    puts 'sources: ' + sources.inspect
+    
+    sources.size.should == 3
+  end
+  
+  it "should initialize configuration only once" do
+    Rhom::RhomDbAdapter::delete_all_from_table('sources')
+    @rho.sources_initialized?.should == false
+    @rho.init_sources
+    @rho.sources_initialized?.should == true
+  end
+  
+  it "should serve request" do
+    pending "need to mock request"
   end
 end

data/spec/rhom_object_factory_spec.rb

@@ -19,19 +19,8 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
 describe "RhomObjectFactory" do
-  
-  attr_accessor :rhom, :rho
-  
-  before(:all) do
-    FileUtils.mkdir_p('build')
-    FileUtils.cp_r('spec/syncdbtest.sqlite','build/syncdbtest.sqlite')
-    Rho::RhoConfig::add_source("Account", {"url"=>"http://rhosync.rhomobile.com/sources/1", "source_id"=>1})
-    Rho::RhoConfig::add_source("Case", {"url"=>"http://rhosync.rhomobile.com/sources/1", "source_id"=>2})
-    Rho::RhoConfig::add_source("Employee", {"url"=>"http://rhosync.rhomobile.com/sources/1", "source_id"=>3})
-    Object::const_set("SYNC_DB_FILE", "../../build/syncdbtest.sqlite") unless defined? SYNC_DB_FILE
-    @rho = Rho::RHO.new(File.dirname(__FILE__) + "/../../../apps/")
-    @rhom = Rhom::RhomObjectFactory.new
-  end
+
+  it_should_behave_like "rho initializer"
   
   before(:each) do
     FileUtils.cp_r('spec/syncdbtest.sqlite','build/syncdbtest.sqlite')
@@ -42,16 +31,6 @@ describe "RhomObjectFactory" do
     @rhom = nil
   end
   
-  after(:all) do
-    FileUtils.rm_rf('build')
-  end
-  
-  def array_print(arr)
-    arr.each_with_index do |x,i|
-      puts "arr[#{i}] = #{x.inspect}"
-    end
-  end
-  
   it "should set source_id attributes" do
     "1".should == Account.get_source_id
     "2".should == Case.get_source_id
@@ -93,6 +72,13 @@ describe "RhomObjectFactory" do
     "Mirapath".should == results[4].name
   end
   
+  it "should have correct number of attributes" do
+    @account = Account.find(:all).first
+    
+    # expecting name, industry, update_type, object, source_id
+    @account.instance_variables.size.should == 5
+  end
+  
   it "should calculate same djb_hash" do
     vars = {"name"=>"foobarthree", "industry"=>"entertainment"}
     account = Account.new(vars)
@@ -104,7 +90,7 @@ describe "RhomObjectFactory" do
     @account1 = Account.new(vars)
     new_id = @account1.object
     @account1.save
-    @account2 = Account.find(new_id).first
+    @account2 = Account.find(new_id)
     @account2.object.should =="{#{@account1.object}}"
     @account2.name.should == vars['name']
     @account2.industry.should == vars['industry']

data/spec/spec_helper.rb

@@ -11,4 +11,31 @@ $:.unshift(File.join(File.dirname(__FILE__), '..'))
 # Use the rubygem for local testing
 require 'spec/stubs'
 require 'rho/rho'
-require 'rhom/rhom'
+require 'rho/settings_controller'
+require 'rhom/rhom'
+
+describe "rho initializer", :shared => true do
+
+  attr_accessor :rhom, :rho
+
+  before(:all) do
+    FileUtils.mkdir_p('build')
+    FileUtils.cp_r('spec/syncdbtest.sqlite','build/syncdbtest.sqlite')
+    Rho::RhoConfig::add_source("Account", {"url"=>"http://rhosync.rhohub.com/sources/1", "source_id"=>1})
+    Rho::RhoConfig::add_source("Case", {"url"=>"http://rhosync.rhohub.com/sources/2", "source_id"=>2})
+    Rho::RhoConfig::add_source("Employee", {"url"=>"http://rhosync.rhohub.com/sources/3", "source_id"=>3})
+    Object::const_set("SYNC_DB_FILE", "../../build/syncdbtest.sqlite") unless defined? SYNC_DB_FILE
+    @rho = Rho::RHO.new(File.dirname(__FILE__) + "/../../../apps/")
+    @rhom = Rhom::RhomObjectFactory.new
+  end
+
+  after(:all) do
+    FileUtils.rm_rf('build')
+  end
+
+  def array_print(arr)
+    arr.each_with_index do |x,i|
+      puts "arr[#{i}] = #{x.inspect}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Rhomobile Dev
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-25 00:00:00 -08:00
+date: 2008-12-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,36 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: templater
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: extlib
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: newgem
   type: :development