rhoconnect-rb 0.1.0 → 0.2.0

data/README.md

@@ -1,9 +1,9 @@
 rhoconnect-rb
 ===
 
-A ruby client library for the [RhoSync](http://rhomobile.com/products/rhosync) App Integration Server.  
+A ruby client library for the [Rhoconnect](http://rhomobile.com/products/rhosync) App Integration Server.
 
-Using rhoconnect-rb, your application's model data will transparently synchronize with a mobile application built using the [Rhodes framework](http://rhomobile.com/products/rhodes), or any of the available [RhoSync clients](http://rhomobile.com/products/rhosync/).  This client includes built-in support for [ActiveRecord](http://ar.rubyonrails.org/) and [DataMapper](http://datamapper.org/) models. 
+Using rhoconnect-rb, your application's model data will transparently synchronize with a mobile application built using the [Rhodes framework](http://rhomobile.com/products/rhodes), or any of the available [Rhoconnect clients](http://rhomobile.com/products/rhosync/).  This client includes built-in support for [ActiveRecord](http://ar.rubyonrails.org/) and [DataMapper](http://datamapper.org/) models.
 
 ## Getting started
 
@@ -11,23 +11,23 @@ Load the `rhoconnect-rb` library:
 
 	require 'rhoconnect-rb'
 
-Note, if you are using datamapper, install the `dm-serializer` library and require it in your application.  `rhoconnect-rb` depends on this utility to interact with RhoSync applications using JSON.
+Note, if you are using datamapper, install the `dm-serializer` library and require it in your application.  `rhoconnect-rb` depends on this utility to interact with Rhoconnect applications using JSON.
 	
 ## Usage
-Now include Rhosync::Resource in a model that you want to synchronize with your mobile application:
+Now include Rhoconnect::Resource in a model that you want to synchronize with your mobile application:
 
 	class Product < ActiveRecord::Base
-	  include Rhosync::Resource
+	  include Rhoconnect::Resource
 	end
 	
 Or, if you are using DataMapper:
 
 	class Product
 	  include DataMapper::Resource
-	  include Rhosync::Resource
+	  include Rhoconnect::Resource
 	end
 	
-Next, your models will need to declare a partition key for `rhoconnect-rb`.  This partition key is used by `rhoconnect-rb` to uniquely identify the model dataset when it is stored in a RhoSync application.  It is typically an attribute on the model or related model.  `rhoconnect-rb` supports two types of partitions: 
+Next, your models will need to declare a partition key for `rhoconnect-rb`.  This partition key is used by `rhoconnect-rb` to uniquely identify the model dataset when it is stored in a Rhoconnect application.  It is typically an attribute on the model or related model.  `rhoconnect-rb` supports two types of partitions:
 
 * :app - No unique key will be used, a shared dataset is used for all users.
 * lambda { some lambda } - Execute a lambda which returns the unique key string.
@@ -35,14 +35,14 @@ Next, your models will need to declare a partition key for `rhoconnect-rb`.  Thi
 For example, the `Product` model above might have a `belongs_to :user` relationship.  The partition identifying the username would be declared as:
 
 	class Product < ActiveRecord::Base
-	  include Rhosync::Resource
+	  include Rhoconnect::Resource
 	  
 	  belongs_to :user
 	
 	  partition lambda { self.user.username }
 	end
 	
-For more information about RhoSync partitions, please refer to the [RhoSync docs](http://docs.rhomobile.com/rhosync/source-adapters#data-partitioning).
+For more information about Rhoconnect partitions, please refer to the [Rhoconnect docs](http://docs.rhomobile.com/rhosync/source-adapters#data-partitioning).
 
 ## Meta
 Created and maintained by Vladimir Tarasov and Lars Burgess.

data/config/routes.rb

@@ -1,7 +1,7 @@
 Rails.application.routes.draw do
-  match '/rhosync/authenticate' => Rhosync::Authenticate
-  match '/rhosync/query' => Rhosync::Query
-  match '/rhosync/create' => Rhosync::Create
-  match '/rhosync/update' => Rhosync::Update
-  match '/rhosync/delete' => Rhosync::Delete
+  match '/rhoconnect/authenticate' => Rhoconnect::Authenticate
+  match '/rhoconnect/query' => Rhoconnect::Query
+  match '/rhoconnect/create' => Rhoconnect::Create
+  match '/rhoconnect/update' => Rhoconnect::Update
+  match '/rhoconnect/delete' => Rhoconnect::Delete
 end

data/lib/{rhosync → rhoconnect}/client.rb

@@ -1,20 +1,25 @@
 require 'uri'
 
-module Rhosync
+module Rhoconnect
   class Client
     attr_accessor :uri, :token
+
+    def self.set_app_endpoint(url)
+      RestClient::Request.execute(:method => :post, :url => url, :timeout => 2000)
+    end
     
     # allow configuration, uri or environment variable initialization
     def initialize(params = {})
-      uri = params[:uri] || Rhosync.configuration.uri || ENV['RHOSYNC_URL']
-      raise ArgumentError.new("Please provide a :uri or set RHOSYNC_URL") unless uri
-      uri = URI.parse(uri)
+      uri = params[:uri] || Rhoconnect.configuration.uri || ENV['RHOCONNECT_URL']
+      raise ArgumentError.new("Please provide a :uri or set RHOCONNECT_URL") unless uri
+      @uri = URI.parse(uri)
+      
+      @token = params[:token] || Rhoconnect.configuration.token || @uri.user
+      @uri.user = nil; @uri = @uri.to_s
       
-      @token = params[:token] || Rhosync.configuration.token || uri.user
-      uri.user = nil; @uri = uri.to_s      
       raise ArgumentError.new("Please provide a :token or set it in uri") unless @token
       
-      RestClient.proxy = ENV['HTTP_PROXY'] || ENV['http_proxy']
+      RestClient.proxy = ENV['HTTP_PROXY'] || ENV['http_proxy'] || Rhoconnect.configuration.http_proxy
     end
     
     def create(source_name, partition, obj = {})
@@ -52,7 +57,7 @@ module Rhosync
     def send_objects(action, source_name, partition, obj = {}) # :nodoc:
       validate_args(source_name, partition, obj)
       
-      process(:post, "/api/#{action}", 
+      process(:post, "/api/source/#{action}",
         {
           :source_id => source_name,
           :user_id => partition,
@@ -78,7 +83,7 @@ module Rhosync
     
     def api_headers   # :nodoc:
       {
-        'User-Agent'           => Rhosync::VERSION,
+        'User-Agent'           => Rhoconnect::VERSION,
         'X-Ruby-Version'       => RUBY_VERSION,
         'X-Ruby-Platform'      => RUBY_PLATFORM
       }

data/lib/rhoconnect/configuration.rb

@@ -0,0 +1,49 @@
+module Rhoconnect
+  class Configuration
+    attr_accessor :uri, :token, :authenticate, :sync_time_as_int, :app_endpoint, :http_proxy
+    
+    def initialize
+      @sync_time_as_int = true
+    end
+      
+  end
+
+  class << self
+    attr_accessor :configuration
+  end
+
+  # Configure Rhoconnect in an initializer:
+  # like config/initializers/rhoconnect.rb
+  #
+  # Setup the Rhoconnect uri and api token.
+  # Use rhoconnect:get_token to get the token value.
+  #
+  #   config.uri   = "http://myrhoconnect.com"
+  #   config.token = "secrettoken"
+  #   config.authenticate = lambda { |credentials| 
+  #     User.authenticate(credentials) 
+  #   }
+  #
+  # @example
+  #   Rhoconnect.configure do |config|
+  #     config.uri   = "http://myrhoconnect.com"
+  #     config.token = "secrettoken"
+  #   end
+  def self.configure
+    self.configuration = Configuration.new
+    yield(configuration)
+    # make a call to rhoconnect instance to set app url
+    endpoint_url = self.configuration.app_endpoint || ENV['APP_ENDPOINT']
+    uri          = self.configuration.uri || ENV['URI']
+    if uri
+      uri = URI.parse(uri)
+      token    = uri.user
+      uri.user = nil
+      uri      = uri.to_s
+    end
+    token  ||=  ENV['token'] || self.configuration.token
+    Rhoconnect::Client.set_app_endpoint(uri + "/api/source/save_adapter?attributes[adapter_url]=#{endpoint_url}&api_token=#{token}") if endpoint_url && uri && token
+  end
+end
+
+Rhoconnect.configure { }

data/lib/{rhosync → rhoconnect}/endpoints.rb

@@ -1,20 +1,20 @@
 require 'json'
 
-module Rhosync
+module Rhoconnect
   class EndpointHelpers
     def self.authenticate(content_type, body)
       code, params = 200, parse_params(content_type, body)
-      if Rhosync.configuration.authenticate
-        code = 401 unless Rhosync.configuration.authenticate.call(params)
+      if Rhoconnect.configuration.authenticate
+        code = 401 unless Rhoconnect.configuration.authenticate.call(params)
       end  
       [code, {'Content-Type' => 'text/plain'}, [""]]
     end
     
     def self.query(content_type, body)
       params = parse_params(content_type, body)
-      action, c_type, result, records = :rhosync_query, 'application/json', {}, []
-      # Call resource rhosync_query class method
-      code, error = get_rhosync_resource(params['resource'], action) do |klass|
+      action, c_type, result, records = :rhoconnect_query, 'application/json', {}, []
+      # Call resource rhoconnect_query class method
+      code, error = get_rhoconnect_resource(params['resource'], action) do |klass|
         records = klass.send(action, params['partition'])
       end
       if code == 200
@@ -35,8 +35,8 @@ module Rhosync
     def self.on_cud(action, content_type, body)
       params = parse_params(content_type, body)
       object_id = ""
-      code, error = get_rhosync_resource(params['resource'], action) do |klass|
-        object_id = klass.send("rhosync_receive_#{action}".to_sym,
+      code, error = get_rhoconnect_resource(params['resource'], action) do |klass|
+        object_id = klass.send("rhoconnect_receive_#{action}".to_sym,
           params['partition'], params['attributes'])
         object_id = object_id.to_s if object_id
       end
@@ -57,7 +57,7 @@ module Rhosync
     
     private
     
-    def self.get_rhosync_resource(resource_name, action)
+    def self.get_rhoconnect_resource(resource_name, action)
       code, error = 200, nil
       begin
         klass = Kernel.const_get(resource_name)
@@ -66,7 +66,7 @@ module Rhosync
         error = "error on method `#{action}` for #{resource_name}: #{ne.message}"
         code = 404
       rescue NameError
-        error = "Missing Rhosync::Resource #{resource_name}"
+        error = "Missing Rhoconnect::Resource #{resource_name}"
         code = 404
       # TODO: catch HaltException and Exception here, built-in source adapter will handle them
       rescue Exception => e
@@ -92,11 +92,11 @@ if defined? Rails
     class Engine < Rails::Engine; end
   #end
   
-  module Rhosync  
+  module Rhoconnect
     class BaseEndpoint
       def self.call(env)
         req = Rack::Request.new(env)
-        Rhosync::EndpointHelpers.send(self.to_s.downcase.split("::")[1].to_sym, req.content_type, req.body.read)
+        Rhoconnect::EndpointHelpers.send(self.to_s.downcase.split("::")[1].to_sym, req.content_type, req.body.read)
       end
     end
     
@@ -135,33 +135,33 @@ if defined? Sinatra
   # require 'rhoconnect-rb'
   # 
   # class Myapp < Sinatra::Base
-  #   register Sinatra::RhosyncEndpoints
+  #   register Sinatra::RhoconnectEndpoints
   #   get '/' do
   #     'hello world'
   #   end
   # end
   module Sinatra
-    module RhosyncHelpers
+    module RhoconnectHelpers
       def call_helper(method,*args)
-        code, c_type, body = Rhosync::EndpointHelpers.send(method,*args)
+        code, c_type, body = Rhoconnect::EndpointHelpers.send(method,*args)
         content_type c_type['Content-Type']
         status code
         body[0]
       end
     end
     
-    module RhosyncEndpoints
+    module RhoconnectEndpoints
       def self.registered(app)
         # install our endpoint helpers
-        app.send(:include, RhosyncHelpers)
+        app.send(:include, RhoconnectHelpers)
 
         [:authenticate,:query,:create,:update,:delete].each do |endpoint|
-          app.post "/rhosync/#{endpoint}" do
+          app.post "/rhoconnect/#{endpoint}" do
             call_helper(endpoint, request.env['CONTENT_TYPE'], request.body.read)
           end
         end
       end
     end
-    register RhosyncEndpoints
+    register RhoconnectEndpoints
   end
 end

data/lib/{rhosync → rhoconnect}/resource.rb

@@ -1,4 +1,4 @@
-module Rhosync
+module Rhoconnect
   module Resource
     
     def self.included(model)
@@ -19,77 +19,77 @@ module Rhosync
         @partition.is_a?(Proc) ? @partition.call : @partition
       end
       
-      def rhosync_receive_create(partition, attributes)
+      def rhoconnect_receive_create(partition, attributes)
         instance = self.send(:new)
-        instance.send(:rhosync_apply_attributes, partition, attributes)
-        instance.skip_rhosync_callbacks = true
+        instance.send(:rhoconnect_apply_attributes, partition, attributes)
+        instance.skip_rhoconnect_callbacks = true
         instance.save
         instance.id #=> return object id
       end
       
-      def rhosync_receive_update(partition, attributes)
+      def rhoconnect_receive_update(partition, attributes)
         object_id = attributes.delete('id')
         instance = self.send(is_datamapper? ? :get : :find, object_id)
-        instance.send(:rhosync_apply_attributes, partition, attributes)
-        instance.skip_rhosync_callbacks = true
+        instance.send(:rhoconnect_apply_attributes, partition, attributes)
+        instance.skip_rhoconnect_callbacks = true
         instance.save
         object_id
       end
       
-      def rhosync_receive_delete(partition, attributes)
+      def rhoconnect_receive_delete(partition, attributes)
         object_id = attributes['id']
         instance = self.send(is_datamapper? ? :get : :find, object_id)      
-        instance.skip_rhosync_callbacks = true
+        instance.skip_rhoconnect_callbacks = true
         instance.destroy
         object_id
       end
     end
     
     module InstanceMethods
-      attr_accessor :skip_rhosync_callbacks
+      attr_accessor :skip_rhoconnect_callbacks
       
-      def rhosync_create
+      def rhoconnect_create
         call_client_method(:create)
       end
       
-      def rhosync_destroy
+      def rhoconnect_destroy
         call_client_method(:destroy)
       end
       
-      def rhosync_update
+      def rhoconnect_update
         call_client_method(:update)
       end
       
-      def rhosync_query(partition)
+      def rhoconnect_query(partition)
         #return all objects for this partition 
       end
       
       # By default we ignore partition
       # TODO: Document - this is user-facing function
-      def rhosync_apply_attributes(partition, attributes)
+      def rhoconnect_apply_attributes(partition, attributes)
         self.attributes = attributes
       end
       
-      # Return Rhosync-friendly attributes list
+      # Return Rhoconnect-friendly attributes list
       def normalized_attributes
         attribs = self.attributes.dup
         attribs.each do |key,value|
           attribs[key] = Time.parse(value.to_s).to_i.to_s if value.is_a?(Time) or value.is_a?(DateTime)
-        end if Rhosync.configuration.sync_time_as_int
+        end if Rhoconnect.configuration.sync_time_as_int
         attribs    
       end
       
       private
         
       def call_client_method(action)
-        unless self.skip_rhosync_callbacks
+        unless self.skip_rhoconnect_callbacks
           attribs = self.normalized_attributes
           begin
-            Rhosync::Client.new.send(action, self.class.to_s, self.class.get_partition, attribs)
+            Rhoconnect::Client.new.send(action, self.class.to_s, self.class.get_partition, attribs)
           rescue RestClient::Exception => re
-            warn "#{self.class.to_s}: rhosync_#{action} returned error: #{re.message} - #{re.http_body}"
+            warn "#{self.class.to_s}: rhoconnect_#{action} returned error: #{re.message} - #{re.http_body}"
           rescue Exception => e
-            warn "#{self.class.to_s}: rhosync_#{action} returned unexpected error: #{e.message}"
+            warn "#{self.class.to_s}: rhoconnect_#{action} returned unexpected error: #{e.message}"
           end
         end
       end
@@ -111,17 +111,17 @@ module Rhosync
         if is_datamapper?
           # test for dm-serializer
           if not is_defined?(DataMapper::Serialize)
-            raise "Rhosync::Resource requires dm-serializer to work with DataMapper. Install with `gem install dm-serializer` and add to your application."
+            raise "Rhoconnect::Resource requires dm-serializer to work with DataMapper. Install with `gem install dm-serializer` and add to your application."
           end
-          after :create, :rhosync_create
-          after :destroy, :rhosync_destroy
-          after :update, :rhosync_update
+          after :create, :rhoconnect_create
+          after :destroy, :rhoconnect_destroy
+          after :update, :rhoconnect_update
         elsif is_activerecord?
-          after_create :rhosync_create
-          after_destroy :rhosync_destroy
-          after_update :rhosync_update
+          after_create :rhoconnect_create
+          after_destroy :rhoconnect_destroy
+          after_update :rhoconnect_update
         else
-          raise "Rhosync::Resource only supports ActiveRecord or DataMapper at this time."  
+          raise "Rhoconnect::Resource only supports ActiveRecord or DataMapper at this time."
         end
       end
       

data/lib/rhoconnect/version.rb

@@ -0,0 +1,3 @@
+module Rhoconnect
+  VERSION = "0.2.0"
+end

data/lib/rhoconnect-rb.rb

@@ -1,7 +1,7 @@
 require 'json'
 require 'rest_client'
-require 'rhosync/version'
-require 'rhosync/configuration'
-require 'rhosync/client'
-require 'rhosync/resource'
-require 'rhosync/endpoints'
+require 'rhoconnect/version'
+require 'rhoconnect/configuration'
+require 'rhoconnect/client'
+require 'rhoconnect/resource'
+require 'rhoconnect/endpoints'

data/rhoconnect-rb.gemspec

@@ -1,17 +1,17 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
-require 'rhosync/version'
+require 'rhoconnect/version'
 
 Gem::Specification.new do |s|
   s.name        = "rhoconnect-rb"
-  s.version     = Rhosync::VERSION
+  s.version     = Rhoconnect::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Rhomobile"]
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.email       = ["support@rhomobile.com"]
   s.homepage    = %q{http://rhomobile.com}
-  s.summary     = %q{RhoSync rails plugin}
-  s.description = %q{RhoSync rails plugin}
+  s.summary     = %q{Rhoconnect rails plugin}
+  s.description = %q{Rhoconnect rails plugin}
 
   s.rubyforge_project = nil  
   s.add_dependency('rest-client', '~>1.6.1')

data/spec/client_spec.rb

@@ -1,39 +1,39 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe Rhosync::Client do
+describe Rhoconnect::Client do
   
   context "on initialize" do
-    it "should initialize with RHOSYNC_URL environment var" do
-      ENV['RHOSYNC_URL'] = "http://token@test.rhosync.com"
-      c = Rhosync::Client.new
+    it "should initialize with Rhoconnect_URL environment var" do
+      ENV['RHOCONNECT_URL'] = "http://token@test.Rhoconnect.com"
+      c = Rhoconnect::Client.new
       c.token.should == 'token'
-      c.uri.should == 'http://test.rhosync.com'
-      ENV.delete('RHOSYNC_URL')
+      c.uri.should == 'http://test.Rhoconnect.com'
+      ENV.delete('Rhoconnect_URL')
     end
   
     it "should initialize with :uri parameter" do
-      c = Rhosync::Client.new(:uri => "http://token@test.rhosync.com")
+      c = Rhoconnect::Client.new(:uri => "http://token@test.Rhoconnect.com")
       c.token.should == 'token'
-      c.uri.should == 'http://test.rhosync.com'
+      c.uri.should == 'http://test.Rhoconnect.com'
     end
   
     it "should initialize with :token parameter" do
-      c = Rhosync::Client.new(:uri => "http://test.rhosync.com", :token => "token")
+      c = Rhoconnect::Client.new(:uri => "http://test.Rhoconnect.com", :token => "token")
       c.token.should == 'token'
-      c.uri.should == 'http://test.rhosync.com'
+      c.uri.should == 'http://test.Rhoconnect.com'
     end
     
     it "should initialize with configure block" do
-      Rhosync.configure do |config|
-        config.uri = "http://test.rhosync.com"
+      Rhoconnect.configure do |config|
+        config.uri = "http://test.Rhoconnect.com"
         config.token = "token"
       end
       begin
-        c = Rhosync::Client.new
+        c = Rhoconnect::Client.new
         c.token.should == 'token'
-        c.uri.should == 'http://test.rhosync.com'
+        c.uri.should == 'http://test.Rhoconnect.com'
       ensure
-        Rhosync.configure do |config|
+        Rhoconnect.configure do |config|
           config.uri = nil
           config.token = nil   
         end
@@ -41,23 +41,24 @@ describe Rhosync::Client do
     end
   
     it "should raise ArgumentError if uri is missing" do
-      lambda { Rhosync::Client.new }.should raise_error(ArgumentError, "Please provide a :uri or set RHOSYNC_URL")
+      ENV['RHOCONNECT_URL'] = nil
+      lambda { Rhoconnect::Client.new }.should raise_error(ArgumentError, "Please provide a :uri or set RHOCONNECT_URL")
     end
   
     it "should raise ArugmentError if token is missing" do
       lambda { 
-        Rhosync::Client.new(:uri => "http://test.rhosync.com") 
+        Rhoconnect::Client.new(:uri => "http://test.Rhoconnect.com")
       }.should raise_error(ArgumentError, "Please provide a :token or set it in uri")
     end
   end
   
   context "on create update destroy" do
     before(:each) do
-      @client = Rhosync::Client.new(:uri => "http://token@test.rhosync.com")
+      @client = Rhoconnect::Client.new(:uri => "http://token@test.Rhoconnect.com")
     end
     
     it "should create an object" do
-      stub_request(:post, "http://test.rhosync.com/api/push_objects").with(
+      stub_request(:post, "http://test.Rhoconnect.com/api/source/push_objects").with(
         :headers => {"Content-Type" => "application/json"}
       ).to_return(:status => 200, :body => "done")
       resp = @client.create("Person", "user1", 
@@ -71,7 +72,7 @@ describe Rhosync::Client do
     end
     
     it "should update an object" do
-      stub_request(:post, "http://test.rhosync.com/api/push_objects").with(
+      stub_request(:post, "http://test.Rhoconnect.com/api/source/push_objects").with(
         :headers => {"Content-Type" => "application/json"}
       ).to_return(:status => 200, :body => "done")
       resp = @client.update("Person", "user1", 
@@ -85,7 +86,7 @@ describe Rhosync::Client do
     end
     
     it "should destroy an object" do
-      stub_request(:post, "http://test.rhosync.com/api/push_deletes").with(
+      stub_request(:post, "http://test.Rhoconnect.com/api/source/push_deletes").with(
         :headers => {"Content-Type" => "application/json"}
       ).to_return(:status => 200, :body => "done")
       resp = @client.destroy("Person", "user1", 
@@ -101,11 +102,11 @@ describe Rhosync::Client do
   
   context "on set callbacks" do
     before(:each) do
-      @client = Rhosync::Client.new(:uri => "http://token@test.rhosync.com")
+      @client = Rhoconnect::Client.new(:uri => "http://token@test.Rhoconnect.com")
     end
     
     it "should set auth callback" do
-      stub_request(:post, "http://test.rhosync.com/api/set_auth_callback").with(
+      stub_request(:post, "http://test.Rhoconnect.com/api/set_auth_callback").with(
         :headers => {"Content-Type" => "application/json"}
       ).to_return(:status => 200, :body => "done")
       resp = @client.set_auth_callback("http://example.com/callback")
@@ -114,7 +115,7 @@ describe Rhosync::Client do
     end
     
     it "should set query callback" do
-      stub_request(:post, "http://test.rhosync.com/api/set_query_callback").with(
+      stub_request(:post, "http://test.Rhoconnect.com/api/set_query_callback").with(
         :headers => {"Content-Type" => "application/json"}
       ).to_return(:status => 200, :body => "done")
       resp = @client.set_query_callback("Person", "http://example.com/callback")

data/spec/endpoints_spec.rb

@@ -1,17 +1,17 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe Rhosync::EndpointHelpers do
+describe Rhoconnect::EndpointHelpers do
   
   # Auth stub class
   class AuthTest; end
   class BrokenResource < ActiveRecord::Base
-    include Rhosync::Resource
+    include Rhoconnect::Resource
   end
   
   # Query stub class
   class Product < ActiveRecord::Base
-    include Rhosync::Resource
-    def self.rhosync_query(partition)
+    include Rhoconnect::Resource
+    def self.rhoconnect_query(partition)
       [self.new]
     end
   end
@@ -20,8 +20,8 @@ describe Rhosync::EndpointHelpers do
     AuthTest.stub!(:do_auth).and_return(success)
     AuthTest.should_receive(:do_auth).with(@creds)
     
-    Rhosync.configure do |config|
-      config.uri = "http://test.rhosync.com"
+    Rhoconnect.configure do |config|
+      config.uri = "http://test.rhoconnect.com"
       config.token = "token"
       config.authenticate = lambda {|credentials|
         AuthTest.do_auth(credentials)
@@ -46,31 +46,31 @@ describe Rhosync::EndpointHelpers do
     
     it "should call configured authenticate block" do
       setup_auth_test(true)
-      Rhosync::Authenticate.call(@env).should == [
+      Rhoconnect::Authenticate.call(@env).should == [
         200, {'Content-Type' => 'text/plain'}, [""]
       ]
     end
     
     it "should call configured authenticate block with 401" do
       setup_auth_test(false)
-      Rhosync::Authenticate.call(@env).should == [
+      Rhoconnect::Authenticate.call(@env).should == [
         401, {'Content-Type' => 'text/plain'}, [""]
       ]
     end
     
     it "should return true if no authenticate block exists" do
-      Rhosync.configure do |config|
-        config.uri = "http://test.rhosync.com"
+      Rhoconnect.configure do |config|
+        config.uri = "http://test.Rhoconnect.com"
         config.token = "token" 
       end
-      Rhosync.configuration.authenticate.should be_nil
-      Rhosync::Authenticate.call(@env).should == [
+      Rhoconnect.configuration.authenticate.should be_nil
+      Rhoconnect::Authenticate.call(@env).should == [
         200, {'Content-Type' => 'text/plain'}, [""]
       ]
     end
     
     it "should call authenticate block with empty params" do
-      Rhosync::EndpointHelpers.authenticate('text/plain', '').should == [
+      Rhoconnect::EndpointHelpers.authenticate('text/plain', '').should == [
         200, {"Content-Type"=>"text/plain"}, [""]
       ]
     end
@@ -89,34 +89,34 @@ describe Rhosync::EndpointHelpers do
       )
       @env.stub!(:body).and_return(@strio)
       Rack::Request.stub!(:new).and_return(@env)
-      code, content_type, body = Rhosync::Query.call(@env)
+      code, content_type, body = Rhoconnect::Query.call(@env)
       code.should == 200
       content_type.should == { "Content-Type" => "application/json" }
       JSON.parse(body[0]).should == { '1' => Product.new.normalized_attributes }
     end
     
-    it "should fail on missing Rhosync::Resource" do
+    it "should fail on missing Rhoconnect::Resource" do
       @strio.stub!(:read).and_return(
         {'partition' => 'testuser', 'resource' => 'Broken'}.to_json
       )
       @env.stub!(:body).and_return(@strio)
       Rack::Request.stub!(:new).and_return(@env)
-      code, content_type, body = Rhosync::Query.call(@env)
+      code, content_type, body = Rhoconnect::Query.call(@env)
       code.should == 404
       content_type.should == { "Content-Type" => "text/plain" }
-      body[0].should == "Missing Rhosync::Resource Broken"
+      body[0].should == "Missing Rhoconnect::Resource Broken"
     end
     
-    it "should fail on undefined rhosync_query method" do
+    it "should fail on undefined rhoconnect_query method" do
       @strio.stub!(:read).and_return(
         {'partition' => 'testuser', 'resource' => 'BrokenResource'}.to_json
       )
       @env.stub!(:body).and_return(@strio)      
       Rack::Request.stub!(:new).and_return(@env)
-      code, content_type, body = Rhosync::Query.call(@env)
+      code, content_type, body = Rhoconnect::Query.call(@env)
       code.should == 404
       content_type.should == { "Content-Type" => "text/plain" }
-      body[0].should == "error on method `rhosync_query` for BrokenResource: undefined method `rhosync_query' for BrokenResource:Class" 
+      body[0].should == "error on method `rhoconnect_query` for BrokenResource: undefined method `rhoconnect_query' for BrokenResource:Class"
     end
     
     it "should fail on unknown exception" do
@@ -125,8 +125,8 @@ describe Rhosync::EndpointHelpers do
       )
       @env.stub!(:body).and_return(@strio)      
       Rack::Request.stub!(:new).and_return(@env)
-      Product.stub!(:rhosync_receive_create).and_return { raise "error in create" }
-      code, content_type, body = Rhosync::Create.call(@env)
+      Product.stub!(:rhoconnect_receive_create).and_return { raise "error in create" }
+      code, content_type, body = Rhoconnect::Create.call(@env)
       code.should == 500
       content_type.should == { "Content-Type" => "text/plain" }
       body[0].should == "error in create"
@@ -144,7 +144,7 @@ describe Rhosync::EndpointHelpers do
       @strio.stub!(:read).and_return(params.to_json)
       @env.stub!(:body).and_return(@strio)      
       Rack::Request.stub!(:new).and_return(@env)
-      code, content_type, body = Rhosync::Create.call(@env)
+      code, content_type, body = Rhoconnect::Create.call(@env)
       code.should == 200
       content_type.should == { "Content-Type" => "text/plain" }
       body.should == ['1']
@@ -163,7 +163,7 @@ describe Rhosync::EndpointHelpers do
       @strio.stub!(:read).and_return(params.to_json)
       @env.stub!(:body).and_return(@strio)      
       Rack::Request.stub!(:new).and_return(@env)
-      code, content_type, body = Rhosync::Update.call(@env)
+      code, content_type, body = Rhoconnect::Update.call(@env)
       code.should == 200
       content_type.should == { "Content-Type" => "text/plain" }
       body.should == ["123"]
@@ -182,7 +182,7 @@ describe Rhosync::EndpointHelpers do
       @strio.stub!(:read).and_return(params.to_json)
       @env.stub!(:body).and_return(@strio)      
       Rack::Request.stub!(:new).and_return(@env)
-      code, content_type, body = Rhosync::Delete.call(@env)
+      code, content_type, body = Rhoconnect::Delete.call(@env)
       code.should == 200
       content_type.should == { "Content-Type" => "text/plain" }
       body.should == ["123"]
@@ -192,7 +192,7 @@ describe Rhosync::EndpointHelpers do
   
   context "on Sinatra endpoints" do    
     class EndpointTest
-      include Sinatra::RhosyncHelpers
+      include Sinatra::RhoconnectHelpers
     end
   
     it "should register endpoints for authenticate and query" do
@@ -201,15 +201,15 @@ describe Rhosync::EndpointHelpers do
       req = mock("request")
       req.stub!(:body).and_return(strio)
       req.stub!(:env).and_return('CONTENT_TYPE' => 'application/json')
-      Sinatra::RhosyncEndpoints.stub!(:request).and_return(req)
-      Sinatra::RhosyncEndpoints.stub!(:params).and_return(@params)
-      Rhosync::EndpointHelpers.stub!(:query)
+      Sinatra::RhoconnectEndpoints.stub!(:request).and_return(req)
+      Sinatra::RhoconnectEndpoints.stub!(:params).and_return(@params)
+      Rhoconnect::EndpointHelpers.stub!(:query)
       app = mock("app")
       app.stub!(:post).and_yield
       app.should_receive(:post).exactly(5).times
-      app.should_receive(:include).with(Sinatra::RhosyncHelpers)
-      Sinatra::RhosyncEndpoints.should_receive(:call_helper).exactly(5).times
-      Sinatra::RhosyncEndpoints.registered(app)
+      app.should_receive(:include).with(Sinatra::RhoconnectHelpers)
+      Sinatra::RhoconnectEndpoints.should_receive(:call_helper).exactly(5).times
+      Sinatra::RhoconnectEndpoints.registered(app)
     end
     
     it "should call helper for authenticate" do

data/spec/resource_spec.rb

@@ -1,11 +1,11 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe Rhosync::Resource do
+describe Rhoconnect::Resource do
   
   context "on set partition" do
     it "should set resource partition to :app" do
       class TestModel1 < ActiveRecord::Base
-        include Rhosync::Resource
+        include Rhoconnect::Resource
       
         partition :app
       end
@@ -15,7 +15,7 @@ describe Rhosync::Resource do
   
     it "should set resource partition with lambda" do
       class TestModel2 < ActiveRecord::Base
-        include Rhosync::Resource
+        include Rhoconnect::Resource
       
         partition lambda{ 'helloworld' }
       end
@@ -27,41 +27,41 @@ describe Rhosync::Resource do
   context "on initialize" do
     it "should raise exception if DataMapper or ActiveRecord::Base are missing" do
       lambda { class TestModel3
-                 include Rhosync::Resource
+                 include Rhoconnect::Resource
                end
-      }.should raise_error("Rhosync::Resource only supports ActiveRecord or DataMapper at this time.")
+      }.should raise_error("Rhoconnect::Resource only supports ActiveRecord or DataMapper at this time.")
     end
     
     it "should register callbacks for ActiveRecord::Base" do
       class TestModel4 < ActiveRecord::Base
-        include Rhosync::Resource
+        include Rhoconnect::Resource
       end
     
-      TestModel4.create_callback.should == :rhosync_create
-      TestModel4.destroy_callback.should == :rhosync_destroy
-      TestModel4.update_callback.should == :rhosync_update
+      TestModel4.create_callback.should == :rhoconnect_create
+      TestModel4.destroy_callback.should == :rhoconnect_destroy
+      TestModel4.update_callback.should == :rhoconnect_update
     end
   
     it "should register callbacks for DataMapper::Resource" do
       class TestModel5
         include DataMapper::Resource
-        include Rhosync::Resource
+        include Rhoconnect::Resource
       end
         
-      TestModel5.rhosync_callbacks[:create].should == :rhosync_create
-      TestModel5.rhosync_callbacks[:destroy].should == :rhosync_destroy
-      TestModel5.rhosync_callbacks[:update].should == :rhosync_update
+      TestModel5.rhoconnect_callbacks[:create].should == :rhoconnect_create
+      TestModel5.rhoconnect_callbacks[:destroy].should == :rhoconnect_destroy
+      TestModel5.rhoconnect_callbacks[:update].should == :rhoconnect_update
     end
     
     it "should raise exception if dm-serializer is missing" do
       class TestModel6
         include DataMapper::Resource
-        include Rhosync::Resource
+        include Rhoconnect::Resource
       end
       TestModel6.stub!(:is_defined?).and_return(false)
       lambda { 
         TestModel6.install_callbacks
-      }.should raise_error("Rhosync::Resource requires dm-serializer to work with DataMapper. Install with `gem install dm-serializer` and add to your application.")
+      }.should raise_error("Rhoconnect::Resource requires dm-serializer to work with DataMapper. Install with `gem install dm-serializer` and add to your application.")
     end
   end
   
@@ -69,50 +69,50 @@ describe Rhosync::Resource do
     
     it "should call create update delete hook" do
       class TestModel7 < ActiveRecord::Base
-        include Rhosync::Resource
+        include Rhoconnect::Resource
         partition :app
       end
-      client = mock('Rhosync::Client')
+      client = mock('Rhoconnect::Client')
       client.stub!(:send)
-      Rhosync::Client.stub!(:new).and_return(client)
+      Rhoconnect::Client.stub!(:new).and_return(client)
       [:create, :update, :destroy].each do |action|
         client.should_receive(:send).with(
           action, "TestModel7", :app, {"name"=>"John", "created_at"=>"1299636666", "updated_at"=>"1299636666", "id"=>1}
         )
-        TestModel7.new.send("rhosync_#{action}".to_sym)
+        TestModel7.new.send("rhoconnect_#{action}".to_sym)
       end
     end
     
     it "should warn on RestClient::Exception" do
       class TestModel8 < ActiveRecord::Base
-        include Rhosync::Resource
+        include Rhoconnect::Resource
         partition :app
       end
-      client = mock('Rhosync::Client')
+      client = mock('Rhoconnect::Client')
       exception = RestClient::Exception.new(
         RestClient::Response.create("error connecting to server", nil, nil), 500
       )
       exception.message = "Internal Server Error"
       client.stub!(:send).and_return { raise exception }
-      Rhosync::Client.stub!(:new).and_return(client)
+      Rhoconnect::Client.stub!(:new).and_return(client)
       tm = TestModel8.new
       tm.should_receive(:warn).with(
-        "TestModel8: rhosync_create returned error: Internal Server Error - error connecting to server"
+        "TestModel8: rhoconnect_create returned error: Internal Server Error - error connecting to server"
       )
-      tm.rhosync_create
+      tm.rhoconnect_create
     end
     
     it "should warn on Exception" do
       class TestModel8 < ActiveRecord::Base
-        include Rhosync::Resource
+        include Rhoconnect::Resource
         partition :app
       end
-      client = mock('Rhosync::Client')
+      client = mock('Rhoconnect::Client')
       client.stub!(:send).and_return { raise Exception.new("error connecting to server") }
-      Rhosync::Client.stub!(:new).and_return(client)
+      Rhoconnect::Client.stub!(:new).and_return(client)
       tm = TestModel8.new
-      tm.should_receive(:warn).with("TestModel8: rhosync_create returned unexpected error: error connecting to server")
-      tm.rhosync_create
+      tm.should_receive(:warn).with("TestModel8: rhoconnect_create returned unexpected error: error connecting to server")
+      tm.rhoconnect_create
     end
   end
 end

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ end
 # stubs for sinatra
 module Sinatra
   def self.register(mod); end
-  module RhosyncEndpoints
+  module RhoconnectEndpoints
     def self.content_type(c_type); end
     def self.status(code); end
   end
@@ -90,11 +90,11 @@ module DataMapper
     end
     
     module ClassMethods
-      attr_accessor :rhosync_callbacks
+      attr_accessor :rhoconnect_callbacks
       
       def after(action, callback)
-        @rhosync_callbacks ||= {}
-        @rhosync_callbacks[action] = callback
+        @rhoconnect_callbacks ||= {}
+        @rhoconnect_callbacks[action] = callback
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect-rb
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 Z
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -49,7 +49,7 @@ dependencies:
   version_requirements: *id002
   name: json
   prerelease: false
-description: RhoSync rails plugin
+description: Rhoconnect rails plugin
 email: 
 - support@rhomobile.com
 executables: []
@@ -68,11 +68,11 @@ files:
 - config/routes.rb
 - init.rb
 - lib/rhoconnect-rb.rb
-- lib/rhosync/client.rb
-- lib/rhosync/configuration.rb
-- lib/rhosync/endpoints.rb
-- lib/rhosync/resource.rb
-- lib/rhosync/version.rb
+- lib/rhoconnect/client.rb
+- lib/rhoconnect/configuration.rb
+- lib/rhoconnect/endpoints.rb
+- lib/rhoconnect/resource.rb
+- lib/rhoconnect/version.rb
 - rhoconnect-rb.gemspec
 - spec/client_spec.rb
 - spec/endpoints_spec.rb
@@ -110,7 +110,7 @@ rubyforge_project:
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: RhoSync rails plugin
+summary: Rhoconnect rails plugin
 test_files: 
 - spec/client_spec.rb
 - spec/endpoints_spec.rb

data/lib/rhosync/configuration.rb

@@ -1,38 +0,0 @@
-module Rhosync
-  class Configuration
-    attr_accessor :uri, :token, :authenticate, :sync_time_as_int
-    
-    def initialize
-      @sync_time_as_int = true
-    end
-      
-  end
-
-  class << self
-    attr_accessor :configuration
-  end
-
-  # Configure RhoSync in an initializer:
-  # like config/initializers/rhosync.rb
-  #
-  # Setup the RhoSync uri and api token.  
-  # Use rhosync:get_token to get the token value.
-  #
-  #   config.uri   = "http://myrhosync.com"
-  #   config.token = "secrettoken"
-  #   config.authenticate = lambda { |credentials| 
-  #     User.authenticate(credentials) 
-  #   }
-  #
-  # @example
-  #   Rhosync.configure do |config|
-  #     config.uri   = "http://myrhosync.com"
-  #     config.token = "secrettoken"
-  #   end
-  def self.configure
-    self.configuration = Configuration.new
-    yield(configuration)
-  end
-end
-
-Rhosync.configure { }

data/lib/rhosync/version.rb

@@ -1,3 +0,0 @@
-module Rhosync
-  VERSION = "0.1.0"
-end