nexusmotion 0.0.2.beta → 0.0.3.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad2cd08d42a11bcf46807174165e4136d540af9d
-  data.tar.gz: c5a7818df0bdf4e951ed96d94087860d5a9ddd2c
+  metadata.gz: 4ec3cc8e9520b1d9e669f738f1ab9b4f9f06db4c
+  data.tar.gz: 122ff846beebf6820548c8998e754d0fc9fb5c51
 SHA512:
-  metadata.gz: 3f06303d91f79a4f6b8acaed5596ceb1ce09c4abd7c881ba25e864419d4ad71099619cda03d75f9456e74c3f49f07f176b8b8c4bf74e595de4e745482d540cef
-  data.tar.gz: 5f4de7f4649eaa3502910acce8538817a9e10e65beb369f36a68becf92589c59ce5f1a4c7624134eac5aab720deabada196b92a21ed7af999f6ca2505802aed6
+  metadata.gz: eae94c4925d4ddba5af79cc38487417f2c640bde42df46efb2cbf70593a6d090db126355d1976d9bfa400a5cfca58f19bb14540cae0900744ff801b265ff03df
+  data.tar.gz: 16ffdcefe8e5ea5cd7c8eeb7791edd2c97437c4bcae90a531b82885f58e0b0ea1b87f23811089e603c394e97297334ee2fc2a91e6a145837c7cf025768954ea9

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+/build/

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in nexusmotion.gemspec
 gemspec
-
-gem 'bacon'

data/README.md

@@ -21,7 +21,7 @@ sudo motion update --pre
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'nexusmotion', ">= 0.0.2.beta"
+gem 'nexusmotion', ">= 0.0.3.beta"
 ```
 
 Add this line in your rake file:
@@ -33,11 +33,14 @@ require 'nexusmotion'
 
 And then execute:
 
-    $ bundle
+    $ "bundle install --path=vendor/bundler
 
-Or install it yourself as:
+> Note: For some reason it needs to be vendored to avoid a bug:
+
+`E/com/yourcompany/testbed(24873): BUG: runtime.cpp:1611`
+
+`E/com/yourcompany/testbed(24873): class 'com/yourcompany/testbed/Client' not precompiled`
 
-    $ gem install nexusmotion --pre
 
 ## Usage
 
@@ -48,7 +51,9 @@ See https://github.com/TigerWolf/TestBed for example usage.
   url = "https://posttestserver.com/post.php?dir=nexusmotion"
   data = [["id", 33443]]
   result = c.post(url, data)
-  puts result
+  puts result.body
+  puts result.code
+  puts result.success?
 ```
 
 ## Contributing

data/Rakefile

@@ -1,54 +1,10 @@
 require "bundler/gem_tasks"
 $:.unshift("/Library/RubyMotionPre/lib")
 require 'motion/project/template/android'
-require 'bundler'
 Bundler.require(:development)
-require 'bacon'
 require "nexusmotion"
-# require 'nexusmotion'
-# require 'bacon'
-
-# task :spec do
-
-#     Motion::Project::App.setup do |app|
-#       app.specs_dir = 'spec/'
-#     end
-
-#     #Dir.glob('./spec/**/*.rb').each {|file| require file }
-#     puts `bacon spec/*`
-
-#     # App.config.spec_mode = true
-#     # spec_files = App.config.spec_files - Dir.glob('./spec/**/*.rb')
-#     # App
-#     # App.config.instance_variable_set("@spec_files", spec_files)
-#     # bacon spec_files
-#     # Rake::Task["simulator"].invoke
-
-# end
 
 Motion::Project::App.setup do |app|
   app.name = 'nexusmotion'
   app.detect_dependencies = true
 end
-
-task :testing do
-  $:.unshift("/Library/RubyMotionPre/lib")
-  require 'motion/project/template/android'
-  require "nexusmotion"
-  require "nexusmotion/client"
-  require "nexusmotion/gap_junction"
-  require "nexusmotion/global_result"
-  require "webstub"
-  require 'bacon'
-
-  App.config_without_setup.spec_mode = true
-  # ENV['debug'] ||= '1'
-  # Rake::Task["device"].invoke
-
-  Bacon.summary_on_exit
-  files = Dir.glob('./spec/**/*.rb')
-  files.each { |file|
-    load file
-  }
-
-end

data/TODO & KNOWN ISSUES.md

@@ -3,9 +3,22 @@ TODO
 
  * Test performance of threads in Android against RubyMotion thread and pick one once exceptions are fixed in RM
  * Add seperate methods for both get and post.
+ * Create a lock on the global result so multiple threads cannot modify (use Mutex http://www.ruby-doc.org/core-2.1.3/Mutex.html)
+ * Come up with another solution for .join so that thread does not block UI thread
+ * Try implementing ASync task in pure Android instead
+ * Try Executor
+ * Set timeout for netork request - customisable
+ * Create a configuration hash like other gems
+ * Implement Async Like https://github.com/typhoeus/typhoeus - implement a callback function that can be user defined (possibly updating the UI or similar.)
+ * Allow for checking of status - AsyncTask.Status.RUNNING
+ * As well as the callback - allow for a blocking call to get the response like Thread.new.join
+
+Future Stuff
+----
+  * Implement progress update - to allow for progress bar
+  * Implement onPreExecute for showing loading icon etc - possibly leave this up to the caller
+  * Implement cancel
 
 KNOWN ISSUES
------------
+----
 
- * If you make a request with an incorrect URL or one that doesnt respond then the app will crash
- * Catch Android exceptions: http://hipbyte.myjetbrains.com/youtrack/issue/RM-618

data/lib/nexusmotion.rb

@@ -1,30 +1,10 @@
-if defined?(Motion::Project::Config)
-  def rubymotion_require(filename)
-    @files_to_require ||= []
-    @files_to_require << filename
-  end
-
-  alias :old_require :require
-  alias :require :rubymotion_require
+unless defined?(Motion::Project::Config)
+  raise "This file must be required within a RubyMotion project Rakefile."
 end
 
-require "nexusmotion/version"
-require "nexusmotion/client"
-require "nexusmotion/global_result"
-require "nexusmotion/gap_junction"
-require "nexusmotion/error"
-
-if defined?(Motion::Project::Config)
-  # Revert normal require
-  alias :require :old_require
-
-  Motion::Project::App.setup do |app|
-    # prepare full paths of files that will be compiled
-    paths_to_require = @files_to_require.map do |file|
-      File.join(File.dirname(__FILE__), file + ".rb")
-    end
-
-    # add paths in correct order
-    app.files.unshift(*paths_to_require)
+Motion::Project::App.setup do |app|
+  Dir.glob(File.join(File.dirname(__FILE__), 'nexusmotion/*.rb')).each do |file|
+    app.files.unshift(file)
   end
 end
+

data/lib/nexusmotion/client.rb

@@ -1,22 +1,33 @@
 module Nexusmotion
   class Client
-    def post(url, data=[])
+    def post(url, data)
+      method = :post
+      request(method, url, data)
+    end
+
+    def get(url)
+      method = :get
+      request(method, url)
+    end
+
+    def request(method, url, data=[])
       begin
         finished = false
+        result_object = Nexusmotion::Result.new
         tr = Thread.start{
           runner = Nexusmotion::GapJunction.new
+          runner.result_object = result_object
           runner.url = url
           runner.data = data
+          runner.method = method
           s = runner.run
           # Thread.current["result"] = s # []= is not yet defined
         }
         tr.join
         finished = true
-        result = Nexusmotion::GlobalResult.result
-        Nexusmotion::GlobalResult.result = nil
-        result
+        result_object
       rescue Exception => e
-        p "An error occurred: #{e.inspect}"
+        result_object.error = e
       end
     end
   end

data/lib/nexusmotion/gap_junction.rb

@@ -1,40 +1,47 @@
 module Nexusmotion
   class GapJunction
+
     def run
-      result = ""
 
       begin
-        # Default Values
-        @url ||= "http://httpbin.org/post"
+        @url ||= ""
         @data ||= []
 
         httpclient = Org::Apache::Http::Impl::Client::DefaultHttpClient.new
-        httppost = Org::Apache::Http::Client::Methods::HttpPost.new(@url);
 
-        nameValuePairs = []
-        @data.each do |key, value|
-          nameValuePairs.add(Org::Apache::Http::Message::BasicNameValuePair.new(key, value))
-        end
+        if @method == :post
+          httrequest = Org::Apache::Http::Client::Methods::HttpPost.new(@url);
 
-        httppost.setEntity(Org::Apache::Http::Client::Entity::UrlEncodedFormEntity.new(nameValuePairs));
+          nameValuePairs = []
+          @data.each do |key, value|
+            nameValuePairs.add(Org::Apache::Http::Message::BasicNameValuePair.new(key, value))
+          end
+          httrequest.setEntity(Org::Apache::Http::Client::Entity::UrlEncodedFormEntity.new(nameValuePairs));
+        else
+          httrequest = Org::Apache::Http::Client::Methods::HttpGet.new(@url);
+        end
 
-        response = httpclient.execute(httppost);
+        response = httpclient.execute(httrequest);
 
-        result = inputStreamToString(response.getEntity().getContent()).toString()
+        response_stream = response.entity
+        status_line = response.statusLine
+        body = inputStreamToString(response_stream.content).toString
+        code = status_line.statusCode
 
         rescue Java::Net::ConnectException => e
           message = "There was problem with the connection."
-          # error = Nexusmotion::Error.new(nil, message)
-          #raise error
-          p message
+          @result_object.error = message
+        rescue Java::Net::UnknownHostException => e
+          message = "Unknown host. Unable to resolve the hostname."
+          @result_object.error = message
         rescue Exception => e
           message = "Unknown error. Error: #{e.inspect}"
-          # error = Nexusmotion::Error.new(nil, message)
-          #raise error
-          p message
+          @result_object.error = message
         end
-        Nexusmotion::GlobalResult.result = result
-        result # This will not be returned/used for now, but possibly in the future.
+
+        @result_object.code = code
+        @result_object.body = body
+        # @result_object # This will not be returned/used for now, but possibly in the future.
     end
 
     def url=(url)
@@ -45,17 +52,22 @@ module Nexusmotion
       @data = data
     end
 
+    def method=(method)
+      @method = method
+    end
+
+    def result_object=(result_object)
+      @result_object = result_object
+    end
+
     def inputStreamToString(is)
-        line = ""
-        total = Java::Lang::StringBuilder.new
-        # Wrap a BufferedReader around the InputStream
-        rd = Java::Io::BufferedReader.new(Java::Io::InputStreamReader.new(is))
-        # Read response until the end
-        while ((line = rd.readLine()) != nil) do
-            total.append(line)
-        end
-         # Return full string
-        total
+      line = ""
+      total = Java::Lang::StringBuilder.new
+      rd = Java::Io::BufferedReader.new(Java::Io::InputStreamReader.new(is))
+      while ((line = rd.readLine()) != nil) do
+          total.append(line)
+      end
+      total
     end
 
   end

data/lib/nexusmotion/result.rb

@@ -0,0 +1,16 @@
+module Nexusmotion
+  class Result
+
+    attr_accessor :body, :error, :code
+
+    def success?
+      @error.nil?
+    end
+
+    def failure?
+      !success?
+    end
+
+  end
+
+end

data/lib/nexusmotion/version.rb

@@ -1,3 +1,3 @@
 module Nexusmotion
-  VERSION = "0.0.2.beta"
+  VERSION = "0.0.3.beta"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexusmotion
 version: !ruby/object:Gem::Version
-  version: 0.0.2.beta
+  version: 0.0.3.beta
 platform: ruby
 authors:
 - TigerWolf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,7 +57,7 @@ files:
 - lib/nexusmotion/client.rb
 - lib/nexusmotion/error.rb
 - lib/nexusmotion/gap_junction.rb
-- lib/nexusmotion/global_result.rb
+- lib/nexusmotion/result.rb
 - lib/nexusmotion/version.rb
 - nexusmotion.gemspec
 homepage: https://github.com/TigerWolf/nexusmotion
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A RubyMotion Android gem to provide basic HTTP like GET and POST.

data/lib/nexusmotion/global_result.rb

@@ -1,11 +0,0 @@
-module Nexusmotion
-  # This is not thread save, when we have thread responses implemented in RubyMotion we can use then instead
-  class GlobalResult
-    class << self
-      attr_accessor :result
-      def self.result=( result )
-        @result = result
-      end
-    end
-  end
-end