rhodes 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,10 @@
+== 0.1.3 2008-12-11
+* Updated source_adapter generator to have base class
+* fixed #50, removed dependency on Find library
+
+== 0.1.2 2008-12-09
+* Added rhogen source <MySourceAdapter>
+
 == 0.1.1 2008-11-18
 * Fixed template application name
 

data/Manifest.txt

@@ -19,7 +19,6 @@ lib/builtinME.rb
 lib/date.rb
 lib/date/format.rb
 lib/erb.rb
-lib/find.rb
 lib/rational.rb
 lib/rho.rb
 lib/rho/render.rb

data/generators/templates/source/source_adapter.rb

@@ -1,38 +1,35 @@
-class <%=name%> 
-  attr_accessor :client
+class <%=name%> < SourceAdapter
   
   def initialize(source)
-    @source=source
+    super
   end
 
   def login
+    #TODO: Write some code here
   end
 
   def query
+    # TODO: write some code here
   end
 
   def sync
-    @result.entry_list.each do |x|
-      x.name_value_list.each do |y|
-        o=ObjectValue.new
-        o.source_id=@source.id
-        o.object=x['id']
-        o.attrib=y.name
-        o.value=y.value
-        o.save
-      end
-    end
+    # usually the generic base class sync does the job
+    super
   end
 
   def create(name_value_list)
+    #TODO: write some code here
   end
 
   def update(name_value_list)
+    #TODO: write some code here
   end
 
   def delete(name_value_list)
+    #TODO: write some code here if applicable
   end
 
   def logoff
+    #TODO: write some code here if applicable
   end
 end

data/lib/rho/rho.rb

@@ -12,13 +12,13 @@ module Rho
   class RHO
     APPLICATIONS = {}
 	
-    def initialize(app_base_path=nil)
+    def initialize(app_manifest_filename=nil)
       puts "Calling RHO.initialize"
       Rhom::RhomDbAdapter::open(Rho::RhoFSConnector::get_db_fullpathname)
-      if app_base_path
-        process_model_dirs(app_base_path)
+      if app_manifest_filename
+        process_model_dirs(app_manifest_filename)
       else
-        process_model_dirs(RhoApplication::get_base_app_path)
+        process_model_dirs(Rho::RhoFSConnector::get_app_manifest_filename)
       end
       init_sources
     end
@@ -29,17 +29,15 @@ module Rho
     end
     
     # Return the directories where we need to load configuration files
-    def process_model_dirs(app_base_path=nil)
-      Rho::RhoFSConnector::enum_files(app_base_path,'config.rb') do |path|
-        require path
+    def process_model_dirs(app_manifest_filename=nil)
+      File.open(app_manifest_filename).each do |line|
+        require File.join(File.dirname(app_manifest_filename), line.chop)
       end
     end
     
     # setup the sources table and model attributes for all applications
     def init_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')
+      if defined? Rho::RhoConfig::sources
         src_attribs = []
         
         # quick and dirty way to get unique array of hashes
@@ -47,22 +45,27 @@ module Rho
           result << h unless result.include?(h); result
         }
 		
-        # generate unique source list in databse for sync
+        # generate unique source list in database for sync
         uniq_sources.each do |source|
+          
           src_id = source['source_id']
           url = source['url']
-          Rhom::RhomDbAdapter::insert_into_table('sources',
-                                                 {"source_id"=>src_id,"source_url"=>url})
+          if !self.source_initialized?(src_id)
+            puts "initializing source #{src_id}..."
+            Rhom::RhomDbAdapter::insert_into_table('sources',
+                                                  {"source_id"=>src_id,"source_url"=>url})
+          end
         end
       end
     end
     
-    def sources_initialized?
-      Rhom::RhomDbAdapter::select_from_table('sources','*').size > 0 ? true : false
+    def source_initialized?(source_id)
+      Rhom::RhomDbAdapter::select_from_table('sources','*', 'source_id'=>source_id).size > 0 ? true : false
     end
 	
     def get_app(appname)
       if (APPLICATIONS[appname].nil?)
+        puts "app require: #{RhoApplication::get_app_path(appname)+'application'}"
         require RhoApplication::get_app_path(appname)+'application'
         APPLICATIONS[appname] = Object.const_get(appname+'Application').new
       end

data/lib/rho/rhofsconnector.rb

@@ -1,5 +1,3 @@
-require 'find'
-
 module Rho
   class RhoFSConnector
 
@@ -12,6 +10,10 @@ module Rho
       def get_base_app_path
         File.join(File.dirname(File.expand_path(__FILE__)), '../../apps/')
       end
+      
+      def get_app_manifest_filename
+        File.join(File.dirname(File.expand_path(__FILE__)), '../../apps/app_manifest.txt')
+      end
 
       def get_model_path(appname, modelname)
         File.join(File.dirname(File.expand_path(__FILE__)), '../../apps/'+appname+'/'+modelname+'/')
@@ -24,15 +26,6 @@ module Rho
   			  File.join(File.dirname(File.expand_path(__FILE__)), '../../db/syncdb.sqlite')
   		  end
   	  end
-	  
-  	  def enum_files(paths, filename) # :yield: path
-  		  Find.find(paths) do |path| 
-  		    if File.basename(path) == filename
-  		      yield path
-  		    end
-  		  end
-  	  end
-		  
     end
 
   end # RhoApplication

data/lib/rho/rhofsconnectorME.rb

@@ -11,6 +11,10 @@ module Rho
       def get_base_app_path
 	      'apps/'  
       end
+      
+      def get_app_manifest_filename
+        get_base_app_path+'app_manifest.txt'
+      end
 
       def get_model_path(appname, modelname)
 		    'apps/'+appname+'/'+modelname+'/'  
@@ -23,14 +27,6 @@ module Rho
   			  'syncdb_.dbs'
   		  end
   	  end
-	  
-      def enum_files(paths, filename) # :yield: path
-		yield get_app_path('Rhosugar/Account') + filename
-		yield get_app_path('Rhosugar/Case') + filename  
-		yield get_app_path('Rhosugar/Employee') + filename  
-  	  end
-		  
     end
-
   end # RhoApplication
 end # Rho

data/lib/rhodes.rb

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

data/lib/rhom/rhom_db_adapter.rb

@@ -71,7 +71,7 @@ module Rhom
             SyncEngine::unlock_sync_mutex
           end
         end
-        puts "returned #{result.length.to_s} records..."
+        #puts "returned #{result.length.to_s} records..."
         result
       end
     

data/spec/app_generator_spec.rb

@@ -10,6 +10,12 @@ describe Rhogen::AppGenerator do
     }.should raise_error(::Templater::TooFewArgumentsError)
   end
   
+  
+  it "should generate class_name" do
+    @generator = Rhogen::AppGenerator.new('/tmp', {}, 'Class-With-Hyphens')
+    @generator.class_name.should == 'ClassWithHyphens'
+  end
+  
   before do
     @generator = Rhogen::AppGenerator.new('/tmp', {}, app_name)
   end

data/spec/model_generator_spec.rb

@@ -12,7 +12,15 @@ describe Rhogen::ModelGenerator do
   end
 
   before do
-    @generator = Rhogen::ModelGenerator.new('/tmp', {}, model_name, "http://something.com/sources/5", 5)
+    @generator = Rhogen::ModelGenerator.new('/tmp', {}, model_name, "http://something.com/sources/5", 5, "name,industry,address")
+  end
+  
+  it "should have attributes" do
+    @generator.attributes?.should == true
+  end
+  
+  it "should have all attributes" do
+    @generator.attributes.should == ['name', 'industry', 'address']
   end
 
   it "should create config.rb, controller.rb, index.erb, edit.erb, and new.erb files" do

data/spec/rho_spec.rb

@@ -31,9 +31,13 @@ describe "Rho" do
   
   it "should initialize configuration only once" do
     Rhom::RhomDbAdapter::delete_all_from_table('sources')
-    @rho.sources_initialized?.should == false
+    @rho.source_initialized?(1).should == false
     @rho.init_sources
-    @rho.sources_initialized?.should == true
+    @rho.source_initialized?(1).should == true
+  end
+  
+  it "should return from get_app" do
+    pending "fix relative paths for testing of get_app"
   end
   
   it "should serve request" do

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ describe "rho initializer", :shared => true do
     FileUtils.mkdir_p('build')
     FileUtils.cp_r('spec/syncdbtest.sqlite','build/syncdbtest.sqlite')
     Object::const_set("SYNC_DB_FILE", "../../build/syncdbtest.sqlite") unless defined? SYNC_DB_FILE
-    @rho = Rho::RHO.new(File.dirname(__FILE__) + "/../../../apps/")
+    @rho = Rho::RHO.new(File.join(File.dirname(File.expand_path(__FILE__)), '../../../apps/app_manifest.txt'))
     @rhom = Rhom::RhomObjectFactory.new
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Rhomobile Dev
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-09 00:00:00 -08:00
+date: 2008-12-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -125,7 +125,6 @@ files:
 - lib/date.rb
 - lib/date/format.rb
 - lib/erb.rb
-- lib/find.rb
 - lib/rational.rb
 - lib/rho.rb
 - lib/rho/render.rb

data/lib/find.rb

@@ -1,81 +0,0 @@
-#
-# find.rb: the Find module for processing all files under a given directory.
-#
-
-#
-# The +Find+ module supports the top-down traversal of a set of file paths.
-#
-# For example, to total the size of all files under your home directory,
-# ignoring anything in a "dot" directory (e.g. $HOME/.ssh):
-#
-#   require 'find'
-#
-#   total_size = 0
-#
-#   Find.find(ENV["HOME"]) do |path|
-#     if FileTest.directory?(path)
-#       if File.basename(path)[0] == ?.
-#         Find.prune       # Don't look any further into this directory.
-#       else
-#         next
-#       end
-#     else
-#       total_size += FileTest.size(path)
-#     end
-#   end
-#
-module Find
-
-  #
-  # Calls the associated block with the name of every file and directory listed
-  # as arguments, then recursively on their subdirectories, and so on.
-  #
-  # See the +Find+ module documentation for an example.
-  #
-  def find(*paths) # :yield: path
-    block_given? or return enum_for(__method__, *paths)
-
-    paths.collect!{|d| raise Errno::ENOENT unless File.exist?(d); d.dup}
-    while file = paths.shift
-      catch(:prune) do
-	yield file.dup.taint
-        next unless File.exist? file
-	begin
-	  if File.lstat(file).directory? then
-	    d = Dir.open(file)
-	    begin
-	      for f in d
-		next if f == "." or f == ".."
-		if File::ALT_SEPARATOR and file =~ /^(?:[\/\\]|[A-Za-z]:[\/\\]?)$/ then
-		  f = file + f
-		elsif file == "/" then
-		  f = "/" + f
-		else
-		  f = File.join(file, f)
-		end
-		paths.unshift f.untaint
-	      end
-	    ensure
-	      d.close
-	    end
-	  end
-       rescue Errno::ENOENT, Errno::EACCES
-	end
-      end
-    end
-  end
-
-  #
-  # Skips the current file or directory, restarting the loop with the next
-  # entry. If the current file is a directory, that directory will not be
-  # recursively entered. Meaningful only within the block associated with
-  # Find::find.
-  #
-  # See the +Find+ module documentation for an example.
-  #
-  def prune
-    throw :prune
-  end
-
-  module_function :find, :prune
-end