lib/tmdb/movie.rb in tmdb-0.3.0 vs lib/tmdb/movie.rb in tmdb-0.4.0

@@ -1,40 +1,49 @@
 # TODO: See about making this a deepopenstruct: https://github.com/aarongough/deepopenstruct
 # TODO: Review http://ruby.learncodethehardway.org/book/ex44.html first, figure out if we ant to use inheritance or composition
 
 module TMDB
   class Movie
-
-      def self.title_search(options = {})
-        # Accepted parameters:
-        # :page, :include_adult (true / false), :year
-        options.merge!(api_key: TMDB::API.api_key)
-        results = TMDB::API.get("/3/search/movie", query: options)['results']
-        movies = []
-        results.each do |result|
-          movies.push(Hashie::Mash.new(result))
-        end
-        return movies
+    def self.title_search(options = {})
+      # Accepted parameters:
+      # :page, :include_adult (true / false), :year
+      options.merge!(api_key: TMDB::API.api_key)
+      results = TMDB::API.get("/3/search/movie", query: options)['results']
+      movies = []
+      results.each do |result|
+        movies.push(Hashie::Mash.new(result))
       end
+      return movies
+    end
 
-      # language (ISO_639_1: 'en')
-      # country (ISO_3166_1: 'US')
-      def self.search(options = {})
-        # US-snobbish
-        options.merge!(api_key: TMDB::API.api_key,
-                       language: 'en',
-                       certification_country: 'US')
-        results = TMDB::API.get("/3/discover/movie", query: options)['results']
-        movies = []
-        results.each do |result|
-          movies.push(Hashie::Mash.new(result))
-        end
-        return movies
+    # language (ISO_639_1: 'en')
+    # country (ISO_3166_1: 'US')
+    def self.search(options = {})
+      # US-snobbish
+      options.merge!(api_key: TMDB::API.api_key,
+                     language: 'en',
+                     certification_country: 'US')
+      results = TMDB::API.get("/3/discover/movie", query: options)['results']
+      movies = []
+      results.each do |result|
+        movies.push(Hashie::Mash.new(result))
       end
+      return movies
+    end
 
-      def self.id(movie_id)
-        options = { api_key: TMDB::API.api_key }
-        Hashie::Mash.new(TMDB::API.get("/3/movie/#{movie_id}", query: options))
-        # movie.title = "Fight Club"
-      end
+    def self.id(movie_id)
+      options = { api_key: TMDB::API.api_key }
+      Hashie::Mash.new(TMDB::API.get("/3/movie/#{movie_id}", query: options))
+      # movie.title = "Fight Club"
+    end
+
+    def self.popular
+      options = { api_key: TMDB::API.api_key }
+      results = TMDB::API.get("/3/movie/popular", query: options)['results']
+      movies = []
+      results.each do |result|
+        movies.push(Hashie::Mash.new(result))
+      end     
+      return movies
+    end
   end
 end
\ No newline at end of file