base-api-client 0.2.3.beta → 0.2.4.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffaf6e1e894e5abe3cce6ad140c14e911cdc7758
-  data.tar.gz: a8d9955e61c1621a6f9acd6c57154dcd15e9c3ce
+  metadata.gz: 2049e5a041b193725cedb8ba838866bb0f5b893c
+  data.tar.gz: 4bc4c3c911f59ca70117c8c6c0a784b5996e7b6e
 SHA512:
-  metadata.gz: d0b03d2976a86f5558edf0fa32ec03b38472e9cab582db58dc2ecd4d3ce167bd04c25d885c427e59f7d28d053b17c572f9ef77c795e049492551d8d6a44f8eb5
-  data.tar.gz: 7563f4afe8ad6929f2e089a888bb36f4c55bde0a47d5cd2b05a5a283ee61c044f5bfcdab5b9c43b036250209ddf7b52a5b211114b70c39d386adaca1f1a3a030
+  metadata.gz: d26d8081069b011a9429e7bce75c842f0fe5670cbe1f0a15204c45263eef680795e554b1f80f6971103c192a74e9e0a8fee8e22f5a54dc4f76363ace617d4564
+  data.tar.gz: fdf932804c2514f6d4e112902dd4e7c0cc62d44d8711b358f6858c489edc4e56e4bcd6fbb83f52ecf0a904e2a0a4eaf3eddf56d34918a2d7d728464c2d846acd

data/Gemfile

@@ -3,7 +3,6 @@ source 'https://rubygems.org'
 gem 'bundler', '~> 1.11.2'
 gem 'guard-rspec'
 gem 'json_spec', '~> 1.1.4'
-gem 'os', '~> 0.9.6'
 gem 'pry-byebug'
 gem 'pry-doc'
 gem 'rake', '~> 10.4.2'

data/base-api-client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name                  = 'base-api-client'
-  spec.version               = '0.2.3.beta'
+  spec.version               = '0.2.4.beta'
   spec.author                = 'ysksn'
   spec.email                 = ['bluewhale1982@gmail.com']
   spec.summary               = 'Client for accessing BASE APIs'
@@ -13,6 +13,4 @@ Gem::Specification.new do |spec|
   spec.bindir                = 'bin'
   spec.post_install_message  = 'base-api-client gem installed :)'
   spec.required_ruby_version = ['> 2.2.2']
-
-  spec.add_runtime_dependency 'os', '~> 0.9.6'
 end

data/config/client_secret.json

@@ -1,8 +1,8 @@
 {
-  "client_id": "e0920d3fba627a5da4eaab4e8e9d43fc",
-  "client_secret": "ad493e7ada7eb96a6f71d1ccb100966b",
+  "client_id": "",
+  "client_secret": "",
   "code": "",
-  "redirect_uri": "http://localhost.local",
-  "search_client_id": "623f75000821c16163ec570ca6469539",
-  "search_client_secret": "214b4134022df8bf0230f5a077c772d9"
+  "redirect_uri": "",
+  "search_client_id": "",
+  "search_client_secret": ""
 }

data/lib/base/api_client/client_secret.rb

@@ -23,21 +23,25 @@ module Base
         @client_id ||= opts['client_id']
         @client_secret ||= opts['client_secret']
         @code ||= opts['code']
+        @expires_at ||= opts['expires_at']
         @redirect_uri ||= opts['redirect_uri']
+        @access_token ||= opts['access_token']
+        @refresh_token ||= opts['refresh_token']
         @search_client_id ||= opts['search_client_id']
         @search_client_secret ||= opts['search_client_secret']
       end
 
       def update!(args)
-        self.client_id =            args[:client_id] if args[:client_id]
-        self.client_secret =        args[:client_secret] if args[:client_secret]
-        self.code =                 args[:code] if args[:code]
-        self.expires_at =           args[:expires_at] if args[:expires_at]
-        self.redirect_uri =         args[:redirect_uri] if args[:redirect_uri]
-        self.access_token =         args[:access_token] if args[:access_token]
-        self.refresh_token =        args[:refresh_token] if args[:refresh_token]
-        self.search_client_id =     args[:search_client_id] if args[:search_client_id]
-        self.search_client_secret = args[:search_client_secret] if args[:search_client_secret]
+        opts = Base::Normalization.recursive_hash_normalize_keys(args)
+        self.client_id =            opts[:client_id] if opts[:client_id]
+        self.client_secret =        opts[:client_secret] if opts[:client_secret]
+        self.code =                 opts[:code] if opts[:code]
+        self.expires_at =           opts[:expires_at] if opts[:expires_at]
+        self.redirect_uri =         opts[:redirect_uri] if opts[:redirect_uri]
+        self.access_token =         opts[:access_token] if opts[:access_token]
+        self.refresh_token =        opts[:refresh_token] if opts[:refresh_token]
+        self.search_client_id =     opts[:search_client_id] if opts[:search_client_id]
+        self.search_client_secret = opts[:search_client_secret] if opts[:search_client_secret]
       end
 
       def to_json
@@ -81,8 +85,8 @@ module Base
           use_ssl: uri.scheme == 'https') { |http| http.request(request) }
       end
 
-      def generate_code
-        system(command, [AUTH_URI, generate_authorize_parameters].join)
+      def generate_code_uri
+        [AUTH_URI, generate_authorize_parameters].join
       end
 
       def set_tokens!
@@ -90,7 +94,7 @@ module Base
         @access_token  = response['access_token']
         @refresh_token = response['refresh_token']
         @code          = nil
-        @expires_at    = to_expires_at(response['expires_in'])
+        send :expires_at=
         to_hash
       end
 
@@ -126,14 +130,6 @@ module Base
             end.join('&')
       end
 
-      def command
-        if OS.linux?
-          'sensible-browser'
-        elsif OS.mac?
-          'open'
-        end
-      end
-
       def grant_type
         @grant_type =
           if code && redirect_uri
@@ -151,8 +147,8 @@ module Base
         JSON.parse response.body
       end
 
-      def to_expires_at(expires_in)
-        Time.now + expires_in
+      def expires_at=(expires_at = nil)
+        @expires_at = expires_at || Time.now + 3600
       end
     end
   end

data/lib/base/apis/normalization.rb

@@ -0,0 +1,19 @@
+module Base
+  class Normalization
+    class << self
+      def recursive_hash_normalize_keys(val)
+        (val.is_a? Hash) ? deep_hash_normalize(val) : val
+      end
+
+      def deep_hash_normalize(old_hash)
+        sym_hash = {}
+
+        old_hash.each do |k, v|
+          sym_hash[k.to_sym] = recursive_hash_normalize_keys(v)
+        end
+
+        sym_hash
+      end
+    end
+  end
+end

data/lib/base/apis.rb

@@ -2,7 +2,6 @@ require 'net/http'
 require 'open-uri'
 require 'pathname'
 require 'multi_json'
-require 'os'
 
 module Base
   module Apis

data/spec/base/api_client/client_secret_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe Base::APIClient::ClientSecret do
         expect(subject.client_secret).to eq \
           'fake_client_secret'
         expect(subject.code).to eq \
-          'fake_code'
+          nil
         expect(subject.redirect_uri).to eq \
           'http://fake_redirect_uri.com'
         expect(subject.search_client_id).to eq \
@@ -131,7 +131,7 @@ RSpec.describe Base::APIClient::ClientSecret do
       expect(subject.send(:to_hash)).to eq(
         client_id:            'fake_client_id',
         client_secret:        'fake_client_secret',
-        code:                 'fake_code',
+        code:                  nil,
         expires_at:            nil,
         redirect_uri:         'http://fake_redirect_uri.com',
         access_token:          nil,
@@ -144,7 +144,7 @@ RSpec.describe Base::APIClient::ClientSecret do
   describe '#to_json' do
     it 'returns values of instance variables in json' do
       expect(subject.send(:to_json)).to eq \
-        <<"EOS""{\"client_id\":\"fake_client_id\",\"client_secret\":\"fake_client_secret\",\"code\":\"fake_code\",\"expires_at\":null,\"redirect_uri\":\"http://fake_redirect_uri.com\",\"access_token\":null,\"refresh_token\":null,\"search_client_id\":\"fake_search_client_id\",\"search_client_secret\":\"fake_search_client_secret\"}"
+        <<"EOS""{\"client_id\":\"fake_client_id\",\"client_secret\":\"fake_client_secret\",\"code\":null,\"expires_at\":null,\"redirect_uri\":\"http://fake_redirect_uri.com\",\"access_token\":null,\"refresh_token\":null,\"search_client_id\":\"fake_search_client_id\",\"search_client_secret\":\"fake_search_client_secret\"}"
 EOS
     end
   end
@@ -157,67 +157,18 @@ EOS
     end
   end
 
-  describe '#command' do
-    context 'OS is Linux' do
-      it 'returns "sensible-browser"' do
-        allow(OS).to receive(:linux?) { true }
-        expect(subject.send(:command)).to eq 'sensible-browser'
-      end
-    end
-
-    context 'OS is OSX' do
-      it 'returns "open"' do
-        allow(OS).to receive(:linux?) { false }
-        allow(OS).to receive(:mac?) { true }
-        expect(subject.send(:command)).to eq 'open'
-      end
-    end
-  end
-
-  describe '#generate_code' do
-    context 'OS is Linux' do
-      before(:each) do
-        allow(subject).to receive(:command) { 'sensible-browser' }
-      end
-
-      it 'call sensible-browser' do
-        expect(subject).to receive(:system).with(
-          'sensible-browser',
-          'https://api.thebase.in/1/oauth/authorize?client_id=fake_client_id&redirect_uri=http://fake_redirect_uri.com&state=&response_type=code&scope=read_items read_orders read_savings read_users read_users_mail write_items write_orders')
-
-        subject.send(:generate_code)
-      end
-
-      it 'returns ture' do
-        allow(subject).to receive(:generate_code) { true }
-        expect(subject.send(:generate_code)).to eq true
-      end
-    end
-
-    context 'OS is OSX' do
-      before(:each) do
-        allow(subject).to receive(:command) { 'open' }
-      end
-
-      it 'call open' do
-        expect(subject).to receive(:system).with(
-          'open',
-          'https://api.thebase.in/1/oauth/authorize?client_id=fake_client_id&redirect_uri=http://fake_redirect_uri.com&state=&response_type=code&scope=read_items read_orders read_savings read_users read_users_mail write_items write_orders')
-
-        subject.send(:generate_code)
-      end
-
-      it 'returns ture' do
-        allow(subject).to receive(:generate_code) { true }
-        expect(subject.send(:generate_code)).to eq true
-      end
+  describe '#generate_code_uri' do
+    it 'generates URI for fetching code' do
+      expect(subject.generate_code_uri).to eq \
+        'https://api.thebase.in/1/oauth/authorize?client_id=fake_client_id&redirect_uri=http://fake_redirect_uri.com&state=&response_type=code&scope=read_items read_orders read_savings read_users read_users_mail write_items write_orders'
     end
   end
 
   describe '#grant_type' do
     context '@grant_type is not nil' do
       it 'returns @grant_type value authorization_code' do
-        subject.instance_variable_set(:@grant_type, 'authorization_code')
+        subject.instance_variable_set(:@grant_type, nil)
+        subject.instance_variable_set(:@code, true)
         subject.send(:grant_type)
         expect(subject.instance_variable_get(:@grant_type)).to eq \
           'authorization_code'
@@ -355,11 +306,25 @@ EOS
       end
     end
 
-    describe '#to_expires_at' do
-      it 'returns expires_at' do
-        expires_at = subject.send(:to_expires_at, 3600)
-        expect(expires_at).to eq \
-          Date.parse(Time.new(2016).to_s).to_time + 3600
+    describe '#expires_at=' do
+      let(:time) { Date.parse(Time.new(2016).to_s).to_time + 3600 }
+
+      context 'an arg given' do
+        it 'returns expires_at' do
+          subject.send(:expires_at=, time)
+          expect(subject.expires_at).to eq time
+        end
+      end
+
+      context 'none is given' do
+        it 'returns expires_at' do
+          allow(Time).to receive(:now) do
+            Date.parse(Time.new(2016).to_s).to_time
+          end
+
+          subject.send(:expires_at=)
+          expect(subject.expires_at).to eq time
+        end
       end
     end
   end

data/spec/base/apis/normalization_spec.rb

@@ -0,0 +1,78 @@
+require 'spec_helper'
+
+RSpec.describe Base::Normalization do
+  describe '::deep_hash_normalize' do
+    context 'given arg is not a hash' do
+      let(:arg) { [] }
+
+      it 'returns arg' do
+        expect(Base::Normalization.recursive_hash_normalize_keys(arg)).to eq []
+      end
+    end
+
+    context 'given arg is a hash' do
+      let(:arg) { { 'a' => 1, 'b' => 2, 'c' => 3 } }
+
+      it 'calles Base::Normalization.deep_hash_normalize' do
+        allow(Base::Normalization).to receive(:deep_hash_normalize).with(arg) do
+          { a: 1,
+            b: 2,
+            c: 3 }
+        end
+
+        Base::Normalization.recursive_hash_normalize_keys(arg)
+      end
+
+      it 'returns given hash with symbol keys' do
+        expect(Base::Normalization.recursive_hash_normalize_keys(arg)).to eq(
+          a: 1,
+          b: 2,
+          c: 3)
+      end
+    end
+  end
+
+  describe '::recursive_hash_normalize_keys' do
+    context 'given arg is a shallow hash' do
+      context 'given hash with string keys' do
+        let(:arg) { { 'a' => 1, 'b' => 2, 'c' => 3 } }
+
+        it 'returns given hash with symbol keys' do
+          expect(Base::Normalization.deep_hash_normalize(arg)).to eq(
+            a: 1,
+            b: 2,
+            c: 3)
+        end
+      end
+
+      context 'given hash with symbol keys' do
+        let(:arg) { { a: 1, b: 2, c: 3 } }
+
+        it 'returns given hash with symbol keys' do
+          expect(Base::Normalization.deep_hash_normalize(arg)).to eq(
+            a: 1,
+            b: 2,
+            c: 3)
+        end
+      end
+    end
+
+    context 'given arg is a deep hash' do
+      let(:arg) do
+        {
+          'a' => 1,
+          b: {
+            'c' => [2, 3, 4],
+            'd' => { 'e' => 'hello' } } }
+      end
+
+      it 'returns given hash with symbol keys' do
+        expect(Base::Normalization.deep_hash_normalize(arg)).to eq(
+          a: 1,
+          b: {
+            c: [2, 3, 4],
+            d: { e: 'hello' } })
+      end
+    end
+  end
+end

data/spec/fixtures/files/client_secret.json

@@ -1,7 +1,6 @@
 {
   "client_id":     "fake_client_id",
   "client_secret": "fake_client_secret",
-  "code":          "fake_code",
   "redirect_uri":  "http://fake_redirect_uri.com",
   "search_client_id":     "fake_search_client_id",
   "search_client_secret": "fake_search_client_secret"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: base-api-client
 version: !ruby/object:Gem::Version
-  version: 0.2.3.beta
+  version: 0.2.4.beta
 platform: ruby
 authors:
 - ysksn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: os
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.6
+date: 2016-02-23 00:00:00.000000000 Z
+dependencies: []
 description: 
 email:
 - bluewhale1982@gmail.com
@@ -44,6 +30,7 @@ files:
 - lib/base/apis/category.rb
 - lib/base/apis/delivery_company.rb
 - lib/base/apis/item_category/detail.rb
+- lib/base/apis/normalization.rb
 - lib/base/apis/order.rb
 - lib/base/apis/saving.rb
 - lib/base/apis/search.rb
@@ -51,6 +38,7 @@ files:
 - spec/base/apis/category_spec.rb
 - spec/base/apis/delivery_company_spec.rb
 - spec/base/apis/item_category/detail_spec.rb
+- spec/base/apis/normalization_spec.rb
 - spec/base/apis/order_spec.rb
 - spec/base/apis/saving_spec.rb
 - spec/base/apis/search_spec.rb
@@ -94,6 +82,7 @@ test_files:
 - spec/base/apis/category_spec.rb
 - spec/base/apis/delivery_company_spec.rb
 - spec/base/apis/item_category/detail_spec.rb
+- spec/base/apis/normalization_spec.rb
 - spec/base/apis/order_spec.rb
 - spec/base/apis/saving_spec.rb
 - spec/base/apis/search_spec.rb