rhodes 3.2.0.beta.5 → 3.2.0.beta.6

data/spec/framework_spec/app/spec/library/net/http/http/shared/started.rb

@@ -8,7 +8,7 @@ describe :net_http_started_p, :shared => true do
   end
 
   before(:each) do
-    @net = Net::HTTP.new("127.0.0.1", 3454)
+    @net = Net::HTTP.new("127.0.0.1", NetHTTPSpecs.server_port)
   end
 
   it "returns true when self has been started" do

data/spec/framework_spec/app/spec/library/net/http/http/start_spec.rb

@@ -12,24 +12,24 @@ describe "Net::HTTP.start" do
   end
 
   it "returns a new Net::HTTP object for the passed address and port" do
-    net = Net::HTTP.start("127.0.0.1", 3454)
+    net = Net::HTTP.start("127.0.0.1", NetHTTPSpecs.server_port)
     net.should be_kind_of(Net::HTTP)
     net.address.should == "127.0.0.1"
-    net.port.should == 3454
+    net.port.should == NetHTTPSpecs.server_port
   end
 
   it "opens the tcp connection" do
-    Net::HTTP.start("127.0.0.1", 3454).started?.should be_true
+    Net::HTTP.start("127.0.0.1", NetHTTPSpecs.server_port).started?.should be_true
   end
 
   describe "when passed a block" do
     it "returns the blocks return value" do
-      Net::HTTP.start("127.0.0.1", 3454) { :test }.should == :test
+      Net::HTTP.start("127.0.0.1", NetHTTPSpecs.server_port) { :test }.should == :test
     end
 
     it "yields the new Net::HTTP object to the block" do
       yielded = false
-      Net::HTTP.start("127.0.0.1", 3454) do |net|
+      Net::HTTP.start("127.0.0.1", NetHTTPSpecs.server_port) do |net|
         yielded = true
         net.should be_kind_of(Net::HTTP)
       end
@@ -37,12 +37,12 @@ describe "Net::HTTP.start" do
     end
 
     it "opens the tcp connection before yielding" do
-      Net::HTTP.start("127.0.0.1", 3454) { |http| http.started?.should be_true }
+      Net::HTTP.start("127.0.0.1", NetHTTPSpecs.server_port) { |http| http.started?.should be_true }
     end
 
     it "closes the tcp connection after yielding" do
       net = nil
-      Net::HTTP.start("127.0.0.1", 3454) { |x| net = x }
+      Net::HTTP.start("127.0.0.1", NetHTTPSpecs.server_port) { |x| net = x }
       net.started?.should be_false
     end
   end
@@ -58,7 +58,7 @@ describe "Net::HTTP#start" do
   end
 
   before(:each) do
-    @http = Net::HTTP.new("127.0.0.1", 3454)
+    @http = Net::HTTP.new("127.0.0.1", NetHTTPSpecs.server_port)
   end
 
   it "returns self" do

data/spec/framework_spec/app/spec/library/net/http/http/trace_spec.rb

@@ -12,7 +12,7 @@ describe "Net::HTTP#trace" do
   end
 
   before(:each) do
-    @http = Net::HTTP.start("127.0.0.1", 3454)
+    @http = Net::HTTP.start("127.0.0.1", NetHTTPSpecs.server_port)
   end
 
   it "sends a TRACE request to the passed path and returns the response" do

data/spec/framework_spec/app/spec/library/net/http/http/unlock_spec.rb

@@ -12,7 +12,7 @@ describe "Net::HTTP#unlock" do
   end
 
   before(:each) do
-    @http = Net::HTTP.start("127.0.0.1", 3454)
+    @http = Net::HTTP.start("127.0.0.1", NetHTTPSpecs.server_port)
   end
 
   it "sends an UNLOCK request to the passed path and returns the response" do

data/spec/framework_spec/app/spec_runner.rb

@@ -99,7 +99,7 @@ class SpecRunner < MSpecScript
     # LIBRARIES
     specs = app_folder + "spec/library/**/*_spec.iseq"
     Dir.glob(specs) do |file|
-      next if file =~ /sha1/      
+      #next if file =~ /sha1/      
     
       file.gsub!(app_folder,"")
       file.gsub!(/\.iseq/,"")

data/spec/framework_spec/build.yml

@@ -12,9 +12,9 @@ iphone:
   entitlements: ""
   codesignidentity: ""
   configuration: Release
-  extensions: ["digest-sha1"]   
+  #extensions: ["digest-sha1"]   
   
 android:    
   version: 2.3.3
 
-extensions: ["mspec", "fileutils", "digest", "digest-md5", "test-libs", "set", "thread", "timeout", "uri", "net-http", "fcntl", "rexml" ]
+extensions: ["mspec", "fileutils", "digest", "digest-md5", "digest-sha1", "test-libs", "set", "thread", "timeout", "uri", "net-http", "fcntl", "rexml" ]

data/spec/phone_spec/app/spec/rhom_object_spec.rb

@@ -721,6 +721,20 @@ end
     @accts[0].industry.should == "Technology"
   end
 
+  it "should find with advanced OR conditions with order" do
+    query = '%IND%'    
+    @accts = getAccount.find( :all, 
+       :conditions => { 
+        {:func=>'UPPER', :name=>'name', :op=>'LIKE'} => query, 
+        {:func=>'UPPER', :name=>'industry', :op=>'LIKE'} => query}, 
+        :op => 'OR', :select => ['name','industry'],
+        :order=>'name', :orderdir=>'DESC' )
+  
+    @accts.length.should == 1
+    @accts[0].name.should == "Mobio India"
+    @accts[0].industry.should == "Technology"
+  end
+
   it "should NOT find with advanced OR conditions" do
     query = '%IND33%'    
     @accts = getAccount.find( :all, 
@@ -748,6 +762,23 @@ end
     @accts[0].industry.should == "Technology"
   end
 
+  it "should find with advanced AND conditions with order" do
+    query = '%IND%'    
+    query2 = '%chnolo%' #LIKE is case insensitive by default   
+    @accts = getAccount.find( :all, 
+       :conditions => { 
+        {:func=>'UPPER', :name=>'name', :op=>'LIKE'} => query,
+        {:func=>'UPPER', :name=>'industry', :op=>'LIKE'} => query2
+       }, 
+       :op => 'AND', 
+       :select => ['name','industry'],
+       :order=>'name', :orderdir=>'DESC')
+  
+    @accts.length.should == 1
+    @accts[0].name.should == "Mobio India"
+    @accts[0].industry.should == "Technology"
+  end
+
   it "should NOT find with advanced AND conditions" do
     query = '%IND123%'    
     query2 = '%chnolo%'     #LIKE is case insensitive by default   
@@ -1323,7 +1354,16 @@ end
     @accts[0].name.should == "Mobio India"
     @accts[0].industry.should == "Technology"
   end
-  
+
+  it "should support sql conditions single filter with order" do
+    return if USE_HSQLDB
+    
+    @accts = getAccount.find(:all, :conditions => ["name like ?", "'Mob%'"], :select => ['name', 'industry'], :order=>'name', :orderdir => 'DESC' )
+    @accts.length.should == 1
+    @accts[0].name.should == "Mobio India"
+    @accts[0].industry.should == "Technology"
+  end
+
   it "should support sql conditions with multiple filters" do
     @accts = getAccount.find(:all, :conditions => ["name like ? and industry like ?", "'Mob%'", "'Tech%'"], :select => ['name', 'industry'])
     @accts.length.should == 1
@@ -1334,6 +1374,7 @@ end
 
   it "should return records when order by is nil for some records" do
     return if USE_HSQLDB
+    
     @accts = getAccount.find(:all, :order => 'shipping_address_country', :dont_ignore_missed_attribs => true, :select => ['name'])
     @accts.length.should == 2
     
@@ -1499,7 +1540,7 @@ end
     accts.length.should == 0
     
   end          
-  
+#=end  
 end
 #=begin
 describe "Rhom#paginate" do

data/version

@@ -1 +1 @@
-3.2.0.beta.5
+3.2.0.beta.6

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196457
+  hash: 62196463
   prerelease: true
   segments: 
   - 3
   - 2
   - 0
   - beta
-  - 5
-  version: 3.2.0.beta.5
+  - 6
+  version: 3.2.0.beta.6
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 -07:00
+date: 2011-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -163,11 +163,14 @@ files:
 - installer/EnvVarUpdate.nsh
 - installer/icon.ico
 - installer/instant-rhodes.nsi
+- installer/jake.rb
 - installer/OLD-README.html
+- installer/Rakefile
 - installer/README.html
 - installer/RHOSTUDIO-LICENSE.txt
 - installer/rhostudio.nsi
 - installer/RHOSYNC-LICENSE.txt
+- installer/ServiceLib.nsh
 - lib/build/compileERB/bb.rb
 - lib/build/compileERB/default.rb
 - lib/build/compileRB/compileRB.rb
@@ -650,6 +653,12 @@ files:
 - lib/extensions/fcntl/ext/Rakefile
 - lib/extensions/fcntl/ext.yml
 - lib/extensions/fileutils/fileutils.rb
+- lib/extensions/hmac/hmac-md5.rb
+- lib/extensions/hmac/hmac-rmd160.rb
+- lib/extensions/hmac/hmac-sha1.rb
+- lib/extensions/hmac/hmac-sha2.rb
+- lib/extensions/hmac/hmac.rb
+- lib/extensions/hmac/ruby_hmac.rb
 - lib/extensions/json/json/common.rb
 - lib/extensions/json/json/pure/generator.rb
 - lib/extensions/json/json/pure.rb
@@ -4799,11 +4808,11 @@ files:
 - res/generators/templates/application/public/jqmobile/images/icons-18-white.png
 - res/generators/templates/application/public/jqmobile/images/icons-36-black.png
 - res/generators/templates/application/public/jqmobile/images/icons-36-white.png
+- res/generators/templates/application/public/jqmobile/jquery-mobile-iphone.css
 - res/generators/templates/application/public/jqmobile/jquery.mobile-1.0rc1.css
 - res/generators/templates/application/public/jqmobile/jquery.mobile-1.0rc1.js
 - res/generators/templates/application/public/jqmobile/jquery.mobile-1.0rc1.min.css
 - res/generators/templates/application/public/jqmobile/jquery.mobile-1.0rc1.min.js
-- res/generators/templates/application/public/jqmobile/jquery.mobile.iphone.css
 - res/generators/templates/application/public/jquery/jquery-1.6.4.js
 - res/generators/templates/application/public/jquery/jquery-1.6.4.min.js
 - res/generators/templates/application/public/js/application.js