spout 0.14.1 → 1.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbba380addbe8afe96326c9e8c171aadd8a272a24a693e1073ce3622819bead3
-  data.tar.gz: '06180a92089af4f0355e1e2f0887f98d04d5a21dc3e0501e4e219f08a713cb5c'
+  metadata.gz: 62adbf205bca2bcc8145f98ec3db81e0e4f727cefc8a6cd4feba20f89cad05c3
+  data.tar.gz: 27865c6bc004b782554f351f9f06e7ba1dfb30c2c3b770fcb30d81017924fa97
 SHA512:
-  metadata.gz: a1ee3a5d7f55a7a0363d3bc2c8950d349a183030f3a0592bb04d28e9b8818ed3e8556d172ac7ea28a99fe26e6cdeba04c323ff35ba94a475ef142600e6abcb21
-  data.tar.gz: 47f28ae6f5521b0300ad65bdbadd889f8ab393544e305517489ad307a7cb380af676a09bdfd1d7507a6b6b6f0aa959441cedf5af377fd9fe44a6f8beb5aaf0e0
+  metadata.gz: f21716870519e6fca63473053c7cbe7f09f447b7fe1515236523a1b9659fcb8fea8d19fac7492a376fde9afd1aef29a586d85ecfb6b086c171b2bd36fa59c095
+  data.tar.gz: 76b8ae9036b3a5e95853b11a7b6cc330b44f0c1815de212949417fa32c8f8edfb3aab00335d974a745a7fe292b473ec26bb7f52a21bf739478889038cb79db25

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.0.0
+
+### Enhancements
+- **Gem Changes**
+  - Updated to ruby 2.6.1
+
+### Bug Fix
+- Deploying a dataset that contains strings with special characters (accents ñ,
+  emojis 😃, etc) now correctly encodes those characters
+
 ## 0.14.1 (July 19, 2018)
 
 ### Bug Fix

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2018 Remo Mueller
+Copyright (c) 2013-2019 Remo Mueller
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,6 +1,6 @@
 # Spout
 
-[![Build Status](https://travis-ci.org/sleepepi/spout.svg?branch=master)](https://travis-ci.org/sleepepi/spout)
+[![Build Status](https://travis-ci.com/sleepepi/spout.svg?branch=master)](https://travis-ci.com/sleepepi/spout)
 [![Code Climate](https://codeclimate.com/github/sleepepi/spout/badges/gpa.svg)](https://codeclimate.com/github/sleepepi/spout)
 
 Turn your CSV data dictionary into a JSON repository. Collaborate with others to

data/lib/spout/commands/deploy.rb

@@ -9,6 +9,7 @@ require "spout/helpers/quietly"
 require "spout/helpers/send_file"
 require "spout/helpers/semantic"
 require "spout/helpers/json_request"
+require "spout/helpers/send_json"
 
 # - **User Authorization**
 #   - User authenticates via token, the user must be a dataset editor
@@ -322,7 +323,7 @@ module Spout
 
         print "Launch Server Scripts: "
         params = { auth_token: @token, dataset: @slug, version: @version, folders: @created_folders.compact.uniq }
-        (json, _status) = Spout::Helpers::JsonRequest.post("#{@url}/api/v1/dictionary/refresh.json", params)
+        (json, _status) = Spout::Helpers::SendJson.post("#{@url}/api/v1/dictionary/refresh.json", params)
         if json.is_a?(Hash) && json["refresh"] == "success"
           puts "DONE".green
         else
@@ -338,7 +339,7 @@ module Spout
         end
         print "  Set Default Version: "
         params = { auth_token: @token, dataset: @slug, version: @version }
-        (json, _status) = Spout::Helpers::JsonRequest.post(
+        (json, _status) = Spout::Helpers::SendJson.post(
           "#{@url}/api/v1/dictionary/update_default_version.json", params
         )
         if json.is_a?(Hash) && json["version_update"] == "success"

data/lib/spout/commands/graphs.rb

@@ -13,7 +13,7 @@ require "spout/models/graphables"
 require "spout/models/tables"
 require "spout/helpers/config_reader"
 require "spout/helpers/send_file"
-require "spout/helpers/json_request"
+require "spout/helpers/send_json"
 require "spout/version"
 
 module Spout
@@ -175,7 +175,7 @@ module Spout
                    domain: (variable.domain ? variable.domain.deploy_params : nil),
                    forms: variable.forms.collect(&:deploy_params) }
         params[:variable][:spout_stats] = stats.to_json
-        (json, status) = Spout::Helpers::JsonRequest.post("#{@url}/api/v1/variables/create_or_update.json", params)
+        (json, status) = Spout::Helpers::SendJson.post("#{@url}/api/v1/variables/create_or_update.json", params)
         if json.is_a?(Hash) && status.is_a?(Net::HTTPSuccess)
           @progress[variable.id]["uploaded"] << @webserver_name
         else

data/lib/spout/helpers/json_request.rb

@@ -7,20 +7,12 @@ require "cgi"
 
 module Spout
   module Helpers
-    # Generates JSON web requests for GET, POST, and PATCH.
+    # Generates JSON web requests for GET.
     class JsonRequest
       class << self
         def get(url, *args)
           new(url, *args).get
         end
-
-        def post(url, *args)
-          new(url, *args).post
-        end
-
-        def patch(url, *args)
-          new(url, *args).patch
-        end
       end
 
       attr_reader :url
@@ -41,6 +33,7 @@ module Spout
 
       def get
         return unless @error.nil?
+
         full_path = @url.path
         query = ([@url.query] + @params).flatten.compact.join("&")
         full_path += "?#{query}" if query.to_s != ""
@@ -52,22 +45,6 @@ module Spout
         puts "GET Error: #{e}".red
       end
 
-      def post
-        return unless @error.nil?
-        response = @http.start do |http|
-          http.post(@url.path, @params.flatten.compact.join("&"))
-        end
-        [JSON.parse(response.body), response]
-      rescue => e
-        puts "POST ERROR: #{e}".red
-        nil
-      end
-
-      def patch
-        @params << "_method=patch"
-        post
-      end
-
       def nested_hash_to_params(args)
         args.collect do |key, value|
           key_value_to_string(key, value, nil)

data/lib/spout/helpers/send_json.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "openssl"
+require "net/http"
+require "json"
+
+module Spout
+  module Helpers
+    # Generates JSON web requests for POST and PATCH.
+    class SendJson
+      class << self
+        def post(*args)
+          new(*args).post
+        end
+
+        def patch(url, *args)
+          new(url, *args).patch
+        end
+      end
+
+      def initialize(url, args = {})
+        @params = args
+        @url = URI.parse(url)
+
+        @http = Net::HTTP.new(@url.host, @url.port)
+        if @url.scheme == "https"
+          @http.use_ssl = true
+          @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+      rescue
+        @error = "Invalid URL: #{url.inspect}"
+        puts @error.red
+      end
+
+      def post
+        return unless @error.nil?
+
+        header = { "Content-Type" => "application/json", "Accept" => "application/json" }
+        response = @http.start do |http|
+          http.post(@url.path, @params.to_json, header)
+        end
+        [JSON.parse(response.body), response]
+      rescue => e
+        puts "POST ERROR".red
+        puts e.to_s.white
+        nil
+      end
+
+      def patch
+        @params["_method"] = "patch"
+        post
+      end
+    end
+  end
+end

data/lib/spout/templates/README.md.erb

@@ -1,7 +1,7 @@
 <%= @project_name.capitalize %> Data Dictionary
 ======================
 
-[![Build Status](https://travis-ci.org/<REPOSITORY>/<%= @project_name.downcase %>-data-dictionary.svg?branch=master)](https://travis-ci.org/<REPOSITORY>/<%= @project_name.downcase %>-data-dictionary)
+[![Build Status](https://travis-ci.com/<REPOSITORY>/<%= @project_name.downcase %>-data-dictionary.svg?branch=master)](https://travis-ci.com/<REPOSITORY>/<%= @project_name.downcase %>-data-dictionary)
 
 ### Exports
 

data/lib/spout/templates/gitignore

@@ -3,7 +3,6 @@
 
 # Project Files
 /gems.locked
-/Gemfile.lock
 
 # Data Dictionary folders
 /coverage

data/lib/spout/templates/ruby-version

@@ -1 +1 @@
-ruby-2.5.1
+ruby-2.6.1

data/lib/spout/templates/travis.yml

@@ -1,5 +1,4 @@
-sudo: false
 language: ruby
-rvm: 2.5.1
+rvm: 2.6.1
 gemfile: "gems.rb"
 script: spout test

data/lib/spout/version.rb

@@ -2,10 +2,10 @@
 
 module Spout
   module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 14
-    TINY = 1
-    BUILD = nil # "pre", "rc", "rc2", nil
+    MAJOR = 1
+    MINOR = 0
+    TINY = 0
+    BUILD = "beta1" # "pre", "rc", "rc2", nil
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join(".").freeze
   end

data/spout.gemspec

@@ -26,18 +26,21 @@ Gem::Specification.new do |spec|
                        "further validations."
   spec.homepage      = "https://github.com/sleepepi/spout"
 
+  # spec.required_ruby_version     = ">= 2.6.1"
+  # spec.required_rubygems_version = ">= 3.0.1"
+
   spec.required_ruby_version     = ">= 2.5.1"
   spec.required_rubygems_version = ">= 2.7.6"
 
   spec.license       = "MIT"
 
-  spec.files = Dir["{bin,lib}/**/*"] + ["CHANGELOG.md", "LICENSE", "Rakefile", "README.md", "spout.gemspec"]
+  spec.files         = Dir["{bin,lib}/**/*"] + ["CHANGELOG.md", "LICENSE", "Rakefile", "README.md", "spout.gemspec"]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "bundler", "~> 1.16"
+  spec.add_dependency "bundler", ">= 1.3.0"
+  spec.add_dependency "json"
   spec.add_dependency "minitest"
   spec.add_dependency "minitest-reporters"
-  spec.add_dependency "json"
 end

metadata

@@ -1,31 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: spout
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Remo Mueller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -104,6 +104,7 @@ files:
 - lib/spout/helpers/quietly.rb
 - lib/spout/helpers/semantic.rb
 - lib/spout/helpers/send_file.rb
+- lib/spout/helpers/send_json.rb
 - lib/spout/helpers/subject_loader.rb
 - lib/spout/helpers/table_formatting.rb
 - lib/spout/models/bucket.rb
@@ -181,8 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.7.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Turn your CSV data dictionary into a JSON repository. Collaborate with others