indico 0.9.3 → 0.9.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a07e355897fb68aed8c2fc6b2cf73a52a315360a
+  data.tar.gz: 5dc85c207c80641e80fdad1aa9ce4f02500a52d3
+SHA512:
+  metadata.gz: a8f30adba9ff040c18ea09f6078a5a39b4b6e3711ac585af7fc0eea701762623c16f192d0f4aec6472328cffb1987c3f5ca540f8d69c24c85ce40aabae80293c
+  data.tar.gz: afa96e01d407b2a7f6d32fa22816b1282394e31be44e3684b474a949116534d90cd2600a6bfa0a2165b8dcc645382e36232bb208a6db07647bd6a986078f4b39

data/.github/PULL_REQUEST_TEMPLATE

@@ -0,0 +1,37 @@
+
+<!--- For the author to fill in -->
+Reviewers: 
+----------
+<!--- Check yourself off the list after review -->
+- [ ] @mention
+
+What's the purpose of the PR?
+-----------------------------
+<!--- Does it resolve an issue?  Does it add a feature?  Is it a refactor? -->
+<!--- Trello ticket links? Design document links?-->
+<!--- List out intended functionality. -->
+
+Description of changes
+----------------------
+<!--- What code was changed? Why? -->
+
+Notes to reviewers
+------------------
+<!--- Is there anything in particular you want reviewers to check for? -->
+
+
+<!--- For the reviewer -->
+Keep in mind while reviewing code:
+----------------------------------
+- Is relevant code tested?
+- Are added functions/methods documented?
+- Separation of concerns (SOC)
+- Don't repeat yourself (DRY) 
+- Limit the number of positional arguments
+- Is function/method length reasonable?
+- Can code be broken down into smaller components?
+- Where do added functions/methods belong?
+- Are variable names descriptive?
+- Are errors handled appropriately?
+- Can logic be simplified?
+- Does the code make sense in context? (expand the diff)

data/lib/indico/helper.rb

@@ -10,7 +10,7 @@ module Indico
       Indico.cloud_protocol + root + '.indico.domains/' + api
     end
   end
-  
+
   def self.api_handler(data, api, config, method='predict')
     server = nil
     api_key = nil
@@ -27,7 +27,7 @@ module Indico
 
     api += (method != "predict" ? ("/" + method) : "")
 
-    unless config.nil?
+    if config
       server = config.delete('cloud')
       api_key = config.delete('api_key')
       apis = config.delete('apis')
@@ -41,7 +41,7 @@ module Indico
     if api_key.nil?
       raise ArgumentError, 'api key is required'
     end
-    
+
     url_params = Array.new
     if apis
       url_params.push(['apis', apis.join(",")])

data/lib/indico/version.rb

@@ -1,3 +1,3 @@
 module Indico
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/lib/indico.rb

@@ -26,6 +26,12 @@ module Indico
   end
 
   def self.political(text, config = nil)
+    if !config
+      config = {}
+    end
+    if !config.key?(:v) and !config.key?(:version)
+      config['version'] = "2"
+    end
     api_handler(text, 'political', config)
   end
 
@@ -66,10 +72,13 @@ module Indico
   end
 
   def self.keywords(text, config = nil)
-    unless !config or config.key?(:v) or config.key?(:version)
+    if !config
+      config = {}
+    end
+    if !config.key?(:v) and !config.key?(:version)
       config['version'] = "2"
     end
-    if config and config.key?(:language) and config[:language] != "english"
+    if config.key?(:language) and config[:language] != "english"
       config['version'] = "1"
     end
     api_handler(text, 'keywords', config)

data/spec/indico_batch_spec.rb

@@ -12,15 +12,6 @@ describe Indico do
     TEXT_APIS.delete("sentiment_hq")
   end
 
-  it 'should tag text with correct political tags' do
-    expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
-    data = ['Guns don\'t kill people.', ' People kill people.']
-    response = Indico.political(data, @config)
-
-    expect(Set.new(response[0].keys)).to eql(expected_keys)
-    expect(Set.new(response[1].keys)).to eql(expected_keys)
-  end
-
   it 'should tag text with correct emotion tags' do
     expected_keys = Set.new(%w(anger fear joy sadness surprise))
     data = "I did it. I got into Grad School. Not just any program, but a GREAT program. :-)"

data/spec/indico_spec.rb

@@ -11,13 +11,6 @@ describe Indico do
     @config = { api_key: api_key, cloud: private_cloud}
   end
 
-  it 'should tag text with correct political tags' do
-    expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
-    response = Indico.political('Guns don\'t kill people. People kill people.')
-
-    expect(Set.new(response.keys)).to eql(expected_keys)
-  end
-
   it 'should return personality values for text' do
     expected_keys = Set.new(%w(openness extraversion conscientiousness agreeableness))
     response = Indico.personality('I love my friends!')
@@ -34,17 +27,6 @@ describe Indico do
     end
   end
 
-  it 'should tag text with correct political tags' do
-    expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
-    data = 'Guns don\'t kill people. People kill people.'
-
-    # for mocking: use http to redirect requests to our public cloud endpoint
-    Indico.cloud_protocol = 'http://'
-    response = Indico.political(data, @config)
-    Indico.cloud_protocol = 'https://'
-    expect(Set.new(response.keys)).to eql(expected_keys)
-  end
-
   it 'should tag text with correct emotion tags' do
     expected_keys = Set.new(%w(anger fear joy sadness surprise))
     data = "I did it. I got into Grad School. Not just any program, but a GREAT program. :-)"

data/spec/political_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Indico do
+    before do
+        api_key = ENV['INDICO_API_KEY']
+        private_cloud = 'indico-test'
+        @config = { api_key: api_key, cloud: private_cloud}
+    end
+
+    it 'should tag text with correct political tags' do
+      expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
+      data = ['Guns don\'t kill people.', ' People kill people.']
+      response = Indico.political(data, @config)
+
+      expect(Set.new(response[0].keys)).to eql(expected_keys)
+      expect(Set.new(response[1].keys)).to eql(expected_keys)
+    end
+
+    it 'should tag text with correct political tags' do
+      expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
+      response = Indico.political('Guns don\'t kill people. People kill people.')
+
+      expect(Set.new(response.keys)).to eql(expected_keys)
+    end
+
+    it 'single political should return the right response' do
+        expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
+
+        config = @config.clone
+        config["version"] = 1
+        response = Indico.political('Guns don\'t kill people. People kill people.')
+
+        expect(Set.new(response.keys)).to eql(expected_keys)
+    end
+
+    it 'batch political should return the right response' do
+        expected_keys = Set.new(%w(Conservative Green Liberal Libertarian))
+        data = 'Guns don\'t kill people. People kill people.'
+
+        config = @config.clone
+        config["version"] = 1
+        response = Indico.political([data, data])
+
+        expect(response.length).to eql(2)
+        expect(Set.new(response[0].keys)).to eql(expected_keys)
+        expect(Set.new(response[1].keys)).to eql(expected_keys)
+    end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indico
 version: !ruby/object:Gem::Version
-  version: 0.9.3
-  prerelease: 
+  version: 0.9.4
 platform: ruby
 authors:
 - Slater Victoroff
@@ -12,12 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -25,7 +23,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -33,7 +30,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,7 +37,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -49,7 +44,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -57,7 +51,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,33 +58,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A simple Ruby Wrapper for the indico set of APIs.
@@ -104,6 +93,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .github/PULL_REQUEST_TEMPLATE
 - .gitignore
 - .rspec
 - Gemfile
@@ -128,32 +118,32 @@ files:
 - spec/indico_batch_spec.rb
 - spec/indico_spec.rb
 - spec/keywords_v2_spec.rb
+- spec/political_spec.rb
 - spec/settings_spec.rb
 - spec/spec_helper.rb
 - spec/versioning_spec.rb
 homepage: https://github.com/IndicoDataSolutions/IndicoIo-ruby
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple Ruby Wrapper for the indico set of APIs.
 test_files: []