random_org_http_api 0.0.3 → 0.0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 467e2abb74244f0f471b85fd48166f1e0c0261fd
-  data.tar.gz: f26795a3c1ff117a12e6a228fd6c529c65d457c2
+  metadata.gz: 87cf6a543500185e6d40cf14dca165293ab0a10a
+  data.tar.gz: 20ed9d531372a7d75c311091b441f3bd77c4d021
 SHA512:
-  metadata.gz: 47d7b7ffbbde6c941fb3e74dd926184b81ca39dd3cec6af4d8b88987b04499b110aedae61aebd75753c0fcfa5d987b7655958670d9b8483be2da64be9c2f827b
-  data.tar.gz: 464d646843b502f4a20c08d6193953f04888c1b905d1939134f94f79059a358a77b6e333c207c07ff6672400fd6af234586f1b346b7d54042b51db682a885b7b
+  metadata.gz: 5ee6fccefdb7e4d2ad4bfe3bb51f971614321323876100ca50d81af235935fd9d5bde4131856e2c06d61f5dd9d1cf23766ebebf31d0a5fcf33f33315d80d04ab
+  data.tar.gz: 36aafa91b88db009501db467309e9fd148660bd83244d5f7109f18c7ade44990ab6ba3741c98dbaf8add1be3387bbdad76c4527095906cb7a5c8fd6d86e9fc77

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.1
+  - 2.2.4
 branches:
   only:
     - master

data/lib/random_org_http_api/configuration.rb

@@ -1,6 +1,6 @@
 module RandomOrgHttpApi
   module Configuration
-    DOMAIN = 'www.random.org'
+    DOMAIN = 'https://www.random.org'
     DEFAULT_QUERY_PARAMS = {
         format: 'plain',
         base: '10',
@@ -16,15 +16,15 @@ module RandomOrgHttpApi
     # Query templates
     # Integer
     INTEGER_QUERY_KEYS = [:num, :min, :max, :col, :base, :format, :rnd]
-    INTEGER_QUERY_TEMPLATE = "/integers/?num=%{num}&min=%{min}&max=%{max}&col=%{col}&base=%{base}&format=%{format}&rnd=%{rnd}"
+    INTEGER_QUERY_TEMPLATE = "integers/?num=%{num}&min=%{min}&max=%{max}&col=%{col}&base=%{base}&format=%{format}&rnd=%{rnd}"
 
     # String
     STRING_QUERY_KEYS = [:num, :len, :digits, :upperalpha, :loweralpha, :unique, :format, :rnd]
-    STRING_QUERY_TEMPLATE = "/strings/?num=%{num}&len=%{len}&digits=%{digits}&upperalpha=%{upperalpha}&loweralpha=%{loweralpha}&unique=%{unique}&format=%{format}&rnd=%{rnd}"
+    STRING_QUERY_TEMPLATE = "strings/?num=%{num}&len=%{len}&digits=%{digits}&upperalpha=%{upperalpha}&loweralpha=%{loweralpha}&unique=%{unique}&format=%{format}&rnd=%{rnd}"
 
     # Sequence
     SEQUENCE_QUERY_KEYS = [:min, :max, :col, :format, :rnd]
-    SEQUENCE_QUERY_TEMPLATE = "/sequences/?min=%{min}&max=%{max}&col=%{col}&format=%{format}&rnd=%{rnd}"
+    SEQUENCE_QUERY_TEMPLATE = "sequences/?min=%{min}&max=%{max}&col=%{col}&format=%{format}&rnd=%{rnd}"
 
   end
 end

data/lib/random_org_http_api/generator.rb

@@ -20,7 +20,7 @@ module RandomOrgHttpApi
 
     # Quota Checker
     def quota
-      quota_query = "/quota/?ip=#{ip}&format=plain"
+      quota_query = "quota/?ip=#{ip}&format=plain"
       request(DOMAIN, quota_query).first.to_i
     end
 
@@ -29,7 +29,10 @@ module RandomOrgHttpApi
     # Метод запроса на сайт random.org
     def request(domain, query)
       # Создаем запрос
-      res = Net::HTTP.get_response(domain, query)
+      uri = URI.join(domain, query)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      res = http.get(uri.request_uri)
       # Если все хорошо, то возвращаем форматированный ответ,
       # если нет, то показываем ответ ошибки сервера.
       res.is_a?(Net::HTTPSuccess) ? res.body.split : res.body.strip

data/lib/random_org_http_api/version.rb

@@ -1,3 +1,3 @@
 module RandomOrgHttpApi
-  VERSION = "0.0.3"
+  VERSION = "0.0.3.1"
 end

data/spec/random_org_http_api/generator_spec.rb

@@ -25,36 +25,36 @@ describe RandomOrgHttpApi::Generator do
     it 'should do generate right query for integer' do
       object_type = 'integer'
       params = {num: 4, max: 100}
-      right_query = '/integers/?num=4&min=1&max=100&col=1&base=10&format=plain&rnd=new'
+      right_query = 'integers/?num=4&min=1&max=100&col=1&base=10&format=plain&rnd=new'
       expect(@generator.send(:query, object_type, params)).to eq(right_query)
     end
 
     it 'should do generate right query for string' do
       object_type = 'string'
       params = {min: 1, max: 10, num: 3, len: 5}
-      right_query = '/strings/?num=3&len=5&digits=on&upperalpha=on&loweralpha=on&unique=on&format=plain&rnd=new'
+      right_query = 'strings/?num=3&len=5&digits=on&upperalpha=on&loweralpha=on&unique=on&format=plain&rnd=new'
       expect(@generator.send(:query, object_type, params)).to eq(right_query)
     end
 
     it 'should do generate right query for sequence' do
       object_type = 'sequence'
       params = {num: 5, len: 10, max: 10}
-      right_query = '/sequences/?min=1&max=10&col=1&format=plain&rnd=new'
+      right_query = 'sequences/?min=1&max=10&col=1&format=plain&rnd=new'
       expect(@generator.send(:query, object_type, params)).to eq(right_query)
     end
   end
 
   describe '#request' do
-    domain = 'www.random.org'
+    domain = 'https://www.random.org'
 
     it 'should do return string with error message if request have bad response' do
-      bad_query = '/strings/?num=HelloWorld&len=5&digits=on&upperalpha=on&loweralpha=on&unique=on&format=plain&rnd=new'
+      bad_query = 'strings/?num=HelloWorld&len=5&digits=on&upperalpha=on&loweralpha=on&unique=on&format=plain&rnd=new'
       expect(@generator.send(:request, domain, bad_query).class).to eq(String)
     end
 
     it 'should do return array if request have good response' do
       if @generator.quota > 0
-        good_query = '/strings/?num=3&len=5&digits=on&upperalpha=on&loweralpha=on&unique=on&format=plain&rnd=new'
+        good_query = 'strings/?num=3&len=5&digits=on&upperalpha=on&loweralpha=on&unique=on&format=plain&rnd=new'
         expect(@generator.send(:request, domain, good_query).class).to eq(Array)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: random_org_http_api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.3.1
 platform: ruby
 authors:
 - Temur Fatkulin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Realization of old HTTP API provided by the random.org service