rhodes 0.1.1 → 0.1.2

data/Manifest.txt

@@ -12,6 +12,7 @@ generators/templates/model/controller.rb
 generators/templates/model/edit.erb
 generators/templates/model/index.erb
 generators/templates/model/new.erb
+generators/templates/source/source_adapter.rb
 lib/ServeME.rb
 lib/TestServe.rb
 lib/builtinME.rb
@@ -29,6 +30,7 @@ lib/rho/rhocontroller.rb
 lib/rho/rhofsconnector.rb
 lib/rho/rhofsconnectorME.rb
 lib/rho/rhosupport.rb
+lib/rho/settings_controller.rb
 lib/rhodes.rb
 lib/rhofsconnector.rb
 lib/rhom.rb
@@ -45,6 +47,8 @@ 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
 spec/stubs.rb

data/generators/rhogen.rb

@@ -93,7 +93,28 @@ module Rhogen
     
   end
   
+  class SourceGenerator < BaseGenerator
+    def self.source_root
+      File.join(File.dirname(__FILE__), 'templates', 'source')
+    end
+    
+    desc <<-DESC
+      Generates a new source adapter with the given name and attributes.  You must specify name.  
+      You can also specify an optional attribute list in the form: 'attribute1', 'attribute2', 'attribute3'...
+    DESC
+  
+    first_argument :name, :required => true, :desc => "model name"
+    second_argument :attributes, :as => :array, :default => [], :required => false, :desc => "array of attributes (only string suppported right now)"
+    
+    template :config do |template|
+      template.source = 'source_adapter.rb'
+      template.destination = "lib/#{name.snake_case}.rb"
+    end
+    
+  end
+  
   add :app, AppGenerator
   add :model, ModelGenerator
+  add :source, SourceGenerator
   
 end

data/generators/templates/source/source_adapter.rb

@@ -0,0 +1,38 @@
+class <%=name%> 
+  attr_accessor :client
+  
+  def initialize(source)
+    @source=source
+  end
+
+  def login
+  end
+
+  def query
+  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
+  end
+
+  def create(name_value_list)
+  end
+
+  def update(name_value_list)
+  end
+
+  def delete(name_value_list)
+  end
+
+  def logoff
+  end
+end

data/lib/rho/settings_controller.rb

@@ -0,0 +1,23 @@
+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/lib/rhodes.rb

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

data/lib/rhom/rhom_db_adapter.rb

@@ -52,7 +52,7 @@ module Rhom
       def execute_sql(sql=nil)
         result = []
         if sql
-          puts 'query is ' + sql
+          #puts 'query is ' + sql
           # Make sure we lock the sync engine's mutex
           # before we perform a database transaction.
           # This prevents concurrency issues.

data/spec/rho_spec.rb

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

data/spec/rhom_object_factory_spec.rb

@@ -50,7 +50,7 @@ describe "RhomObjectFactory" do
   
   it "should retrieve Case models" do
     results = Case.find(:all)
-    array_print(results)
+    #array_print(results)
     results.length.should == 5
     "60".should == results[0].case_number
     "hire another engineer".should == results[4].name
@@ -58,9 +58,6 @@ describe "RhomObjectFactory" do
   
   it "should retrieve Account models" do
     results = Account.find(:all)
-    results.each_with_index do |result,i|
-      puts "result[#{i}]: " + result.inspect
-    end
     results.length.should == 5
     #array_print(results)
     

data/spec/settings_controller_spec.rb

@@ -0,0 +1,48 @@
+#
+#  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 == 4
+  end
+  
+  it "should retrieve source for update" do
+    @controller.get_source('{1}')['source_url'].should == 'http://rhosync.rhohub.com/sources/1'
+  end
+  
+  it "should retrieve source without braces" do
+    @controller.get_source('1')['source_url'].should == 'http://rhosync.rhohub.com/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

data/spec/source_generator_spec.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/generator_spec_helper'
+
+describe Rhogen::SourceGenerator do
+  
+  source_name = 'NeatSource'
+
+  it "should complain if no name is specified" do
+    lambda {
+      @generator = Rhogen::SourceGenerator.new('/tmp', {})
+    }.should raise_error(::Templater::TooFewArgumentsError)
+  end
+  
+  before do
+    @generator = Rhogen::SourceGenerator.new('/tmp', {}, source_name)
+  end
+  
+  it "should create neat_source.rb files" do
+    ['neat_source.rb'].each do |template|
+      @generator.should create("/tmp/lib/#{template}")
+    end
+  end
+  
+  it "should generate valid erb templates" do
+    pending "need to figure out how to validate erb"
+  end
+  
+end

data/spec/spec_helper.rb

@@ -11,7 +11,6 @@ $:.unshift(File.join(File.dirname(__FILE__), '..'))
 # Use the rubygem for local testing
 require 'spec/stubs'
 require 'rho/rho'
-require 'rho/settings_controller'
 require 'rhom/rhom'
 
 describe "rho initializer", :shared => true do
@@ -21,9 +20,6 @@ describe "rho initializer", :shared => true do
   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

data/tasks/rspec.rake

@@ -27,8 +27,8 @@ Spec::Rake::SpecTask.new do |t|
   t.rcov = true
   t.rcov_opts = ['--include',
                  '"lib/rhom/*,lib/rho/*"',
-                 '--exclude',
-                 '"spec/*,lib/date.rb,lib/rational.rb,lib/time.rb,lib/find.rb,config.rb,lib/erb.rb,lib/singleton.rb,lib/pairparser.rb,/Library/Ruby/Gems/*,/var/lib/gems/*,/usr/lib/ruby"',
+                 '-x',
+                 'spec,gems,sqlite3/*,lib/date.rb,lib/rational.rb,lib/time.rb,lib/find.rb,config.rb,lib/erb.rb,lib/singleton.rb,lib/pairparser.rb',
                  '--text-report',
                  '--html']
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Rhomobile Dev
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-05 00:00:00 -08:00
+date: 2008-12-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ files:
 - generators/templates/model/edit.erb
 - generators/templates/model/index.erb
 - generators/templates/model/new.erb
+- generators/templates/source/source_adapter.rb
 - lib/ServeME.rb
 - lib/TestServe.rb
 - lib/builtinME.rb
@@ -135,6 +136,7 @@ files:
 - lib/rho/rhofsconnector.rb
 - lib/rho/rhofsconnectorME.rb
 - lib/rho/rhosupport.rb
+- lib/rho/settings_controller.rb
 - lib/rhodes.rb
 - lib/rhofsconnector.rb
 - lib/rhom.rb
@@ -151,6 +153,8 @@ 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
 - spec/stubs.rb