milkman 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f70e86ed17fee9abd767258828429e32331dc7e
-  data.tar.gz: 041527d2354dcb3677e501db286f68e6b5fed53d
+  metadata.gz: ed084fc316eb5e7092bc447b6784b49cb4761bc6
+  data.tar.gz: 87a261589670a17d73fd7bc78502bbbc8bb9231a
 SHA512:
-  metadata.gz: d22bc948d10b6db10cb2a230315d14b802658d7b7a1912db053a28cc515597eb1a462839e2f7832cabcecfc9c0b68812404d25ed4040bf286821ed3c931a40d1
-  data.tar.gz: 95221cd07e2073ff65c43c0e84103bb55046d4791f00fa5e2be8c08089129b5330cf95e68edc22310ad3568d52d85650f7e3591823dc335b0f0085dfc0a5231d
+  metadata.gz: e88fc8802a1c97541aafe654951f551e6fc2de6a85b3335d745e4b5473fc5985e8e155f6f76d1bd6363e7b5e658246dd9603f9374521fd5846b9e0504f3165f6
+  data.tar.gz: dce35f2574c2bd334e27f859a9bff04291cc9734db74dba722f183c547b327eb52ba83a2c5b1aa16d99d74bd57b6925d84219c1c5fc7872185eec7b99232db99

data/lib/milkman.rb

@@ -2,7 +2,7 @@ require "i18n"
 
 module Milkman
 
-  AUTH_URL = "http://www.rememberthemilk.com/services/auth/"
+  AUTH_URL = "https://www.rememberthemilk.com/services/auth/"
   BASE_URL = "http://api.rememberthemilk.com/services/rest/"
 
   I18n.load_path += Dir.glob(File.join(File.dirname(__FILE__), "locales/*.yml"))

data/lib/milkman/authorizer.rb

@@ -3,10 +3,11 @@ module Milkman
 
     include Utility
 
-    attr_accessor :options
+    attr_accessor :options, :shared_secret
 
     def initialize(attributes)
-      @options = attributes.merge! default_options
+      @shared_secret = attributes.delete(:shared_secret)
+      @options       = attributes.merge! default_options
     end
 
     def self.authorize(options)
@@ -15,7 +16,7 @@ module Milkman
 
     def authorize
       puts I18n.t("milkman.authorization.frob_message", url: frob_message_url)
-      puts I18n.t("milkman.authorization.auth_token_message", username: response["rsp"]["auth"]["user"]["username"], api_key: options[:api_key], shared_secret: options[:shared_secret], auth_token: response["rsp"]["auth"]["token"])
+      puts I18n.t("milkman.authorization.auth_token_message", username: response["rsp"]["auth"]["user"]["username"], api_key: options[:api_key], shared_secret: shared_secret, auth_token: response["rsp"]["auth"]["token"])
     end
 
     private
@@ -25,7 +26,7 @@ module Milkman
     end
 
     def signed_options
-      sign options[:shared_secret], options.merge!(method: "rtm.auth.getToken", frob: frob)
+      sign shared_secret, options.merge!(method: "rtm.auth.getToken", frob: frob)
     end
 
     def frob
@@ -33,7 +34,7 @@ module Milkman
     end
 
     def frob_message_url
-      authorization_url sign(options[:shared_secret], options)
+      authorization_url sign(shared_secret, options.except(:format))
     end
 
     def authorization_url(parameters)

data/lib/milkman/client.rb

@@ -3,10 +3,11 @@ module Milkman
 
     include Utility
 
-    attr_accessor :options
+    attr_accessor :options, :shared_secret
 
     def initialize(attributes)
-      @options = attributes.merge default_options
+      @shared_secret = attributes.delete(:shared_secret)
+      @options       = attributes.merge default_options
 
       if !has_required_options?
         raise NoMilkError, "The API key and shared secret are required."
@@ -14,14 +15,14 @@ module Milkman
     end
 
     def get(method, request_options = {})
-      signed_options = sign options[:shared_secret], options.merge!(method: method).merge!(request_options)
+      signed_options = sign shared_secret, options.merge!(method: method).merge!(request_options)
       Milkman::Request.call request_url(signed_options)
     end
 
     private
 
     def has_required_options?
-      options[:api_key] && options[:shared_secret]
+      options[:api_key] && shared_secret
     end
 
   end

data/lib/milkman/version.rb

@@ -1,3 +1,3 @@
 module Milkman
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/milkman/authorizer_spec.rb

@@ -8,11 +8,14 @@ module Milkman
     end
 
     context "#initialize" do
+      let(:client) { described_class.new(options) }
 
-      it "saves a references to the specified options" do
-        hash = { api_key: "<api_key>", shared_secret: "<shared_secret>", format: "json", perms: "delete" }
+      it "knows its shared secret" do
+        expect(client.shared_secret).to eq "<shared_secret>"
+      end
 
-        client = described_class.new(options)
+      it "saves a references to the specified options" do
+        hash = { api_key: "<api_key>", format: "json", perms: "delete" }
         expect(client.options).to eq hash
       end
 

data/spec/milkman/client_spec.rb

@@ -8,11 +8,15 @@ module Milkman
     end
 
     context "#initialize" do
+      let(:client) { described_class.new(options) }
+
+      it "knows its shared secret" do
+        expect(client.shared_secret).to eq "bar"
+      end
 
       it "saves a references to the specified options" do
-        hash = { api_key: "foo", shared_secret: "bar", format: "json", perms: "delete" }
+        hash = { api_key: "foo", format: "json", perms: "delete" }
 
-        client = described_class.new(options)
         expect(client.options).to eq hash
       end
 
@@ -62,7 +66,7 @@ module Milkman
     context "#get" do
 
       it "requests a call to the RTM API with the specified method" do
-        expect(Milkman::Request).to receive(:call).with "http://api.rememberthemilk.com/services/rest/?api_key=foo&shared_secret=bar&perms=delete&format=json&method=method&api_sig=57c35d820267ab89717e291d619860d2"
+        expect(Milkman::Request).to receive(:call).with "http://api.rememberthemilk.com/services/rest/?api_key=foo&perms=delete&format=json&method=method&api_sig=7c861e6ffbe0ce450cdfcc68f7447753"
 
         client = described_class.new(options)
         client.get "method"

data/spec/milkman_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Milkman do
 
   it "knows its AUTH_URL" do
-    expect(Milkman::AUTH_URL).to eq "http://www.rememberthemilk.com/services/auth/"
+    expect(Milkman::AUTH_URL).to eq "https://www.rememberthemilk.com/services/auth/"
   end
 
   it "knows its BASE_URL" do

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: milkman
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Kevin Tuhumury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   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: i18n
   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: httparty
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capture_stdout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem provides a Ruby wrapper around the Remember The Milk (RTM) API
@@ -145,11 +145,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .coveralls.yml
+- .gitignore
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -181,17 +181,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Milkman is a Ruby wrapper for the Remember The Milk (RTM) API.