productive 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6bbda2ba26520dea3d18c61ee5dad955d1cff23
-  data.tar.gz: c548d9825ab20b7b2c4add3abc57a697a418841b
+  metadata.gz: ade904ec45d6bfd889ad1aa9e8a86d26da920710
+  data.tar.gz: 1a0b17811c30f76bf2f9ad43721ceb7a0c0ab0bc
 SHA512:
-  metadata.gz: c92f9cad758a6f5d0287edd37b72515ec8d7dfd0b127ada6f5193b0ae4d31772aa38c3d23507c9a99084b68a94f6393a1cab985101ebfd83c5ec8de04acf852e
-  data.tar.gz: 8e61f057da799703f68bd46c4f9074f6158f9482b1e07d8b4aa6f28efef8f77b0ba0eebaf7d881d2c7e0b4969c4edff6b8f139cad85eda940f1e08415fb54c38
+  metadata.gz: 3b479c35c2deeee84f71ce9d43abc3deac70e8d25c6607dd2650d4aaf96e7719492db4e96d7cca0aee5a4b7928ce08352b4abe6e62ec62c0e01cfa12fa3da232
+  data.tar.gz: e71849e848d371f765f0794d2cdafe3757ee6f5552ce91a7f5484481d46c0d9f835cde1254d150111593013d70721991b0cb48dc88acf5c063c6b68cd23077cc

data/README.md

@@ -29,7 +29,7 @@ Productive.configure do |config|
   config.account_id = ACCOUNT_ID
 end
 
-Productive::Base.setup
+Productive::Base.setup(Productive.configuration)
 ```
 
 ## Usage

data/lib/generators/productive/productive_generator.rb

@@ -6,26 +6,24 @@ class ProductiveGenerator < Rails::Generators::Base
   argument :api_key, required: true, desc: 'required'
   argument :account_id, required: true, desc: 'required'
 
-  gem 'productive'
-
   desc 'Configure Productive API client'
 
   def create_initializer_file
-    unless /^[a-f0-9\-]{36}$/ =~ api_key
+    if /^[a-f0-9\-]{36}$/ !~ api_key
       raise Thor::Error, "Invalid Productive API key #{api_key.inspect}\nYou can find the API key on the Settings -> Security page of https://productive.io"
     end
 
-    unless /^[0-9]*$/ =~ account_id
+    if /^[0-9]*$/ !~ account_id
       raise Thor::Error, "Invalid Productive Account ID #{account_id.inspect}\n"
     end
 
     initializer 'productive.rb' do
-      <<-EOF
-Productive.configure do |config|
-  config.api_key = #{api_key.inspect}
-  config.account_id = #{account_id.inspect}
-end
-      EOF
+      <<-CONFIG.strip_heredoc
+        Productive.configure do |config|
+          config.api_key = #{api_key.inspect}
+          config.account_id = #{account_id.inspect}
+        end
+      CONFIG
     end
   end
 end

data/lib/json_api_paginator.rb

@@ -1,3 +1,5 @@
+require 'rack'
+
 class JsonApiPaginator
   attr_reader :params, :result_set, :links, :meta
 
@@ -28,7 +30,7 @@ class JsonApiPaginator
     if links['last']
       uri = result_set.links.link_url_for('last')
       last_params = params_for_uri(uri)
-      last_params['page[number]'].to_i
+      last_params['page']['number'].to_i
     else
       current_page
     end
@@ -40,11 +42,11 @@ class JsonApiPaginator
   alias_method :total_count, :total_entries
 
   def per_page
-    params['page[size]'].to_i
+    params['page']['size'].to_i
   end
 
   def current_page
-    (params['page[number]'] || 1).to_i
+    (params['page']['number'] || 1).to_i
   end
 
   def previous_page
@@ -59,6 +61,6 @@ class JsonApiPaginator
   def params_for_uri(uri)
     return {} unless uri
     uri = Addressable::URI.parse(uri)
-    uri.query_values || {}
+    Rack::Utils.parse_nested_query(uri.query || '')
   end
 end

data/lib/productive/configuration.rb

@@ -8,8 +8,8 @@ module Productive
     attr_accessor :paginator
 
     def initialize
-      self.api_key = ENV['PRODUCTIVE_API_KEY']
-      self.account_id = nil
+      self.api_key = ENV.fetch('PRODUCTIVE_API_KEY')
+      self.account_id = ENV.fetch('PRODUCTIVE_ACCOUNT_ID')
       self.base_url = 'https://productive.io/api/v2/'
       self.paginator = JsonApiPaginator
     end

data/lib/productive/railtie.rb

@@ -3,7 +3,7 @@ require 'rails'
 module Productive
   class Railtie < Rails::Railtie
     config.after_initialize do
-      Productive::Base.setup
+      Productive::Base.setup(Productive.configuration)
     end
   end
 end

data/lib/productive/resources/base.rb

@@ -1,7 +1,6 @@
 module Productive
   class Base < JsonApiClient::Resource
-    def self.setup
-      config = Productive.configuration
+    def self.setup(config)
       self.site = File.join config.base_url, config.account_id.to_s, '/'
       self.connection_options = {headers: {'X-Auth-Token' => config.api_key}}
       self.paginator = config.paginator

data/lib/productive/version.rb

@@ -1,3 +1,3 @@
 module Productive
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/productive.gemspec

@@ -13,5 +13,6 @@ Gem::Specification.new do |s|
   s.license = 'MIT'
   s.files = `git ls-files`.split("\n")
 
+  s.add_dependency 'rack'
   s.add_dependency 'json_api_client'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: productive
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Josip Bišćan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json_api_client
   requirement: !ruby/object:Gem::Requirement