netflix4r 0.0.3 → 0.1.0

data/README.md

@@ -13,7 +13,7 @@ You must add your netflix credentials to flix4r/lib/credentials.yml. You can get
 Example
 ==========
 
-    list = NetFlix::Title.search(:term => 'sneakers', :max_results => 2)
+    list = NetFlix::Title.search(term: 'sneakers', max_results: 2)
     [#<NetFlix::Title:0x57f0f58 ...>, #<NetFlix::Title:0x57f0f58 ...>] # shortened for readability
     sneakers = list.first
     sneakers.title

data/Rakefile

@@ -45,7 +45,7 @@ Rcov::RcovTask.new do |test|
   test.verbose = true
 end
 
-task :default => :test
+task default: :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/lib/net_flix/api/catalog/titles.rb

@@ -5,13 +5,13 @@ module NetFlix
 
         class << self
 
-          # example Title.search(:term => 'sneakers', :max_results => 10)
+          # example Title.search(term: 'sneakers', max_results: 10)
           def search(params = {})
-            NetFlix::Request.new(:url => 'http://api.netflix.com/catalog/titles', :parameters => params).send
+            NetFlix::Request.new(url: 'http://api.netflix.com/catalog/titles', parameters: params).send
           end
 
           def list(params = {})
-            NetFlix::Request.new(:url => 'http://api.netflix.com/catalog/titles/index', :parameters => params).send
+            NetFlix::Request.new(url: 'http://api.netflix.com/catalog/titles/index', parameters: params).send
           end
 
         end # class methods

data/lib/net_flix/authenticator.rb

@@ -5,8 +5,7 @@ module NetFlix
     require 'digest/sha1'
 
     has_value :request
-    has_value :timestamp, :default => Time.now.to_i
-    has_value :nonce, :default => rand(1_000_000)
+    has_value :nonce, default: rand(1_000_000)
     has_value :credentials
 
     def access_token
@@ -42,7 +41,7 @@ module NetFlix
       {
       'oauth_consumer_key' => key,
       'oauth_signature_method' => 'HMAC-SHA1',
-      'oauth_timestamp' => timestamp,
+      'oauth_timestamp' => Time.now.to_i,
       'oauth_nonce' => nonce,
       'oauth_version' => '1.0'
       }

data/lib/net_flix/builders/actor_builder.rb

@@ -20,7 +20,7 @@ class ActorBuilder
     if cast_link.nil?
       []
     else
-      request = NetFlix::Request.new(:url => cast_link)
+      request = NetFlix::Request.new(url: cast_link)
       response = request.send
       from_xml(response)
     end

data/lib/net_flix/builders/format_builder.rb

@@ -24,7 +24,7 @@ class FormatBuilder
       if cast_link.nil?
         []
       else
-        request = NetFlix::Request.new(:url => cast_link)
+        request = NetFlix::Request.new(url: cast_link)
         response = request.send
         from_xml(response)
       end

data/lib/net_flix/request.rb

@@ -3,9 +3,9 @@ module NetFlix
  
     RESERVED_CHARACTERS = /[^A-Za-z0-9\-\._~]/
 
-    has_value :http_method, :default => 'GET'
-    has_value :url, :default => 'http://api.netflix.com/catalog/titles/index'
-    has_value :parameters, :klass => HashWithIndifferentAccess, :default => {}
+    has_value :http_method, default: 'GET'
+    has_value :url, default: 'http://api.netflix.com/catalog/titles/index'
+    has_value :parameters, klass: HashWithIndifferentAccess, default: {}
 
     def ordered_keys
       parameters.keys.sort
@@ -18,7 +18,7 @@ module NetFlix
     end
 
     def authenticator
-      @auth = NetFlix::Authenticator.new(:request => self, :credentials => NetFlix.credentials)
+      @auth = NetFlix::Authenticator.new(request: self, credentials: NetFlix.credentials)
     end
 
     def target

data/lib/valuable.rb

@@ -74,7 +74,7 @@ class Valuable
     end
 
     def has_collection(name)
-      has_value(name, :default => [] )
+      has_value(name, default: [] )
     end 
 
   end

data/test/actor_builder_test.rb

@@ -14,7 +14,7 @@ class ActorBuilderTest < Test::Unit::TestCase
 
   def test_that_cast_reference_is_pulled
 
-    NetFlix::Request.expects(:new).with(:url => 'http://api.netflix.com/catalog/titles/movies/60024073/cast').returns(stub_everything(:send => '<xml/>'))
+    NetFlix::Request.expects(:new).with(url: 'http://api.netflix.com/catalog/titles/movies/60024073/cast').returns(stub_everything(send: '<xml/>'))
     
     xml = %|
               <title_index_item>  

data/test/authenticator_test.rb

@@ -3,13 +3,13 @@ require File.join( File.dirname(__FILE__), 'test.rb')
 class AuthenticatorTest < Test::Unit::TestCase
 
   def test_that_url_is_properly_encoded
-    fake_request = stub_everything(:url => 'http://photos.example.net/a pic')
-    assert_equal 'http%3A%2F%2Fphotos.example.net%2Fa%20pic', NetFlix::Authenticator.new(:request => fake_request).encoded_url
+    fake_request = stub_everything(url: 'http://photos.example.net/a pic')
+    assert_equal 'http%3A%2F%2Fphotos.example.net%2Fa%20pic', NetFlix::Authenticator.new(request: fake_request).encoded_url
   end
 
   def test_that_spaces_in_parameters_are_encoded
-    request = stub_everything(:parameter_string => 'a key=value')
-    assert_equal 'a%20key%3Dvalue', NetFlix::Authenticator.new(:request => request).encoded_parameters
+    request = stub_everything(parameter_string: 'a key=value')
+    assert_equal 'a%20key%3Dvalue', NetFlix::Authenticator.new(request: request).encoded_parameters
   end
 
   def test_that_authentication_corresponds_to_known_values
@@ -17,24 +17,24 @@ class AuthenticatorTest < Test::Unit::TestCase
     #based on http://term.ie/oauth/example/client.php
 
     cred = stub_everything(
-	     :key => '123456789012345678901234',
-             :secret => '1234567890',
-             :valid? => true)
+	     key: '123456789012345678901234',
+             secret: '1234567890',
+             valid?: true)
     
     expected_sbs = 'GET&http%3A%2F%2Fapi.netflix.com%2Fcatalog%2Ftitles&max_results%3D5%26oauth_consumer_key%3D123456789012345678901234%26oauth_nonce%3D24aea97b0b5dd516145966aaf2945c6a%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1233950836%26oauth_version%3D1.0%26term%3Dsneakers'
 
     expected_signature = 'vlROEST9UXwI+zc9fld82giaYPE='
 
     request = NetFlix::Request.new(
-      :url => 'http://api.netflix.com/catalog/titles',
-      :http_method => 'GET',
-      :parameters => {'term' => 'sneakers', 'max_results' => '5'})
+      url: 'http://api.netflix.com/catalog/titles',
+      http_method: 'GET',
+      parameters: {'term' => 'sneakers', 'max_results' => '5'})
 	    
     auth = NetFlix::Authenticator.new(
-        :request => request,
-        :timestamp => 1233950836,
-        :nonce => '24aea97b0b5dd516145966aaf2945c6a',
-	:credentials => cred
+        request: request,
+        timestamp: 1233950836,
+        nonce: '24aea97b0b5dd516145966aaf2945c6a',
+	credentials: cred
       )
 	  
     assert_equal expected_sbs, auth.signature_base_string
@@ -42,30 +42,30 @@ class AuthenticatorTest < Test::Unit::TestCase
   end
 
   def test_that_signature_key_includes_consumer_secret_and_ampersand
-    cred = stub_everything(:secret => 'shhh', :key => 'letmein')
-    assert_equal 'shhh&', NetFlix::Authenticator.new(:credentials => cred).signature_key
+    cred = stub_everything(secret: 'shhh', key: 'letmein')
+    assert_equal 'shhh&', NetFlix::Authenticator.new(credentials: cred).signature_key
   end
 
   def test_that_access_token_is_included_in_signature_key_if_it_is_available
-    cred = stub_everything(:secret => 'shhh', :key => 'letmein', :access_token => 'they_like_me')
+    cred = stub_everything(secret: 'shhh', key: 'letmein', access_token: 'they_like_me')
     request = stub_everything
 
-    assert_equal 'shhh&they_like_me', NetFlix::Authenticator.new(:request => request, :credentials => cred).signature_key
+    assert_equal 'shhh&they_like_me', NetFlix::Authenticator.new(request: request, credentials: cred).signature_key
   end
 
   def test_that_signature_is_added_to_parameters_during_signing
-    cred = stub_everything(:secred => 'shhh', :key => 'letmein', :valid? => true) 
+    cred = stub_everything(secret: 'shhh', key: 'letmein', valid?: true) 
     params = stub_everything
     params.expects(:merge).with(has_key('oauth_signature')).once
     
-    request = stub_everything(:parameters => params)
-    auth = NetFlix::Authenticator.new(:request => request, :credentials => cred)
+    request = stub_everything(parameters: params)
+    auth = NetFlix::Authenticator.new(request: request, credentials: cred)
     auth.sign!
   end
 
   def test_that_exception_is_raised_if_secret_is_missing
-    credentials = stub_everything(:valid? => false)
-    authenticator = NetFlix::Authenticator.new(:credentials => credentials)
+    credentials = stub_everything(valid?: false)
+    authenticator = NetFlix::Authenticator.new(credentials: credentials)
 
     assert_raises ArgumentError do
       authenticator.require_credentials

data/test/credentials_test.rb

@@ -3,7 +3,7 @@ require File.join( File.dirname(__FILE__), 'test.rb')
 class CredentialsTest < Test::Unit::TestCase
 
   def file_contents
-    {:key => :value}.to_yaml
+    {key: :value}.to_yaml
   end
 
   def test_that_credentials_file_is_not_loaded_if_it_dne
@@ -20,7 +20,7 @@ class CredentialsTest < Test::Unit::TestCase
 
   def test_that_values_from_file_are_present
     File.stubs(:exist?).returns(true)
-    File.stubs(:open).returns({:key => :my_key, :secret => 'quiet!'}.to_yaml)
+    File.stubs(:open).returns({key: :my_key, secret: 'quiet!'}.to_yaml)
     assert_equal :my_key, NetFlix::Credentials.from_file.key
   end
 

data/test/format_builder_test.rb

@@ -12,7 +12,7 @@ class FormatBuilderTest < Test::Unit::TestCase
 
   def test_that_format_links_are_followed
 
-    NetFlix::Request.expects(:new).with(:url => 'http://api.netflix.com/catalog/titles/movies/60031755/format_availability').returns(stub_everything(:send => '<xml/>'))
+    NetFlix::Request.expects(:new).with(url: 'http://api.netflix.com/catalog/titles/movies/60031755/format_availability').returns(stub_everything(send: '<xml/>'))
     
     FormatBuilder.from_movie( title_with_link_to_formats )    
   end

data/test/helper.rb

@@ -12,7 +12,7 @@ require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'flix4r'
+require 'netflix4r'
 
 class Test::Unit::TestCase
 end

data/test/request_test.rb

@@ -3,20 +3,20 @@ require File.join( File.dirname(__FILE__), 'test.rb')
 class NetflixTest < Test::Unit::TestCase
 
   def test_that_http_method_is_validated
-    assert_equal false, NetFlix::Request.new(:http_method => 'Thing').valid?
+    assert_equal false, NetFlix::Request.new(http_method: 'Thing').valid?
   end
 
   def test_that_http_method_knows_valid_values
-    assert_equal true, NetFlix::Request.new(:http_method => 'POST').valid?
-    assert_equal true, NetFlix::Request.new(:http_method => 'GET').valid?
+    assert_equal true, NetFlix::Request.new(http_method: 'POST').valid?
+    assert_equal true, NetFlix::Request.new(http_method: 'GET').valid?
   end
 
   def test_that_parameters_appear_alphabetically_in_parameter_string
-    assert_equal 'key_a=value1&key_b=value2', NetFlix::Request.new(:parameters => {'key_b' => 'value2', 'key_a' => 'value1'}).parameter_string
+    assert_equal 'key_a=value1&key_b=value2', NetFlix::Request.new(parameters: {'key_b' => 'value2', 'key_a' => 'value1'}).parameter_string
   end
 
   def test_that_authenticator_receives_copy_of_request
-    request = NetFlix::Request.new(:parameters => {'key1' => '2'})
+    request = NetFlix::Request.new(parameters: {'key1' => '2'})
     NetFlix::Authenticator.expects(:new).with(has_entry(:request, request)).returns(stub_everything)
     Net::HTTP.stubs(:get)
     
@@ -24,7 +24,7 @@ class NetflixTest < Test::Unit::TestCase
   end
 
   def test_that_request_is_logged_when_sent
-    request = NetFlix::Request.new(:url => 'some_url', :parameters => {'logme' => 'please'})
+    request = NetFlix::Request.new(url: 'some_url', parameters: {'logme' => 'please'})
     NetFlix.expects(:log).with('some_url?logme=please')
     request.log
   end

data/test/title_test.rb

@@ -3,7 +3,7 @@ require File.join( File.dirname(__FILE__), 'test.rb')
 class TitleTest < Test::Unit::TestCase
 
   def request_stub
-    stub_everything(:send => '<xml />')
+    stub_everything(send: '<xml />')
   end
 
   def test_that_title_can_go_to_and_from_json

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netflix4r
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70174415753620 !ruby/object:Gem::Requirement
+  requirement: &70218846804660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174415753620
+  version_requirements: *70218846804660
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &70174415752160 !ruby/object:Gem::Requirement
+  requirement: &70218846803360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174415752160
+  version_requirements: *70218846803360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70174415767320 !ruby/object:Gem::Requirement
+  requirement: &70218846754620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174415767320
+  version_requirements: *70218846754620
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70174415766420 !ruby/object:Gem::Requirement
+  requirement: &70218846753640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174415766420
+  version_requirements: *70218846753640
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70174415765720 !ruby/object:Gem::Requirement
+  requirement: &70218846752360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174415765720
+  version_requirements: *70218846752360
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70174415764840 !ruby/object:Gem::Requirement
+  requirement: &70218846751680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70174415764840
+  version_requirements: *70218846751680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70174415764040 !ruby/object:Gem::Requirement
+  requirement: &70218846750860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *70174415764040
+  version_requirements: *70218846750860
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70174415763360 !ruby/object:Gem::Requirement
+  requirement: &70218846750080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70174415763360
+  version_requirements: *70218846750080
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70174415762340 !ruby/object:Gem::Requirement
+  requirement: &70218846748020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174415762340
+  version_requirements: *70218846748020
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &70174415761800 !ruby/object:Gem::Requirement
+  requirement: &70218846763280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174415761800
+  version_requirements: *70218846763280
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70174415761220 !ruby/object:Gem::Requirement
+  requirement: &70218846761940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174415761220
+  version_requirements: *70218846761940
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70174415760460 !ruby/object:Gem::Requirement
+  requirement: &70218846760940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174415760460
+  version_requirements: *70218846760940
 description: a ruby client for the NetFlix API
 email: axcess1@me.com
 executables: []
@@ -195,7 +195,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1982381224223883512
+      hash: 3530660002784482062
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: