bisu 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 446a726b593e73b165a48ac438000b7599964496
-  data.tar.gz: 8dcf59ab1e303d41eaf2d748e52d62faa1fe8fe4
+  metadata.gz: 33b84e9bf0f3646a3679b0f9dddf54d8fc037fe3
+  data.tar.gz: d3ef51a9fb26c9f0850a215fbfc2f86bd128b7e7
 SHA512:
-  metadata.gz: e0da63cddc2297390bf8a3e3d6d292946f4c59fd82ed50d3d4e86f87a99ceee26d443921d77d2d876c9863352b5470f9affa30e882e42366f4927b8b7d57cc3a
-  data.tar.gz: d9c5b5038f8068379fd06a6e320e504903014e99d2bc129c27da2fa8ff2c51f971bc89376350feb11e78b26c1146bae5a2f0de846138b8dbc800aee03aca9c0b
+  metadata.gz: efeae832bf35b4dea2bd76933527260ed93d8da737ff6e7a8d386351531dab1b362ddcf2563cf630429920e2ec43c4a3e8dbd6ee33f107531c6bc5e3be3aef5b
+  data.tar.gz: d3aef119028db40c390020ed8f3f16c26adc364928e1e3ed150e6d75b114d9197728cdb3440955d59e5aad40a8076cfeedf1edb91b50461c4c8df44bfa68069a

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 All notable changes to this project will be documented in this file.
 `Bisu` adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.4.4](https://github.com/hole19/bisu/releases/tag/v1.4.4)
+Released on 2017/03/13
+
+#### Added
+- Removed dependency from onesky-ruby gem
+
+## [1.4.3](https://github.com/hole19/bisu/releases/tag/v1.4.3)
+Released on 2016/12/22
+
+#### Added
+- Fixed a bug related to OneSky integration related to new line character handling
+
+## [1.4.2](https://github.com/hole19/bisu/releases/tag/v1.4.2)
+Released on 2016/12/12
+
+#### Added
+- Fixed a missing gem dependency
+
 ## [1.4.1](https://github.com/hole19/bisu/releases/tag/v1.4.1)
 Released on 2016/12/01
 

data/Gemfile

@@ -4,7 +4,6 @@ ruby '2.3.1'
 gem 'safe_yaml',  '~> 1.0'
 gem 'colorize',   '~> 0.7'
 gem 'xml-simple', '~> 1.1'
-gem 'onesky-ruby'
 
 gem 'webmock',    '~> 1.20'
 gem 'rspec'

data/Gemfile.lock

@@ -6,19 +6,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    domain_name (0.5.20161021)
-      unf (>= 0.0.5, < 1.0.0)
     hashdiff (0.3.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    mime-types (2.99.3)
-    netrc (0.11.0)
-    onesky-ruby (1.0.1)
-      rest-client (~> 1.8)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -36,9 +24,6 @@ GEM
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
     safe_yaml (1.0.4)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
     webmock (1.24.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -50,7 +35,6 @@ PLATFORMS
 
 DEPENDENCIES
   colorize (~> 0.7)
-  onesky-ruby
   rspec
   rspec-its
   safe_yaml (~> 1.0)
@@ -61,4 +45,4 @@ RUBY VERSION
    ruby 2.3.1p112
 
 BUNDLED WITH
-   1.12.5
+   1.14.3

data/bisu.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'safe_yaml',  '~> 1.0'
   s.add_runtime_dependency 'colorize',   '~> 0.7'
   s.add_runtime_dependency 'xml-simple', '~> 1.1'
-  s.add_runtime_dependency 'onesky-ruby', '~> 1.0'
 
   s.add_development_dependency 'webmock', '~> 1.20'
 end

data/lib/bisu/one_sky.rb

@@ -1,9 +1,11 @@
-require 'onesky'
+require 'net/https'
+require 'json'
 
 module Bisu
   class OneSky
     def initialize(api_key, api_secret, project_id, file_name)
-      @client     = Onesky::Client.new(api_key, api_secret)
+      @api_key    = api_key
+      @api_secret = api_secret
       @project_id = project_id
       @file_name  = file_name
     end
@@ -11,8 +13,8 @@ module Bisu
     def to_i18
       Logger.info("Downloading dictionary from OneSky...")
 
-      proj = @client.project(@project_id)
-      file = proj.export_multilingual(source_file_name: @file_name, file_format: "I18NEXT_MULTILINGUAL_JSON")
+      path = "https://platform.api.onesky.io/1/projects/#{@project_id}/translations/multilingual"
+      file = get(path, source_file_name: @file_name, file_format: "I18NEXT_MULTILINGUAL_JSON")
 
       hash = JSON.parse(file)
       hash.each do |lang, v|
@@ -28,5 +30,32 @@ module Bisu
 
       hash
     end
+
+    private
+
+    def get(url, params)
+      uri = URI(url)
+      uri.query = URI.encode_www_form(authenticated_params(params))
+
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+      response = http.request(request)
+
+      raise "OneSky: Http Error #{JSON.parse(response.body)}" if response.code.to_i >= 400
+
+      response.body
+    end
+
+    def authenticated_params(params)
+      now = Time.now.to_i
+
+      { api_key: @api_key,
+        timestamp: now,
+        dev_hash: Digest::MD5.hexdigest(now.to_s + @api_secret)
+      }.merge(params)
+    end
   end
 end

data/lib/bisu/version.rb

@@ -1,4 +1,4 @@
 module Bisu
-  VERSION = '1.4.3'
-  VERSION_UPDATED_AT = '2016-12-22'
+  VERSION = '1.4.4'
+  VERSION_UPDATED_AT = '2017-03-13'
 end

data/spec/lib/bisu/one_sky_spec.rb

@@ -8,12 +8,14 @@ describe Bisu::OneSky do
 
   let(:os_response) { File.read("spec/fixtures/sample_one_sky_response.txt") }
 
-  before do
-    project = double("OSProject")
-    allow_any_instance_of(Onesky::Client).to receive(:project).with(project_id).and_return(project)
-    allow(project).to receive(:export_multilingual).with(source_file_name: file_name, file_format: "I18NEXT_MULTILINGUAL_JSON").and_return(os_response)
+  def stub_multilingual(status:, response:)
+    stub_request(:get, "https://platform.api.onesky.io/1/projects/#{project_id}/translations/multilingual").
+      with(query: hash_including(api_key: api_key, file_format: "I18NEXT_MULTILINGUAL_JSON", source_file_name: file_name)).
+      to_return(:status => status, :body => response, :headers => {})
   end
 
+  before { stub_multilingual(status: 200, response: os_response) }
+
   it { expect { to_i18 }.not_to raise_error }
 
   it "returns an hash in i18 format" do
@@ -27,7 +29,7 @@ describe Bisu::OneSky do
   end
 
   context "when OneSky raises an error" do
-    before { allow_any_instance_of(Onesky::Client).to receive(:project).and_raise("ups... not allowed!") }
+    before { stub_multilingual(status: 400, response: { error: "ups... not allowed!" }.to_json) }
 
     it "raises that same error" do
       expect { to_i18 }.to raise_error /not allowed/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bisu
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - joaoffcosta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: onesky-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement