bluepotion 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ada06103d7e2b09d8f69878a072869d19f3c0188
-  data.tar.gz: 612d94fc6906fb6ad7d9a9d76376ff0f6203ab2f
+  metadata.gz: b2753dc1bf30f1d007bbdde6e645aa14894fafe0
+  data.tar.gz: 3f373b657682bf8617045c056e5cee5b88e7b6b4
 SHA512:
-  metadata.gz: a4f9d90c3edea2e837635765b801a6d73c21b8e1ab0125c25ffe72bb8293373b8db84418de2603d88f5db341c19c8e12085e99072aa03ea0dc50a939f6d2e3d2
-  data.tar.gz: a54a04e03c0d3ef01b52abd99585246de71bc3b4715789e328a6c94037f770f37a290a62c1450b2eda8e3ec45fc97d756b890c02a412cac13b362d78c82ec3df
+  metadata.gz: 85af577175f249ca9b416135aaa58ba8191428a4707024fb7cbc8033702b04d455ce91c792ab56c8ebc23e6e32bd96470dfe0e3d926e3656368ef98f06aaba49
+  data.tar.gz: 6b1233452ee3ca385c832e5708ce0e8d8b37975739a08a047c8741a2cbc4ab85038d2581b0953be98aa02e508b350138324715b3985fce3a99f39b44b9b258d2

data/bin/bluepotion_add_line_numbers

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+
+def skip_line?(line)
+  return true if 
+    line.strip == "" ||
+    line.strip =~ /^class\s/ ||
+    line.strip =~ /^module\s/ ||
+    line.strip =~ /^def\s/ ||
+    line.strip =~ /^if\s/ ||
+    line.strip =~ /^unless\s/ ||
+    line.strip =~ /^while\s/ ||
+    line.strip =~ /^#/ ||
+    line =~ /\sdo(\s|$)/ ||
+    line.strip == "end"
+end
+
+base_path = Dir.pwd
+file = ARGV[0]
+path_and_file = "#{base_path}/#{file}"
+puts "Adding line numbers to #{path_and_file}"
+
+file = File.open(path_and_file)
+contents = file.read
+file.close
+
+lines = contents.split("\n")
+
+out = []
+lines.each_with_index do |line, i|
+  if skip_line?(line)
+    out << " " * 13 
+  else
+    out << "mp \"#{(i + 1).to_s.rjust(4)} ‡\"; "
+  end
+  out << line
+  out << "\n"
+end
+
+out = out.join
+
+FileUtils.cp path_and_file, "#{path_and_file}_before_adding_lines"
+
+File.write(path_and_file, out)
+
+puts "Done"

data/bin/bluepotion_remove_line_numbers

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+require 'fileutils'
+
+base_path = Dir.pwd
+file = ARGV[0]
+path_and_file = "#{base_path}/#{file}"
+puts "Removing line numbers from #{path_and_file}"
+
+file = File.open(path_and_file)
+contents = file.read
+file.close
+
+lines = contents.split("\n")
+
+out = []
+lines.each_with_index do |line, i|
+  ll = line.length
+  
+  if ll > 12
+    original_line = line[13..(ll - 1)]
+    out << original_line
+  else
+    out << line
+  end
+  out << "\n"
+end
+
+out = out.join
+
+FileUtils.cp path_and_file, "#{path_and_file}_before_removing_lines"
+
+File.write(path_and_file, out)
+
+puts "Done"

data/lib/project/blue_potion_net.rb

@@ -71,17 +71,17 @@ class BluePotionNet
       session_client.build_shared(PMApplication.current_application.context, url, &block)
     end
 
-    def get(url, opts={}, &block)
+    def get(url, params={}, opts={}, &block)
       raise "[BluePotion error] You must provide a block when using app.net.get" unless block
       ses = opts.delete(:session) || self.session
-      opts[:serializer] = :string unless opts[:serializer]
-      ses.get(url, opts, &block)
+      ses.get(url, params, opts, &block)
     end
 
-    def get_json(url, opts={}, &block)
+    def get_json(url, params={}, opts={}, &block)
       raise "[BluePotion error] You must provide a block when using app.net.get_json" unless block
+      ses = opts.delete(:session) || self.session
       opts[:serializer] = :json
-      get(url, opts, &block)
+      ses.get(url, params, opts, &block)
     end
 
     def post(url, params, opts={}, &block)

data/lib/project/compatibility/dispatch.rb

@@ -0,0 +1,7 @@
+class Dispatch
+  class << self
+    def once(&block)
+      block.call
+    end
+  end
+end

data/lib/project/pro_motion/adapters/pm_base_adapter.rb

@@ -70,6 +70,12 @@ class PMBaseAdapter < Android::Widget::BaseAdapter
   end
 
   def update_view(view, data)
-    out.text = data
+    if cell_options[:update].is_a?(Proc)
+      cell_options[:update].call(out, data)
+    elsif cell_options[:update].is_a?(Symbol) || cell_options[:update].is_a?(String)
+      find.screen.send(cell_options[:update], out, data)
+    else
+      out.text = data
+    end
   end
 end

data/lib/project/pro_motion/adapters/pm_cursor_adapter.rb

@@ -22,13 +22,21 @@ class PMCursorAdapter < PMBaseAdapter
     out = convert_view || rmq.create!(cell_options[:cell_class] || Potion::TextView)
     update_view(out, data)
     if cell_options[:action]
-      find(out).on(:tap) { find.screen.send(cell_options[:action], data, position) }
+      find(out).on(:tap) do
+        find.screen.send(cell_options[:action], item(position), position)
+      end
     end
     out
   end
 
   def update_view(out, data)
-    out.text = data.getString(cell_options[:title_column])
+    if cell_options[:update].is_a?(Proc)
+      cell_options[:update].call(out, data)
+    elsif cell_options[:update].is_a?(Symbol) || cell_options[:update].is_a?(String)
+      find.screen.send(cell_options[:update], out, data)
+    else
+      out.text = data.getString(cell_options[:title_column].to_i)
+    end
   end
 
 end

data/lib/project/pro_motion/fragments/pm_list_screen.rb

@@ -63,6 +63,10 @@
       end
     end
 
+    def update_table_data
+      adapter.notifyDataSetChanged
+    end
+
     ### Boilerplate from PMScreen ###
 
     def onAttach(activity)

data/lib/project/version.rb

@@ -1,3 +1,3 @@
 module BluePotion
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/project/volley_wrap/http_result.rb

@@ -60,9 +60,7 @@ module VW
         "none"
       end
 
-      #mp @request_params.class.name
       params_string = if @request_params
-        #@request_params.class.name
         @request_params.map{|k,v| "  #{k} = #{v}"}.join("\n")
       else
         "none"

data/lib/project/volley_wrap/request.rb

@@ -8,10 +8,9 @@ module VW
     VOLLEY_PUT = 2
     VOLLEY_DELETE = 3
 
-    def self.get_request(url, listener)
-      set_request_for_listener VOLLEY_GET, url, nil, listener
-      Request.new(VOLLEY_GET, url, listener, listener).tap do |req|
-        req.setRetryPolicy(retry_policy)
+    def self.get_request(url, params, listener)
+      url = add_params_to_url(url, params)
+      request_with_params(VOLLEY_GET, url, params, listener).tap do |req|
         req.listener = listener
       end
     end
@@ -52,6 +51,18 @@ module VW
       super
     end
 
+    def self.add_params_to_url(url, params)
+      if params.blank?
+        url
+      else
+        params_array = params.map do |k, v|
+          v = Java::Net::URLEncoder.encode(v, "utf-8")
+          "#{k}=#{v}"
+        end
+        "#{url}?#{params_array.join("&")}"
+      end
+    end
+
     def self.set_request_for_listener(method, url, params, listener)
       # There probably is a much better way then passing all these around like this
       listener.request_url = url
@@ -83,13 +94,16 @@ module VW
       new_params
     end
 
+
     def self.request_with_params(method, url, params, listener)
       set_request_for_listener method, url, params, listener
 
       Request.new(method, url, listener, listener).tap do |req|
         req.setRetryPolicy(retry_policy)
-        params = prepare_params(params)
-        req.setParams(params)
+        unless method == VOLLEY_GET
+          params = prepare_params(params)
+          req.setParams(params)
+        end
       end
     end
 

data/lib/project/volley_wrap/session_client.rb

@@ -29,11 +29,11 @@ module VW
       @serializer = serializer
     end
 
-    def get(url, opts={}, dummy=nil, &block) # Dummy is to get around RM bug
+    def get(url, params, opts={}, &block)
       request_url = base_url + url
       ser = opts[:serializer] || @serializer
       listener = VW::ResponseListener.new(ser, &block)
-      queue VW::Request.get_request(request_url, listener)
+      queue VW::Request.get_request(request_url, params, listener)
     end
 
     def post(url, params, opts={}, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bluepotion
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - InfiniteRed
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -31,13 +31,18 @@ email:
 - hello@clearsightstudio.com
 executables:
 - bluepotion
+- bluepotion_add_line_numbers
+- bluepotion_remove_line_numbers
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
 - bin/bluepotion
+- bin/bluepotion_add_line_numbers
+- bin/bluepotion_remove_line_numbers
 - lib/bluepotion.rb
 - lib/project/blue_potion_net.rb
+- lib/project/compatibility/dispatch.rb
 - lib/project/ext/activity.rb
 - lib/project/ext/array_list.rb
 - lib/project/ext/fragment.rb