thumbtack 1.1.1 → 2.0.0

data/lib/thumbtack/types/date.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types

data/lib/thumbtack/types/identity.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types

data/lib/thumbtack/types/integer.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types

data/lib/thumbtack/types/length_validation.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types
@@ -19,8 +19,8 @@ module Thumbtack
       #   if the value is not less or equal to the maximum length
       def self.validate(value, maximum_length)
         unless value.length <= maximum_length
-          fail ValidationError,
-               "#{value} cannot be greater than #{maximum_length} characters"
+          raise ValidationError,
+                "#{value} cannot be greater than #{maximum_length} characters"
         end
         self
       end

data/lib/thumbtack/types/md5.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types
@@ -9,7 +9,7 @@ module Thumbtack
       # The length of an MD5 value
       LENGTH = 32
       # The valid characters in an MD5 value
-      CHARACTERS = '0123456789abcdf'.freeze
+      CHARACTERS = '0123456789abcdf'
 
       # Validate a string is a valid MD5 parameter
       #
@@ -22,8 +22,8 @@ module Thumbtack
       #   if the value is not a 32 character hexadecimal MD5 hash
       def self.validate(value)
         unless valid_md5?(value)
-          fail ValidationError,
-               "#{value} must be a 32 character hexadecimal MD5 hash"
+          raise ValidationError,
+                "#{value} must be a 32 character hexadecimal MD5 hash"
         end
         self
       end

data/lib/thumbtack/types/range_validation.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types
@@ -22,8 +22,8 @@ module Thumbtack
       #   if the value is not within the range
       def self.validate(value, range)
         unless range.cover?(value)
-          fail ValidationError,
-               "#{value} must be between #{range.begin} and #{range.end}"
+          raise ValidationError,
+                "#{value} must be between #{range.begin} and #{range.end}"
         end
         self
       end

data/lib/thumbtack/types/tags.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types
@@ -10,9 +10,9 @@ module Thumbtack
       # The maximum tag length
       MAXIMUM_LENGTH = 255
       # Tags cannot have commas
-      INVALID_CHARACTER = ','.freeze
+      INVALID_CHARACTER = ','
       # Tag parameters are separated by spaces
-      SEPARATOR = ' '.freeze
+      SEPARATOR = ' '
 
       # Validate a tags value
       #
@@ -25,10 +25,10 @@ module Thumbtack
       #   if any tags contain commas or are longer than 255 characters
       def self.validate(value)
         Array(value).each do |tag|
-          unless tag_valid?(tag)
-            fail ValidationError,
-                 "#{tag} cannot contain commas or be longer than 255 characters"
-          end
+          next if tag_valid?(tag)
+
+          raise ValidationError,
+                "#{tag} cannot contain commas or be longer than 255 characters"
         end
         self
       end

data/lib/thumbtack/types/text.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types

data/lib/thumbtack/types/{date_time.rb → time.rb}

@@ -1,24 +1,24 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types
-    # Handles conversion and validation of DateTimes to parameters supported by
+    # Handles conversion and validation of Times to parameters supported by
     # Pinboard
     #
     # @api private
-    class DateTime
+    class Time
       # The earliest allowable time
-      EARLIEST = ::DateTime.new(1, 1, 1)
+      EARLIEST = ::Time.new(1, 1, 1, 0, 0, 0, 0)
       # The latest allowable time
-      LATEST = ::DateTime.new(2100, 1, 1)
+      LATEST = ::Time.new(2100, 1, 1, 0, 0, 0, 0)
       # Pinboard's date time format
-      FORMAT = '%Y-%m-%dT%H:%M:%SZ'.freeze
+      FORMAT = '%Y-%m-%dT%H:%M:%SZ'
       # Pinboard's date time format for notes
-      NOTE_FORMAT = '%Y-%m-%d %H:%M:%S'.freeze
+      NOTE_FORMAT = '%Y-%m-%d %H:%M:%S'
 
       # Validate a time
       #
-      # @param [DateTime] value
+      # @param [Time] value
       #   The time to validate
       #
       # @return [self]
@@ -32,7 +32,7 @@ module Thumbtack
 
       # Convert a time to a parameter acceptable to Pinboard
       #
-      # @param [DateTime] value
+      # @param [Time] value
       #   the time to convert
       #
       # @return [String]
@@ -46,9 +46,9 @@ module Thumbtack
       # @param [String] parameter
       #   the time formatted yyyy-mm-ddTHH:MM:SSZ
       #
-      # @return [DateTime]
+      # @return [Time]
       def self.deserialize(parameter)
-        ::DateTime.strptime(parameter)
+        ::Time.strptime(parameter, FORMAT)
       end
 
       # Convert a parameter from Pinboard's notes to a datetime value
@@ -56,9 +56,9 @@ module Thumbtack
       # @param [String] parameter
       #   the time formatted yyyy-mm-dd HH:MM:SS
       #
-      # @return [DateTime]
+      # @return [Time]
       def self.deserialize_from_note(parameter)
-        ::DateTime.strptime(parameter, NOTE_FORMAT)
+        ::Time.strptime(parameter, NOTE_FORMAT)
       end
     end
   end

data/lib/thumbtack/types/title.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types

data/lib/thumbtack/types/url.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   module Types
@@ -7,7 +7,7 @@ module Thumbtack
     # @api private
     class URL < Identity
       # Valid URL schemes
-      VALID_SCHEMES = %w(http https javascript mailto ftp file feed).freeze
+      VALID_SCHEMES = %w[http https javascript mailto ftp file feed].freeze
 
       # Validate a URL
       #
@@ -21,8 +21,8 @@ module Thumbtack
       #   file, or feed
       def self.validate(value)
         unless VALID_SCHEMES.include? URI(value).scheme
-          fail ValidationError,
-               "scheme must be one of #{VALID_SCHEMES.join(', ')}"
+          raise ValidationError,
+                "scheme must be one of #{VALID_SCHEMES.join(', ')}"
         end
         self
       end

data/lib/thumbtack/user.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   # Wraps API calls related to users

data/lib/thumbtack/version.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Thumbtack
   # Gem version
-  VERSION = '1.1.1'.freeze
+  VERSION = '2.0.0'
 end

data/test/test_helper.rb

@@ -1,6 +1,9 @@
-# encoding: utf-8
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+# frozen_string_literal: true
+
+if ENV.fetch('COVERAGE', false)
+  require 'simplecov'
+  SimpleCov.start { add_filter 'test/' }
+end
 
 require 'thumbtack'
 require 'minitest/autorun'
@@ -17,4 +20,4 @@ def mock_client_action(url, params)
   client
 end
 
-include Thumbtack
+Minitest::Test.include Thumbtack

data/test/thumbtack/client_test.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/thumbtack/integration/basic_adapter_test.rb

@@ -1,11 +1,11 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
 module Integration
   class BasicAdapterTest < Minitest::Test
     def setup
-      path = File.expand_path('../../../auth_token.txt', __FILE__)
+      path = File.expand_path('../../auth_token.txt', __dir__)
       auth_token = File.open(path).read.strip
       @username, @token = auth_token.split(':')
       @adapter = Adapters::BasicAdapter.new(@username, @token)

data/test/thumbtack/note_summary_test.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -17,8 +17,8 @@ class NoteSummaryTest < Minitest::Test
     assert_equal '8e5d6964bb810e0050b0', note.id
     assert_equal 'StarCraft beta coming this week!', note.title
     assert_equal '0c9c30f60cadabd31415', note.digest
-    assert_equal DateTime.new(2010, 2, 11, 3, 46, 56), note.created_at
-    assert_equal DateTime.new(2010, 2, 11, 3, 47, 47), note.updated_at
+    assert_equal Time.new(2010, 2, 11, 3, 46, 56), note.created_at
+    assert_equal Time.new(2010, 2, 11, 3, 47, 47), note.updated_at
     assert_equal 19, note.length
   end
 end

data/test/thumbtack/note_test.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -18,8 +18,8 @@ class NoteTest < Minitest::Test
     assert_equal '8e5d6964bb810e0050b0', note.id
     assert_equal 'StarCraft beta coming this week!', note.title
     assert_equal '0c9c30f60cadabd31415', note.digest
-    assert_equal DateTime.new(2010, 2, 11, 3, 46, 56), note.created_at
-    assert_equal DateTime.new(2010, 2, 11, 3, 47, 47), note.updated_at
+    assert_equal Time.new(2010, 2, 11, 3, 46, 56), note.created_at
+    assert_equal Time.new(2010, 2, 11, 3, 47, 47), note.updated_at
     assert_equal 19, note.length
     assert_equal 'This is a test note', note.text
   end

data/test/thumbtack/notes_test.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 

data/test/thumbtack/post_test.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -22,9 +22,9 @@ class PostTest < Minitest::Test
     assert_equal '', post.extended
     assert_equal '46ca40b9b92ee0ea1284785a5d2a9b38', post.meta
     assert_equal 'dab521de65f9250b4cca7383feef67dc', post.digest
-    assert_equal DateTime.new(2014, 6, 29, 16, 57, 45), post.time
+    assert_equal Time.new(2014, 6, 29, 16, 57, 45), post.time
     assert_equal true, post.shared
     assert_equal false, post.toread
-    assert_equal %w(test123 another), post.tags
+    assert_equal %w[test123 another], post.tags
   end
 end

data/test/thumbtack/posts_test.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'test_helper'
 
@@ -11,7 +11,7 @@ class PostsTest < Minitest::Test
     )
     posts = Posts.new(client)
 
-    assert_equal DateTime.new(2014, 6, 26, 19, 1, 33), posts.update
+    assert_equal Time.new(2014, 6, 26, 19, 1, 33), posts.update
     client.verify
   end
 
@@ -40,7 +40,7 @@ class PostsTest < Minitest::Test
                  posts.add(
                    'http://example.org',
                    'example.org',
-                   tags: %w(thumbtack test)
+                   tags: %w[thumbtack test]
                  )
     client.verify
   end
@@ -62,17 +62,7 @@ class PostsTest < Minitest::Test
       { url: 'http://example.org' },
       'date' => '2014-06-29T16:57:45Z',
       'user' => 'nwjsmith',
-      'posts' => [{
-        'href' => 'http://example.org',
-        'description' => 'example.org',
-        'extended' => '',
-        'meta' => '46ca40b9b92ee0ea1284785a5d2a9b38',
-        'hash' => 'dab521de65f9250b4cca7383feef67dc',
-        'time' => '2014-06-29T16:57:45Z',
-        'shared' => 'yes',
-        'toread' => 'no',
-        'tags' => 'test123'
-      }]
+      'posts' => [example_post_hash]
     )
     posts = Posts.new(client)
     response = posts.get(url: 'http://example.org')
@@ -88,17 +78,7 @@ class PostsTest < Minitest::Test
       { tag: 'webdev' },
       'date' => '2014-06-29T16:57:45Z',
       'user' => 'nwjsmith',
-      'posts' => [{
-        'href' => 'http://example.org',
-        'description' => 'example.org',
-        'extended' => '',
-        'meta' => '46ca40b9b92ee0ea1284785a5d2a9b38',
-        'hash' => 'dab521de65f9250b4cca7383feef67dc',
-        'time' => '2014-06-29T16:57:45Z',
-        'shared' => 'yes',
-        'toread' => 'no',
-        'tags' => 'webdev'
-      }]
+      'posts' => [example_post_hash]
     )
     posts = Posts.new(client)
     response = posts.recent(tag: 'webdev')
@@ -112,19 +92,7 @@ class PostsTest < Minitest::Test
     client = mock_client_get(
       '/posts/all',
       { tag: 'webdev' },
-      [
-        {
-          'href' => 'http://example.org',
-          'description' => 'example.org',
-          'extended' => '',
-          'meta' => '46ca40b9b92ee0ea1284785a5d2a9b38',
-          'hash' => 'dab521de65f9250b4cca7383feef67dc',
-          'time' => '2014-06-29T16:57:45Z',
-          'shared' => 'yes',
-          'toread' => 'no',
-          'tags' => 'webdev'
-        }
-      ]
+      [example_post_hash]
     )
     posts = Posts.new(client)
     response = posts.all(tag: 'webdev')
@@ -139,8 +107,8 @@ class PostsTest < Minitest::Test
       '/posts/suggest',
       { url: 'http://blog.com' },
       [
-        { 'popular' => %w(blog blogs people) },
-        { 'recommended' => %w(blog writing weblog) }
+        { 'popular' => %w[blog blogs people] },
+        { 'recommended' => %w[blog writing weblog] }
       ]
     )
     posts = Posts.new(client)
@@ -159,10 +127,7 @@ class PostsTest < Minitest::Test
       'tag' => 'argentina',
       'dates' => {
         '2010-11-29' => '5',
-        '2010-11-28' => '15',
-        '2010-11-26' => '2',
         '2010-11-25' => '2',
-        '2010-11-23' => '7',
         '2010-11-22' => '20',
         '2010-11-21' => '16',
         '2010-11-19' => '4'
@@ -174,10 +139,7 @@ class PostsTest < Minitest::Test
     assert_equal(
       {
         Date.new(2010, 11, 29) => 5,
-        Date.new(2010, 11, 28) => 15,
-        Date.new(2010, 11, 26) => 2,
         Date.new(2010, 11, 25) => 2,
-        Date.new(2010, 11, 23) => 7,
         Date.new(2010, 11, 22) => 20,
         Date.new(2010, 11, 21) => 16,
         Date.new(2010, 11, 19) => 4
@@ -186,4 +148,20 @@ class PostsTest < Minitest::Test
     )
     client.verify
   end
+
+  private
+
+  def example_post_hash
+    {
+      'href' => 'http://example.org',
+      'description' => 'example.org',
+      'extended' => '',
+      'meta' => '46ca40b9b92ee0ea1284785a5d2a9b38',
+      'hash' => 'dab521de65f9250b4cca7383feef67dc',
+      'time' => '2014-06-29T16:57:45Z',
+      'shared' => 'yes',
+      'toread' => 'no',
+      'tags' => 'webdev'
+    }
+  end
 end