phonegap-rails 0.0.11 → 0.0.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2NiODQ0NDYzZDM4ZmFiYjNjYTFiNmRhZDQ1MmJmNWM5ODJiMmU3ZQ==
+    ZmQ5ZTM5NTUxNzE1YTdiODdkMjI2ZDM2Yjg3ZGQwMDE4YWIxMDQ3Yg==
   data.tar.gz: !binary |-
-    YzY1MDVjOWVkOTEwNzRjMjRlYjVhMmMyNzE3NTU2MzU4OTFkZjUyZA==
+    OWZkMTA0ZWFhMmJlMTk3MmFjNDBmMWFhOGVhYWFmODUwZTljNGQxNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWVhN2M4MWFhZGM1ZDE0ZDg3ZTc5NmExOTliMjJiZDJiYjcyZTlkNmFmYTg1
-    YjAwMTc5ZGE0NTZkYjBmZGNjNmY4ZTQ4ZGVhOTI5MjEwZWIzZTY3OGRjMDQ1
-    MmRhYzJjNzYyMzgwYjM4NjkzNDJkNWIxNzU4ZDZkM2EwY2Q3YWY=
+    OTZlOTE2MzJlYTA3ZmViYjE1YTA0Y2MwMmY0YWQzYmQzYjRiYjgyMDZiNzkw
+    NWI1NzI3ZTUyN2Y0YzRiNWFmZmU4YTZlZjZkODVkZjcxNzk0NThlYzNjNDUy
+    NTExNThjZTBhMzM3ZDFhYmM1MzdjNzZiNjhjNmJiNjIzNjdkYjQ=
   data.tar.gz: !binary |-
-    MTNmYWE5OGRkZmZkOWZjMzM0ZmY3ZDM4YjNkODYyNmY0MWEyZGE4ZDg4MmVk
-    MDM4MWZjMjU2OTk4MmExMmJmNzdkODY5Yjk0ODcxMjUwMmYxMjczYzAzMmE3
-    MTcyYzI4MTZiNjEzMDUyNDQzODY0OTdiNWZjN2ZjNmI4NjZlNWY=
+    NDQ2OWM5ZTM3YWUyNGRmMDZjODI5MjA1ODJkMGY5OWU3NDgxYTZkYzZiY2I0
+    MTNjYTI0ODNlYjMzMGI5MjM1ZDlkODRlOGUxOGYzYjdhZTdlNTA0NDcwNTEz
+    ZmE1M2FlZTg3YTg3MDE5MTEyNmViNGFiZjc1N2I3ZWUxZTZlNWM=

data/lib/generators/phonegap_rails/install/templates/config/phonegap_rails.yml

@@ -2,7 +2,7 @@
 ##  General settings
 ##
 #phonegap_path:             '~/Development/phonegap-2.6.0'
-#api_server:                'http://example.com'
+#api_server:                'http://example.com' //This will be accessible through API_SERVER global var
 
 ##  Android settings
 #android:

data/lib/phonegap/rails/tasks/rails.rake

@@ -14,7 +14,7 @@ namespace :phonegap do
         unless config['android'].nil?
           package = config['android']["package"] unless config['android']["package"].nil?
         end
-        api_server = config['api_server'] unless config['api_server'].nil?
+        @api_server = config['api_server'] unless config['api_server'].nil?
       end
     end
     
@@ -75,7 +75,6 @@ namespace :phonegap do
         file.write ERB.new(File.read("#{public_source}/android_index.html.erb")).result
         file.close
         ## Fix relative paths and configure API server
-        puts 'Fix relative paths'
         css_file_path = "#{project_path}/assets/www/css/application.css"
         css_file = File.read(css_file_path)
         new_css_file = css_file.gsub(/\/assets/, '../assets')
@@ -85,25 +84,12 @@ namespace :phonegap do
         js_file_path = "#{project_path}/assets/www/js/application.js"
         js_file = File.read(js_file_path)
         new_js_file = js_file.gsub(/src=\\"\//, 'src=\"')
-        if api_server.blank?
+        if @api_server.blank?
           puts "Warning: No API server is specified for this app"
         else
           if new_js_file =~ /href=\\"\//
-            puts "Relative paths found. Making absolute to reference API: #{api_server}"
-            new_js_file.gsub!(/href=\\"\//, 'href=\"'+api_server+'/')
-          end
-          if new_js_file =~ /ember/
-            if new_js_file =~ /DS\.Store\.extend/ and (
-               new_js_file =~ /RESTAdapter/ or
-               not new_js_file =~ /DS\.Store\.extend.*\(.*\{.*adapter:.*\}.*\)/mx
-               )
-              puts "ember.js RESTAdapter found. Adding API url #{api_server} to RESTAdapter"
-              new_js_file << "\nDS.RESTAdapter.reopen({url: '#{api_server}'});//Added phonegap-rails"
-            end
-            if new_js_file =~ /(Auth\.Config\.reopen[^\(\{]*\([^\(\{]*\{)/mx
-              puts "ember-auth found. Adding API baseUrl: #{api_server}"
-              new_js_file.sub!(/(Auth\.Config\.reopen[^\(\{]*\([^\(\{]*\{)/mx,"#{$1}\n\tbaseUrl: '#{api_server}',//Added phonegap-rails")
-            end
+            puts "Relative paths found. Making absolute to reference API: #{@api_server}"
+            new_js_file.gsub!(/href=\\"\//, 'href=\"'+@api_server+'/')
           end
         end
         file = File.open(js_file_path, "w")

data/lib/phonegap/rails/version.rb

@@ -1,5 +1,5 @@
 module Phonegap
   module Rails
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end
 end

data/lib/public/android_index.html.erb

@@ -24,6 +24,9 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <link rel="stylesheet" type="text/css" href="css/application.css" />
         <title><%=@app_title%></title>
+				<script>
+					var API_SERVER = "<%=@api_server%>"; // Comes from phonegap_rails.yml
+				</script>
     </head>
     <body>
         <script type="text/javascript" src="cordova-2.6.0.js"></script>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phonegap-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Josep Casals