wolfram_databin 0.1.2 → 0.1.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4e733cc3c55e931304a1933fb5e1367924dcb037
4
- data.tar.gz: f7ac9124f8c675a612b873765e1960f2ce5bf6be
3
+ metadata.gz: 8d97c4291a955f1ef6d8f955edf26768c0293c86
4
+ data.tar.gz: 2cbc4847dfb99f194e10538d8b91696231eedd08
5
5
  SHA512:
6
- metadata.gz: 94e42934a7daf6e05df5c9d1e44e91e9f4eb3dd4c1905f4932da12f7e71d55c98adc1ee71e731baf76d589f4ba57eb92b78fc327f86706d598c0cfd01ed2c31a
7
- data.tar.gz: e60257184000f2d006c56dd554278508689884b4f9e90896ae652ea6324dc3662737eb9615481d698f0869d4bdcd2223b08a3b0820b8846e36d076416477c58d
6
+ metadata.gz: 6cedc5cf163368926a735fa84b30964e09f2f5deb2c866de4d1b6bd9b6d7b01de5f958b888883c83cebe648e5ffcceb324a29848c5c0c4d94880dc5f02222e5b
7
+ data.tar.gz: 54ff1829c98cfe28270d5d83d94cb59a32c786a352b19af51ec7194f42efe015d2a9e386a1ca4d1e0b64533188843a23f32f96936f297f1ee04cb12c7d7a941b
data/Gemfile CHANGED
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
2
2
  ruby '2.1.5'
3
3
  gem "codeclimate-test-reporter"
4
4
  gem "minitest"
5
- gem "httpclient"
5
+ #gem "httpclient"
6
+ gem "hurley"
6
7
  #gem "minitest-rails"
7
8
  gemspec
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- wolfram_databin (0.1.2)
4
+ wolfram_databin (0.1.3)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
@@ -9,9 +9,9 @@ GEM
9
9
  codeclimate-test-reporter (0.4.7)
10
10
  simplecov (>= 0.7.1, < 1.0.0)
11
11
  docile (1.1.5)
12
- httpclient (2.6.0.1)
13
- json (1.8.2)
14
- minitest (5.6.1)
12
+ hurley (0.1)
13
+ json (1.8.3)
14
+ minitest (5.7.0)
15
15
  simplecov (0.10.0)
16
16
  docile (~> 1.1.0)
17
17
  json (~> 1.8)
@@ -23,6 +23,6 @@ PLATFORMS
23
23
 
24
24
  DEPENDENCIES
25
25
  codeclimate-test-reporter
26
- httpclient
26
+ hurley
27
27
  minitest
28
28
  wolfram_databin!
data/README.md CHANGED
@@ -1,4 +1,4 @@
1
- [![Build Status](https://travis-ci.org/semdinsp/wolfram_databin.svg?branch=master)](https://travis-ci.org/semdinsp/wolfram_databin)[![Code Climate](https://codeclimate.com/github/semdinsp/wolfram_databin/badges/gpa.svg)](https://codeclimate.com/github/semdinsp/wolfram_databin)
1
+ [![Build Status](https://travis-ci.org/semdinsp/wolfram_databin.svg)](https://travis-ci.org/semdinsp/wolfram_databin)[![Code Climate](https://codeclimate.com/github/semdinsp/wolfram_databin/badges/gpa.svg)](https://codeclimate.com/github/semdinsp/wolfram_databin)
2
2
  [![Gem Version](https://badge.fury.io/rb/wolfram_databin.png)](http://badge.fury.io/rb/wolfram_databin)
3
3
 
4
4
  Wolfram Databin
@@ -1,5 +1,5 @@
1
1
  require 'rubygems'
2
- require 'httpclient'
2
+ require 'hurley'
3
3
  module WolframDatabin
4
4
  class Base
5
5
  attr_accessor :shortid, :uri, :debug_flag
@@ -24,28 +24,40 @@ module WolframDatabin
24
24
  dbin=WolframDatabin::Base.new
25
25
  dbin.submit_data(tshortid,aquery)
26
26
  end
27
+ def fix_query(query)
28
+ #need to remove underscores
29
+ fixed={}
30
+ query.each {|k,v| fixed[k.to_s.gsub('_',"U")]=v}
31
+ # puts "fixed is #{fixed} query is #{query}"
32
+ fixed
33
+
34
+ end
27
35
  def submit_data(tshortid,aquery)
28
36
  self.set_shortid(tshortid)
37
+ # puts "INSPECT POST #{self.shortid} query: #{aquery}"
38
+ # self.debug
29
39
  res=self.post_data(aquery)
30
40
  res
31
41
  end
32
42
  def post_data(query)
33
43
  raise "short id not set" if self.shortid==nil
34
44
  res=''
35
- qdata={bin: self.shortid}.merge(query)
45
+ qdata={bin: self.shortid}.merge(self.fix_query(query))
36
46
  begin
37
47
  Timeout::timeout(40) do
38
- puts "uri #{@uri}" if self.debug_flag
39
- @uri=URI.parse(self.get_url)
40
- clnt = HTTPClient.new
41
- res=clnt.get(@uri,qdata)
48
+ # @uri=URI.parse(self.get_url)
49
+ q=self.get_url + Hurley::Query::Flat.new(qdata).to_s
50
+ puts "url is #{q}"
51
+ puts "uri #{@uri} query #{qdata}" if self.debug_flag
52
+ res=Hurley.get(q)
42
53
  end
43
54
  rescue Exception => e
44
55
  puts "Exception: #{e.inspect}"
45
56
  ensure
46
57
  puts "result: #{res.inspect} query #{qdata} bin: #{self.shortid} url: #{@uri.inspect}" if self.debug_flag
47
58
  end
48
- if res.is_a?(HTTP::Message)
59
+ #if res.is_a?(HTTP::Message)
60
+ if res.is_a?(Hurley::Response)
49
61
  return {success: res.body.include?('successfully added'), result: res}
50
62
  else
51
63
  return {success: false, result: res}
@@ -14,7 +14,7 @@
14
14
  <img src="./assets/0.10.0/loading.gif" alt="loading"/>
15
15
  </div>
16
16
  <div id="wrapper" style="display:none;">
17
- <div class="timestamp">Generated <abbr class="timeago" title="2015-05-16T12:04:41+08:00">2015-05-16T12:04:41+08:00</abbr></div>
17
+ <div class="timestamp">Generated <abbr class="timeago" title="2015-07-18T10:20:36+08:00">2015-07-18T10:20:36+08:00</abbr></div>
18
18
  <ul class="group_tabs"></ul>
19
19
 
20
20
  <div id="content">
data/test/test_wolfram.rb CHANGED
@@ -36,7 +36,7 @@ class WolframDatabinTest < Minitest::Test
36
36
 
37
37
  end
38
38
  def test_submit_class
39
- res = WolframDatabin::Base.submit_data("4PZWVcDT",{clas_submit_time: Time.now})
39
+ res = WolframDatabin::Base.submit_data("4PZWVcDT",{classubmittime: Time.now})
40
40
  assert res[:success], "response should be success #{res} "
41
41
 
42
42
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wolfram_databin
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Sproule
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-16 00:00:00.000000000 Z
11
+ date: 2015-07-18 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: Upload data to wolfram databin mathematica via ruby
14
14
  email: scott.sproule@ficonab.com